Merge branch 'main' into patch-1

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "14.4.0"
+  ".": "14.6.0"
 }

CHANGELOG.md

@@ -1,5 +1,48 @@
 # Changelog
 
+## [14.6.0](https://github.com/LazyVim/LazyVim/compare/v14.5.0...v14.6.0) (2024-12-20)
+
+
+### Features
+
+* **colorscheme:** add fzf integration to catppuccin ([#5175](https://github.com/LazyVim/LazyVim/issues/5175)) ([751803f](https://github.com/LazyVim/LazyVim/commit/751803f98bf3baaf7db1c1e2ddd28e082396124a))
+* **lualine:** add fzf extensions. ([#5203](https://github.com/LazyVim/LazyVim/issues/5203)) ([7a16a75](https://github.com/LazyVim/LazyVim/commit/7a16a752ba1fa535bb54d6492fb8df6c72ab8ba0))
+
+
+### Bug Fixes
+
+* **blink:** remove compatibility with 0.7.6 release ([#5212](https://github.com/LazyVim/LazyVim/issues/5212)) ([857f330](https://github.com/LazyVim/LazyVim/commit/857f330c2139c328cfce0251b11713dc179d6a81))
+* **codeium:** doesnt automatically load when `vim.g.ai_cmp` is set to false ([#5182](https://github.com/LazyVim/LazyVim/issues/5182)) ([b51279c](https://github.com/LazyVim/LazyVim/commit/b51279c6d727a09cd3d2bf3c9d0cf829810280bb))
+* **fzf:** fzf.lua compatible hidden scrollbar ([#5177](https://github.com/LazyVim/LazyVim/issues/5177)) ([3a79273](https://github.com/LazyVim/LazyVim/commit/3a79273f3c3bbd22bcdba795b7b8fe6a949db96e))
+* **luasnip:** use blink's luasnip source. Closes [#5211](https://github.com/LazyVim/LazyVim/issues/5211) ([86de9c9](https://github.com/LazyVim/LazyVim/commit/86de9c9e443572b0244ee9bbdcf5f10ecaabaf74))
+
+
+### Performance Improvements
+
+* **supermaven:** add lazy-loading ([#5183](https://github.com/LazyVim/LazyVim/issues/5183)) ([a3a28bf](https://github.com/LazyVim/LazyVim/commit/a3a28bf8e43f7239316942c2f2bac6e74b28586b))
+
+
+### Reverts
+
+* fix(fzf): fzf.lua compatible hidden scrollbar ([#5177](https://github.com/LazyVim/LazyVim/issues/5177)) ([c40692c](https://github.com/LazyVim/LazyVim/commit/c40692c1b0a95492eead8cc093972c634d54043b))
+
+## [14.5.0](https://github.com/LazyVim/LazyVim/compare/v14.4.0...v14.5.0) (2024-12-17)
+
+
+### Features
+
+* **blink:** increase lazydev scores ([22015e0](https://github.com/LazyVim/LazyVim/commit/22015e0b4835ae148c19b459bf494fe5f72b415b))
+
+
+### Bug Fixes
+
+* **blink:** add `vim.snippet` fixes to blink (was already added to cmp). Fixes [#5067](https://github.com/LazyVim/LazyVim/issues/5067) ([5ea3cfa](https://github.com/LazyVim/LazyVim/commit/5ea3cfa48e6ac88b90282da86dba7799f67b2e30))
+* **blink:** don't trigger automatically on insert ([2cf3d23](https://github.com/LazyVim/LazyVim/commit/2cf3d234bfc31a1a4eda282ddabc12987f762893))
+* **blink:** remove show_on_insert_on_trigger_character since this has been fixed for {} and others ([0f3a120](https://github.com/LazyVim/LazyVim/commit/0f3a1201861e6d6e8834aa8937dcf3e4a70a937a))
+* **illuminate:** disable snacks.words when illuminate extra is enabled. Fixes [#5125](https://github.com/LazyVim/LazyVim/issues/5125) ([d025115](https://github.com/LazyVim/LazyVim/commit/d0251155ab2a293136c933b4e925e1fa16d39a2d))
+* **supermaven:** don't attach to bigfile and some snacks ft. Fixes [#5139](https://github.com/LazyVim/LazyVim/issues/5139) ([25ee13c](https://github.com/LazyVim/LazyVim/commit/25ee13ce29ad8c4e10d677e641955cfd3c810fb5))
+* **vscode:** disable some snacks plugins in vscode. Closes [#5124](https://github.com/LazyVim/LazyVim/issues/5124) ([301135b](https://github.com/LazyVim/LazyVim/commit/301135b2749affe71645c610001c8253ae78c591))
+
 ## [14.4.0](https://github.com/LazyVim/LazyVim/compare/v14.3.0...v14.4.0) (2024-12-15)
 
 

doc/LazyVim.txt

@@ -1,4 +1,4 @@
-*LazyVim.txt*             For Neovim             Last change: 2024 December 15
+*LazyVim.txt*             For Neovim             Last change: 2024 December 20
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

lua/lazyvim/config/init.lua

@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "14.4.0" -- x-release-please-version
+M.version = "14.6.0" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

lua/lazyvim/plugins/colorscheme.lua

@@ -19,6 +19,7 @@ return {
         cmp = true,
         dashboard = true,
         flash = true,
+        fzf = true,
         grug_far = true,
         gitsigns = true,
         headlines = true,

lua/lazyvim/plugins/extras/ai/codeium.lua

@@ -4,6 +4,7 @@ return {
   {
     "Exafunction/codeium.nvim",
     cmd = "Codeium",
+    event = "InsertEnter",
     build = ":Codeium Auth",
     opts = {
       enable_cmp_source = vim.g.ai_cmp,

lua/lazyvim/plugins/extras/ai/supermaven.lua

@@ -1,11 +1,17 @@
 return {
   {
     "supermaven-inc/supermaven-nvim",
+    event = "InsertEnter",
+    cmd = {
+      "SupermavenUseFree",
+      "SupermavenUsePro",
+    },
     opts = {
       keymaps = {
         accept_suggestion = nil, -- handled by nvim-cmp / blink.cmp
       },
       disable_inline_completion = vim.g.ai_cmp,
+      ignore_filetypes = { "bigfile", "snacks_input", "snacks_notif" },
     },
   },
 

lua/lazyvim/plugins/extras/coding/blink.lua

@@ -36,6 +36,11 @@ return {
     ---@module 'blink.cmp'
     ---@type blink.cmp.Config
     opts = {
+      snippets = {
+        expand = function(snippet, _)
+          return LazyVim.cmp.expand(snippet)
+        end,
+      },
       appearance = {
         -- sets the fallback highlight groups to nvim-cmp's highlight groups
         -- useful for when your theme doesn't support blink.cmp
@@ -101,13 +106,7 @@ return {
       if not opts.keymap["<Tab>"] then
         if opts.keymap.preset == "super-tab" then -- super-tab
           opts.keymap["<Tab>"] = {
-            function(cmp)
-              if cmp.snippet_active() then
-                return cmp.accept()
-              else
-                return cmp.select_and_accept()
-              end
-            end,
+            require("blink.cmp.keymap.presets")["super-tab"]["<Tab>"][1],
             LazyVim.cmp.map({ "snippet_forward", "ai_accept" }),
             "fallback",
           }
@@ -119,17 +118,6 @@ return {
         end
       end
 
-      ---  NOTE: compat with latest version. Currenlty 0.7.6
-      if not vim.g.lazyvim_blink_main then
-        ---@diagnostic disable-next-line: inject-field
-        opts.sources.completion = opts.sources.completion or {}
-        opts.sources.completion.enabled_providers = enabled
-        if vim.tbl_get(opts, "completion", "menu", "draw", "treesitter") then
-          ---@diagnostic disable-next-line: assign-type-mismatch
-          opts.completion.menu.draw.treesitter = true
-        end
-      end
-
       -- Unset custom prop to pass blink.cmp validation
       opts.sources.compat = nil
 
@@ -187,6 +175,7 @@ return {
           lazydev = {
             name = "LazyDev",
             module = "lazydev.integrations.blink",
+            score_offset = 100, -- show at a higher priority than lsp
           },
         },
       },

lua/lazyvim/plugins/extras/coding/luasnip.lua

@@ -67,12 +67,8 @@ return {
   {
     "saghen/blink.cmp",
     optional = true,
-    dependencies = {
-      { "saghen/blink.compat", opts = { impersonate_nvim_cmp = true } },
-      { "saadparwaiz1/cmp_luasnip" },
-    },
     opts = {
-      sources = { compat = { "luasnip" } },
+      sources = { default = { "luasnip" } },
       snippets = {
         expand = function(snippet)
           require("luasnip").lsp_expand(snippet)

lua/lazyvim/plugins/extras/editor/illuminate.lua

@@ -2,6 +2,9 @@
 -- This works with LSP, Treesitter, and regexp matching to find the other
 -- instances.
 return {
+  -- disable snacks words
+  { "snacks.nvim", opts = { words = { enabled = false } } },
+
   {
     "RRethy/vim-illuminate",
     event = "LazyFile",
@@ -53,8 +56,4 @@ return {
       { "[[", desc = "Prev Reference" },
     },
   },
-  {
-    "neovim/nvim-lspconfig",
-    opts = { document_highlight = { enabled = false } },
-  },
 }

lua/lazyvim/plugins/extras/vscode.lua

@@ -28,6 +28,7 @@ Config.options.change_detection.enabled = false
 Config.options.defaults.cond = function(plugin)
   return vim.tbl_contains(enabled, plugin.name) or plugin.vscode
 end
+vim.g.snacks_animate = false
 
 -- Add some vscode specific keymaps
 vim.api.nvim_create_autocmd("User", {
@@ -53,6 +54,15 @@ function LazyVim.terminal()
 end
 
 return {
+  {
+    "snacks.nvim",
+    opts = {
+      indent = { enabled = false },
+      scroll = { enabled = false },
+      notifier = { enabled = false },
+      statuscolumn = { enabled = false },
+    },
+  },
   {
     "LazyVim/LazyVim",
     config = function(_, opts)

lua/lazyvim/plugins/lsp/init.lua

@@ -46,10 +46,6 @@ return {
         codelens = {
           enabled = false,
         },
-        -- Enable lsp cursor word highlighting
-        document_highlight = {
-          enabled = true,
-        },
         -- add any global capabilities here
         capabilities = {
           workspace = {

lua/lazyvim/plugins/ui.lua

@@ -159,7 +159,7 @@ return {
             end,
           },
         },
-        extensions = { "neo-tree", "lazy" },
+        extensions = { "neo-tree", "lazy", "fzf" },
       }
 
       -- do not add trouble symbols if aerial is enabled