diff --git a/lua/plugins/_lsp.lua b/lua/plugins/_lsp.lua index d022592..a1fa120 100644 --- a/lua/plugins/_lsp.lua +++ b/lua/plugins/_lsp.lua @@ -62,22 +62,20 @@ return { end, }, }, - opts = function(_, opts) - opts.skip_config = opts.skip_config or {} - opts.ensure_installed = opts.ensure_installed or {} + opts = function() local servers = { "lua_ls" } local mason_install = pcode.mason_ensure_installed or {} - local unregis_lsp = pcode.unregister_lsp or {} vim.list_extend(servers, mason_install) - vim.list_extend(opts.ensure_installed, servers) - vim.list_extend(opts.skip_config, unregis_lsp) - opts.automatic_installation = true - return opts + return { + ensure_installed = servers, + automatic_installation = true, + } end, config = function(_, opts) require("mason-lspconfig").setup(opts) local option = {} + local unregis_lsp = pcode.unregister_lsp or {} require("mason-lspconfig").setup_handlers({ function(server_name) -- default handler (optional) local capabilities = require("user.lsp.handlers").capabilities @@ -85,7 +83,7 @@ return { capabilities.offsetEncoding = { "utf-16" } end local is_skip = false - local my_index = idxOf(opts.skip_config, server_name) + local my_index = idxOf(unregis_lsp, server_name) if my_index ~= nil then is_skip = true end diff --git a/lua/plugins/java.lua b/lua/plugins/java.lua index 79d2bd8..3cc890d 100644 --- a/lua/plugins/java.lua +++ b/lua/plugins/java.lua @@ -17,15 +17,6 @@ end if pcode.active_java_config.active then M = { - { - "williamboman/mason-lspconfig.nvim", - opts = function(_, opts) - opts.skip_config = opts.skip_config or {} - if pcode.active_java_config.use_nvim_jdtls or false then - vim.list_extend(opts.skip_config, { "jdtls" }) - end - end, - }, { "mfussenegger/nvim-jdtls", ft = java_filetypes, diff --git a/lua/plugins/themes/_globalvar.lua b/lua/plugins/themes/_globalvar.lua index d7feae4..d3a1225 100644 --- a/lua/plugins/themes/_globalvar.lua +++ b/lua/plugins/themes/_globalvar.lua @@ -110,11 +110,11 @@ end -- pcode.nvim_dap = true -- end -- run if java config true --- if pcode.active_java_config.active and pcode.active_java_config.use_nvim_jdtls then --- table.insert(pcode.treesitter_ensure_installed, "java") --- table.insert(pcode.mason_ensure_installed, "jdtls") --- table.insert(pcode.null_ls_ensure_installed, "google_java_format") --- table.insert(pcode.dap_ensure_installed, "javadbg") --- table.insert(pcode.unregister_lsp, "jdtls") --- end +if pcode.active_java_config.active and pcode.active_java_config.use_nvim_jdtls then + -- table.insert(pcode.treesitter_ensure_installed, "java") + -- table.insert(pcode.mason_ensure_installed, "jdtls") + -- table.insert(pcode.null_ls_ensure_installed, "google_java_format") + -- table.insert(pcode.dap_ensure_installed, "javadbg") + table.insert(pcode.unregister_lsp, "jdtls") +end return {}