Refresh generated neovim config
This commit is contained in:
@ -212,7 +212,9 @@ compare.scopes = setmetatable({
|
||||
|
||||
-- Cursor scope.
|
||||
local cursor_scope = nil
|
||||
for _, scope in ipairs(locals.get_scopes(buf)) do
|
||||
-- Prioritize the older get_scopes method from nvim-treesitter `master` over get from `main`
|
||||
local scopes = locals.get_scopes and locals.get_scopes(buf) or select(3, locals.get(buf))
|
||||
for _, scope in ipairs(scopes) do
|
||||
if scope:start() <= cursor_row and cursor_row <= scope:end_() then
|
||||
if not cursor_scope then
|
||||
cursor_scope = scope
|
||||
|
||||
@ -88,6 +88,12 @@ cmp.visible = cmp.sync(function()
|
||||
return cmp.core.view:visible() or vim.fn.pumvisible() == 1
|
||||
end)
|
||||
|
||||
---Get what number candidates are currently selected.
|
||||
---If not selected, nil is returned.
|
||||
cmp.get_selected_index = cmp.sync(function()
|
||||
return cmp.core.view:get_selected_index()
|
||||
end)
|
||||
|
||||
---Get current selected entry or nil
|
||||
cmp.get_selected_entry = cmp.sync(function()
|
||||
return cmp.core.view:get_selected_entry()
|
||||
|
||||
@ -14,7 +14,7 @@ feedkeys.call = setmetatable({
|
||||
if #keys > 0 then
|
||||
table.insert(queue, { keymap.t('<Cmd>setlocal lazyredraw<CR>'), 'n' })
|
||||
table.insert(queue, { keymap.t('<Cmd>setlocal textwidth=0<CR>'), 'n' })
|
||||
table.insert(queue, { keymap.t('<Cmd>setlocal backspace=2<CR>'), 'n' })
|
||||
table.insert(queue, { keymap.t('<Cmd>setlocal backspace=nostop<CR>'), 'n' })
|
||||
table.insert(queue, { keys, string.gsub(mode, '[itx]', ''), true })
|
||||
table.insert(queue, { keymap.t('<Cmd>setlocal %slazyredraw<CR>'):format(vim.o.lazyredraw and '' or 'no'), 'n' })
|
||||
table.insert(queue, { keymap.t('<Cmd>setlocal textwidth=%s<CR>'):format(vim.bo.textwidth or 0), 'n' })
|
||||
@ -44,7 +44,10 @@ feedkeys.call = setmetatable({
|
||||
})
|
||||
feedkeys.run = function(id)
|
||||
if feedkeys.call.callbacks[id] then
|
||||
feedkeys.call.callbacks[id]()
|
||||
local ok, err = pcall(feedkeys.call.callbacks[id])
|
||||
if not ok then
|
||||
vim.notify(err, vim.log.levels.ERROR)
|
||||
end
|
||||
feedkeys.call.callbacks[id] = nil
|
||||
end
|
||||
return ''
|
||||
|
||||
@ -211,6 +211,13 @@ view.scroll_docs = function(self, delta)
|
||||
self.docs_view:scroll(delta)
|
||||
end
|
||||
|
||||
---Get what number candidates are currently selected.
|
||||
---If not selected, nil is returned.
|
||||
---@return integer|nil
|
||||
view.get_selected_index = function(self)
|
||||
return self:_get_entries_view():get_selected_index()
|
||||
end
|
||||
|
||||
---Select prev menu item.
|
||||
---@param option cmp.SelectOption
|
||||
view.select_next_item = function(self, option)
|
||||
|
||||
@ -306,9 +306,15 @@ custom_entries_view.info = function(self)
|
||||
return self.entries_win:info()
|
||||
end
|
||||
|
||||
custom_entries_view.get_selected_index = function(self)
|
||||
if self:visible() and self.entries_win:option('cursorline') then
|
||||
return vim.api.nvim_win_get_cursor(self.entries_win.win)[1]
|
||||
end
|
||||
end
|
||||
|
||||
custom_entries_view.select_next_item = function(self, option)
|
||||
if self:visible() then
|
||||
local cursor = vim.api.nvim_win_get_cursor(self.entries_win.win)[1]
|
||||
local cursor = self:get_selected_index()
|
||||
local is_top_down = self:is_direction_top_down()
|
||||
local last = #self.entries
|
||||
|
||||
@ -345,7 +351,7 @@ end
|
||||
|
||||
custom_entries_view.select_prev_item = function(self, option)
|
||||
if self:visible() then
|
||||
local cursor = vim.api.nvim_win_get_cursor(self.entries_win.win)[1]
|
||||
local cursor = self:get_selected_index()
|
||||
local is_top_down = self:is_direction_top_down()
|
||||
local last = #self.entries
|
||||
|
||||
@ -402,7 +408,7 @@ end
|
||||
|
||||
custom_entries_view.get_selected_entry = function(self)
|
||||
if self:visible() and self.entries_win:option('cursorline') then
|
||||
return self.entries[vim.api.nvim_win_get_cursor(self.entries_win.win)[1]]
|
||||
return self.entries[self:get_selected_index()]
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
local config = require('cmp.config')
|
||||
local misc = require('cmp.utils.misc')
|
||||
local snippet = require('cmp.utils.snippet')
|
||||
local str = require('cmp.utils.str')
|
||||
-- local str = require('cmp.utils.str')
|
||||
local api = require('cmp.utils.api')
|
||||
local types = require('cmp.types')
|
||||
|
||||
|
||||
@ -116,6 +116,15 @@ native_entries_view.preselect = function(self, index)
|
||||
end
|
||||
end
|
||||
|
||||
native_entries_view.get_selected_index = function(self)
|
||||
if self:visible() then
|
||||
local idx = vim.fn.complete_info({ 'selected' }).selected
|
||||
if idx > -1 then
|
||||
return math.max(0, idx) + 1
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
native_entries_view.select_next_item = function(self, option)
|
||||
local callback = function()
|
||||
self.event:emit('change')
|
||||
@ -163,11 +172,9 @@ native_entries_view.get_first_entry = function(self)
|
||||
end
|
||||
|
||||
native_entries_view.get_selected_entry = function(self)
|
||||
if self:visible() then
|
||||
local idx = vim.fn.complete_info({ 'selected' }).selected
|
||||
if idx > -1 then
|
||||
return self.entries[math.max(0, idx) + 1]
|
||||
end
|
||||
local idx = self:get_selected_index()
|
||||
if idx then
|
||||
return self.entries[idx]
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -179,6 +179,12 @@ wildmenu_entries_view.info = function(self)
|
||||
return self.entries_win:info()
|
||||
end
|
||||
|
||||
wildmenu_entries_view.get_selected_index = function(self)
|
||||
if self:visible() and self.active then
|
||||
return self.selected_index
|
||||
end
|
||||
end
|
||||
|
||||
wildmenu_entries_view.select_next_item = function(self, option)
|
||||
if self:visible() then
|
||||
local cursor
|
||||
@ -223,8 +229,9 @@ wildmenu_entries_view.get_first_entry = function(self)
|
||||
end
|
||||
|
||||
wildmenu_entries_view.get_selected_entry = function(self)
|
||||
if self:visible() and self.active then
|
||||
return self.entries[self.selected_index]
|
||||
local idx = self:get_selected_index()
|
||||
if idx then
|
||||
return self.entries[idx]
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
/nix/store/3czmrawji85vf8979kll2yx2f1kjkric-lua-5.1.5
|
||||
/nix/store/rn8bzg423wwkayzbsbmhmvcgjmbzrq5z-lua-5.1.5
|
||||
@ -8,7 +8,7 @@ rock_manifest = {
|
||||
lua = {
|
||||
cmp = {
|
||||
config = {
|
||||
["compare.lua"] = "a3570d9e528aba104a6ba6bd7f510da8",
|
||||
["compare.lua"] = "3aebf065a89dafb7a139972a49ccb5b5",
|
||||
["context.lua"] = "28e9f4e9575f6183d1d05bbee4c4408c",
|
||||
["default.lua"] = "2f2648b4528925dc6a98f0fa4d93c6fc",
|
||||
["mapping.lua"] = "39b88ca1fa06ced8522ec0ee27cb24f2",
|
||||
@ -22,7 +22,7 @@ rock_manifest = {
|
||||
["core_spec.lua"] = "edbefcd3d75e48e9d7bc4326f100a864",
|
||||
["entry.lua"] = "6bc6aba58cea17879cd2ccdffee61631",
|
||||
["entry_spec.lua"] = "ca2aff02436ad84ca62d3df331173f01",
|
||||
["init.lua"] = "dd38eea91cabba39091ce75117f3dda7",
|
||||
["init.lua"] = "c428d4c7f3fc90af2151e9ca1a72ec50",
|
||||
["matcher.lua"] = "55af0d4c7ce03827a3dbda8715a1b472",
|
||||
["matcher_spec.lua"] = "59da9197d47615ada5bf93011766356c",
|
||||
["source.lua"] = "60cc28eea79e72914142fe5dc5ad95d1",
|
||||
@ -47,7 +47,7 @@ rock_manifest = {
|
||||
["char.lua"] = "723a8066d2e67d40034ffce692250a58",
|
||||
["debug.lua"] = "c87003d9480670c22d73a1ba670e8c89",
|
||||
["event.lua"] = "38b59f97402a0c71ac21fb1408536c0d",
|
||||
["feedkeys.lua"] = "abbd5d1828baec177ffbc9a1c47ce7c5",
|
||||
["feedkeys.lua"] = "dc06216a0ec2eb1ac6412cb1fdb8e059",
|
||||
["feedkeys_spec.lua"] = "76b9acca3b02ef4163ae070b9fd78ed9",
|
||||
["highlight.lua"] = "f9bf48596410a2105e7e1f9214ff3a33",
|
||||
["keymap.lua"] = "791262dc36492c6daa8a485c8c855f28",
|
||||
@ -63,13 +63,13 @@ rock_manifest = {
|
||||
["window.lua"] = "8b90f3cbc1992529e7326cc5ec109b47"
|
||||
},
|
||||
view = {
|
||||
["custom_entries_view.lua"] = "7011cd4c8a63f645c1e8bab3ca30d293",
|
||||
["custom_entries_view.lua"] = "b66a0988215b358970d1ed7ccb12fc11",
|
||||
["docs_view.lua"] = "527e58b879a27b67382048808b1c599b",
|
||||
["ghost_text_view.lua"] = "0447ab52f6f0d315fac966aae10fbf92",
|
||||
["native_entries_view.lua"] = "fbf5f842464ee3e399f3c7825bb2604b",
|
||||
["wildmenu_entries_view.lua"] = "002776dbd93c238824d042a1a1ef41b6"
|
||||
["ghost_text_view.lua"] = "9327099e6007f383fdd459d1cdbbcae9",
|
||||
["native_entries_view.lua"] = "2ccde9ddc9f917194d507da6c54afb5f",
|
||||
["wildmenu_entries_view.lua"] = "6af1772e3ad9d4fa79f0548e686f3189"
|
||||
},
|
||||
["view.lua"] = "4604db1f3975e50e724fa14b76ffc932",
|
||||
["view.lua"] = "770aecef2794ea7626439b18385b8545",
|
||||
["vim_source.lua"] = "205a75409f6ae2debad0bf96e7041466"
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user