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

Fix #294

Browse Source
This commit is contained in:
hrsh7th
2021-10-11 03:03:02 +09:00
parent d8e6a865e4
commit 2085cc4d35
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lua/cmp/view/custom_entries_view.lua
View File

@@ -10,7 +10,6 @@ local misc = require('cmp.utils.misc')
---@field private entries_win cmp.Window ---@field private entries_win cmp.Window
---@field private offset number ---@field private offset number
---@field private entries cmp.Entry[] ---@field private entries cmp.Entry[]
---@field private column_bytes any
---@field private column_width any ---@field private column_width any
---@field public event cmp.Event ---@field public event cmp.Event
local custom_entries_view = {} local custom_entries_view = {}
@@ -52,16 +51,14 @@ custom_entries_view.new = function()
local v = e:get_view(self.offset) local v = e:get_view(self.offset)
local o = 1 local o = 1
for _, key in ipairs({ 'abbr', 'kind', 'menu' }) do for _, key in ipairs({ 'abbr', 'kind', 'menu' }) do
if self.column_bytes[key] > 0 then vim.api.nvim_buf_set_extmark(buf, custom_entries_view.ns, i, o, {
vim.api.nvim_buf_set_extmark(buf, custom_entries_view.ns, i, o, { end_line = i,
end_line = i, end_col = o + v[key].bytes,
end_col = o + v[key].bytes, hl_group = v[key].hl_group,
hl_group = v[key].hl_group, hl_mode = 'combine',
hl_mode = 'combine', ephemeral = true,
ephemeral = true, })
}) o = o + v[key].bytes + (self.column_width[key] - v[key].width) + 1
o = o + self.column_bytes[key] + 1
end
end end
for _, m in ipairs(e.matches or {}) do for _, m in ipairs(e.matches or {}) do
vim.api.nvim_buf_set_extmark(buf, custom_entries_view.ns, i, m.word_match_start, { vim.api.nvim_buf_set_extmark(buf, custom_entries_view.ns, i, m.word_match_start, {
@@ -91,7 +88,6 @@ end
custom_entries_view.open = function(self, offset, entries) custom_entries_view.open = function(self, offset, entries)
self.offset = offset self.offset = offset
self.entries = {} self.entries = {}
self.column_bytes = { abbr = 0, kind = 0, menu = 0 }
self.column_width = { abbr = 0, kind = 0, menu = 0 } self.column_width = { abbr = 0, kind = 0, menu = 0 }
-- Apply window options (that might be changed) on the custom completion menu. -- Apply window options (that might be changed) on the custom completion menu.
@@ -105,9 +101,6 @@ custom_entries_view.open = function(self, offset, entries)
local view = e:get_view(offset) local view = e:get_view(offset)
if view.dup == 1 or not dedup[e.completion_item.label] then if view.dup == 1 or not dedup[e.completion_item.label] then
dedup[e.completion_item.label] = true dedup[e.completion_item.label] = true
self.column_bytes.abbr = math.max(self.column_bytes.abbr, view.abbr.bytes)
self.column_bytes.kind = math.max(self.column_bytes.kind, view.kind.bytes)
self.column_bytes.menu = math.max(self.column_bytes.menu, view.menu.bytes)
self.column_width.abbr = math.max(self.column_width.abbr, view.abbr.width) self.column_width.abbr = math.max(self.column_width.abbr, view.abbr.width)
self.column_width.kind = math.max(self.column_width.kind, view.kind.width) self.column_width.kind = math.max(self.column_width.kind, view.kind.width)
self.column_width.menu = math.max(self.column_width.menu, view.menu.width) self.column_width.menu = math.max(self.column_width.menu, view.menu.width)