mroot/lazyvim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2026-07-25 14:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jorge Villalobos 2024-12-13 14:11:50 -05:00 • committed by GitHub
commit 6c48cd2867
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/.release-please-manifest.json vendored
View file

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

8
CHANGELOG.md
View file

@ -1,5 +1,13 @@
# Changelog # 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) ## [14.0.1](https://github.com/LazyVim/LazyVim/compare/v14.0.0...v14.0.1) (2024-12-13)

2
lua/lazyvim/config/init.lua
View file

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

5
lua/lazyvim/plugins/extras/coding/blink.lua
View file

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

5
lua/lazyvim/plugins/extras/coding/nvim-cmp.lua
View file

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

2
lua/lazyvim/util/init.lua
View file

@ -269,7 +269,7 @@ end
function M.cmp_engine() function M.cmp_engine()
vim.g.lazyvim_cmp = vim.g.lazyvim_cmp or "auto" vim.g.lazyvim_cmp = vim.g.lazyvim_cmp or "auto"
if vim.g.lazyvim_cmp == "auto" then 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 end
return vim.g.lazyvim_cmp return vim.g.lazyvim_cmp
end end