Merge 16de9cf02736251883f3e64cef535ad557858baf into 9929044f2432758bc0a7c3fab13414e49f316443

init.lua

@@ -514,8 +514,8 @@ require('lazy').setup({
       -- Useful status updates for LSP.
       { 'j-hui/fidget.nvim', opts = {} },
 
-      -- Allows extra capabilities provided by blink.cmp
+      -- Allows extra capabilities provided by nvim-cmp
-      'saghen/blink.cmp',
+      'hrsh7th/cmp-nvim-lsp',
     },
     config = function()
       -- Brief aside: **What is LSP?**
@@ -682,9 +682,10 @@ require('lazy').setup({
 
       -- 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.
-      --  When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
+      --  When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
-      --  So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
+      --  So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
-      local capabilities = require('blink.cmp').get_lsp_capabilities()
+      local capabilities = vim.lsp.protocol.make_client_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.
@@ -803,14 +804,12 @@ require('lazy').setup({
   },
 
   { -- Autocompletion
-    'saghen/blink.cmp',
+    'hrsh7th/nvim-cmp',
-    event = 'VimEnter',
+    event = 'InsertEnter',
-    version = '1.*',
     dependencies = {
-      -- Snippet Engine
+      -- Snippet Engine & its associated nvim-cmp source
       {
         'L3MON4D3/LuaSnip',
-        version = '2.*',
         build = (function()
           -- Build Step is needed for regex support in snippets.
           -- This step is not supported in many windows environments.
@@ -831,74 +830,95 @@ require('lazy').setup({
           --   end,
           -- },
         },
-        opts = {},
       },
-      'folke/lazydev.nvim',
+      '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',
     },
-    --- @module 'blink.cmp'
+    config = function()
-    --- @type blink.cmp.Config
+      -- See `:help cmp`
-    opts = {
+      local cmp = require 'cmp'
-      keymap = {
+      local luasnip = require 'luasnip'
-        -- 'default' (recommended) for mappings similar to built-in completions
+      luasnip.config.setup {}
-        --   <c-y> to accept ([y]es) the completion.
+
-        --    This will auto-import if your LSP supports it.
+      cmp.setup {
-        --    This will expand snippets if the LSP sent a snippet.
+        snippet = {
-        -- 'super-tab' for tab to accept
+          expand = function(args)
-        -- 'enter' for enter to accept
+            luasnip.lsp_expand(args.body)
-        -- 'none' for no mappings
+          end,
-        --
+        },
-        -- For an understanding of why the 'default' preset is recommended,
+        completion = { completeopt = 'menu,menuone,noinsert' },
-        -- 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!
-        --
+        mapping = cmp.mapping.preset.insert {
-        -- All presets have the following mappings:
+          -- Select the [n]ext item
-        -- <tab>/<s-tab>: move to right/left of your snippet expansion
+          ['<C-n>'] = cmp.mapping.select_next_item(),
-        -- <c-space>: Open menu or open docs if already open
+          -- Select the [p]revious item
-        -- <c-n>/<c-p> or <up>/<down>: Select next/previous item
+          ['<C-p>'] = cmp.mapping.select_prev_item(),
-        -- <c-e>: Hide menu
-        -- <c-k>: Toggle signature help
-        --
-        -- See :h blink-cmp-config-keymap for defining your own keymap
-        preset = 'default',
 
-        -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
+          -- Scroll the documentation window [b]ack / [f]orward
-        --    https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
+          ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-      },
+          ['<C-f>'] = cmp.mapping.scroll_docs(4),
 
-      appearance = {
+          -- Accept ([y]es) the completion.
-        -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
+          --  This will auto-import if your LSP supports it.
-        -- Adjusts spacing to ensure icons are aligned
+          --  This will expand snippets if the LSP sent a snippet.
-        nerd_font_variant = 'mono',
+          ['<C-y>'] = cmp.mapping.confirm { select = true },
-      },
 
-      completion = {
+          -- If you prefer more traditional completion keymaps,
-        -- By default, you may press `<c-space>` to show the documentation.
+          -- you can uncomment the following lines
-        -- Optionally, set `auto_show = true` to show the documentation after a delay.
+          --['<CR>'] = cmp.mapping.confirm { select = true },
-        documentation = { auto_show = false, auto_show_delay_ms = 500 },
+          --['<Tab>'] = cmp.mapping.select_next_item(),
-      },
+          --['<S-Tab>'] = cmp.mapping.select_prev_item(),
 
-      sources = {
+          -- Manually trigger a completion from nvim-cmp.
-        default = { 'lsp', 'path', 'snippets', 'lazydev' },
+          --  Generally you don't need this, because nvim-cmp will display
-        providers = {
+          --  completions whenever it has completion options available.
-          lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
+          ['<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 = {
-
+          {
-      snippets = { preset = 'luasnip' },
+            name = 'lazydev',
-
+            -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
-      -- Blink.cmp includes an optional, recommended rust fuzzy matcher,
+            group_index = 0,
-      -- which automatically downloads a prebuilt binary when enabled.
+          },
-      --
+          { name = 'nvim_lsp' },
-      -- By default, we use the Lua implementation instead, but you may enable
+          { name = 'luasnip' },
-      -- the rust implementation via `'prefer_rust_with_warning'`
+          { name = 'path' },
-      --
+          { 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.

lua/kickstart/plugins/autopairs.lua

@@ -4,5 +4,13 @@
 return {
   'windwp/nvim-autopairs',
   event = 'InsertEnter',
-  opts = {},
+  -- Optional dependency
+  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,
 }