mirror of
https://github.com/nvim-lua/kickstart.nvim.git
synced 2025-05-05 15:32:54 +00:00
feat: switch nvim-cmp for blink.cmp (#1426)
This commit is contained in:
Liam Dyer
GitHub
parent
9929044f24
commit
d350db2449
158
init.lua
158
init.lua
@ -481,8 +481,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
|
-- Allows extra capabilities provided by blink.cmp
|
||||||
'hrsh7th/cmp-nvim-lsp',
|
'saghen/blink.cmp',
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
-- Brief aside: **What is LSP?**
|
-- Brief aside: **What is LSP?**
|
||||||
@ -649,10 +649,9 @@ require('lazy').setup({
|
|||||||
|
|
||||||
-- LSP servers and clients are able to communicate to each other what features they support.
|
-- LSP servers and clients are able to communicate to each other what features they support.
|
||||||
-- By default, Neovim doesn't support everything that is in the LSP specification.
|
-- By default, Neovim doesn't support everything that is in the LSP specification.
|
||||||
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
|
-- When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
|
||||||
-- So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
|
-- So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
local capabilities = require('blink.cmp').get_lsp_capabilities()
|
||||||
capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
|
|
||||||
|
|
||||||
-- Enable the following language servers
|
-- Enable the following language servers
|
||||||
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
|
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
|
||||||
@ -771,12 +770,14 @@ require('lazy').setup({
|
|||||||
},
|
},
|
||||||
|
|
||||||
{ -- Autocompletion
|
{ -- Autocompletion
|
||||||
'hrsh7th/nvim-cmp',
|
'saghen/blink.cmp',
|
||||||
event = 'InsertEnter',
|
event = 'VimEnter',
|
||||||
|
version = '1.*',
|
||||||
dependencies = {
|
dependencies = {
|
||||||
-- Snippet Engine & its associated nvim-cmp source
|
-- Snippet Engine
|
||||||
{
|
{
|
||||||
'L3MON4D3/LuaSnip',
|
'L3MON4D3/LuaSnip',
|
||||||
|
version = '2.*',
|
||||||
build = (function()
|
build = (function()
|
||||||
-- Build Step is needed for regex support in snippets.
|
-- Build Step is needed for regex support in snippets.
|
||||||
-- This step is not supported in many windows environments.
|
-- This step is not supported in many windows environments.
|
||||||
@ -797,95 +798,74 @@ require('lazy').setup({
|
|||||||
-- end,
|
-- end,
|
||||||
-- },
|
-- },
|
||||||
},
|
},
|
||||||
|
opts = {},
|
||||||
},
|
},
|
||||||
'saadparwaiz1/cmp_luasnip',
|
'folke/lazydev.nvim',
|
||||||
|
|
||||||
-- 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()
|
--- @module 'blink.cmp'
|
||||||
-- See `:help cmp`
|
--- @type blink.cmp.Config
|
||||||
local cmp = require 'cmp'
|
opts = {
|
||||||
local luasnip = require 'luasnip'
|
keymap = {
|
||||||
luasnip.config.setup {}
|
-- 'default' (recommended) for mappings similar to built-in completions
|
||||||
|
-- <c-y> to accept ([y]es) the completion.
|
||||||
cmp.setup {
|
-- This will auto-import if your LSP supports it.
|
||||||
snippet = {
|
-- This will expand snippets if the LSP sent a snippet.
|
||||||
expand = function(args)
|
-- 'super-tab' for tab to accept
|
||||||
luasnip.lsp_expand(args.body)
|
-- 'enter' for enter to accept
|
||||||
end,
|
-- 'none' for no mappings
|
||||||
},
|
--
|
||||||
completion = { completeopt = 'menu,menuone,noinsert' },
|
-- For an understanding of why the 'default' preset is recommended,
|
||||||
|
-- you will need to read `:help ins-completion`
|
||||||
-- 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!
|
-- No, but seriously. Please read `:help ins-completion`, it is really good!
|
||||||
mapping = cmp.mapping.preset.insert {
|
--
|
||||||
-- Select the [n]ext item
|
-- All presets have the following mappings:
|
||||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
-- <tab>/<s-tab>: move to right/left of your snippet expansion
|
||||||
-- Select the [p]revious item
|
-- <c-space>: Open menu or open docs if already open
|
||||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
-- <c-n>/<c-p> or <up>/<down>: Select next/previous item
|
||||||
|
-- <c-e>: Hide menu
|
||||||
|
-- <c-k>: Toggle signature help
|
||||||
|
--
|
||||||
|
-- See :h blink-cmp-config-keymap for defining your own keymap
|
||||||
|
preset = 'default',
|
||||||
|
|
||||||
-- Scroll the documentation window [b]ack / [f]orward
|
-- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
|
||||||
['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
-- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
|
||||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
},
|
||||||
|
|
||||||
-- Accept ([y]es) the completion.
|
appearance = {
|
||||||
-- This will auto-import if your LSP supports it.
|
-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
|
||||||
-- This will expand snippets if the LSP sent a snippet.
|
-- Adjusts spacing to ensure icons are aligned
|
||||||
['<C-y>'] = cmp.mapping.confirm { select = true },
|
nerd_font_variant = 'mono',
|
||||||
|
},
|
||||||
|
|
||||||
-- If you prefer more traditional completion keymaps,
|
completion = {
|
||||||
-- you can uncomment the following lines
|
-- By default, you may press `<c-space>` to show the documentation.
|
||||||
--['<CR>'] = cmp.mapping.confirm { select = true },
|
-- Optionally, set `auto_show = true` to show the documentation after a delay.
|
||||||
--['<Tab>'] = cmp.mapping.select_next_item(),
|
documentation = { auto_show = false, auto_show_delay_ms = 500 },
|
||||||
--['<S-Tab>'] = cmp.mapping.select_prev_item(),
|
},
|
||||||
|
|
||||||
-- Manually trigger a completion from nvim-cmp.
|
sources = {
|
||||||
-- Generally you don't need this, because nvim-cmp will display
|
default = { 'lsp', 'path', 'snippets', 'lazydev' },
|
||||||
-- completions whenever it has completion options available.
|
providers = {
|
||||||
['<C-Space>'] = cmp.mapping.complete {},
|
lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
|
||||||
|
|
||||||
-- 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',
|
snippets = { preset = 'luasnip' },
|
||||||
-- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
|
|
||||||
group_index = 0,
|
-- Blink.cmp includes an optional, recommended rust fuzzy matcher,
|
||||||
},
|
-- which automatically downloads a prebuilt binary when enabled.
|
||||||
{ name = 'nvim_lsp' },
|
--
|
||||||
{ name = 'luasnip' },
|
-- By default, we use the Lua implementation instead, but you may enable
|
||||||
{ name = 'path' },
|
-- the rust implementation via `'prefer_rust_with_warning'`
|
||||||
{ name = 'nvim_lsp_signature_help' },
|
--
|
||||||
},
|
-- See :h blink-cmp-config-fuzzy for more information
|
||||||
}
|
fuzzy = { implementation = 'lua' },
|
||||||
end,
|
|
||||||
|
-- Shows a signature help window while you type arguments for a function
|
||||||
|
signature = { enabled = true },
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
{ -- You can easily change to a different colorscheme.
|
{ -- You can easily change to a different colorscheme.
|
||||||
|
|||||||
@ -4,13 +4,5 @@
|
|||||||
return {
|
return {
|
||||||
'windwp/nvim-autopairs',
|
'windwp/nvim-autopairs',
|
||||||
event = 'InsertEnter',
|
event = 'InsertEnter',
|
||||||
-- Optional dependency
|
opts = {},
|
||||||
dependencies = { 'hrsh7th/nvim-cmp' },
|
|
||||||
config = function()
|
|
||||||
require('nvim-autopairs').setup {}
|
|
||||||
-- If you want to automatically add `(` after selecting a function or method
|
|
||||||
local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
|
|
||||||
local cmp = require 'cmp'
|
|
||||||
cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
|
|
||||||
end,
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user