leigh/nvim-cmp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve backward compatibility

Browse Source
This commit is contained in:
hrsh7th
2025-04-01 16:47:02 +09:00
parent c4c784a621
commit 3fce8d9700
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lua/cmp/utils/misc.lua
View File

@@ -197,7 +197,10 @@ end
---@return integer
misc.to_utfindex = function(text, vimindex)
vimindex = vimindex or #text + 1
return vim.str_utfindex(text, 'utf-16', math.max(0, math.min(vimindex - 1, #text)))
if vim.fn.has('nvim-0.11') then
return vim.str_utfindex(text, 'utf-16', math.max(0, math.min(vimindex - 1, #text)))
end
return vim.str_utfindex(text, math.max(0, math.min(vimindex - 1, #text)))
end
---Safe version of vim.str_byteindex

6
lua/cmp/view/ghost_text_view.lua
View File

@@ -90,15 +90,15 @@ ghost_text_view.text_gen = function(self, line, cursor_col)
if self.entry:get_completion_item().insertTextFormat == types.lsp.InsertTextFormat.Snippet then
word = tostring(snippet.parse(word))
end
local word_clen = vim.str_utfindex(word)
local word_clen = vim.fn.strchars(word, true)
local cword = string.sub(line, self.entry.offset, cursor_col)
local cword_clen = vim.str_utfindex(cword)
local cword_clen = vim.fn.strchars(cword, true)
-- Number of characters from entry text (word) to be displayed as ghost thext
local nchars = word_clen - cword_clen
-- Missing characters to complete the entry text
local text
if nchars > 0 then
text = string.sub(word, vim.str_byteindex(word, word_clen - nchars) + 1)
text = string.sub(word, misc.to_vimindex(word, word_clen - nchars))
else
text = ''
end