updates
This commit is contained in:
parent
22be77e7e6
commit
064189d6ee
@ -17,6 +17,7 @@ require("null-ls").setup({
|
|||||||
null_ls.builtins.completion.luasnip,
|
null_ls.builtins.completion.luasnip,
|
||||||
-- null_ls.builtins.code_actions.gitsigns,
|
-- null_ls.builtins.code_actions.gitsigns,
|
||||||
null_ls.builtins.code_actions.shellcheck,
|
null_ls.builtins.code_actions.shellcheck,
|
||||||
|
null_ls.builtins.code_actions.eslint, null_ls.builtins.diagnostics.tsc,
|
||||||
null_ls.builtins.diagnostics.cppcheck,
|
null_ls.builtins.diagnostics.cppcheck,
|
||||||
null_ls.builtins.diagnostics.gitlint,
|
null_ls.builtins.diagnostics.gitlint,
|
||||||
null_ls.builtins.diagnostics.jsonlint,
|
null_ls.builtins.diagnostics.jsonlint,
|
||||||
@ -28,7 +29,8 @@ require("null-ls").setup({
|
|||||||
-- }
|
-- }
|
||||||
-- }),
|
-- }),
|
||||||
null_ls.builtins.formatting.sql_formatter,
|
null_ls.builtins.formatting.sql_formatter,
|
||||||
null_ls.builtins.diagnostics.pylint,
|
null_ls.builtins.diagnostics.pylint, null_ls.builtins.diagnostics.mypy,
|
||||||
|
null_ls.builtins.diagnostics.pycodestyle,
|
||||||
null_ls.builtins.diagnostics.pydocstyle.with({
|
null_ls.builtins.diagnostics.pydocstyle.with({
|
||||||
extra_args = { "--config=$ROOT/setup.cfg" }
|
extra_args = { "--config=$ROOT/setup.cfg" }
|
||||||
}), null_ls.builtins.diagnostics.vint,
|
}), null_ls.builtins.diagnostics.vint,
|
||||||
|
@ -214,8 +214,8 @@ cmp.setup.cmdline(':', {
|
|||||||
})
|
})
|
||||||
|
|
||||||
local servers = {
|
local servers = {
|
||||||
'bashls', 'jedi_language_server', 'jsonls', 'yamlls', 'vimls', 'dotls',
|
'bashls', 'pyright', 'jsonls', 'yamlls', 'vimls', 'dotls', 'dockerls',
|
||||||
'dockerls', 'html', 'cssls', 'lua_ls'
|
'html', 'cssls', 'lua_ls', 'eslint', 'tsserver', 'angularls', 'ansiblels'
|
||||||
}
|
}
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
if lsp == 'lua_ls' then
|
if lsp == 'lua_ls' then
|
||||||
@ -223,7 +223,30 @@ for _, lsp in ipairs(servers) do
|
|||||||
-- on_attach = my_custom_on_attach,
|
-- on_attach = my_custom_on_attach,
|
||||||
-- on_attach = highlight_symbol_under_cursor(),
|
-- on_attach = highlight_symbol_under_cursor(),
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
callSnippet = "Replace"
|
callSnippet = "Replace",
|
||||||
|
settings = {
|
||||||
|
Lua = {
|
||||||
|
runtime = {
|
||||||
|
version = 'Lua 5.4',
|
||||||
|
path = {
|
||||||
|
'?.lua', '?/init.lua',
|
||||||
|
-- vim.fn.expand '~/.luarocks/share/lua/5.4/?.lua',
|
||||||
|
-- vim.fn.expand '~/.luarocks/share/lua/5.4/?/init.lua',
|
||||||
|
'/usr/share/5.3/?.lua',
|
||||||
|
'/usr/share/lua/5.3/?/init.lua',
|
||||||
|
'/usr/share/5.4/?.lua',
|
||||||
|
'/usr/share/lua/5.4/?/init.lua'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
workspace = {
|
||||||
|
library = {
|
||||||
|
-- vim.fn.expand '~/.luarocks/share/lua/5.3',
|
||||||
|
'/usr/share/lua/5.1', '/usr/share/lua/5.3',
|
||||||
|
'/usr/share/lua/5.4'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
lspconfig[lsp].setup { capabilities = capabilities }
|
lspconfig[lsp].setup { capabilities = capabilities }
|
||||||
|
Loading…
Reference in New Issue
Block a user