js0ny/dotfiles
1
0
Fork 0
mirror of https://github.com/js0ny/dotfiles.git synced 2025-12-21 08:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(nvim): Use Tab, S-Tab to navigate between cursor positions

Browse source
This commit is contained in:
js0ny 2025-03-05 12:38:30 +00:00
parent 69f40cd1f1
commit 869e6ed042
3 changed files with 44 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tools/nvim/lua/keymaps/cmp_map.lua
View file

@ -1,13 +0,0 @@
--- `map` default for `cmp.mapping`
local map = function(map)
return {
{ keys = "<C-n>", cmd = map.select_next_item(), opts = { desc = "Select next completion item" } },
{ keys = "<C-p>", cmd = map.select_prev_item(), opts = { desc = "Select previous completion item" } },
{ keys = "<C-f>", cmd = map.confirm({ select = true }), opts = { desc = "Confirm completion" } },
{ keys = "<Tab>", cmd = map.confirm({ select = true }), opts = { desc = "Confirm completion" } },
{ keys = "<C-Space>", cmd = map.complete(), opts = { desc = "Trigger completion" } },
{ keys = "<C-b>", cmd = map.abort(), opts = { desc = "Abort completion" } },
}
end
return map

2
tools/nvim/lua/keymaps/init.lua
View file

@ -21,8 +21,6 @@ utils.set_keymaps(keymaps_modifier)
M.nvim_tree_keymaps = require("keymaps.nvim-tree").plugin
M.cmp_nvim_keymaps = require("keymaps.cmp_map")
-- local function set_markdown_keymaps(bufnr)
-- local opts = { noremap = true, silent = true, buffer = bufnr }
-- vim.keymap.set("v", "`", 'c`<C-r>"`<Esc>', opts)

57
tools/nvim/lua/plugins/mod/nvim-cmp.lua
View file

@ -23,6 +23,7 @@ return {
local lspconfig = require("lspconfig")
local capabilities = require("cmp_nvim_lsp").default_capabilities()
local servers_module = require("config.servers")
local luasnip = require("luasnip")
local servers = servers_module.servers
local servers_config = servers_module.server_config
-- 默认 LSP 配置
@ -30,8 +31,8 @@ return {
capabilities = capabilities,
}
local raw_keymaps = require("keymaps").cmp_nvim_keymaps(cmp.mapping)
local mapped = set_keymaps(raw_keymaps)
-- local raw_keymaps = require("keymaps.cmp_map")(cmp.mapping) -- require("keymaps").cmp_nvim_keymaps(cmp.mapping)
-- local mapped = set_keymaps(raw_keymaps)
local kind_icons = require("config.icons").lsp_kind
-- 配置 nvim-cmp
cmp.setup({
@ -46,7 +47,47 @@ return {
require("luasnip").lsp_expand(args.body)
end,
},
mapping = cmp.mapping.preset.insert(mapped),
mapping = {
-- cmp.mapping.preset.insert(mapped),
["<C-n>"] = cmp.mapping.select_next_item(),
["<C-p>"] = cmp.mapping.select_prev_item(),
["<C-f>"] = cmp.mapping.confirm({ select = true }),
["<C-b>"] = cmp.mapping.abort(),
["<C-Space>"] = cmp.mapping.complete(),
["<CR>"] = cmp.mapping(function(fallback)
if cmp.visible() then
if luasnip.expandable() then
luasnip.expand()
else
cmp.confirm({
select = true,
})
end
else
fallback()
end
end),
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.confirm({ select = true })
elseif luasnip.locally_jumpable(1) then
luasnip.jump(1)
else
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.locally_jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end, { "i", "s" }),
}, -- cmp.mapping.preset.insert(mapped),
sources = cmp.config.sources({
{ name = "copilot", priority = 10 },
{ name = "nvim_lsp" },
@ -58,15 +99,6 @@ return {
}),
})
-- 配置 cmdline 模式
-- cmp.setup.cmdline(":", {
-- mapping = cmp.mapping.preset.cmdline(),
-- sources = {
-- { name = "cmdline" },
-- },
-- })
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
cmp.setup.cmdline({ "/", "?" }, {
mapping = cmp.mapping.preset.cmdline(),
sources = {
@ -74,7 +106,6 @@ return {
},
})
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
cmp.setup.cmdline(":", {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({