diff options
Diffstat (limited to '')
-rw-r--r-- | .config/nvim/lua/lsp.lua | 63 |
1 files changed, 22 insertions, 41 deletions
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index 4c8ab62..495f7fa 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -105,9 +105,10 @@ vim.api.nvim_create_autocmd("LspAttach", { end; }) -local lsputils = require("lspconfig").util +local lspconfig = require("lspconfig") +local lsputils = lspconfig.util -require("lspconfig").tsserver.setup({ +lspconfig.tsserver.setup({ on_attach = on_attach; root_dir = lsputils.root_pattern("package.json", "tsconfig.json"); settings = { @@ -157,12 +158,12 @@ require("lspconfig").tsserver.setup({ -- }; -- }); -require("lspconfig").rust_analyzer.setup({ +lspconfig.rust_analyzer.setup({ capabilities = capabilities; on_attach = on_attach; }) -require("lspconfig").sqls.setup({ +lspconfig.sqls.setup({ on_attach = function(client, bufnr) require("sqls").on_attach(client, bufnr) on_attach(client, bufnr) @@ -170,7 +171,7 @@ require("lspconfig").sqls.setup({ capabilities = capabilities; }) -require("lspconfig").omnisharp.setup({ +lspconfig.omnisharp.setup({ cmd = { "omnisharp" }; handlers = { @@ -215,50 +216,35 @@ require("lspconfig").omnisharp.setup({ analyze_open_documents_only = false; }) -require("lspconfig").marksman.setup({ +lspconfig.marksman.setup({ root_dir = vim.loop.cwd; on_attach = on_attach; capabilities = capabilities; }) -require("lspconfig").jsonls.setup({ +lspconfig.jsonls.setup({ capabilities = capabilities; cmd = { "vscode-json-language-server"; "--stdio" }; on_attach = on_attach; }) -require("lspconfig").html.setup({ +lspconfig.html.setup({ capabilities = capabilities; cmd = { "vscode-html-language-server"; "--stdio" }; on_attach = on_attach; }) -require("lspconfig").cssls.setup({ - capabilities = capabilities; - on_attach = on_attach; -}) +lspconfig.cssls.setup({ capabilities = capabilities; on_attach = on_attach }) -require("lspconfig").bashls.setup({ - capabilities = capabilities; - on_attach = on_attach; -}) +lspconfig.bashls.setup({ capabilities = capabilities; on_attach = on_attach }) -require("lspconfig").clangd.setup({ - capabilities = capabilities; - on_attach = on_attach; -}) +lspconfig.clangd.setup({ capabilities = capabilities; on_attach = on_attach }) -require("lspconfig").dockerls.setup({ - capabilities = capabilities; - on_attach = on_attach; -}) +lspconfig.dockerls.setup({ capabilities = capabilities; on_attach = on_attach }) -require("lspconfig").eslint.setup({ - capabilities = capabilities; - on_attach = on_attach; -}) +lspconfig.eslint.setup({ capabilities = capabilities; on_attach = on_attach }) -require("lspconfig").lua_ls.setup({ +lspconfig.lua_ls.setup({ capabilities = capabilities; on_attach = on_attach; settings = { @@ -281,9 +267,9 @@ require("lspconfig").lua_ls.setup({ }; }) -require("lspconfig").jdtls.setup({}) +lspconfig.jdtls.setup({}) -require('lspconfig').jedi_language_server.setup({}) +lspconfig.jedi_language_server.setup({}) local null_ls = require("null-ls") @@ -313,16 +299,11 @@ null_ls.setup({ local dap, dapui = require("dap"), require("dapui") dapui.setup() -dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open() -end -dap.listeners.before.event_terminated["dapui_config"] = function() - dapui.close() -end -dap.listeners.before.event_exited["dapui_config"] = function() - dapui.close() -end - +dap.listeners.after.event_initialized["dapui_config"] = + function() dapui.open() end +dap.listeners.before.event_terminated["dapui_config"] = + function() dapui.close() end +dap.listeners.before.event_exited["dapui_config"] = function() dapui.close() end vim.diagnostic.config({ virtual_text = false; |