remove duplicate lsp config

lazy-lock.json

@@ -19,7 +19,7 @@
   "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
   "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" },
   "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
-  "lazy.nvim": { "branch": "main", "commit": "37c7163f8d27243993ac07db8477e44cd5275027" },
+  "lazy.nvim": { "branch": "main", "commit": "ec95702ae617308df35f35ad93c469c86d47346f" },
   "lsp-progress.nvim": { "branch": "main", "commit": "55a04895ea20c365b670051a3128265d43bdfa3d" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
@@ -28,16 +28,16 @@
   "mini.indentscope": { "branch": "main", "commit": "56d42be090e8fcc68eda69cfe55af8c5e562300e" },
   "neoscroll.nvim": { "branch": "master", "commit": "a731f66f1d39ec6175fd201c5bf849e54abda99c" },
   "neotest": { "branch": "master", "commit": "f30bab1faef13d47f3905e065215c96a42d075ad" },
-  "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" },
+  "neotest-java": { "branch": "main", "commit": "320f31c71b183f2c584198f33f93542fd0e5a768" },
   "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" },
   "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
   "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
   "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
   "nvim-dap": { "branch": "master", "commit": "5ba8ceace596360321cf33fa4b56d9d46e057ce9" },
-  "nvim-dap-python": { "branch": "master", "commit": "d777c2b32ed39f61209c09bede28d7491621a631" },
   "nvim-dap-ui": { "branch": "master", "commit": "f7d75cca202b52a60c520ec7b1ec3414d6e77b0f" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" },
+  "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" },
   "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
   "nvim-lspconfig": { "branch": "master", "commit": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98" },
   "nvim-material-icon": { "branch": "main", "commit": "5ad42234d880659dfe9d4ff936c310cd6c5a1610" },
@@ -46,7 +46,7 @@
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
   "nvim-scrollview": { "branch": "main", "commit": "06563ae0c9928a2df42aefe66f2aed2f2943e32e" },
   "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
-  "nvim-treesitter": { "branch": "master", "commit": "c11d49cbefb3c22550747840843eb86ab4a3b267" },
+  "nvim-treesitter": { "branch": "master", "commit": "3e535e826da265748b875b18dbfb361bd1a1701c" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
   "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
@@ -56,6 +56,7 @@
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "12b1a1e095d968887a17ef791c2edb78d7595d46" },
   "rest.nvim": { "branch": "main", "commit": "91badd46c60df6bd9800c809056af2d80d33da4c" },
   "smart-splits.nvim": { "branch": "master", "commit": "66fda3a601a5b4c679656f15eb6ddd613c8d3216" },
+  "symbols-outline.nvim": { "branch": "master", "commit": "964c5902243446124417a3a9e9454f5ef032cc36" },
   "telescope.nvim": { "branch": "master", "commit": "7bd2f9b72f8449780b79bcf351534e2cd36ec43a" },
   "tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "9be4af5b1bc1f26a11206ed7ce8bf44312e7941a" },
   "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" },

lua/custom/default.lua

@@ -169,10 +169,10 @@ pcode.active_javascript_config = {
 }
 pcode.active_php_config = false
 pcode.active_golang_config = false
-pcode.active_python_config = true
+pcode.active_python_config = false
 pcode.active_cpp_config = false
 pcode.active_java_config = {
-  active = false,
+  active = true,
   project = "gradle", -- gradle or maven
   use_nvim_jdtls = true, -- mfussenegger/nvim-jdtls
 }

lua/plugins/lsp.lua

@@ -1,136 +0,0 @@
-return {
-  {
-    "williamboman/mason-lspconfig.nvim",
-    dependencies = {
-      {
-        "neovim/nvim-lspconfig",
-        lazy = true,
-        event = "BufRead",
-        cmd = {
-          "LspInfo",
-          "LspInstall",
-          "LspUninstall",
-        },
-        config = function()
-          require("lspconfig.ui.windows").default_options.border = "rounded"
-        end,
-      },
-      {
-        "williamboman/mason.nvim",
-        lazy = true,
-        cmd = {
-          "Mason",
-          "MasonInstall",
-          "MasonUninstall",
-          "MasonUninstallAll",
-          "MasonLog",
-        },
-        opts = function()
-          local icons = vim.g.pcode_icons.ui
-          return {
-            ui = {
-              -- border = "none",
-              border = icons.Border,
-              icons = {
-                package_pending = icons.DotCircle,
-                package_installed = icons.CheckCircle,
-                package_uninstalled = icons.BlankCircle,
-              },
-              keymaps = {
-                -- Keymap to expand a server in the UI
-                toggle_server_expand = "<CR>",
-                -- Keymap to install the server under the current cursor position
-                install_server = "i",
-                -- Keymap to reinstall/update the server under the current cursor position
-                update_server = "u",
-                -- Keymap to check for new version for the server under the current cursor position
-                check_server_version = "c",
-                -- Keymap to update all installed servers
-                update_all_servers = "U",
-                -- Keymap to check which installed servers are outdated
-                check_outdated_servers = "C",
-                -- Keymap to uninstall a server
-                uninstall_server = "X",
-              },
-            },
-            log_level = vim.log.levels.INFO,
-            max_concurrent_installers = 4,
-          }
-        end,
-        config = function(_, opts)
-          require("mason").setup(opts)
-        end,
-      },
-    },
-    event = "BufReadPre",
-    opts = function()
-      local servers = { "lua_ls" }
-      local mason_install = pcode.mason_ensure_installed or {}
-      vim.list_extend(servers, mason_install)
-      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
-          if server_name == "clangd" then
-            capabilities.offsetEncoding = { "utf-16" }
-          end
-          local is_skip = false
-          local my_index = idxOf(unregis_lsp, server_name)
-          if my_index ~= nil then
-            is_skip = true
-          end
-          if not is_skip then
-            option = {
-              on_attach = require("user.lsp.handlers").on_attach,
-              capabilities = capabilities,
-            }
-
-            server_name = vim.split(server_name, "@")[1]
-
-            local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server_name)
-            if require_ok then
-              option = vim.tbl_deep_extend("force", conf_opts, option)
-            end
-            require("lspconfig")[server_name].setup(option)
-          end
-        end,
-        ["jdtls"] = function()
-          require("lspconfig").jdtls.setup({
-            on_attach = require("user.lsp.handlers").on_attach,
-            capabilities = require("user.lsp.handlers").capabilities,
-            cmd = {
-              "jdtls",
-              "-configuration",
-              vim.fn.expand("$HOME") .. "/.cache/jdtls/config",
-              "-data",
-              vim.fn.expand("$HOME") .. "/.cache/jdtls/workspace",
-            },
-            filetypes = { "java" },
-            root_dir = require("lspconfig.util").root_pattern(
-              -- Single-module projects
-              {
-                "build.xml", -- Ant
-                "pom.xml", -- Maven
-                "settings.gradle", -- Gradle
-                "settings.gradle.kts", -- Gradle
-              },
-              -- Multi-module projects
-              { "build.gradle", "build.gradle.kts" }
-            ) or vim.fn.getcwd(),
-            singe_file_support = true,
-          })
-        end,
-      })
-      require("user.lsp.handlers").setup()
-    end,
-  },
-}