upstream: typos + #2414

Author: iguanacucumber

lua/cmp/config/compare.lua

@@ -66,7 +66,7 @@ compare.recently_used = setmetatable({
   end,
 })
 
----kind: Entires with smaller ordinal value of 'kind' will be ranked higher.
+---kind: Entries with smaller ordinal value of 'kind' will be ranked higher.
 ---(see lsp.CompletionItemKind enum).
 ---Exceptions are that Text(1) will be ranked the lowest, and snippets be the highest.
 ---@type cmp.ComparatorFunction
@@ -106,7 +106,7 @@ compare.sort_text = function(entry1, entry2)
   return nil
 end
 
----length: Entires with shorter label length will be ranked higher.
+---length: Entries with shorter label length will be ranked higher.
 ---@type cmp.ComparatorFunction
 compare.length = function(entry1, entry2)
   local diff = #entry1.completion_item.label - #entry2.completion_item.label

lua/cmp/core.lua

@@ -441,11 +441,11 @@ core.confirm = function(self, e, option, callback)
           return
         end
         vim.cmd([[silent! undojoin]])
-        vim.lsp.util.apply_text_edits(text_edits, ctx.bufnr, e.source:get_position_encoding_kind())
+        api.apply_text_edits(text_edits, ctx.bufnr, e.source:get_position_encoding_kind())
       end)
     else
       vim.cmd([[silent! undojoin]])
-      vim.lsp.util.apply_text_edits(e.completion_item.additionalTextEdits, ctx.bufnr, e.source:get_position_encoding_kind())
+      api.apply_text_edits(e.completion_item.additionalTextEdits, ctx.bufnr, e.source:get_position_encoding_kind())
     end
   end)
   feedkeys.call('', 'n', function()

lua/cmp/entry.lua

@@ -290,6 +290,7 @@ entry._get_view = function(self, item, entries_buf)
     view.menu.hl_group = item.menu_hl_group or 'CmpItemMenu'
     view.dup = item.dup
   end)
+
   return view
 end
 

lua/cmp/utils/api.lua

@@ -67,4 +67,15 @@ api.get_cursor_before_line = function()
   return string.sub(api.get_current_line(), 1, cursor[2])
 end
 
+--- Applies a list of text edits to a buffer. Preserves 'buflisted' state.
+---@param text_edits lsp.TextEdit[]
+---@param bufnr integer Buffer id
+---@param position_encoding 'utf-8'|'utf-16'|'utf-32'
+api.apply_text_edits = function(text_edits, bufnr, position_encoding)
+  -- preserve 'buflisted' state because vim.lsp.util.apply_text_edits forces it to true
+  local prev_buflisted = vim.bo[bufnr].buflisted
+  vim.lsp.util.apply_text_edits(text_edits, bufnr, position_encoding)
+  vim.bo[bufnr].buflisted = prev_buflisted
+end
+
 return api