support nvim 0.11.5

Author: Dale

.config/nvim/lua/plugins/nvim-lspconfig.lua

@@ -1,67 +1,130 @@
 -- nvim-lspconfig allows convenient configuration of LSP clients
-return {
-  {
+
+-- nvim 0.11 changed the way lspconfig works, so we split the config based on
+-- version (hence the duplication)
+local post_v011 = vim.version().minor >= 11
+
+if post_v011 then
+  return {
     "neovim/nvim-lspconfig",
-    cmd = "LspStart",
+    version = "v2.5",
+    config = function()
+      -- Python language server
+      vim.lsp.config.pyright = {
+        cmd = { "pyright-langserver", "--stdio" },
+        filetypes = { "python" },
+        root_markers = {
+          "pyproject.toml",
+          "setup.py",
+          "setup.cfg",
+          "requirements.txt",
+          "Pipfile",
+          "pyrightconfig.json",
+          ".git",
+        },
+      }
+
+      -- Bash language server
+      vim.lsp.config.bashls = {
+        cmd = { "bash-language-server", "start" },
+        filetypes = { "sh", "bash" },
+        root_markers = { ".git" },
+      }
+
+      -- R language server
+      vim.lsp.config.r_language_server = {
+        cmd = { "R", "--slave", "-e", "languageserver::run()" },
+        filetypes = { "r", "rmd" },
+        root_markers = { ".git", "DESCRIPTION" },
+      }
+
+      -- Lua language server
+      vim.lsp.config.lua_ls = {
+        cmd = { "lua-language-server" },
+        filetypes = { "lua" },
+        root_markers = { ".luarc.json", ".luarc.jsonc", ".git" },
+        settings = {
+          Lua = {
+            runtime = { version = "LuaJIT" },
+            workspace = {
+              library = { vim.env.VIMRUNTIME },
+            },
+          },
+        },
+      }
+      vim.diagnostic.config({ virtual_text = true })
+
+      -- LSP keymaps
+      vim.api.nvim_create_autocmd("LspAttach", {
+        group = vim.api.nvim_create_augroup("UserLspConfig", {}),
+        callback = function(ev)
+          vim.keymap.set("n", "<leader>cgd", vim.lsp.buf.definition, { buffer = ev.buf, desc = "Goto definition" })
+          vim.keymap.set("n", "<leader>cK", vim.lsp.buf.hover, { buffer = ev.buf, desc = "Hover help" })
+          vim.keymap.set("n", "<leader>crn", vim.lsp.buf.rename, { buffer = ev.buf, desc = "Rename" })
+          vim.keymap.set("n", "<leader>cgr", vim.lsp.buf.references, { buffer = ev.buf, desc = "Goto references" })
+          vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { buffer = ev.buf, desc = "Code action" })
+        end,
+      })
+    end,
+    keys = {
+      { "<leader>cl", "<cmd>LspStart<cr>", desc = "Start LSP" },
+      { "<leader>ce", vim.diagnostic.open_float, desc = "Open diagnostics/errors" },
+    },
+  }
+else
+  return {
+    "neovim/nvim-lspconfig",
+    version = "v2.5",
     init = function()
       local lspconfig = require("lspconfig")
 
-      -- Below, autostart = false means that you need to explicity call :LspStart (<leader>cl)
+      -- below, autostart = false means that you need to explicity call :lspstart (<leader>cl)
       --
       -- ----------------------------------------------------------------------
-      -- CONFIGURE ADDITIONAL LANGUAGE SERVERS HERE
+      -- configure additional language servers here
       --
-      -- pyright is the language server for Python
+      -- pyright is the language server for python
       lspconfig.pyright.setup({ autostart = false })
 
       lspconfig.bashls.setup({ autostart = false })
 
-      -- language server for R
+      -- language server for r
       lspconfig.r_language_server.setup({ autostart = false })
 
-      -- Language server for Lua. These are the recommended options
-      -- when mainly using Lua for Neovim
+      -- language server for lua. these are the recommended options
+      -- when mainly using lua for neovim
       lspconfig.lua_ls.setup({
-        autostart = false,
-        on_init = function(client)
-          local path = client.workspace_folders[1].name
-          if not vim.loop.fs_stat(path .. "/.luarc.json") and not vim.loop.fs_stat(path .. "/.luarc.jsonc") then
-            client.config.settings = vim.tbl_deep_extend("force", client.config.settings, {
-              Lua = {
-                runtime = { version = "LuaJIT" },
-                workspace = {
-                  checkThirdParty = false,
-                  library = {
-                    vim.env.VIMRUNTIME,
-                  },
-                },
-              },
-            })
-
-            client.notify("workspace/didChangeConfiguration", { settings = client.config.settings })
-          end
-        end,
+        settings = {
+          Lua = {
+            runtime = {
+              version = "LuaJIT",
+            },
+            workspace = {
+              library = { vim.env.VIMRUNTIME },
+            },
+          },
+        },
       })
 
-      -- Use LspAttach autocommand to only map the following keys after
+      -- use lspattach autocommand to only map the following keys after
       -- the language server attaches to the current buffer
-      vim.api.nvim_create_autocmd("LspAttach", {
-        group = vim.api.nvim_create_augroup("UserLspConfig", {}),
+      vim.api.nvim_create_autocmd("lspattach", {
+        group = vim.api.nvim_create_augroup("userlspconfig", {}),
         callback = function(ev)
-          vim.keymap.set("n", "<leader>cgd", vim.lsp.buf.definition, { buffer = ev.buf, desc = "Goto definition" })
-          vim.keymap.set("n", "<leader>cK", vim.lsp.buf.hover, { buffer = ev.buf, desc = "Hover help" })
+          vim.keymap.set("n", "<leader>cgd", vim.lsp.buf.definition, { buffer = ev.buf, desc = "Goto Definition" })
+          vim.keymap.set("n", "<leader>ck", vim.lsp.buf.hover, { buffer = ev.buf, desc = "Hover help" })
           vim.keymap.set("n", "<leader>crn", vim.lsp.buf.rename, { buffer = ev.buf, desc = "Rename" })
-          vim.keymap.set("n", "<leader>cgr", vim.lsp.buf.references, { buffer = ev.buf, desc = "Goto references" })
-          vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { buffer = ev.buf, desc = "Code action" })
+          vim.keymap.set("n", "<leader>cgr", vim.lsp.buf.references, { buffer = ev.buf, desc = "Goto References" })
+          vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { buffer = ev.buf, desc = "Code Action" })
         end,
       })
     end,
     keys = {
-      -- Because autostart=false above, need to manually start the language server.
-      { "<leader>cl", "<cmd>LspStart<CR>", desc = "Start LSP" },
+      -- because autostart=false above, need to manually start the language server.
+      { "<leader>cl", "<cmd>LspStart<cr>", desc = "Start LSP" },
       { "<leader>ce", vim.diagnostic.open_float, desc = "Open diagnostics/errors" },
       { "]d", vim.diagnostic.goto_next, desc = "Next diagnostic/error" },
       { "[d", vim.diagnostic.goto_prev, desc = "Prev diagnostic/error" },
     },
-  },
-}
+  }
+end

docs/changelog.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+2025-11-21
+----------
+
+**vim**
+
+- Update installed nvim to v0.11.5, and update LSP configs accordingly. This
+  LSP config is backwards-compatible with the previously-used version, v0.10.
+
 2025-10-27
 ----------
 

setup.sh

@@ -22,7 +22,7 @@ set -eo pipefail
 # Change tool versions here
 VISIDATA_VERSION=2.11
 HUB_VERSION=2.14.2
-NVIM_VERSION=0.10.4
+NVIM_VERSION=0.11.5
 RG_VERSION=13.0.0
 BAT_VERSION=0.19.0
 JQ_VERSION=1.6