From e9d117b9c313eb95839cbce913767bb8b86188b7 Mon Sep 17 00:00:00 2001 From: Antoine Vaure Date: Fri, 14 Jun 2024 11:51:52 +0200 Subject: [PATCH] Fix lsp --- lua/configs/lspconfig.lua | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/lua/configs/lspconfig.lua b/lua/configs/lspconfig.lua index c53f933..5fa93c2 100644 --- a/lua/configs/lspconfig.lua +++ b/lua/configs/lspconfig.lua @@ -1,24 +1,9 @@ local default = { - on_attach = function(client, bufnr) - require "lsp_signature".on_attach( - { - bind = true, -- This is mandatory, otherwise border config won't get registered. - handler_opts = { - border = "none" - }, - hint_enable = false, - doc_lines = 0, - floating_window_off_x = 999, - floating_window_off_y = 1, - -- floating_window = false, - } - , bufnr) -- Note: add in lsp client on-attach - end, capabilities = require('cmp_nvim_lsp').default_capabilities() } local servers = { - java_language_server = { cmd = {"java-language-server"} }, + java_language_server = { cmd = { "java-language-server" } }, ocamllsp = {}, pyright = {}, basedpyright = {}, @@ -48,31 +33,18 @@ local enabled = {} for server, config in pairs(servers) do local lsp = require("lspconfig")[server] - + -- print(server) local config = vim.tbl_deep_extend("keep", config, default, lsp.document_config.default_config) if config.cmd ~= nil then if vim.fn.executable(config.cmd[1]) == 1 then - table.insert(enabled, server) + enabled[server] = config end end end --- disable pyright if besedpyright is enabled -for _, server in pairs(enabled) do - if server == "basedpyright" then - for i, s in ipairs(enabled) do - if s == "pyright" then - table.remove(enabled, i) - break - end - end - end -end - -for _, server in pairs(enabled) do +for server, config in pairs(enabled) do local lsp = require("lspconfig")[server] - local config = servers[server] lsp.setup(config) end