clean up legacy files
This commit is contained in:
parent
638ff2812f
commit
bc35923fe2
658 changed files with 196 additions and 1 deletions
|
|
@ -1,49 +0,0 @@
|
|||
local cmp = require 'cmp'
|
||||
|
||||
cmp.setup({
|
||||
window = {documentation = cmp.config.window.bordered({border = "single"})},
|
||||
formatting = {
|
||||
format = function(entry, vim_item)
|
||||
-- set a name for each source
|
||||
vim_item.menu = ({
|
||||
nvim_lsp = "[LSP]",
|
||||
path = "[Path]",
|
||||
buffer = "[Buffer]",
|
||||
ultisnips = "[UltiSnips]"
|
||||
})[entry.source.name]
|
||||
return vim_item
|
||||
end
|
||||
},
|
||||
completion = {
|
||||
keyword_length = 1,
|
||||
max_item_count = 20
|
||||
-- autocomplete = false
|
||||
},
|
||||
snippet = {expand = function(args) vim.fn["UltiSnips#Anon"](args.body) end},
|
||||
mapping = {
|
||||
['<C-u>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-d>'] = cmp.mapping.scroll_docs(4),
|
||||
["<C-n>"] = cmp.mapping({
|
||||
i = function()
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item({behavior = cmp.SelectBehavior.Insert})
|
||||
else
|
||||
cmp.complete()
|
||||
end
|
||||
end
|
||||
})
|
||||
},
|
||||
sources = {
|
||||
{name = 'nvim_lsp', max_item_count = 8, keyword_length = 3},
|
||||
{name = 'path'},
|
||||
{name = 'buffer',
|
||||
option = {
|
||||
keyword_length = 4,
|
||||
max_item_count = 20,
|
||||
get_bufnrs = function()
|
||||
return vim.api.nvim_list_bufs()
|
||||
end
|
||||
}},
|
||||
{name = 'ultisnips', priority_weight = 10, keyword_length = 1}
|
||||
}
|
||||
})
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
|
||||
require("indent_blankline").setup {
|
||||
space_char_blankline = " ",
|
||||
show_current_context = true,
|
||||
}
|
||||
230
lua/init-lsp.lua
230
lua/init-lsp.lua
|
|
@ -1,230 +0,0 @@
|
|||
vim.cmd [[
|
||||
sign define LspDiagnosticsSignError text= texthl= linehl= numhl=LspDiagnosticsLineNrError
|
||||
sign define LspDiagnosticsSignWarning text= texthl= linehl= numhl=LspDiagnosticsLineNrWarning
|
||||
sign define LspDiagnosticsSignInfo text= texthl= linehl= numhl=LspDiagnosticsLineNrInformation
|
||||
sign define LspDiagnosticsSignHint text= texthl= linehl= numhl=LspDiagnosticsLineNrHint
|
||||
]]
|
||||
--
|
||||
-- lspconfig
|
||||
local nvim_lsp = require('lspconfig')
|
||||
|
||||
-- Use a loop to conveniently call 'setup' on multiple servers and
|
||||
-- map buffer local keybindings when the language server attaches
|
||||
local servers = {
|
||||
-- astro
|
||||
-- npm install -g @astrojs/language-server
|
||||
'astro', -- npm i -g bash-language-server
|
||||
-- no formatting support
|
||||
'bashls', -- npm i -g vscode-langservers-extracted
|
||||
-- no formatting support
|
||||
'cssls', -- npm install -g intelephense
|
||||
-- suports formatting
|
||||
'intelephense',
|
||||
|
||||
-- https://phpactor.readthedocs.io/en/master/usage/standalone.html
|
||||
'phpactor', -- npm install -g pyright
|
||||
-- static type checker
|
||||
'pyright', -- https://github.com/neovim/nvim-lspconfig/wiki
|
||||
-- 'tailwindcss',
|
||||
-- npm install -g typescript typescript-language-server
|
||||
-- supports formatting
|
||||
'tsserver', -- npm install -g vim-language-server
|
||||
-- no formatting support
|
||||
'vimls', -- vue
|
||||
-- use vetur
|
||||
'yamlls' -- no formatting support
|
||||
-- is now automatically started/configured by rust-tools
|
||||
-- sudo pacman -Syu rust-analyzer
|
||||
-- 'rust_analyzer'
|
||||
}
|
||||
|
||||
-- Use an on_attach function to only map the following keys
|
||||
-- after the language server attaches to the current buffer
|
||||
local on_attach = function(client, bufnr)
|
||||
local function buf_set_keymap(...)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, ...)
|
||||
end
|
||||
|
||||
local function buf_set_option(...)
|
||||
vim.api.nvim_buf_set_option(bufnr, ...)
|
||||
end
|
||||
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
-- Mappings.
|
||||
local opts = {noremap = true, silent = true}
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
buf_set_keymap('n', '[d',
|
||||
'<cmd>lua vim.diagnostic.goto_prev({float = {...}})<CR>',
|
||||
opts)
|
||||
buf_set_keymap('n', ']d',
|
||||
'<cmd>lua vim.diagnostic.goto_next({float = {...}})<CR>',
|
||||
opts)
|
||||
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||
buf_set_keymap('n', 'gl',
|
||||
'<cmd>lua vim.diagnostic.open_float(buffer, {{opts}, scope="line"})<CR>',
|
||||
opts)
|
||||
buf_set_keymap('n', 'gh', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>',
|
||||
opts)
|
||||
buf_set_keymap('n', '<space>T',
|
||||
'<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>l', '<cmd>lua vim.diagnostic.setloclist()<CR>',
|
||||
opts)
|
||||
buf_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setqflist()<CR>',
|
||||
opts)
|
||||
buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>',
|
||||
opts)
|
||||
buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>',
|
||||
opts)
|
||||
-- buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
||||
-- buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
|
||||
-- buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
|
||||
|
||||
if client.name == 'phpactor' then
|
||||
client.server_capabilities.find_references = false;
|
||||
end
|
||||
|
||||
if client.name == 'tsserver' or client.name == 'intelephense' then
|
||||
client.server_capabilities.document_formatting = false;
|
||||
-- print(vim.inspect(client.server_capabilities));
|
||||
end
|
||||
|
||||
if client.server_capabilities.document_formatting then
|
||||
vim.cmd [[augroup lsp_formatting]]
|
||||
vim.cmd [[autocmd!]]
|
||||
vim.cmd [[autocmd BufWritePre <buffer> :lua vim.lsp.buf.formatting_seq_sync({}, 3000)]]
|
||||
vim.cmd [[augroup END]]
|
||||
end
|
||||
|
||||
if client.server_capabilities.document_highlight then
|
||||
vim.cmd [[
|
||||
augroup lsp_document_highlight
|
||||
autocmd! * <buffer>
|
||||
autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
|
||||
autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
|
||||
augroup END
|
||||
]]
|
||||
end
|
||||
end
|
||||
|
||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
|
||||
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||
|
||||
for _, lsp in ipairs(servers) do
|
||||
nvim_lsp[lsp].setup {
|
||||
on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
flags = {debounce_text_changes = 150}
|
||||
}
|
||||
end
|
||||
|
||||
local runtime_path = vim.split(package.path, ';')
|
||||
table.insert(runtime_path, "lua/?.lua")
|
||||
table.insert(runtime_path, "lua/?/init.lua")
|
||||
|
||||
require'lspconfig'.sumneko_lua.setup {
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
|
||||
version = 'LuaJIT',
|
||||
-- Setup your lua path
|
||||
path = runtime_path
|
||||
},
|
||||
diagnostics = {
|
||||
-- Get the language server to recognize the `vim` global
|
||||
globals = {'vim'}
|
||||
},
|
||||
workspace = {
|
||||
-- Make the server aware of Neovim runtime files
|
||||
library = vim.api.nvim_get_runtime_file("", true)
|
||||
},
|
||||
-- Do not send telemetry data containing a randomized but unique identifier
|
||||
telemetry = {enable = false}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-- toml
|
||||
-- 'taplo'
|
||||
-- -- sudo pacman -Syu taplo-cli
|
||||
require'lspconfig'.taplo.setup {
|
||||
on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
flags = {debounce_text_changes = 150},
|
||||
cmd = {"taplo", "lsp", "stdio"}
|
||||
}
|
||||
|
||||
-- rust-tools
|
||||
require('rust-tools').setup({
|
||||
server = {
|
||||
on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
flags = {debounce_text_changes = 150},
|
||||
|
||||
settings = {["rust-analyzer"] = {checkOnSave = {command = "clippy"}}}
|
||||
}
|
||||
})
|
||||
-- inlay hints
|
||||
require('rust-tools').inlay_hints.enable()
|
||||
------
|
||||
|
||||
-- null-ls
|
||||
local null_ls = require("null-ls")
|
||||
|
||||
local null_ls_utils = require("null-ls.utils")
|
||||
local root = null_ls_utils.get_root()
|
||||
local eslint_command = root .. "/node_modules/eslint/bin/eslint.js"
|
||||
-- print(eslint_command);
|
||||
|
||||
local sources = {
|
||||
null_ls.builtins.formatting.prettierd,
|
||||
null_ls.builtins.diagnostics.eslint.with({
|
||||
condition = function(utils)
|
||||
local has_file = utils.root_has_file({
|
||||
"node_modules/@wordpress/scripts/config/.eslintrc.js"
|
||||
})
|
||||
-- print("condition")
|
||||
-- print(has_file)
|
||||
return has_file
|
||||
end,
|
||||
extra_args = {
|
||||
"--no-eslintrc", "--config ",
|
||||
root .. "/node_modules/@wordpress/scripts/config/.eslintrc.js",
|
||||
"--ignore-path ",
|
||||
root .. "/node_modules/@wordpress/scripts/config/.eslintignore"
|
||||
}
|
||||
}), --
|
||||
-- null_ls.builtins.diagnostics.eslint.with({
|
||||
-- filetypes = { "javascript", "javascriptreact", "typescript", "typescriptreact", "vue", "svelte", "astro" },
|
||||
-- command = eslint_command
|
||||
-- }),
|
||||
-- null_ls.builtins.diagnostics.eslint.with({
|
||||
-- condition = function(utils)
|
||||
-- local has_file1 = utils.root_has_file({".eslintrc.js"})
|
||||
-- local has_file2 = utils.root_has_file({"gatsby-config.js"})
|
||||
-- print("condition")
|
||||
-- print(has_file1)
|
||||
-- print(has_file2)
|
||||
-- return has_file1 and has_file2
|
||||
-- end
|
||||
-- }), --
|
||||
null_ls.builtins.diagnostics.phpcs.with({
|
||||
condition = function(utils)
|
||||
return not utils.root_has_file({"vendor/bin/phpcs"})
|
||||
end,
|
||||
args = {"--standard=PSR12", "--report=json", "-s", "-"}
|
||||
}), --
|
||||
null_ls.builtins.formatting.black, -- black
|
||||
null_ls.builtins.diagnostics.shellcheck, -- shellcheck,
|
||||
null_ls.builtins.diagnostics.flake8, -- flake8
|
||||
null_ls.builtins.formatting.lua_format -- luaFormatter
|
||||
}
|
||||
|
||||
null_ls.setup({sources = sources, on_attach = on_attach})
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
-- nvim-autopairs
|
||||
require('nvim-autopairs').setup {}
|
||||
------
|
||||
|
||||
-- cmp
|
||||
require("cmp").setup({
|
||||
map_cr = false, -- map <CR> on insert mode
|
||||
map_complete = false, -- it will auto insert `(` after select function or method item
|
||||
auto_select = true -- automatically select the first item
|
||||
})
|
||||
------
|
||||
|
||||
-- nvim-ts-autotag
|
||||
require'nvim-treesitter.configs'.setup {
|
||||
autotag = {
|
||||
enable = true,
|
||||
filetypes = {
|
||||
-- not working for astro files
|
||||
'html', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'svelte', 'vue', 'tsx', 'jsx', 'rescript', 'astro',
|
||||
'xml',
|
||||
'php',
|
||||
'markdown',
|
||||
'glimmer','handlebars','hbs'
|
||||
},
|
||||
}
|
||||
}
|
||||
------
|
||||
|
||||
-- nvim-ufo
|
||||
require('ufo').setup({
|
||||
provider_selector = function(bufnr, filetype, buftype)
|
||||
return {'treesitter', 'indent'}
|
||||
end
|
||||
})
|
||||
------
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
require'nvim-treesitter.configs'.setup {
|
||||
-- ensure_installed = "maintained", -- one of "all", "maintained" (parsers with maintainers), or a list of languages
|
||||
ignore_install = {"c"}, -- List of parsers to ignore installing
|
||||
highlight = {
|
||||
enable = true, -- false will disable the whole extension
|
||||
disable = {"c", "rust"}, -- list of language that will be disabled
|
||||
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
|
||||
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
||||
-- Using this option may slow down your editor, and you may see some duplicate highlights.
|
||||
-- Instead of true it can also be a list of languages
|
||||
additional_vim_regex_highlighting = false
|
||||
},
|
||||
indent = {enable = true}
|
||||
}
|
||||
38
lua/init.lua
38
lua/init.lua
|
|
@ -1,38 +0,0 @@
|
|||
vim.o.foldmethod = 'expr'
|
||||
vim.o.foldexpr = 'nvim_treesitter#foldexpr()'
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = false,
|
||||
signs = true,
|
||||
underline = false,
|
||||
update_in_insert = false,
|
||||
severity_sort = true,
|
||||
float = {
|
||||
border = "single",
|
||||
source = "always" -- Or "if_many"
|
||||
}
|
||||
})
|
||||
|
||||
local signs = {Error = "● ", Warn = "● ", Hint = "● ", Info = "● "}
|
||||
for type, icon in pairs(signs) do
|
||||
local hl = "DiagnosticSign" .. type
|
||||
vim.fn.sign_define(hl, {text = icon, texthl = hl, numhl = hl})
|
||||
end
|
||||
|
||||
local border = {
|
||||
{"┌", "FloatBorder"}, {"─", "FloatBorder"}, {"┐", "FloatBorder"},
|
||||
{"│", "FloatBorder"}, {"┘", "FloatBorder"}, {"─", "FloatBorder"},
|
||||
{"└", "FloatBorder"}, {"│", "FloatBorder"}
|
||||
}
|
||||
|
||||
vim.lsp.handlers["textDocument/hover"] =
|
||||
vim.lsp.with(vim.lsp.handlers.hover, {border = "single"})
|
||||
vim.lsp.handlers["textDocument/signatureHelp"] =
|
||||
vim.lsp.with(vim.lsp.handlers.signature_help, {border = "single"})
|
||||
|
||||
local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview
|
||||
function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
|
||||
opts = opts or {}
|
||||
opts.border = opts.border or border
|
||||
return orig_util_open_floating_preview(contents, syntax, opts, ...)
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue