feat!: astronvim v6 compatible

lua/astrocommunity/editing-support/nvim-treesitter-sexp/init.lua

@@ -1,7 +1,7 @@
 return {
   "PaterJason/nvim-treesitter-sexp",
   dependencies = { "nvim-treesitter/nvim-treesitter" },
-  enabled = vim.fn.has "nvim-0.11" == 0,
+  enabled = false, -- plugin not compatible with nvim 0.11+
   ft = { "clojure", "fennel", "janet", "query" },
   cmd = "TSSexp",
   opts = {},

lua/astrocommunity/editing-support/zen-mode-nvim/init.lua

@@ -22,20 +22,8 @@ return {
       },
     },
     on_open = function() -- disable diagnostics, indent blankline, winbar, and offscreen matchup
-      -- TODO: remove unnecessary code when dropping support for Neovim v0.9
-      if vim.diagnostic.is_enabled then
-        vim.g.diagnostics_enabled_old = vim.diagnostic.is_enabled()
-      elseif vim.diagnostic.is_disabled then
-        vim.g.diagnostics_enabled_old = not vim.diagnostic.is_disabled()
-      end
-      if vim.g.diagnostics_enabled_old then
-        -- TODO: Remove this when astronvim drops 0.10 support
-        if vim.fn.has "nvim-0.10" == 0 then
-          vim.diagnostic.disable()
-        else
-          vim.diagnostic.enable(false)
-        end
-      end
+      vim.g.diagnostics_enabled_old = vim.diagnostic.is_enabled()
+      if vim.g.diagnostics_enabled_old then vim.diagnostic.enable(false) end
 
       vim.g.indent_blankline_enabled_old = vim.g.indent_blankline_enabled
       vim.g.indent_blankline_enabled = false

lua/astrocommunity/lsp/lsplinks-nvim/init.lua

@@ -13,7 +13,7 @@ return {
               desc = "Lazy load `lsplinks.nvim`",
               callback = function(args)
                 local client = vim.lsp.get_client_by_id(args.data.client_id)
-                if client and client.supports_method and client.supports_method "textDocument/documentLink" then
+                if client and client:supports_method "textDocument/documentLink" then
                   require("lazy").load { plugins = { "lsplinks.nvim" } }
                   return true
                 end

lua/astrocommunity/lsp/lspsaga-nvim/init.lua

@@ -43,8 +43,8 @@ return {
           "<Cmd>Lspsaga finder<CR>",
           desc = "Search references",
           cond = function(client)
-            return client.supports_method "textDocument/references"
-              or client.supports_method "textDocument/implementation"
+            return client:supports_method "textDocument/references"
+              or client:supports_method "textDocument/implementation"
           end,
         }
 

lua/astrocommunity/note-taking/zk-nvim/init.lua

@@ -34,7 +34,7 @@ return {
     },
   },
   opts = function()
-    local lsp_config = require("astrolsp").lsp_opts "zk"
+    local lsp_config = vim.lsp.config["zk"] or {}
     return {
       lsp = {
         config = lsp_config,

lua/astrocommunity/pack/cs/init.lua

@@ -28,25 +28,14 @@ return {
     dependencies = {
       {
         "AstroNvim/astrolsp",
-        opts = vim.fn.has "nvim-0.11" == 1
-            and {
-              handlers = {
-                csharp_ls = function(server, opts)
-                  require("lspconfig")[server].setup(opts)
-                  require("csharpls_extended").buf_read_cmd_bind()
-                end,
-              },
-            }
-          or { -- TODO: drop when dropping support for Neovim v0.10
-            config = {
-              csharp_ls = {
-                handlers = {
-                  ["textDocument/definition"] = function(...) require("csharpls_extended").handler(...) end,
-                  ["textDocument/typeDefinition"] = function(...) require("csharpls_extended").handler(...) end,
-                },
-              },
-            },
+        opts = {
+          handlers = {
+            csharp_ls = function(server, opts)
+              require("lspconfig")[server].setup(opts)
+              require("csharpls_extended").buf_read_cmd_bind()
+            end,
           },
+        },
       },
     },
   },

lua/astrocommunity/pack/dart/init.lua

@@ -27,8 +27,7 @@ return {
     "akinsho/flutter-tools.nvim",
     ft = "dart",
     opts = function(_, opts)
-      local astrolsp_avail, astrolsp = pcall(require, "astrolsp")
-      if astrolsp_avail then opts.lsp = astrolsp.lsp_opts "dartls" end
+      opts.lsp = vim.lsp.config["dartls"] or {}
       opts.debugger = { enabled = true }
     end,
     dependencies = { "nvim-lua/plenary.nvim" },

lua/astrocommunity/pack/moonbit/init.lua

@@ -11,8 +11,7 @@ return {
       if not require("astrocore").is_available "nvim-treesitter" then opts.treesitter = { enabled = false } end
       -- only enable the LSP if the lsp command is executable
       if vim.fn.executable "moonbit-lsp" == 1 then
-        local astrolsp_avail, astrolsp = pcall(require, "astrolsp")
-        if astrolsp_avail then opts.lsp = astrolsp.lsp_opts "moonbit" end
+        opts.lsp = vim.lsp.config["moonbit"] or {}
       else
         opts.lsp = false
       end

lua/astrocommunity/pack/rust/init.lua

@@ -80,7 +80,7 @@ return {
   },
   {
     "mrcjkb/rustaceanvim",
-    version = vim.fn.has "nvim-0.11" == 1 and "^6" or "^5",
+    version = "^6",
     ft = "rust",
     specs = {
       {
@@ -113,8 +113,7 @@ return {
         adapter = cfg.get_codelldb_adapter()
       end
 
-      local astrolsp_avail, astrolsp = pcall(require, "astrolsp")
-      local astrolsp_opts = (astrolsp_avail and astrolsp.lsp_opts "rust_analyzer") or {}
+      local astrolsp_opts = vim.lsp.config["rust_analyzer"] or {}
       local server = {
         ---@type table | (fun(project_root:string|nil, default_settings: table|nil):table) -- The rust-analyzer settings or a function that creates them.
         settings = function(project_root, default_settings)

lua/astrocommunity/pack/scala/init.lua

@@ -24,8 +24,7 @@ return {
     },
     opts = function()
       local metals, astrocore = require "metals", require "astrocore"
-      local astrolsp_avail, astrolsp = pcall(require, "astrolsp")
-      local user_config = astrolsp_avail and astrolsp.lsp_opts "metals" or {}
+      local user_config = vim.lsp.config["metals"] or {}
       if astrocore.is_available "nvim-dap" then
         user_config.on_attach = astrocore.patch_func(user_config.on_attach, function(orig, ...)
           orig(...)

lua/astrocommunity/pack/typescript-all-in-one/init.lua

@@ -27,18 +27,15 @@ return {
               local curr_client = vim.lsp.get_client_by_id(args.data.client_id)
 
               if curr_client and curr_client.name == "denols" then
-                local clients = (vim.lsp.get_clients or vim.lsp.get_active_clients) {
-                  bufnr = bufnr,
-                  name = "vtsls",
-                }
+                local clients = vim.lsp.get_clients { bufnr = bufnr, name = "vtsls" }
                 for _, client in ipairs(clients) do
                   vim.lsp.stop_client(client.id, true)
                 end
               end
 
               -- if vtsls attached, stop it if there is a denols server attached
               if curr_client and curr_client.name == "vtsls" then
-                if next((vim.lsp.get_clients or vim.lsp.get_active_clients) { bufnr = bufnr, name = "denols" }) then
+                if next(vim.lsp.get_clients { bufnr = bufnr, name = "denols" }) then
                   vim.lsp.stop_client(curr_client.id, true)
                 end
               end

lua/astrocommunity/pack/typescript-deno/init.lua

@@ -36,9 +36,6 @@ return {
     "sigmasd/deno-nvim",
     ft = { "javascript", "typescript", "javascriptreact", "typescriptreact" },
     dependencies = { { "AstroNvim/astrolsp", optional = true, opts = { handlers = { denols = false } } } },
-    opts = function(_, opts)
-      local astrolsp_avail, astrolsp = pcall(require, "astrolsp")
-      if astrolsp_avail then opts.server = astrolsp.lsp_opts "denols" end
-    end,
+    opts = function(_, opts) opts.server = vim.lsp.config["denols"] or {} end,
   },
 }

lua/astrocommunity/project/neoconf-nvim/init.lua

@@ -1,14 +1,8 @@
 return {
   "folke/neoconf.nvim",
   cmd = "Neoconf",
-  init = function()
-    require("astrocore").notify(
-      "`Neoconf.nvim` has been included upstream!\nPlease remove from your community plugins.",
-      vim.log.levels.WARN
-    )
-  end,
   opts = {},
   specs = {
-    { "neovim/nvim-lspconfig", dependencies = { "folke/neoconf.nvim" } },
+    { "neovim/nvim-lspconfig", optional = true, dependencies = { "folke/neoconf.nvim" } },
   },
 }