mirror
/
kickstart.nvim
mirror of https://github.com/nvim-lua/kickstart.nvim.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix rebase errors

This commit is contained in:
Joe Hayes 2023-11-14 10:12:03 -05:00
parent 8d781e89b7
commit 297b7fe350
1 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
init.lua
View File

@ -657,54 +657,44 @@ cmp.setup {
completeopt = 'menu,menuone,noinsert' completeopt = 'menu,menuone,noinsert'
}, },
mapping = cmp.mapping.preset.insert { mapping = cmp.mapping.preset.insert {
['<C-n>'] = cmp.mapping.select_next_item(), ["<C-n>"] = cmp.mapping.select_next_item(),
['<C-p>'] = cmp.mapping.select_prev_item(), ["<C-p>"] = cmp.mapping.select_prev_item(),
['<C-d>'] = cmp.mapping.scroll_docs(-4), ["<C-d>"] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4), ["<C-f>"] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete {}, ["<C-Space>"] = cmp.mapping.complete {},
['<CR>'] = cmp.mapping.confirm { ["<CR>"] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Replace, behavior = cmp.ConfirmBehavior.Replace,
select = true, select = true
}, },
mapping = cmp.mapping.preset.insert { ["<Tab>"] = cmp.mapping(
["<C-n>"] = cmp.mapping.select_next_item(), function(fallback)
["<C-p>"] = cmp.mapping.select_prev_item(), if cmp.visible() then
["<C-d>"] = cmp.mapping.scroll_docs(-4), cmp.select_next_item()
["<C-f>"] = cmp.mapping.scroll_docs(4), elseif luasnip.expand_or_locally_jumpable() then
["<C-Space>"] = cmp.mapping.complete {}, luasnip.expand_or_jump()
["<CR>"] = cmp.mapping.confirm { else
behavior = cmp.ConfirmBehavior.Replace, fallback()
select = true end
}, end,
["<Tab>"] = cmp.mapping( {"i", "s"}
function(fallback) ),
if cmp.visible() then ["<S-Tab>"] = cmp.mapping(
cmp.select_next_item() function(fallback)
elseif luasnip.expand_or_locally_jumpable() then if cmp.visible() then
luasnip.expand_or_jump() cmp.select_prev_item()
else elseif luasnip.locally_jumpable(-1) then
fallback() luasnip.jump(-1)
end else
end, fallback()
{"i", "s"} end
), end,
["<S-Tab>"] = cmp.mapping( {"i", "s"}
function(fallback) )
if cmp.visible() then },
cmp.select_prev_item() sources = {
elseif luasnip.locally_jumpable(-1) then {name = "nvim_lsp"},
luasnip.jump(-1) {name = "luasnip"}
else }
fallback()
end
end,
{"i", "s"}
)
},
sources = {
{name = "nvim_lsp"},
{name = "luasnip"}
}
} }
require("focus").setup() require("focus").setup()