2 files changed, 10 insertions, 5 deletions
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 8db215829f..6666b3c044 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -383,8 +383,14 @@ function M.rename(new_name, options)
     )
   end
 
+  -- Clients must at least support rename, prepareRename is optional
+  clients = vim.tbl_filter(
+    function(client) return client.supports_method("textDocument/rename") end,
+    clients
+  )
+
   if #clients == 0 then
-    vim.notify("[LSP] Rename request failed, no matching language servers.")
+    vim.notify("[LSP] Rename, no matching language servers with rename capability.")
   end
 
   local win = vim.api.nvim_get_current_win()
@@ -459,7 +465,8 @@ function M.rename(new_name, options)
           rename(input)
         end)
       end, bufnr)
-    elseif client.supports_method("textDocument/rename") then
+    else
+      assert(client.supports_method("textDocument/rename"), 'Client must support textDocument/rename')
       if new_name then
         rename(new_name)
         return
@@ -475,8 +482,6 @@ function M.rename(new_name, options)
         end
         rename(input)
       end)
-    else
-      vim.notify('Client ' .. client.id .. '/' .. client.name .. ' has no rename capability')
     end
   end
 
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 72dfb3cd76..bb87e8372b 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1384,7 +1384,7 @@ end
 ---             - height: (number) height of floating window
 ---             - width: (number) width of floating window
 ---             - wrap: (boolean, default true) wrap long lines
----             - wrap_at: (string) character to wrap at for computing height when wrap is enabled
+---             - wrap_at: (number) character to wrap at for computing height when wrap is enabled
 ---             - max_width: (number) maximal width of floating window
 ---             - max_height: (number) maximal height of floating window
 ---             - pad_top: (number) number of lines to pad contents at top