fixup! chore(lsp.completion): cleanup
This commit is contained in:
Robin Gruyters
parent
eeb0c4a236
commit
8b697b7898
215
init.lua
215
init.lua
@ -161,6 +161,10 @@ vim.opt.scrolloff = 10
|
|||||||
-- See `:help 'confirm'`
|
-- See `:help 'confirm'`
|
||||||
vim.opt.confirm = true
|
vim.opt.confirm = true
|
||||||
|
|
||||||
|
-- set options for insert completion (ins-completion)
|
||||||
|
-- See `:help completeopt`
|
||||||
|
vim.o.completeopt = 'noselect,menu,menuone,noinsert,popup'
|
||||||
|
|
||||||
-- [[ Basic Keymaps ]]
|
-- [[ Basic Keymaps ]]
|
||||||
-- See `:help vim.keymap.set()`
|
-- See `:help vim.keymap.set()`
|
||||||
|
|
||||||
@ -486,8 +490,8 @@ require('lazy').setup({
|
|||||||
-- Useful status updates for LSP.
|
-- Useful status updates for LSP.
|
||||||
{ 'j-hui/fidget.nvim', opts = {} },
|
{ 'j-hui/fidget.nvim', opts = {} },
|
||||||
|
|
||||||
-- Allows extra capabilities provided by nvim-cmp
|
-- Show pictograms for completion
|
||||||
-- 'hrsh7th/cmp-nvim-lsp',
|
{ 'onsails/lspkind.nvim', enabled = vim.g.have_nerd_font },
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
-- Brief aside: **What is LSP?**
|
-- Brief aside: **What is LSP?**
|
||||||
@ -623,88 +627,25 @@ require('lazy').setup({
|
|||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- Show pictograms for completion when Nerd fonts are enabled
|
||||||
|
if vim.g.have_nerd_font then
|
||||||
|
local lspkind = require 'lspkind'
|
||||||
|
local kinds = vim.lsp.protocol.CompletionItemKind
|
||||||
|
|
||||||
|
for i, kind in ipairs(kinds) do
|
||||||
|
kinds[i] = (lspkind.symbolic(kind, {
|
||||||
|
mode = 'symbol',
|
||||||
|
}) or '') .. ' ' .. kind
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd('LspAttach', {
|
vim.api.nvim_create_autocmd('LspAttach', {
|
||||||
group = vim.api.nvim_create_augroup('kickstart-lsp-completion', { clear = true }),
|
group = vim.api.nvim_create_augroup('kickstart-lsp-completion', { clear = true }),
|
||||||
callback = function(event)
|
callback = function(event)
|
||||||
local function keymap(lhs, rhs, opts, mode)
|
|
||||||
opts = type(opts) == 'string' and { desc = opts } or vim.tbl_extend('error', opts --[[@as table]], { buffer = event.buf })
|
|
||||||
mode = mode or 'n'
|
|
||||||
vim.keymap.set(mode, lhs, rhs, opts)
|
|
||||||
end
|
|
||||||
|
|
||||||
local function feedkeys(keys)
|
|
||||||
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(keys, true, false, true), 'n', true)
|
|
||||||
end
|
|
||||||
|
|
||||||
---Is the completion menu open?
|
|
||||||
local function pumvisible()
|
|
||||||
return tonumber(vim.fn.pumvisible()) ~= 0
|
|
||||||
end
|
|
||||||
|
|
||||||
local client = vim.lsp.get_client_by_id(event.data.client_id)
|
local client = vim.lsp.get_client_by_id(event.data.client_id)
|
||||||
|
|
||||||
if client and client:supports_method 'textDocument/completion' then
|
if client and client:supports_method 'textDocument/completion' then
|
||||||
vim.lsp.completion.enable(true, client.id, event.buf, { autotrigger = true })
|
vim.lsp.completion.enable(true, client.id, event.buf, { autotrigger = true })
|
||||||
|
|
||||||
-- Use enter to accept completions.
|
|
||||||
keymap('<cr>', function()
|
|
||||||
return pumvisible() and '<C-y>' or '<cr>'
|
|
||||||
end, { expr = true }, 'i')
|
|
||||||
|
|
||||||
-- Use slash to dismiss the completion menu.
|
|
||||||
keymap('/', function()
|
|
||||||
return pumvisible() and '<C-e>' or '/'
|
|
||||||
end, { expr = true }, 'i')
|
|
||||||
|
|
||||||
-- Use <C-n> to navigate to the next completion or:
|
|
||||||
-- - Trigger LSP completion.
|
|
||||||
-- - If there's no one, fallback to vanilla omnifunc.
|
|
||||||
keymap('<C-n>', function()
|
|
||||||
if pumvisible() then
|
|
||||||
feedkeys '<C-n>'
|
|
||||||
else
|
|
||||||
if next(vim.lsp.get_clients { bufnr = 0 }) then
|
|
||||||
vim.lsp.completion.trigger()
|
|
||||||
else
|
|
||||||
if vim.bo.omnifunc == '' then
|
|
||||||
feedkeys '<C-x><C-n>'
|
|
||||||
else
|
|
||||||
feedkeys '<C-x><C-o>'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end, 'Trigger/select next completion', 'i')
|
|
||||||
|
|
||||||
-- Buffer completions.
|
|
||||||
keymap('<C-u>', '<C-x><C-n>', { desc = 'Buffer completions' }, 'i')
|
|
||||||
|
|
||||||
-- Use <Tab> to accept a Copilot suggestion, navigate between snippet tabstops,
|
|
||||||
-- or select the next completion.
|
|
||||||
-- Do something similar with <S-Tab>.
|
|
||||||
keymap('<Tab>', function()
|
|
||||||
local copilot = require 'copilot.suggestion'
|
|
||||||
|
|
||||||
if copilot.is_visible() then
|
|
||||||
copilot.accept()
|
|
||||||
elseif pumvisible() then
|
|
||||||
feedkeys '<C-n>'
|
|
||||||
elseif vim.snippet.active { direction = 1 } then
|
|
||||||
vim.snippet.jump(1)
|
|
||||||
else
|
|
||||||
feedkeys '<Tab>'
|
|
||||||
end
|
|
||||||
end, {}, { 'i', 's' })
|
|
||||||
keymap('<S-Tab>', function()
|
|
||||||
if pumvisible() then
|
|
||||||
feedkeys '<C-p>'
|
|
||||||
elseif vim.snippet.active { direction = -1 } then
|
|
||||||
vim.snippet.jump(-1)
|
|
||||||
else
|
|
||||||
feedkeys '<S-Tab>'
|
|
||||||
end
|
|
||||||
end, {}, { 'i', 's' })
|
|
||||||
|
|
||||||
-- Inside a snippet, use backspace to remove the placeholder.
|
|
||||||
keymap('<BS>', '<C-o>s', {}, 's')
|
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
@ -861,124 +802,6 @@ require('lazy').setup({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
-- { -- Autocompletion
|
|
||||||
-- 'hrsh7th/nvim-cmp',
|
|
||||||
-- event = 'InsertEnter',
|
|
||||||
-- dependencies = {
|
|
||||||
-- -- Snippet Engine & its associated nvim-cmp source
|
|
||||||
-- {
|
|
||||||
-- 'L3MON4D3/LuaSnip',
|
|
||||||
-- build = (function()
|
|
||||||
-- -- Build Step is needed for regex support in snippets.
|
|
||||||
-- -- This step is not supported in many windows environments.
|
|
||||||
-- -- Remove the below condition to re-enable on windows.
|
|
||||||
-- if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
|
|
||||||
-- return
|
|
||||||
-- end
|
|
||||||
-- return 'make install_jsregexp'
|
|
||||||
-- end)(),
|
|
||||||
-- dependencies = {
|
|
||||||
-- -- `friendly-snippets` contains a variety of premade snippets.
|
|
||||||
-- -- See the README about individual language/framework/plugin snippets:
|
|
||||||
-- -- https://github.com/rafamadriz/friendly-snippets
|
|
||||||
-- -- {
|
|
||||||
-- -- 'rafamadriz/friendly-snippets',
|
|
||||||
-- -- config = function()
|
|
||||||
-- -- require('luasnip.loaders.from_vscode').lazy_load()
|
|
||||||
-- -- end,
|
|
||||||
-- -- },
|
|
||||||
-- },
|
|
||||||
-- },
|
|
||||||
-- 'saadparwaiz1/cmp_luasnip',
|
|
||||||
--
|
|
||||||
-- -- Adds other completion capabilities.
|
|
||||||
-- -- nvim-cmp does not ship with all sources by default. They are split
|
|
||||||
-- -- into multiple repos for maintenance purposes.
|
|
||||||
-- 'hrsh7th/cmp-nvim-lsp',
|
|
||||||
-- 'hrsh7th/cmp-path',
|
|
||||||
-- 'hrsh7th/cmp-nvim-lsp-signature-help',
|
|
||||||
-- },
|
|
||||||
-- config = function()
|
|
||||||
-- -- See `:help cmp`
|
|
||||||
-- local cmp = require 'cmp'
|
|
||||||
-- local luasnip = require 'luasnip'
|
|
||||||
-- luasnip.config.setup {}
|
|
||||||
--
|
|
||||||
-- cmp.setup {
|
|
||||||
-- snippet = {
|
|
||||||
-- expand = function(args)
|
|
||||||
-- luasnip.lsp_expand(args.body)
|
|
||||||
-- end,
|
|
||||||
-- },
|
|
||||||
-- completion = { completeopt = 'menu,menuone,noinsert' },
|
|
||||||
--
|
|
||||||
-- -- For an understanding of why these mappings were
|
|
||||||
-- -- chosen, you will need to read `:help ins-completion`
|
|
||||||
-- --
|
|
||||||
-- -- No, but seriously. Please read `:help ins-completion`, it is really good!
|
|
||||||
-- mapping = cmp.mapping.preset.insert {
|
|
||||||
-- -- Select the [n]ext item
|
|
||||||
-- ['<C-n>'] = cmp.mapping.select_next_item(),
|
|
||||||
-- -- Select the [p]revious item
|
|
||||||
-- ['<C-p>'] = cmp.mapping.select_prev_item(),
|
|
||||||
--
|
|
||||||
-- -- Scroll the documentation window [b]ack / [f]orward
|
|
||||||
-- ['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
|
||||||
-- ['<C-f>'] = cmp.mapping.scroll_docs(4),
|
|
||||||
--
|
|
||||||
-- -- Accept ([y]es) the completion.
|
|
||||||
-- -- This will auto-import if your LSP supports it.
|
|
||||||
-- -- This will expand snippets if the LSP sent a snippet.
|
|
||||||
-- ['<C-y>'] = cmp.mapping.confirm { select = true },
|
|
||||||
--
|
|
||||||
-- -- If you prefer more traditional completion keymaps,
|
|
||||||
-- -- you can uncomment the following lines
|
|
||||||
-- --['<CR>'] = cmp.mapping.confirm { select = true },
|
|
||||||
-- --['<Tab>'] = cmp.mapping.select_next_item(),
|
|
||||||
-- --['<S-Tab>'] = cmp.mapping.select_prev_item(),
|
|
||||||
--
|
|
||||||
-- -- Manually trigger a completion from nvim-cmp.
|
|
||||||
-- -- Generally you don't need this, because nvim-cmp will display
|
|
||||||
-- -- completions whenever it has completion options available.
|
|
||||||
-- ['<C-Space>'] = cmp.mapping.complete {},
|
|
||||||
--
|
|
||||||
-- -- Think of <c-l> as moving to the right of your snippet expansion.
|
|
||||||
-- -- So if you have a snippet that's like:
|
|
||||||
-- -- function $name($args)
|
|
||||||
-- -- $body
|
|
||||||
-- -- end
|
|
||||||
-- --
|
|
||||||
-- -- <c-l> will move you to the right of each of the expansion locations.
|
|
||||||
-- -- <c-h> is similar, except moving you backwards.
|
|
||||||
-- ['<C-l>'] = cmp.mapping(function()
|
|
||||||
-- if luasnip.expand_or_locally_jumpable() then
|
|
||||||
-- luasnip.expand_or_jump()
|
|
||||||
-- end
|
|
||||||
-- end, { 'i', 's' }),
|
|
||||||
-- ['<C-h>'] = cmp.mapping(function()
|
|
||||||
-- if luasnip.locally_jumpable(-1) then
|
|
||||||
-- luasnip.jump(-1)
|
|
||||||
-- end
|
|
||||||
-- end, { 'i', 's' }),
|
|
||||||
--
|
|
||||||
-- -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
|
|
||||||
-- -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
|
|
||||||
-- },
|
|
||||||
-- sources = {
|
|
||||||
-- {
|
|
||||||
-- name = 'lazydev',
|
|
||||||
-- -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
|
|
||||||
-- group_index = 0,
|
|
||||||
-- },
|
|
||||||
-- { name = 'nvim_lsp' },
|
|
||||||
-- { name = 'luasnip' },
|
|
||||||
-- { name = 'path' },
|
|
||||||
-- { name = 'nvim_lsp_signature_help' },
|
|
||||||
-- },
|
|
||||||
-- }
|
|
||||||
-- end,
|
|
||||||
-- },
|
|
||||||
|
|
||||||
{ -- You can easily change to a different colorscheme.
|
{ -- You can easily change to a different colorscheme.
|
||||||
-- Change the name of the colorscheme plugin below, and then
|
-- Change the name of the colorscheme plugin below, and then
|
||||||
-- change the command in the config to whatever the name of that colorscheme is.
|
-- change the command in the config to whatever the name of that colorscheme is.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user