Merge branch 'main' into blink-color-kind-block

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "14.0.1"
+  ".": "14.0.2"
 }

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [14.0.2](https://github.com/LazyVim/LazyVim/compare/v14.0.1...v14.0.2) (2024-12-13)
+
+
+### Bug Fixes
+
+* **cmp:** disable nvim-cmp/blink.cmp when needed ([60b7704](https://github.com/LazyVim/LazyVim/commit/60b77045d57d5473e50042b9b879c9c1054e6a10))
+* **cmp:** wrong extras check for nvim-cmp ([009e358](https://github.com/LazyVim/LazyVim/commit/009e3587be1badc04c9a8b8b459e8555b405509c))
+
 ## [14.0.1](https://github.com/LazyVim/LazyVim/compare/v14.0.0...v14.0.1) (2024-12-13)
 
 

lua/lazyvim/config/init.lua

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

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

@@ -6,6 +6,11 @@ if lazyvim_docs then
 end
 
 return {
+  {
+    "hrsh7th/nvim-cmp",
+    optional = true,
+    enabled = false,
+  },
   {
     "saghen/blink.cmp",
     version = not vim.g.lazyvim_blink_main and "*",

lua/lazyvim/plugins/extras/coding/nvim-cmp.lua

@@ -1,4 +1,9 @@
 return {
+  {
+    "saghen/blink.cmp",
+    enabled = false,
+    optional = true,
+  },
 
   -- Setup nvim-cmp
   {

lua/lazyvim/util/init.lua

@@ -269,7 +269,7 @@ end
 function M.cmp_engine()
   vim.g.lazyvim_cmp = vim.g.lazyvim_cmp or "auto"
   if vim.g.lazyvim_cmp == "auto" then
-    return LazyVim.has_extra("nvim-cmp") and "nvim-cmp" or "blink.cmp"
+    return LazyVim.has_extra("coding.nvim-cmp") and "nvim-cmp" or "blink.cmp"
   end
   return vim.g.lazyvim_cmp
 end