diff --git a/init.lua b/init.lua
index cbf9ff65d67..f9db7aad313 100644
--- a/init.lua
+++ b/init.lua
@@ -161,6 +161,10 @@ vim.opt.scrolloff = 10
-- See `:help 'confirm'`
vim.opt.confirm = true
+-- set options for insert completion (ins-completion)
+-- See `:help completeopt`
+vim.o.completeopt = 'noselect,menu,menuone,noinsert,popup'
+
-- [[ Basic Keymaps ]]
-- See `:help vim.keymap.set()`
@@ -486,8 +490,8 @@ require('lazy').setup({
-- Useful status updates for LSP.
{ 'j-hui/fidget.nvim', opts = {} },
- -- Allows extra capabilities provided by nvim-cmp
- 'hrsh7th/cmp-nvim-lsp',
+ -- Show pictograms for completion
+ { 'onsails/lspkind.nvim', enabled = vim.g.have_nerd_font },
},
config = function()
-- Brief aside: **What is LSP?**
@@ -623,6 +627,29 @@ require('lazy').setup({
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', {
+ group = vim.api.nvim_create_augroup('kickstart-lsp-completion', { clear = true }),
+ callback = function(event)
+ local client = vim.lsp.get_client_by_id(event.data.client_id)
+
+ if client and client:supports_method 'textDocument/completion' then
+ vim.lsp.completion.enable(true, client.id, event.buf, { autotrigger = true })
+ end
+ end,
+ })
+
-- Diagnostic Config
-- See :help vim.diagnostic.Opts
vim.diagnostic.config {
@@ -657,7 +684,7 @@ require('lazy').setup({
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
-- So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
local capabilities = vim.lsp.protocol.make_client_capabilities()
- capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
+ -- capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
-- Enable the following language servers
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
@@ -775,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.
-- Change the name of the colorscheme plugin below, and then
-- change the command in the config to whatever the name of that colorscheme is.