From 917c685c1fb3774375ea2236e5e7aaa3d951fdda Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Wed, 23 Oct 2024 11:23:09 +0200 Subject: [PATCH 01/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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,