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

Fix same name property

Browse Source 
Fix #354
This commit is contained in:
hrsh7th
2021-10-16 12:05:56 +09:00
parent 0dcc2eb5d3
commit 7d484d8bfd
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lua/cmp/view/native_entries_view.lua
View File

@@ -9,7 +9,7 @@ local misc = require('cmp.utils.misc')
---@field private offset number ---@field private offset number
---@field private items vim.CompletedItem ---@field private items vim.CompletedItem
---@field private entries cmp.Entry[] ---@field private entries cmp.Entry[]
---@field private preselect number ---@field private preselect_index number
---@field public event cmp.Event ---@field public event cmp.Event
local native_entries_view = {} local native_entries_view = {}
@@ -19,7 +19,7 @@ native_entries_view.new = function()
self.offset = -1 self.offset = -1
self.items = {} self.items = {}
self.entries = {} self.entries = {}
self.preselect = 0 self.preselect_index = 0
autocmd.subscribe('CompleteChanged', function() autocmd.subscribe('CompleteChanged', function()
self.event:emit('change') self.event:emit('change')
end) end)
@@ -36,12 +36,12 @@ end
native_entries_view.redraw = function(self) native_entries_view.redraw = function(self)
if #self.entries > 0 and self.offset <= vim.api.nvim_win_get_cursor(0)[2] + 1 then if #self.entries > 0 and self.offset <= vim.api.nvim_win_get_cursor(0)[2] + 1 then
local completeopt = vim.o.completeopt local completeopt = vim.o.completeopt
vim.o.completeopt = self.preselect == 1 and 'menu,menuone,noinsert' or config.get().completion.completeopt vim.o.completeopt = self.preselect_index == 1 and 'menu,menuone,noinsert' or config.get().completion.completeopt
vim.fn.complete(self.offset, self.items) vim.fn.complete(self.offset, self.items)
vim.o.completeopt = completeopt vim.o.completeopt = completeopt
if self.preselect > 1 and config.get().preselect == types.cmp.PreselectMode.Item then if self.preselect_index > 1 and config.get().preselect == types.cmp.PreselectMode.Item then
self:preselect(self.preselect) self:preselect(self.preselect_index)
end end
end end
end end
@@ -50,22 +50,22 @@ native_entries_view.open = function(self, offset, entries)
local dedup = {} local dedup = {}
local items = {} local items = {}
local dedup_entries = {} local dedup_entries = {}
local preselect = 0 local preselect_index = 0
for _, e in ipairs(entries) do for _, e in ipairs(entries) do
local item = e:get_vim_item(offset) local item = e:get_vim_item(offset)
if item.dup == 1 or not dedup[item.abbr] then if item.dup == 1 or not dedup[item.abbr] then
dedup[item.abbr] = true dedup[item.abbr] = true
table.insert(items, item) table.insert(items, item)
table.insert(dedup_entries, e) table.insert(dedup_entries, e)
if preselect == 0 and e.completion_item.preselect then if preselect_index == 0 and e.completion_item.preselect then
preselect = #dedup_entries preselect_index = #dedup_entries
end end
end end
end end
self.offset = offset self.offset = offset
self.items = items self.items = items
self.entries = dedup_entries self.entries = dedup_entries
self.preselect = preselect self.preselect_index = preselect_index
self:redraw() self:redraw()
end end
@@ -76,7 +76,7 @@ native_entries_view.close = function(self)
self.offset = -1 self.offset = -1
self.entries = {} self.entries = {}
self.items = {} self.items = {}
self.preselect = 0 self.preselect_index = 0
end end
native_entries_view.abort = function(_) native_entries_view.abort = function(_)