neovim

commit 29494f042c28b1de1933b21255837b765782cf04
parent 60a0e3d0a0f73ea271eb3e3e98366a6d30af3456
Author: Olivia Kinnear <git@superatomic.dev>
Date:   Thu, 25 Dec 2025 02:19:12 -0600

fix(ex): error handling for `:lsp` #37061


Diffstat:
M
runtime/doc/lsp.txt
 | 
6
+++---
M
runtime/lua/vim/_core/ex_cmd/lsp.lua
 | 
31
++++++++++++++++++++++++++-----
M
src/nvim/ex_docmd.c
 | 
2
+-

3 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
@@ -282,10 +282,10 @@ To see the capabilities for a given server, try this in a LSP-enabled buffer: >v
 FAQ                                                     *lsp-faq*
 
 - Q: How to force-reload LSP?
-- A: Stop all clients, then reload the buffer. >vim
-     :lua vim.iter(vim.lsp.get_clients()):each(function(client) client:stop() end)
+- A: Use `:lsp restart`. You can also stop all clients, then reload the buffer: >vim
+     :lsp stop
      :edit
-
+<
 - Q: Why isn't completion working?
 - A: In the buffer where you want to use LSP, check that 'omnifunc' is set to
      "v:lua.vim.lsp.omnifunc": `:verbose set omnifunc?`
diff --git a/runtime/lua/vim/_core/ex_cmd/lsp.lua b/runtime/lua/vim/_core/ex_cmd/lsp.lua
@@ -3,6 +3,11 @@ local lsp = vim.lsp
 
 local M = {}
 
+--- @param msg string
+local function echo_err(msg)
+  api.nvim_echo({ { msg } }, true, { err = true })
+end
+
 --- @return string[]
 local function get_client_names()
   local client_names = vim
@@ -63,7 +68,7 @@ local function checked_enable(names, enable)
     if name:find('*') == nil and lsp.config[name] ~= nil then
       lsp.enable(name, enable)
     else
-      vim.notify(("No client config named '%s'"):format(name), vim.log.levels.ERROR)
+      echo_err(("No client config named '%s'"):format(name))
     end
   end
 end
@@ -75,10 +80,18 @@ local function ex_lsp_enable(config_names)
     local filetype = vim.bo.filetype
     for _, name in ipairs(get_config_names()) do
       local filetypes = lsp.config[name].filetypes
-      if filetypes and vim.tbl_contains(filetypes, filetype) then
+      if filetypes == nil or vim.list_contains(filetypes, filetype) then
         table.insert(config_names, name)
       end
     end
+    if #config_names == 0 then
+      if filetype == '' then
+        echo_err('Current buffer has no filetype')
+      else
+        echo_err(("No configs for filetype '%s'"):format(filetype))
+      end
+      return
+    end
   end
 
   checked_enable(config_names)
@@ -97,6 +110,10 @@ local function ex_lsp_disable(config_names)
         return lsp.config[name] ~= nil
       end)
       :totable()
+    if #config_names == 0 then
+      echo_err('No configs with clients attached to current buffer')
+      return
+    end
   end
 
   checked_enable(config_names, false)
@@ -107,14 +124,18 @@ end
 local function get_clients_from_names(client_names)
   -- Default to stopping all active clients attached to the current buffer.
   if #client_names == 0 then
-    return lsp.get_clients { bufnr = api.nvim_get_current_buf() }
+    local clients = lsp.get_clients { bufnr = api.nvim_get_current_buf() }
+    if #clients == 0 then
+      echo_err('No clients attached to current buffer')
+    end
+    return clients
   else
     return vim
       .iter(client_names)
       :map(function(name)
         local clients = lsp.get_clients { name = name }
         if #clients == 0 then
-          vim.notify(("No active clients named '%s'"):format(name), vim.log.levels.ERROR)
+          echo_err(("No active clients named '%s'"):format(name))
         end
         return clients
       end)
@@ -181,7 +202,7 @@ M.ex_lsp = function(args)
   end
   local subcmd = fargs[1]
   if not vim.list_contains(available_subcmds, subcmd) then
-    vim.notify(("Invalid subcommand '%s'"):format(subcmd), vim.log.levels.ERROR)
+    echo_err(("Invalid subcommand '%s'"):format(subcmd))
     return
   end
 
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
@@ -8060,7 +8060,7 @@ static void ex_lsp(exarg_T *eap)
 
   NLUA_EXEC_STATIC("require'vim._core.ex_cmd.lsp'.ex_lsp(...)", args, kRetNilBool, NULL, &err);
   if (ERROR_SET(&err)) {
-    emsg(err.msg);
+    emsg_multiline(err.msg, "lua_error", HLF_E, true);
   }
   api_clear_error(&err);
 }