diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json index b2abfd3a..8bfa7ed7 100644 --- a/.github/.release-please-manifest.json +++ b/.github/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "14.0.1" + ".": "14.0.2" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c1010bb..52625d6c 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua index c963bf46..6aeab070 100644 --- a/lua/lazyvim/config/init.lua +++ b/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 diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua index ff7b77eb..a2235520 100644 --- a/lua/lazyvim/plugins/extras/coding/blink.lua +++ b/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 "*", diff --git a/lua/lazyvim/plugins/extras/coding/nvim-cmp.lua b/lua/lazyvim/plugins/extras/coding/nvim-cmp.lua index 3ec15c83..cdada25a 100644 --- a/lua/lazyvim/plugins/extras/coding/nvim-cmp.lua +++ b/lua/lazyvim/plugins/extras/coding/nvim-cmp.lua @@ -1,4 +1,9 @@ return { + { + "saghen/blink.cmp", + enabled = false, + optional = true, + }, -- Setup nvim-cmp { diff --git a/lua/lazyvim/util/init.lua b/lua/lazyvim/util/init.lua index c831606a..188544c3 100644 --- a/lua/lazyvim/util/init.lua +++ b/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