From 917c685c1fb3774375ea2236e5e7aaa3d951fdda Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Wed, 23 Oct 2024 11:23:09 +0200 Subject: [PATCH 01/28] feat(catppuccin): bufferline integration. Closes #4583. Closes #4581 --- lua/lazyvim/plugins/colorscheme.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lua/lazyvim/plugins/colorscheme.lua b/lua/lazyvim/plugins/colorscheme.lua index c6376e1b..4e63bb75 100644 --- a/lua/lazyvim/plugins/colorscheme.lua +++ b/lua/lazyvim/plugins/colorscheme.lua @@ -50,5 +50,16 @@ return { which_key = true, }, }, + specs = { + { + "akinsho/bufferline.nvim", + optional = true, + opts = function(_, opts) + if vim.g.colors_name:find("catppuccin") then + opts.highlights = require("catppuccin.groups.integrations.bufferline").get() + end + end, + }, + }, }, } From 27f53eaa1e52e2c5f4e2cd82d7bee14d05d31df7 Mon Sep 17 00:00:00 2001 From: folke Date: Wed, 23 Oct 2024 09:24:14 +0000 Subject: [PATCH 02/28] chore(build): auto-generate docs --- doc/LazyVim.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt index b0c811f3..9d74a4a7 100644 --- a/doc/LazyVim.txt +++ b/doc/LazyVim.txt @@ -1,4 +1,4 @@ -*LazyVim.txt* For Neovim Last change: 2024 October 04 +*LazyVim.txt* For Neovim Last change: 2024 October 23 ============================================================================== Table of Contents *LazyVim-table-of-contents* From e46cb62a17e1f4b7f163f4e0fdd13593c4af3abd Mon Sep 17 00:00:00 2001 From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:26:14 +0300 Subject: [PATCH 03/28] feat(extras): expose `prios` to users for customization (#4587) ## Description Offer to users capability to customize priorities of the Extras. ## Related Issue(s) Closes #4584 ## Screenshots ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/plugins/xtras.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lua/lazyvim/plugins/xtras.lua b/lua/lazyvim/plugins/xtras.lua index 761569c5..0527dde5 100644 --- a/lua/lazyvim/plugins/xtras.lua +++ b/lua/lazyvim/plugins/xtras.lua @@ -10,6 +10,10 @@ local prios = { ["lazyvim.plugins.extras.editor.outline"] = 100, } +if vim.g.xtras_prios then + prios = vim.tbl_deep_extend("force", prios, vim.g.xtras_prios or {}) +end + ---@type string[] local extras = LazyVim.dedup(LazyVim.config.json.data.extras) From fe7003de506ef7022a6c5f623476630d7bc30944 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Wed, 23 Oct 2024 11:32:18 +0200 Subject: [PATCH 04/28] fix(folds): enable folds when treesitter available. Fixes #4563 --- lua/lazyvim/util/ui.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/lazyvim/util/ui.lua b/lua/lazyvim/util/ui.lua index 28537bce..7c6780ea 100644 --- a/lua/lazyvim/util/ui.lua +++ b/lua/lazyvim/util/ui.lua @@ -197,8 +197,8 @@ function M.foldexpr() return "0" end - -- don't use treesitter folds for non-file buffers - if vim.bo[buf].buftype ~= "" then + -- don't use treesitter folds for terminal + if vim.bo[buf].buftype == "terminal" then return "0" end From b4eb4e1f4a4024229fe40782fdb12683c1c69634 Mon Sep 17 00:00:00 2001 From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:40:31 +0300 Subject: [PATCH 05/28] feat(keymaps): allow `v:count1` when moving lines (#4618) ## Description Allow user to use `v:count1` when moving lines ## Related Issue(s) Closes #4615. ## Screenshots ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/config/keymaps.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua index a6f1c574..84bba42c 100644 --- a/lua/lazyvim/config/keymaps.lua +++ b/lua/lazyvim/config/keymaps.lua @@ -23,12 +23,12 @@ map("n", "", "vertical resize -2", { desc = "Decrease Window Wi map("n", "", "vertical resize +2", { desc = "Increase Window Width" }) -- Move Lines -map("n", "", "m .+1==", { desc = "Move Down" }) -map("n", "", "m .-2==", { desc = "Move Up" }) +map("n", "", "execute 'move .+' . v:count1==", { desc = "Move Down" }) +map("n", "", "execute 'move .-' . (v:count1 + 1)==", { desc = "Move Up" }) map("i", "", "m .+1==gi", { desc = "Move Down" }) map("i", "", "m .-2==gi", { desc = "Move Up" }) -map("v", "", ":m '>+1gv=gv", { desc = "Move Down" }) -map("v", "", ":m '<-2gv=gv", { desc = "Move Up" }) +map("v", "", ":execute \"'<,'>move '>+\" . v:count1gv=gv", { desc = "Move Down" }) +map("v", "", ":execute \"'<,'>move '<-\" . (v:count1 + 1)gv=gv", { desc = "Move Up" }) -- buffers map("n", "", "bprevious", { desc = "Prev Buffer" }) From 0f5fa439e5038eadf0686444c5703cfe630d065f Mon Sep 17 00:00:00 2001 From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:44:27 +0300 Subject: [PATCH 06/28] refactor(cmp): add `optional` where necessary (#4557) ## Description Makes it easier to disable it for users who want to try other completion engines, without it being pulled back by some Extra. ## Related Issue(s) None ## Screenshots ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/plugins/coding.lua | 2 ++ lua/lazyvim/plugins/extras/coding/tabnine.lua | 1 + lua/lazyvim/plugins/extras/lang/python.lua | 1 + lua/lazyvim/plugins/extras/lang/rust.lua | 1 + lua/lazyvim/plugins/extras/lang/tailwind.lua | 1 + 5 files changed, 6 insertions(+) diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua index 8529ab20..18ce7407 100644 --- a/lua/lazyvim/plugins/coding.lua +++ b/lua/lazyvim/plugins/coding.lua @@ -85,6 +85,7 @@ return { -- snippets { "nvim-cmp", + optional = true, dependencies = { { "garymjr/nvim-snippets", @@ -209,6 +210,7 @@ return { -- Add lazydev source to cmp { "hrsh7th/nvim-cmp", + optional = true, opts = function(_, opts) table.insert(opts.sources, { name = "lazydev", group_index = 0 }) end, diff --git a/lua/lazyvim/plugins/extras/coding/tabnine.lua b/lua/lazyvim/plugins/extras/coding/tabnine.lua index f02fccc9..1c92a25d 100644 --- a/lua/lazyvim/plugins/extras/coding/tabnine.lua +++ b/lua/lazyvim/plugins/extras/coding/tabnine.lua @@ -2,6 +2,7 @@ return { -- Tabnine cmp source { "nvim-cmp", + optional = true, dependencies = { { "tzachar/cmp-tabnine", diff --git a/lua/lazyvim/plugins/extras/lang/python.lua b/lua/lazyvim/plugins/extras/lang/python.lua index f85b23be..4c098452 100644 --- a/lua/lazyvim/plugins/extras/lang/python.lua +++ b/lua/lazyvim/plugins/extras/lang/python.lua @@ -133,6 +133,7 @@ return { { "hrsh7th/nvim-cmp", + optional = true, opts = function(_, opts) opts.auto_brackets = opts.auto_brackets or {} table.insert(opts.auto_brackets, "python") diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua index 4caeaef8..145940ca 100644 --- a/lua/lazyvim/plugins/extras/lang/rust.lua +++ b/lua/lazyvim/plugins/extras/lang/rust.lua @@ -9,6 +9,7 @@ return { -- Extend auto completion { "hrsh7th/nvim-cmp", + optional = true, dependencies = { { "Saecki/crates.nvim", diff --git a/lua/lazyvim/plugins/extras/lang/tailwind.lua b/lua/lazyvim/plugins/extras/lang/tailwind.lua index 8f43d25b..cbdd612e 100644 --- a/lua/lazyvim/plugins/extras/lang/tailwind.lua +++ b/lua/lazyvim/plugins/extras/lang/tailwind.lua @@ -59,6 +59,7 @@ return { }, { "hrsh7th/nvim-cmp", + optional = true, dependencies = { { "roobert/tailwindcss-colorizer-cmp.nvim", opts = {} }, }, From 7c7c196a78e936a1bc4cf28e7908e9bd96d75607 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 11:55:48 +0200 Subject: [PATCH 07/28] chore(main): release 12.43.0 (#4630) :robot: I have created a release *beep* *boop* --- ## [12.43.0](https://github.com/LazyVim/LazyVim/compare/v12.42.0...v12.43.0) (2024-10-23) ### Features * **catppuccin:** bufferline integration. Closes [#4583](https://github.com/LazyVim/LazyVim/issues/4583). Closes [#4581](https://github.com/LazyVim/LazyVim/issues/4581) ([917c685](https://github.com/LazyVim/LazyVim/commit/917c685c1fb3774375ea2236e5e7aaa3d951fdda)) * **extras:** expose `prios` to users for customization ([#4587](https://github.com/LazyVim/LazyVim/issues/4587)) ([e46cb62](https://github.com/LazyVim/LazyVim/commit/e46cb62a17e1f4b7f163f4e0fdd13593c4af3abd)) * **keymaps:** allow `v:count1` when moving lines ([#4618](https://github.com/LazyVim/LazyVim/issues/4618)) ([b4eb4e1](https://github.com/LazyVim/LazyVim/commit/b4eb4e1f4a4024229fe40782fdb12683c1c69634)) ### Bug Fixes * **folds:** enable folds when treesitter available. Fixes [#4563](https://github.com/LazyVim/LazyVim/issues/4563) ([fe7003d](https://github.com/LazyVim/LazyVim/commit/fe7003de506ef7022a6c5f623476630d7bc30944)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/.release-please-manifest.json | 2 +- CHANGELOG.md | 14 ++++++++++++++ lua/lazyvim/config/init.lua | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json index a2c4b235..3d20ea43 100644 --- a/.github/.release-please-manifest.json +++ b/.github/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "12.42.0" + ".": "12.43.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index d3f2dcf8..df0deeba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [12.43.0](https://github.com/LazyVim/LazyVim/compare/v12.42.0...v12.43.0) (2024-10-23) + + +### Features + +* **catppuccin:** bufferline integration. Closes [#4583](https://github.com/LazyVim/LazyVim/issues/4583). Closes [#4581](https://github.com/LazyVim/LazyVim/issues/4581) ([917c685](https://github.com/LazyVim/LazyVim/commit/917c685c1fb3774375ea2236e5e7aaa3d951fdda)) +* **extras:** expose `prios` to users for customization ([#4587](https://github.com/LazyVim/LazyVim/issues/4587)) ([e46cb62](https://github.com/LazyVim/LazyVim/commit/e46cb62a17e1f4b7f163f4e0fdd13593c4af3abd)) +* **keymaps:** allow `v:count1` when moving lines ([#4618](https://github.com/LazyVim/LazyVim/issues/4618)) ([b4eb4e1](https://github.com/LazyVim/LazyVim/commit/b4eb4e1f4a4024229fe40782fdb12683c1c69634)) + + +### Bug Fixes + +* **folds:** enable folds when treesitter available. Fixes [#4563](https://github.com/LazyVim/LazyVim/issues/4563) ([fe7003d](https://github.com/LazyVim/LazyVim/commit/fe7003de506ef7022a6c5f623476630d7bc30944)) + ## [12.42.0](https://github.com/LazyVim/LazyVim/compare/v12.41.0...v12.42.0) (2024-10-04) diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua index 6472fe9f..70b54722 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 = "12.42.0" -- x-release-please-version +M.version = "12.43.0" -- x-release-please-version LazyVim.config = M ---@class LazyVimOptions From 2f6c1f60834108359b3404748453a65843909a03 Mon Sep 17 00:00:00 2001 From: nowaylifer Date: Wed, 23 Oct 2024 17:03:06 +0300 Subject: [PATCH 08/28] fix(dap): remove explicit `load_launchjs` call (#4634) ## Description The explicit call to `load_launchjs` is unnecessary, since after https://github.com/mfussenegger/nvim-dap/pull/1237 `.vscode/launch.json` files are loaded automatically. ## Related Issue(s) Fixes #4432 ## Screenshots ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/plugins/extras/dap/core.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lua/lazyvim/plugins/extras/dap/core.lua b/lua/lazyvim/plugins/extras/dap/core.lua index 67a3d71b..ac6709f1 100644 --- a/lua/lazyvim/plugins/extras/dap/core.lua +++ b/lua/lazyvim/plugins/extras/dap/core.lua @@ -69,11 +69,6 @@ return { vscode.json_decode = function(str) return vim.json.decode(json.json_strip_comments(str)) end - - -- Extends dap.configurations with entries read from .vscode/launch.json - if vim.fn.filereadable(".vscode/launch.json") then - vscode.load_launchjs() - end end, }, From 6570a141c0de30fccee38e2b10dcd14830624e16 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Thu, 24 Oct 2024 07:58:12 +0200 Subject: [PATCH 09/28] fix(catppuccin): fix bufferline integration when no colorscheme is set. Closes #4641 --- lua/lazyvim/plugins/colorscheme.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/lazyvim/plugins/colorscheme.lua b/lua/lazyvim/plugins/colorscheme.lua index 4e63bb75..9087c3ad 100644 --- a/lua/lazyvim/plugins/colorscheme.lua +++ b/lua/lazyvim/plugins/colorscheme.lua @@ -55,7 +55,7 @@ return { "akinsho/bufferline.nvim", optional = true, opts = function(_, opts) - if vim.g.colors_name:find("catppuccin") then + if (vim.g.colors_name or ""):find("catppuccin") then opts.highlights = require("catppuccin.groups.integrations.bufferline").get() end end, From 944d214c26405077275a3f5d24350c3c90854732 Mon Sep 17 00:00:00 2001 From: folke Date: Thu, 24 Oct 2024 05:59:11 +0000 Subject: [PATCH 10/28] chore(build): auto-generate docs --- doc/LazyVim.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt index 9d74a4a7..c31bcadf 100644 --- a/doc/LazyVim.txt +++ b/doc/LazyVim.txt @@ -1,4 +1,4 @@ -*LazyVim.txt* For Neovim Last change: 2024 October 23 +*LazyVim.txt* For Neovim Last change: 2024 October 24 ============================================================================== Table of Contents *LazyVim-table-of-contents* From 5f432d997e397790cea39d9bb8826c1d4ca14afb Mon Sep 17 00:00:00 2001 From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com> Date: Thu, 24 Oct 2024 09:30:17 +0300 Subject: [PATCH 11/28] fix(autocmds): change mapping for `lazyvim_close_with_q` (#4638) ## Description Currently `checkhealth` buffers stay visible on `bufferline` when you close them with `q`. Use `:bd` instead to delete the buffer from bufferlist. `vim.schedule` is needed because `LspInfo` adds its own mapping to close the window (see [here](https://github.com/neovim/nvim-lspconfig/blob/edd9591199d1c78c0cb20514231f7f936f9412a2/lua/lspconfig/health.lua#L328)), so we need to overwrite it. ## Related Issue(s) None ## Screenshots ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/config/autocmds.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lua/lazyvim/config/autocmds.lua b/lua/lazyvim/config/autocmds.lua index 7839950b..bc52c876 100644 --- a/lua/lazyvim/config/autocmds.lua +++ b/lua/lazyvim/config/autocmds.lua @@ -72,11 +72,13 @@ vim.api.nvim_create_autocmd("FileType", { }, callback = function(event) vim.bo[event.buf].buflisted = false - vim.keymap.set("n", "q", "close", { - buffer = event.buf, - silent = true, - desc = "Quit buffer", - }) + vim.schedule(function() + vim.keymap.set("n", "q", ":bd", { + buffer = event.buf, + silent = true, + desc = "Quit buffer", + }) + end) end, }) From 0eb400908d17f4116f02c6464d7ef81456ca303c Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Thu, 24 Oct 2024 09:25:03 +0200 Subject: [PATCH 12/28] fix(autocmds): force close buffers with q. See #4638 --- lua/lazyvim/config/autocmds.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/lazyvim/config/autocmds.lua b/lua/lazyvim/config/autocmds.lua index bc52c876..d33bf69e 100644 --- a/lua/lazyvim/config/autocmds.lua +++ b/lua/lazyvim/config/autocmds.lua @@ -73,7 +73,9 @@ vim.api.nvim_create_autocmd("FileType", { callback = function(event) vim.bo[event.buf].buflisted = false vim.schedule(function() - vim.keymap.set("n", "q", ":bd", { + vim.keymap.set("n", "q", function() + vim.api.nvim_buf_delete(event.buf, { force = true }) + end, { buffer = event.buf, silent = true, desc = "Quit buffer", From cb40a09538dc0c417a7ffbbacdbdec90be4a792c Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Thu, 24 Oct 2024 17:18:01 +0200 Subject: [PATCH 13/28] fix(autocmds): close window and force delete buf on q. See #4638 --- lua/lazyvim/config/autocmds.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/lazyvim/config/autocmds.lua b/lua/lazyvim/config/autocmds.lua index d33bf69e..6fe6b139 100644 --- a/lua/lazyvim/config/autocmds.lua +++ b/lua/lazyvim/config/autocmds.lua @@ -74,7 +74,8 @@ vim.api.nvim_create_autocmd("FileType", { vim.bo[event.buf].buflisted = false vim.schedule(function() vim.keymap.set("n", "q", function() - vim.api.nvim_buf_delete(event.buf, { force = true }) + vim.cmd("close") + pcall(vim.api.nvim_buf_delete, event.buf, { force = true }) end, { buffer = event.buf, silent = true, From 4ee6be4499008db458089fb2573b13f6b5ec5d3b Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Fri, 1 Nov 2024 23:47:03 +0200 Subject: [PATCH 14/28] fix(lazygit): file history when cwd is outside the repo (#4666) ## Description When using `gf` Lazygit is launched in the current directory rather than the root directory. ## Related Issue(s) ## Screenshots ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/config/keymaps.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua index 84bba42c..cc226964 100644 --- a/lua/lazyvim/config/keymaps.lua +++ b/lua/lazyvim/config/keymaps.lua @@ -137,7 +137,7 @@ map("n", "gB", LazyVim.lazygit.browse, { desc = "Git Browse" }) map("n", "gf", function() local git_path = vim.api.nvim_buf_get_name(0) - LazyVim.lazygit({args = { "-f", vim.trim(git_path) }}) + LazyVim.lazygit({args = { "-f", vim.trim(git_path) }, cwd = LazyVim.root.git()}) end, { desc = "Lazygit Current File History" }) map("n", "gl", function() From f11890bf99477898f9c003502397786026ba4287 Mon Sep 17 00:00:00 2001 From: folke Date: Fri, 1 Nov 2024 21:48:00 +0000 Subject: [PATCH 15/28] chore(build): auto-generate docs --- doc/LazyVim.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt index c31bcadf..44cbcbc9 100644 --- a/doc/LazyVim.txt +++ b/doc/LazyVim.txt @@ -1,4 +1,4 @@ -*LazyVim.txt* For Neovim Last change: 2024 October 24 +*LazyVim.txt* For Neovim Last change: 2024 November 01 ============================================================================== Table of Contents *LazyVim-table-of-contents* From 1d3d64fd1ae26581b71f39091c816e568b7a3b39 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sat, 2 Nov 2024 09:46:34 +0100 Subject: [PATCH 16/28] fix(rust): disable rust_analyzer in the rust extra. Fixes #4685 --- lua/lazyvim/plugins/extras/lang/rust.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua index 145940ca..b8eb4a23 100644 --- a/lua/lazyvim/plugins/extras/lang/rust.lua +++ b/lua/lazyvim/plugins/extras/lang/rust.lua @@ -95,6 +95,7 @@ return { "neovim/nvim-lspconfig", opts = { servers = { + rust_analyzer = { enabled = false }, taplo = { keys = { { From a66b44a9fe0031c85a536f13f84582a6ba7c3f82 Mon Sep 17 00:00:00 2001 From: folke Date: Sat, 2 Nov 2024 08:48:22 +0000 Subject: [PATCH 17/28] chore(build): auto-generate docs --- doc/LazyVim.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt index 44cbcbc9..5f4566f4 100644 --- a/doc/LazyVim.txt +++ b/doc/LazyVim.txt @@ -1,4 +1,4 @@ -*LazyVim.txt* For Neovim Last change: 2024 November 01 +*LazyVim.txt* For Neovim Last change: 2024 November 02 ============================================================================== Table of Contents *LazyVim-table-of-contents* From ad52bf91bc8f1821bbb0b7218d03768eec9a9e42 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sat, 2 Nov 2024 09:54:55 +0100 Subject: [PATCH 18/28] feat(extras): blink (#4680) ## Description Extra to use [blink.cmp](https://github.com/Saghen/blink.cmp) instead of **nvim-cmp**. ## Todo - [x] tokyonight suport - [x] basic integration - [ ] check / update all cmp sources - [ ] copilot and others integration - [x] native lazydev source ## Limitations There's no copilot source, so instead when enabling both blink and copilot: - blink ghost text is disabled - copilot suggestions are enabled - use `` to navigate snippets and accept copilot completions ## Related Issue(s) - https://github.com/LazyVim/LazyVim/discussions/4679 --- lua/lazyvim/plugins/extras/coding/blink.lua | 96 +++++++++++++++++++ lua/lazyvim/plugins/extras/coding/copilot.lua | 40 ++++++++ lua/lazyvim/plugins/lsp/init.lua | 2 + lua/lazyvim/plugins/xtras.lua | 1 + lua/lazyvim/util/cmp.lua | 10 +- 5 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 lua/lazyvim/plugins/extras/coding/blink.lua diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua new file mode 100644 index 00000000..e571fc10 --- /dev/null +++ b/lua/lazyvim/plugins/extras/coding/blink.lua @@ -0,0 +1,96 @@ +return { + { + "hrsh7th/nvim-cmp", + enabled = false, + }, + { + "saghen/blink.cmp", + -- TODO: use release version + -- version = "*", + opts_extend = { "sources.completion.enabled_providers" }, + dependencies = { + "rafamadriz/friendly-snippets", + -- add blink.compat to dependencies + -- { "saghen/blink.compat", opts = {} }, + }, + event = "InsertEnter", + + ---@module 'blink.cmp' + ---@type blink.cmp.Config + opts = { + fuzzy = { + prebuilt_binaries = { + download = true, + force_version = "v0.5.0", + }, + }, + highlight = { + -- sets the fallback highlight groups to nvim-cmp's highlight groups + -- useful for when your theme doesn't support blink.cmp + -- will be removed in a future release, assuming themes add support + use_nvim_cmp_as_default = false, + }, + -- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- adjusts spacing to ensure icons are aligned + nerd_font_variant = "mono", + windows = { + autocomplete = { + draw = "reversed", + }, + documentation = { + auto_show = true, + }, + ghost_text = { + enabled = true, + }, + }, + + -- experimental auto-brackets support + accept = { auto_brackets = { enabled = true } }, + + -- experimental signature help support + -- trigger = { signature_help = { enabled = true } } + sources = { + completion = { + -- remember to enable your providers here + enabled_providers = { "lsp", "path", "snippets", "buffer" }, + }, + }, + + keymap = { + preset = "enter", + }, + }, + }, + + -- add icons + { + "saghen/blink.cmp", + opts = function(_, opts) + opts.kind_icons = LazyVim.config.icons.kinds + end, + }, + + -- lazydev + { + "saghen/blink.cmp", + opts = { + sources = { + completion = { + -- add lazydev to your completion providers + enabled_providers = { "lazydev" }, + }, + providers = { + lsp = { + -- dont show LuaLS require statements when lazydev has items + fallback_for = { "lazydev" }, + }, + lazydev = { + name = "LazyDev", + module = "lazydev.integrations.blink", + }, + }, + }, + }, + }, +} diff --git a/lua/lazyvim/plugins/extras/coding/copilot.lua b/lua/lazyvim/plugins/extras/coding/copilot.lua index 8f0680ea..4d737379 100644 --- a/lua/lazyvim/plugins/extras/coding/copilot.lua +++ b/lua/lazyvim/plugins/extras/coding/copilot.lua @@ -80,4 +80,44 @@ return { }) end, }, + + { + "saghen/blink.cmp", + optional = true, + specs = { + { + "zbirenbaum/copilot.lua", + event = "InsertEnter", + opts = { + suggestion = { + enabled = true, + auto_trigger = true, + keymap = { accept = false }, + }, + }, + }, + }, + opts = { + windows = { + ghost_text = { + enabled = false, + }, + }, + keymap = { + [""] = { + function(cmp) + if cmp.is_in_snippet() then + return cmp.accept() + elseif require("copilot.suggestion").is_visible() then + require("copilot.suggestion").accept() + else + return cmp.select_and_accept() + end + end, + "snippet_forward", + "fallback", + }, + }, + }, + }, } diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua index 076344dd..3e8bc8b7 100644 --- a/lua/lazyvim/plugins/lsp/init.lua +++ b/lua/lazyvim/plugins/lsp/init.lua @@ -184,11 +184,13 @@ return { local servers = opts.servers local has_cmp, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") + local has_blink, blink = pcall(require, "blink.cmp") local capabilities = vim.tbl_deep_extend( "force", {}, vim.lsp.protocol.make_client_capabilities(), has_cmp and cmp_nvim_lsp.default_capabilities() or {}, + has_blink and blink.get_lsp_capabilities() or {}, opts.capabilities or {} ) diff --git a/lua/lazyvim/plugins/xtras.lua b/lua/lazyvim/plugins/xtras.lua index 0527dde5..c2b52cb6 100644 --- a/lua/lazyvim/plugins/xtras.lua +++ b/lua/lazyvim/plugins/xtras.lua @@ -4,6 +4,7 @@ local prios = { ["lazyvim.plugins.extras.dap.core"] = 1, ["lazyvim.plugins.extras.ui.edgy"] = 2, ["lazyvim.plugins.extras.lang.typescript"] = 5, + ["lazyvim.plugins.extras.coding.blink"] = 5, ["lazyvim.plugins.extras.formatting.prettier"] = 10, -- default priority is 50 ["lazyvim.plugins.extras.editor.aerial"] = 100, diff --git a/lua/lazyvim/util/cmp.lua b/lua/lazyvim/util/cmp.lua index 8cb3d1bc..5eff81fa 100644 --- a/lua/lazyvim/util/cmp.lua +++ b/lua/lazyvim/util/cmp.lua @@ -71,9 +71,17 @@ function M.add_missing_snippet_docs(window) end function M.visible() + ---@module 'blink.cmp' + local blink = package.loaded["blink.cmp"] + if blink then + return blink.windows and blink.windows.autocomplete.win:is_open() + end ---@module 'cmp' local cmp = package.loaded["cmp"] - return cmp and cmp.core.view:visible() + if cmp then + return cmp.core.view:visible() + end + return false end -- This is a better implementation of `cmp.confirm`: From db8895b518278331fb73bbd81975cbe5012c8f71 Mon Sep 17 00:00:00 2001 From: Stefan Boca <45266795+stefanboca@users.noreply.github.com> Date: Sat, 2 Nov 2024 02:02:23 -0700 Subject: [PATCH 19/28] feat(extras): enable crates.nvim in-process lsp server (#4684) ## Description Rather than manually handling hover and completions through nvim-cmp and nvim-lspconfig, enable the crates.nvim in-process lsp server. This also allows crates.nvim to provide code actions. ## Related Issue(s) This change also removes the direct dependency on nvim-cmp, which should help with #4680 ## Screenshots ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. Co-authored-by: Folke Lemaitre --- lua/lazyvim/plugins/extras/lang/rust.lua | 44 +++++++----------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua index b8eb4a23..583981d4 100644 --- a/lua/lazyvim/plugins/extras/lang/rust.lua +++ b/lua/lazyvim/plugins/extras/lang/rust.lua @@ -6,26 +6,23 @@ return { }) end, - -- Extend auto completion + -- LSP for Cargo.toml { - "hrsh7th/nvim-cmp", - optional = true, - dependencies = { - { - "Saecki/crates.nvim", - event = { "BufRead Cargo.toml" }, - opts = { - completion = { - cmp = { enabled = true }, - }, + "Saecki/crates.nvim", + event = { "BufRead Cargo.toml" }, + opts = { + completion = { + crates = { + enabled = true, }, }, + lsp = { + enabled = true, + actions = true, + completion = true, + hover = true, + }, }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - opts.sources = opts.sources or {} - table.insert(opts.sources, { name = "crates" }) - end, }, -- Add Rust & related to treesitter @@ -96,21 +93,6 @@ return { opts = { servers = { rust_analyzer = { enabled = false }, - taplo = { - keys = { - { - "K", - function() - if vim.fn.expand("%:t") == "Cargo.toml" and require("crates").popup_available() then - require("crates").show_popup() - else - vim.lsp.buf.hover() - end - end, - desc = "Show Crate Documentation", - }, - }, - }, }, }, }, From 6e1d0994d99e63a46c3eff737c44ca47e3ecbe28 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sat, 2 Nov 2024 17:41:38 +0100 Subject: [PATCH 20/28] fix(copilot): create undo point before accepting copilot suggestion when using blink --- lua/lazyvim/plugins/extras/coding/copilot.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/lazyvim/plugins/extras/coding/copilot.lua b/lua/lazyvim/plugins/extras/coding/copilot.lua index 4d737379..9d9c6aa0 100644 --- a/lua/lazyvim/plugins/extras/coding/copilot.lua +++ b/lua/lazyvim/plugins/extras/coding/copilot.lua @@ -109,6 +109,7 @@ return { if cmp.is_in_snippet() then return cmp.accept() elseif require("copilot.suggestion").is_visible() then + LazyVim.create_undo() require("copilot.suggestion").accept() else return cmp.select_and_accept() From 28da1eb073f99abda9ea9b2349e5d8b8087ffcce Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sat, 2 Nov 2024 17:41:55 +0100 Subject: [PATCH 21/28] feat(blink): use vim.o.pumblend as winblend option for autocomplete menu in blink --- lua/lazyvim/plugins/extras/coding/blink.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua index e571fc10..73ca4638 100644 --- a/lua/lazyvim/plugins/extras/coding/blink.lua +++ b/lua/lazyvim/plugins/extras/coding/blink.lua @@ -36,6 +36,7 @@ return { windows = { autocomplete = { draw = "reversed", + winblend = vim.o.pumblend, }, documentation = { auto_show = true, From ec616a3cecaf1e5de1687223575ff019ad688e55 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sat, 2 Nov 2024 18:12:31 +0100 Subject: [PATCH 22/28] fix(blink): explicetely set version=false for now --- lua/lazyvim/plugins/extras/coding/blink.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua index 73ca4638..8d1076b3 100644 --- a/lua/lazyvim/plugins/extras/coding/blink.lua +++ b/lua/lazyvim/plugins/extras/coding/blink.lua @@ -7,6 +7,7 @@ return { "saghen/blink.cmp", -- TODO: use release version -- version = "*", + version = false, opts_extend = { "sources.completion.enabled_providers" }, dependencies = { "rafamadriz/friendly-snippets", From a7b4c4391bccc894f56847ead7abe4ae7a8e4fc0 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sat, 2 Nov 2024 18:51:04 +0100 Subject: [PATCH 23/28] fix(autocmds): `vim.highlight` is deprecated --- lua/lazyvim/config/autocmds.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/lazyvim/config/autocmds.lua b/lua/lazyvim/config/autocmds.lua index 6fe6b139..e301bc1e 100644 --- a/lua/lazyvim/config/autocmds.lua +++ b/lua/lazyvim/config/autocmds.lua @@ -18,7 +18,7 @@ vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, { vim.api.nvim_create_autocmd("TextYankPost", { group = augroup("highlight_yank"), callback = function() - vim.highlight.on_yank() + (vim.hl or vim.highlight).on_yank() end, }) From 29dab35619bf6a3aafe7d71904fb31452bdd23a7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2024 00:15:26 +0100 Subject: [PATCH 24/28] chore(main): release 12.44.0 (#4635) :robot: I have created a release *beep* *boop* --- ## [12.44.0](https://github.com/LazyVim/LazyVim/compare/v12.43.0...v12.44.0) (2024-11-02) ### Features * **blink:** use vim.o.pumblend as winblend option for autocomplete menu in blink ([28da1eb](https://github.com/LazyVim/LazyVim/commit/28da1eb073f99abda9ea9b2349e5d8b8087ffcce)) * **extras:** blink ([#4680](https://github.com/LazyVim/LazyVim/issues/4680)) ([ad52bf9](https://github.com/LazyVim/LazyVim/commit/ad52bf91bc8f1821bbb0b7218d03768eec9a9e42)) * **extras:** enable crates.nvim in-process lsp server ([#4684](https://github.com/LazyVim/LazyVim/issues/4684)) ([db8895b](https://github.com/LazyVim/LazyVim/commit/db8895b518278331fb73bbd81975cbe5012c8f71)) ### Bug Fixes * **autocmds:** `vim.highlight` is deprecated ([a7b4c43](https://github.com/LazyVim/LazyVim/commit/a7b4c4391bccc894f56847ead7abe4ae7a8e4fc0)) * **autocmds:** change mapping for `lazyvim_close_with_q` ([#4638](https://github.com/LazyVim/LazyVim/issues/4638)) ([5f432d9](https://github.com/LazyVim/LazyVim/commit/5f432d997e397790cea39d9bb8826c1d4ca14afb)) * **autocmds:** close window and force delete buf on q. See [#4638](https://github.com/LazyVim/LazyVim/issues/4638) ([cb40a09](https://github.com/LazyVim/LazyVim/commit/cb40a09538dc0c417a7ffbbacdbdec90be4a792c)) * **autocmds:** force close buffers with q. See [#4638](https://github.com/LazyVim/LazyVim/issues/4638) ([0eb4009](https://github.com/LazyVim/LazyVim/commit/0eb400908d17f4116f02c6464d7ef81456ca303c)) * **blink:** explicetely set version=false for now ([ec616a3](https://github.com/LazyVim/LazyVim/commit/ec616a3cecaf1e5de1687223575ff019ad688e55)) * **catppuccin:** fix bufferline integration when no colorscheme is set. Closes [#4641](https://github.com/LazyVim/LazyVim/issues/4641) ([6570a14](https://github.com/LazyVim/LazyVim/commit/6570a141c0de30fccee38e2b10dcd14830624e16)) * **copilot:** create undo point before accepting copilot suggestion when using blink ([6e1d099](https://github.com/LazyVim/LazyVim/commit/6e1d0994d99e63a46c3eff737c44ca47e3ecbe28)) * **dap:** remove explicit `load_launchjs` call ([#4634](https://github.com/LazyVim/LazyVim/issues/4634)) ([2f6c1f6](https://github.com/LazyVim/LazyVim/commit/2f6c1f60834108359b3404748453a65843909a03)) * **lazygit:** file history when cwd is outside the repo ([#4666](https://github.com/LazyVim/LazyVim/issues/4666)) ([4ee6be4](https://github.com/LazyVim/LazyVim/commit/4ee6be4499008db458089fb2573b13f6b5ec5d3b)) * **rust:** disable rust_analyzer in the rust extra. Fixes [#4685](https://github.com/LazyVim/LazyVim/issues/4685) ([1d3d64f](https://github.com/LazyVim/LazyVim/commit/1d3d64fd1ae26581b71f39091c816e568b7a3b39)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/.release-please-manifest.json | 2 +- CHANGELOG.md | 23 +++++++++++++++++++++++ lua/lazyvim/config/init.lua | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json index 3d20ea43..e2b3ecea 100644 --- a/.github/.release-please-manifest.json +++ b/.github/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "12.43.0" + ".": "12.44.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index df0deeba..5e0dd3b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # Changelog +## [12.44.0](https://github.com/LazyVim/LazyVim/compare/v12.43.0...v12.44.0) (2024-11-02) + + +### Features + +* **blink:** use vim.o.pumblend as winblend option for autocomplete menu in blink ([28da1eb](https://github.com/LazyVim/LazyVim/commit/28da1eb073f99abda9ea9b2349e5d8b8087ffcce)) +* **extras:** blink ([#4680](https://github.com/LazyVim/LazyVim/issues/4680)) ([ad52bf9](https://github.com/LazyVim/LazyVim/commit/ad52bf91bc8f1821bbb0b7218d03768eec9a9e42)) +* **extras:** enable crates.nvim in-process lsp server ([#4684](https://github.com/LazyVim/LazyVim/issues/4684)) ([db8895b](https://github.com/LazyVim/LazyVim/commit/db8895b518278331fb73bbd81975cbe5012c8f71)) + + +### Bug Fixes + +* **autocmds:** `vim.highlight` is deprecated ([a7b4c43](https://github.com/LazyVim/LazyVim/commit/a7b4c4391bccc894f56847ead7abe4ae7a8e4fc0)) +* **autocmds:** change mapping for `lazyvim_close_with_q` ([#4638](https://github.com/LazyVim/LazyVim/issues/4638)) ([5f432d9](https://github.com/LazyVim/LazyVim/commit/5f432d997e397790cea39d9bb8826c1d4ca14afb)) +* **autocmds:** close window and force delete buf on q. See [#4638](https://github.com/LazyVim/LazyVim/issues/4638) ([cb40a09](https://github.com/LazyVim/LazyVim/commit/cb40a09538dc0c417a7ffbbacdbdec90be4a792c)) +* **autocmds:** force close buffers with q. See [#4638](https://github.com/LazyVim/LazyVim/issues/4638) ([0eb4009](https://github.com/LazyVim/LazyVim/commit/0eb400908d17f4116f02c6464d7ef81456ca303c)) +* **blink:** explicetely set version=false for now ([ec616a3](https://github.com/LazyVim/LazyVim/commit/ec616a3cecaf1e5de1687223575ff019ad688e55)) +* **catppuccin:** fix bufferline integration when no colorscheme is set. Closes [#4641](https://github.com/LazyVim/LazyVim/issues/4641) ([6570a14](https://github.com/LazyVim/LazyVim/commit/6570a141c0de30fccee38e2b10dcd14830624e16)) +* **copilot:** create undo point before accepting copilot suggestion when using blink ([6e1d099](https://github.com/LazyVim/LazyVim/commit/6e1d0994d99e63a46c3eff737c44ca47e3ecbe28)) +* **dap:** remove explicit `load_launchjs` call ([#4634](https://github.com/LazyVim/LazyVim/issues/4634)) ([2f6c1f6](https://github.com/LazyVim/LazyVim/commit/2f6c1f60834108359b3404748453a65843909a03)) +* **lazygit:** file history when cwd is outside the repo ([#4666](https://github.com/LazyVim/LazyVim/issues/4666)) ([4ee6be4](https://github.com/LazyVim/LazyVim/commit/4ee6be4499008db458089fb2573b13f6b5ec5d3b)) +* **rust:** disable rust_analyzer in the rust extra. Fixes [#4685](https://github.com/LazyVim/LazyVim/issues/4685) ([1d3d64f](https://github.com/LazyVim/LazyVim/commit/1d3d64fd1ae26581b71f39091c816e568b7a3b39)) + ## [12.43.0](https://github.com/LazyVim/LazyVim/compare/v12.42.0...v12.43.0) (2024-10-23) diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua index 70b54722..b03a3d01 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 = "12.43.0" -- x-release-please-version +M.version = "12.44.0" -- x-release-please-version LazyVim.config = M ---@class LazyVimOptions From 0403e80a8e6250130fe94af1034a6f0760a24ca8 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sun, 3 Nov 2024 12:48:11 +0100 Subject: [PATCH 25/28] fix(java): jdtls run with args (#4689) ## Description Makes run with args work for jdtls ## Related Issue(s) - Closes #4686 - Closes #4673 --- lua/lazyvim/plugins/extras/dap/core.lua | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lua/lazyvim/plugins/extras/dap/core.lua b/lua/lazyvim/plugins/extras/dap/core.lua index ac6709f1..a605052c 100644 --- a/lua/lazyvim/plugins/extras/dap/core.lua +++ b/lua/lazyvim/plugins/extras/dap/core.lua @@ -1,11 +1,17 @@ ----@param config {args?:string[]|fun():string[]?} +---@param config {type?:string, args?:string[]|fun():string[]?} local function get_args(config) - local args = type(config.args) == "function" and (config.args() or {}) or config.args or {} + local args = type(config.args) == "function" and (config.args() or {}) or config.args or {} --[[@as string[] | string ]] + local args_str = type(args) == "table" and table.concat(args, " ") or args --[[@as string]] + config = vim.deepcopy(config) ---@cast args string[] config.args = function() - local new_args = vim.fn.input("Run with args: ", table.concat(args, " ")) --[[@as string]] - return vim.split(vim.fn.expand(new_args) --[[@as string]], " ") + local new_args = vim.fn.expand(vim.fn.input("Run with args: ", args_str)) + if config.type and config.type == "java" then + ---@diagnostic disable-next-line: return-type-mismatch + return new_args + end + return vim.split(new_args, " ") end return config end From f4d78ac0de8fd4c9237516df8ef93974a29cb6fb Mon Sep 17 00:00:00 2001 From: folke Date: Sun, 3 Nov 2024 11:49:08 +0000 Subject: [PATCH 26/28] chore(build): auto-generate docs --- doc/LazyVim.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt index 5f4566f4..301c542c 100644 --- a/doc/LazyVim.txt +++ b/doc/LazyVim.txt @@ -1,4 +1,4 @@ -*LazyVim.txt* For Neovim Last change: 2024 November 02 +*LazyVim.txt* For Neovim Last change: 2024 November 03 ============================================================================== Table of Contents *LazyVim-table-of-contents* From fa3739678af494b8657d68ddc44bcc598f9bd00a Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sun, 3 Nov 2024 12:53:08 +0100 Subject: [PATCH 27/28] fix(copilot): properly process tab with copilot and blink. Fixes #4692 --- lua/lazyvim/plugins/extras/coding/copilot.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/lazyvim/plugins/extras/coding/copilot.lua b/lua/lazyvim/plugins/extras/coding/copilot.lua index 9d9c6aa0..22ba0c64 100644 --- a/lua/lazyvim/plugins/extras/coding/copilot.lua +++ b/lua/lazyvim/plugins/extras/coding/copilot.lua @@ -111,6 +111,7 @@ return { elseif require("copilot.suggestion").is_visible() then LazyVim.create_undo() require("copilot.suggestion").accept() + return true else return cmp.select_and_accept() end From 7ebed5349d49dd9996d61155bc12605871058ec1 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sun, 3 Nov 2024 15:26:45 +0100 Subject: [PATCH 28/28] fix(blink): use release version --- lua/lazyvim/plugins/extras/coding/blink.lua | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua index 8d1076b3..e6d4e29b 100644 --- a/lua/lazyvim/plugins/extras/coding/blink.lua +++ b/lua/lazyvim/plugins/extras/coding/blink.lua @@ -5,9 +5,7 @@ return { }, { "saghen/blink.cmp", - -- TODO: use release version - -- version = "*", - version = false, + version = "*", opts_extend = { "sources.completion.enabled_providers" }, dependencies = { "rafamadriz/friendly-snippets", @@ -19,12 +17,6 @@ return { ---@module 'blink.cmp' ---@type blink.cmp.Config opts = { - fuzzy = { - prebuilt_binaries = { - download = true, - force_version = "v0.5.0", - }, - }, highlight = { -- sets the fallback highlight groups to nvim-cmp's highlight groups -- useful for when your theme doesn't support blink.cmp