Merge branch 'LazyVim:main' into lang/typst

lua/lazyvim/plugins/extras/lang/clangd.lua

@@ -103,8 +103,11 @@ return {
   },
 
   {
-    "nvim-cmp",
+    "hrsh7th/nvim-cmp",
+    optional = true,
     opts = function(_, opts)
+      opts.sorting = opts.sorting or {}
+      opts.sorting.comparators = opts.sorting.comparators or {}
       table.insert(opts.sorting.comparators, 1, require("clangd_extensions.cmp_scores"))
     end,
   },

lua/lazyvim/plugins/extras/lang/git.lua

@@ -9,7 +9,8 @@ return {
   },
 
   {
-    "nvim-cmp",
+    "hrsh7th/nvim-cmp",
+    optional = true,
     dependencies = {
       { "petertriho/cmp-git", opts = {} },
     },

lua/lazyvim/plugins/extras/lang/java.lua

@@ -40,6 +40,20 @@ return {
   {
     "mfussenegger/nvim-dap",
     optional = true,
+    opts = function()
+      -- Simple configuration to attach to remote java debug process
+      -- Taken directly from https://github.com/mfussenegger/nvim-dap/wiki/Java
+      local dap = require("dap")
+      dap.configurations.java = {
+        {
+          type = "java",
+          request = "attach",
+          name = "Debug (Attach) - Remote",
+          hostName = "127.0.0.1",
+          port = 5005,
+        },
+      }
+    end,
     dependencies = {
       {
         "williamboman/mason.nvim",
@@ -71,8 +85,12 @@ return {
     dependencies = { "folke/which-key.nvim" },
     ft = java_filetypes,
     opts = function()
-      local mason_registry = require("mason-registry")
-      local lombok_jar = mason_registry.get_package("jdtls"):get_install_path() .. "/lombok.jar"
+      local cmd = { vim.fn.exepath("jdtls") }
+      if LazyVim.has("mason.nvim") then
+        local mason_registry = require("mason-registry")
+        local lombok_jar = mason_registry.get_package("jdtls"):get_install_path() .. "/lombok.jar"
+        table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
+      end
       return {
         -- How to find the root dir for a given filename. The default comes from
         -- lspconfig which provides a function specifically for java projects.
@@ -93,10 +111,7 @@ return {
 
         -- How to run jdtls. This can be overridden to a full java command-line
         -- if the Python wrapper script doesn't suffice.
-        cmd = {
-          vim.fn.exepath("jdtls"),
-          string.format("--jvm-arg=-javaagent:%s", lombok_jar),
-        },
+        cmd = cmd,
         full_cmd = function(opts)
           local fname = vim.api.nvim_buf_get_name(0)
           local root_dir = opts.root_dir(fname)
@@ -131,29 +146,30 @@ return {
     config = function(_, opts)
       -- Find the extra bundles that should be passed on the jdtls command-line
       -- if nvim-dap is enabled with java debug/test.
-      local mason_registry = require("mason-registry")
       local bundles = {} ---@type string[]
-      if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
-        local java_dbg_pkg = mason_registry.get_package("java-debug-adapter")
-        local java_dbg_path = java_dbg_pkg:get_install_path()
-        local jar_patterns = {
-          java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar",
-        }
-        -- java-test also depends on java-debug-adapter.
-        if opts.test and mason_registry.is_installed("java-test") then
-          local java_test_pkg = mason_registry.get_package("java-test")
-          local java_test_path = java_test_pkg:get_install_path()
-          vim.list_extend(jar_patterns, {
-            java_test_path .. "/extension/server/*.jar",
-          })
-        end
-        for _, jar_pattern in ipairs(jar_patterns) do
-          for _, bundle in ipairs(vim.split(vim.fn.glob(jar_pattern), "\n")) do
-            table.insert(bundles, bundle)
+      if LazyVim.has("mason.nvim") then
+        local mason_registry = require("mason-registry")
+        if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
+          local java_dbg_pkg = mason_registry.get_package("java-debug-adapter")
+          local java_dbg_path = java_dbg_pkg:get_install_path()
+          local jar_patterns = {
+            java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar",
+          }
+          -- java-test also depends on java-debug-adapter.
+          if opts.test and mason_registry.is_installed("java-test") then
+            local java_test_pkg = mason_registry.get_package("java-test")
+            local java_test_path = java_test_pkg:get_install_path()
+            vim.list_extend(jar_patterns, {
+              java_test_path .. "/extension/server/*.jar",
+            })
+          end
+          for _, jar_pattern in ipairs(jar_patterns) do
+            for _, bundle in ipairs(vim.split(vim.fn.glob(jar_pattern), "\n")) do
+              table.insert(bundles, bundle)
+            end
           end
         end
       end
-
       local function attach_jdtls()
         local fname = vim.api.nvim_buf_get_name(0)
 
@@ -197,8 +213,8 @@ return {
                 { "<leader>cx", group = "extract" },
                 { "<leader>cxv", require("jdtls").extract_variable_all, desc = "Extract Variable" },
                 { "<leader>cxc", require("jdtls").extract_constant, desc = "Extract Constant" },
-                { "gs", require("jdtls").super_implementation, desc = "Goto Super" },
-                { "gS", require("jdtls.tests").goto_subjects, desc = "Goto Subjects" },
+                { "<leader>cgs", require("jdtls").super_implementation, desc = "Goto Super" },
+                { "<leader>cgS", require("jdtls.tests").goto_subjects, desc = "Goto Subjects" },
                 { "<leader>co", require("jdtls").organize_imports, desc = "Organize Imports" },
               },
             })
@@ -225,40 +241,43 @@ return {
               },
             })
 
-            if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
-              -- custom init for Java debugger
-              require("jdtls").setup_dap(opts.dap)
-              require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)
+            if LazyVim.has("mason.nvim") then
+              local mason_registry = require("mason-registry")
+              if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
+                -- custom init for Java debugger
+                require("jdtls").setup_dap(opts.dap)
+                require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main)
 
-              -- Java Test require Java debugger to work
-              if opts.test and mason_registry.is_installed("java-test") then
-                -- custom keymaps for Java test runner (not yet compatible with neotest)
-                wk.add({
-                  {
-                    mode = "n",
-                    buffer = args.buf,
-                    { "<leader>t", group = "test" },
+                -- Java Test require Java debugger to work
+                if opts.test and mason_registry.is_installed("java-test") then
+                  -- custom keymaps for Java test runner (not yet compatible with neotest)
+                  wk.add({
                     {
-                      "<leader>tt",
-                      function()
-                        require("jdtls.dap").test_class({
-                          config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
-                        })
-                      end,
-                      desc = "Run All Test",
+                      mode = "n",
+                      buffer = args.buf,
+                      { "<leader>t", group = "test" },
+                      {
+                        "<leader>tt",
+                        function()
+                          require("jdtls.dap").test_class({
+                            config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
+                          })
+                        end,
+                        desc = "Run All Test",
+                      },
+                      {
+                        "<leader>tr",
+                        function()
+                          require("jdtls.dap").test_nearest_method({
+                            config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
+                          })
+                        end,
+                        desc = "Run Nearest Test",
+                      },
+                      { "<leader>tT", require("jdtls.dap").pick_test, desc = "Run Test" },
                     },
-                    {
-                      "<leader>tr",
-                      function()
-                        require("jdtls.dap").test_nearest_method({
-                          config_overrides = type(opts.test) ~= "boolean" and opts.test.config_overrides or nil,
-                        })
-                      end,
-                      desc = "Run Nearest Test",
-                    },
-                    { "<leader>tT", require("jdtls.dap").pick_test, desc = "Run Test" },
-                  },
-                })
+                  })
+                end
               end
             end
 

lua/lazyvim/plugins/extras/lang/rust.lua

@@ -1,3 +1,13 @@
+if lazyvim_docs then
+  -- LSP Server to use for Rust.
+  -- Set to "bacon-ls" to use bacon-ls instead of rust-analyzer.
+  -- only for diagnostics. The rest of LSP support will still be
+  -- provided by rust-analyzer.
+  vim.g.lazyvim_rust_diagnostics = "rust-analyzer"
+end
+
+local diagnostics = vim.g.lazyvim_rust_diagnostics or "rust-analyzer"
+
 return {
   recommended = function()
     return LazyVim.extras.wants({
@@ -35,7 +45,13 @@ return {
   {
     "williamboman/mason.nvim",
     optional = true,
-    opts = { ensure_installed = { "codelldb" } },
+    opts = function(_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      vim.list_extend(opts.ensure_installed, { "codelldb" })
+      if diagnostics == "bacon-ls" then
+        vim.list_extend(opts.ensure_installed, { "bacon" })
+      end
+    end,
   },
 
   {
@@ -62,8 +78,12 @@ return {
                 enable = true,
               },
             },
-            -- Add clippy lints for Rust.
-            checkOnSave = true,
+            -- Add clippy lints for Rust if using rust-analyzer
+            checkOnSave = diagnostics == "rust-analyzer",
+            -- Enable diagnostics if using rust-analyzer
+            diagnostics = {
+              enable = diagnostics == "rust-analyzer",
+            },
             procMacro = {
               enable = true,
               ignored = {
@@ -72,11 +92,36 @@ return {
                 ["async-recursion"] = { "async_recursion" },
               },
             },
+            files = {
+              excludeDirs = {
+                ".direnv",
+                ".git",
+                ".github",
+                ".gitlab",
+                "bin",
+                "node_modules",
+                "target",
+                "venv",
+                ".venv",
+              },
+            },
           },
         },
       },
     },
     config = function(_, opts)
+      if LazyVim.has("mason.nvim") then
+        local package_path = require("mason-registry").get_package("codelldb"):get_install_path()
+        local codelldb = package_path .. "/extension/adapter/codelldb"
+        local library_path = package_path .. "/extension/lldb/lib/liblldb.dylib"
+        local uname = io.popen("uname"):read("*l")
+        if uname == "Linux" then
+          library_path = package_path .. "/extension/lldb/lib/liblldb.so"
+        end
+        opts.dap = {
+          adapter = require("rustaceanvim.config").get_codelldb_adapter(codelldb, library_path),
+        }
+      end
       vim.g.rustaceanvim = vim.tbl_deep_extend("keep", vim.g.rustaceanvim or {}, opts or {})
       if vim.fn.executable("rust-analyzer") == 0 then
         LazyVim.error(
@@ -92,6 +137,9 @@ return {
     "neovim/nvim-lspconfig",
     opts = {
       servers = {
+        bacon_ls = {
+          enabled = diagnostics == "bacon-ls",
+        },
         rust_analyzer = { enabled = false },
       },
     },

lua/lazyvim/plugins/extras/lang/sql.lua

@@ -48,19 +48,21 @@ return {
       vim.api.nvim_create_autocmd("FileType", {
         pattern = sql_ft,
         callback = function()
-          local cmp = require("cmp")
+          if LazyVim.has("nvim-cmp") then
+            local cmp = require("cmp")
 
-          -- global sources
-          ---@param source cmp.SourceConfig
-          local sources = vim.tbl_map(function(source)
-            return { name = source.name }
-          end, cmp.get_config().sources)
+            -- global sources
+            ---@param source cmp.SourceConfig
+            local sources = vim.tbl_map(function(source)
+              return { name = source.name }
+            end, cmp.get_config().sources)
 
-          -- add vim-dadbod-completion source
-          table.insert(sources, { name = "vim-dadbod-completion" })
+            -- add vim-dadbod-completion source
+            table.insert(sources, { name = "vim-dadbod-completion" })
 
-          -- update sources for the current buffer
-          cmp.setup.buffer({ sources = sources })
+            -- update sources for the current buffer
+            cmp.setup.buffer({ sources = sources })
+          end
         end,
       })
     end,
@@ -122,6 +124,23 @@ return {
     end,
   },
 
+  -- blink.cmp integration
+  {
+    "saghen/blink.cmp",
+    optional = true,
+    opts = {
+      sources = {
+        default = { "dadbod" },
+        providers = {
+          dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink" },
+        },
+      },
+    },
+    dependencies = {
+      "kristijanhusak/vim-dadbod-completion",
+    },
+  },
+
   -- Linters & formatters
   {
     "williamboman/mason.nvim",

lua/lazyvim/plugins/extras/lang/tex.lua

@@ -30,7 +30,7 @@ return {
       vim.g.vimtex_quickfix_method = vim.fn.executable("pplatex") == 1 and "pplatex" or "latexlog"
     end,
     keys = {
-      { "<localLeader>l", "", desc = "+vimtex" },
+      { "<localLeader>l", "", desc = "+vimtex", ft = "tex" },
     },
   },
 

lua/lazyvim/plugins/extras/lang/typescript.lua

@@ -44,6 +44,7 @@ return {
               enableMoveToFileCodeAction = true,
               autoUseWorkspaceTsdk = true,
               experimental = {
+                maxInlayHintLength = 30,
                 completion = {
                   enableServerSideFuzzyMatch = true,
                 },