From 6aae99e76df387507dadcaaa93af97191aace714 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 12:00:59 +0200 Subject: [PATCH 01/15] chore(main): release 11.4.1 (#3256) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8c9cc0a..06b99bc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [11.4.1](https://github.com/LazyVim/LazyVim/compare/v11.4.0...v11.4.1) (2024-05-20) + + +### Bug Fixes + +* **java:** properly pass settings to jdtls ([8e67bb1](https://github.com/LazyVim/LazyVim/commit/8e67bb124009e0dbf29f8e78d701d07756670278)) + ## [11.4.0](https://github.com/LazyVim/LazyVim/compare/v11.3.2...v11.4.0) (2024-05-20) From d19a0041362f0a862b1bef995844ca07bbae6caf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 21 May 2024 10:01:38 +0000 Subject: [PATCH 02/15] chore(build): auto-generate vimdoc --- doc/LazyVim.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/LazyVim.txt b/doc/LazyVim.txt index 9fb3ea57..9733cc94 100644 --- a/doc/LazyVim.txt +++ b/doc/LazyVim.txt @@ -1,4 +1,4 @@ -*LazyVim.txt* For Neovim >= 0.9.0 Last change: 2024 May 20 +*LazyVim.txt* For Neovim >= 0.9.0 Last change: 2024 May 21 ============================================================================== Table of Contents *LazyVim-table-of-contents* From 8c94842b4a613995bf4c0c79febcd74c310439d0 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Tue, 21 May 2024 18:23:04 +0200 Subject: [PATCH 03/15] fix(lsp): sometimes lsp client is not fully initialized and doesnt yet have client.supports_method on 0.9.5. Fixes #3263 --- lua/lazyvim/util/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/lazyvim/util/lsp.lua b/lua/lazyvim/util/lsp.lua index 6479f1df..e14a5e13 100644 --- a/lua/lazyvim/util/lsp.lua +++ b/lua/lazyvim/util/lsp.lua @@ -61,7 +61,7 @@ function M._check_methods(client, buffer) for method, clients in pairs(M._supports_method) do clients[client] = clients[client] or {} if not clients[client][buffer] then - if client.supports_method(method, { bufnr = buffer }) then + if client.supports_method and client.supports_method(method, { bufnr = buffer }) then clients[client][buffer] = true vim.api.nvim_exec_autocmds("User", { pattern = "LspSupportsMethod", From 55b07dee21ee5306624e16dd90c2b3c9c0f3ddde Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Tue, 21 May 2024 19:22:41 +0200 Subject: [PATCH 04/15] fix(nvim-snippets): enable global friendly-snippets. See #3240 --- lua/lazyvim/plugins/coding.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua index 589e4b1c..9e623296 100644 --- a/lua/lazyvim/plugins/coding.lua +++ b/lua/lazyvim/plugins/coding.lua @@ -90,7 +90,13 @@ return { "nvim-cmp", dependencies = { { "rafamadriz/friendly-snippets" }, - { "garymjr/nvim-snippets", opts = { friendly_snippets = true } }, + { + "garymjr/nvim-snippets", + opts = { + friendly_snippets = true, + global_snippets = { "all", "global" }, + }, + }, }, opts = function(_, opts) opts.snippet = { From 8ba7c64a7da9e46f2ac601919508803824208935 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Tue, 21 May 2024 19:31:40 +0200 Subject: [PATCH 05/15] feat(comments): use ts-comments.nvim instead of nvim-ts-context-commentstring on Neovim 0.10 --- lua/lazyvim/plugins/coding.lua | 20 ++++--------------- .../plugins/extras/coding/mini-comment.lua | 7 +++++++ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua index 9e623296..c6150347 100644 --- a/lua/lazyvim/plugins/coding.lua +++ b/lua/lazyvim/plugins/coding.lua @@ -156,22 +156,10 @@ return { -- comments { - "JoosepAlviste/nvim-ts-context-commentstring", - lazy = true, - opts = { - enable_autocmd = false, - }, - init = function() - if vim.fn.has("nvim-0.10") == 1 then - vim.schedule(function() - local get_option = vim.filetype.get_option - vim.filetype.get_option = function(filetype, option) - return option == "commentstring" and require("ts_context_commentstring.internal").calculate_commentstring() - or get_option(filetype, option) - end - end) - end - end, + "folke/ts-comments.nvim", + event = "VeryLazy", + opts = {}, + enabled = vim.fn.has("nvim-0.10") == 1, }, { import = "lazyvim.plugins.extras.coding.mini-comment", diff --git a/lua/lazyvim/plugins/extras/coding/mini-comment.lua b/lua/lazyvim/plugins/extras/coding/mini-comment.lua index d401c9de..457787ef 100644 --- a/lua/lazyvim/plugins/extras/coding/mini-comment.lua +++ b/lua/lazyvim/plugins/extras/coding/mini-comment.lua @@ -10,4 +10,11 @@ return { }, }, }, + { + "JoosepAlviste/nvim-ts-context-commentstring", + lazy = true, + opts = { + enable_autocmd = false, + }, + }, } From 2bae438570aa96904836e56d8dad7f33eb3204ee Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Tue, 21 May 2024 19:51:13 +0200 Subject: [PATCH 06/15] fix(cmp): fix cmp's broken snippet parsing functionality. Fixes #3266 --- lua/lazyvim/plugins/coding.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua index c6150347..231b8f2b 100644 --- a/lua/lazyvim/plugins/coding.lua +++ b/lua/lazyvim/plugins/coding.lua @@ -71,6 +71,16 @@ return { for _, source in ipairs(opts.sources) do source.group_index = source.group_index or 1 end + + local parse = require("cmp.utils.snippet").parse + require("cmp.utils.snippet").parse = function(input) + local ok, ret = pcall(parse, input) + if ok then + return ret + end + return LazyVim.cmp.snippet_preview(input) + end + local cmp = require("cmp") cmp.setup(opts) cmp.event:on("confirm_done", function(event) From d73397c4aaac74d95970ac06caffa25abd7c2af4 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Tue, 21 May 2024 19:54:20 +0200 Subject: [PATCH 07/15] fix(snippets): make friendly snippets a dep of nvim-snippets --- lua/lazyvim/plugins/coding.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua index 231b8f2b..659a28ab 100644 --- a/lua/lazyvim/plugins/coding.lua +++ b/lua/lazyvim/plugins/coding.lua @@ -99,13 +99,13 @@ return { and { "nvim-cmp", dependencies = { - { "rafamadriz/friendly-snippets" }, { "garymjr/nvim-snippets", opts = { friendly_snippets = true, global_snippets = { "all", "global" }, }, + dependencies = { "rafamadriz/friendly-snippets" }, }, }, opts = function(_, opts) From cb1e1b9c82b405fa277f1869cd04dcd9c4507412 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Tue, 21 May 2024 20:18:20 +0200 Subject: [PATCH 08/15] fix(snippets): fixes custom snippets. use my branch till nvim-snippets PR is merged. Fixes #3240 --- lua/lazyvim/plugins/coding.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua index 659a28ab..1634f551 100644 --- a/lua/lazyvim/plugins/coding.lua +++ b/lua/lazyvim/plugins/coding.lua @@ -101,6 +101,9 @@ return { dependencies = { { "garymjr/nvim-snippets", + -- Use my branch till PR is merged. + -- https://github.com/garymjr/nvim-snippets/pull/10 + url = "https://github.com/folke/nvim-snippets", opts = { friendly_snippets = true, global_snippets = { "all", "global" }, From 027d6bc2e896d453153f48a8c15db2a627698dc8 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Tue, 21 May 2024 20:26:30 +0200 Subject: [PATCH 09/15] fix(snippets): my nvim-snippets PR is merged, so remove work-around. That was quick :) --- lua/lazyvim/plugins/coding.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua index 1634f551..659a28ab 100644 --- a/lua/lazyvim/plugins/coding.lua +++ b/lua/lazyvim/plugins/coding.lua @@ -101,9 +101,6 @@ return { dependencies = { { "garymjr/nvim-snippets", - -- Use my branch till PR is merged. - -- https://github.com/garymjr/nvim-snippets/pull/10 - url = "https://github.com/folke/nvim-snippets", opts = { friendly_snippets = true, global_snippets = { "all", "global" }, From ab4e57a4bfe6107c21a25450292ef69537a2b37b Mon Sep 17 00:00:00 2001 From: Kevin Traver Date: Tue, 21 May 2024 12:34:28 -0600 Subject: [PATCH 10/15] feat(telescope): add quickfix and telescope keymaps (#3077) --- lua/lazyvim/plugins/editor.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua index b09d4f02..1ae0b76f 100644 --- a/lua/lazyvim/plugins/editor.lua +++ b/lua/lazyvim/plugins/editor.lua @@ -198,10 +198,12 @@ return { { "sh", "Telescope help_tags", desc = "Help Pages" }, { "sH", "Telescope highlights", desc = "Search Highlight Groups" }, { "sk", "Telescope keymaps", desc = "Key Maps" }, + { "sl", "Telescope loclist", desc = "Location List" }, { "sM", "Telescope man_pages", desc = "Man Pages" }, { "sm", "Telescope marks", desc = "Jump to Mark" }, { "so", "Telescope vim_options", desc = "Options" }, { "sR", "Telescope resume", desc = "Resume" }, + { "sq", "Telescope quickfix", desc = "Quickfix List" }, { "sw", LazyVim.telescope("grep_string", { word_match = "-w" }), desc = "Word (Root Dir)" }, { "sW", LazyVim.telescope("grep_string", { cwd = false, word_match = "-w" }), desc = "Word (cwd)" }, { "sw", LazyVim.telescope("grep_string"), mode = "v", desc = "Selection (Root Dir)" }, From e46dd4e9b2ac68a5058447ef73b413605d15ae62 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Tue, 21 May 2024 22:06:52 +0200 Subject: [PATCH 11/15] fix(neo-tree): better icons for git staged/unstaged --- lua/lazyvim/plugins/editor.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua index 1ae0b76f..a834c074 100644 --- a/lua/lazyvim/plugins/editor.lua +++ b/lua/lazyvim/plugins/editor.lua @@ -96,6 +96,12 @@ return { expander_expanded = "", expander_highlight = "NeoTreeExpander", }, + git_status = { + symbols = { + unstaged = "󰄱", + staged = "󰱒", + }, + }, }, }, config = function(_, opts) From 3ebe30685d8b5c6e3c0723b532c73b64771f1ec7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 22:28:15 +0200 Subject: [PATCH 12/15] chore(main): release 11.5.0 (#3265) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- CHANGELOG.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06b99bc6..4e3b1fb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [11.5.0](https://github.com/LazyVim/LazyVim/compare/v11.4.1...v11.5.0) (2024-05-21) + + +### Features + +* **comments:** use ts-comments.nvim instead of nvim-ts-context-commentstring on Neovim 0.10 ([8ba7c64](https://github.com/LazyVim/LazyVim/commit/8ba7c64a7da9e46f2ac601919508803824208935)) +* **telescope:** add quickfix and telescope keymaps ([#3077](https://github.com/LazyVim/LazyVim/issues/3077)) ([ab4e57a](https://github.com/LazyVim/LazyVim/commit/ab4e57a4bfe6107c21a25450292ef69537a2b37b)) + + +### Bug Fixes + +* **cmp:** fix cmp's broken snippet parsing functionality. Fixes [#3266](https://github.com/LazyVim/LazyVim/issues/3266) ([2bae438](https://github.com/LazyVim/LazyVim/commit/2bae438570aa96904836e56d8dad7f33eb3204ee)) +* **lsp:** sometimes lsp client is not fully initialized and doesnt yet have client.supports_method on 0.9.5. Fixes [#3263](https://github.com/LazyVim/LazyVim/issues/3263) ([8c94842](https://github.com/LazyVim/LazyVim/commit/8c94842b4a613995bf4c0c79febcd74c310439d0)) +* **neo-tree:** better icons for git staged/unstaged ([e46dd4e](https://github.com/LazyVim/LazyVim/commit/e46dd4e9b2ac68a5058447ef73b413605d15ae62)) +* **nvim-snippets:** enable global friendly-snippets. See [#3240](https://github.com/LazyVim/LazyVim/issues/3240) ([55b07de](https://github.com/LazyVim/LazyVim/commit/55b07dee21ee5306624e16dd90c2b3c9c0f3ddde)) +* **snippets:** fixes custom snippets. use my branch till nvim-snippets PR is merged. Fixes [#3240](https://github.com/LazyVim/LazyVim/issues/3240) ([cb1e1b9](https://github.com/LazyVim/LazyVim/commit/cb1e1b9c82b405fa277f1869cd04dcd9c4507412)) +* **snippets:** make friendly snippets a dep of nvim-snippets ([d73397c](https://github.com/LazyVim/LazyVim/commit/d73397c4aaac74d95970ac06caffa25abd7c2af4)) +* **snippets:** my nvim-snippets PR is merged, so remove work-around. That was quick :) ([027d6bc](https://github.com/LazyVim/LazyVim/commit/027d6bc2e896d453153f48a8c15db2a627698dc8)) + ## [11.4.1](https://github.com/LazyVim/LazyVim/compare/v11.4.0...v11.4.1) (2024-05-20) From 79608fbc4fe7d5fbd2d238e8d8ebfce7d576b7c2 Mon Sep 17 00:00:00 2001 From: Kevin Traver Date: Tue, 21 May 2024 14:56:15 -0600 Subject: [PATCH 13/15] feat(telescope): add telescope jumplist keymap (#3268) --- lua/lazyvim/plugins/editor.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/lazyvim/plugins/editor.lua b/lua/lazyvim/plugins/editor.lua index a834c074..3c98ba8e 100644 --- a/lua/lazyvim/plugins/editor.lua +++ b/lua/lazyvim/plugins/editor.lua @@ -203,6 +203,7 @@ return { { "sG", LazyVim.telescope("live_grep", { cwd = false }), desc = "Grep (cwd)" }, { "sh", "Telescope help_tags", desc = "Help Pages" }, { "sH", "Telescope highlights", desc = "Search Highlight Groups" }, + { "sj", "Telescope jumplist", desc = "Jumplist" }, { "sk", "Telescope keymaps", desc = "Key Maps" }, { "sl", "Telescope loclist", desc = "Location List" }, { "sM", "Telescope man_pages", desc = "Man Pages" }, From 9eec03d890f7846e6f47e12ebbe369c7177fd5f1 Mon Sep 17 00:00:00 2001 From: Peter Benjamin Date: Tue, 21 May 2024 14:03:43 -0700 Subject: [PATCH 14/15] feat(markdown): configure conform for markdown files (#2308) --- lua/lazyvim/plugins/extras/lang/markdown.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lua/lazyvim/plugins/extras/lang/markdown.lua b/lua/lazyvim/plugins/extras/lang/markdown.lua index e290f174..dcffbad0 100644 --- a/lua/lazyvim/plugins/extras/lang/markdown.lua +++ b/lua/lazyvim/plugins/extras/lang/markdown.lua @@ -5,6 +5,15 @@ return { root = "README.md", }) end, + { + "stevearc/conform.nvim", + optional = true, + opts = { + formatters_by_ft = { + markdown = { { "prettierd", "prettier" }, "markdownlint", "markdown-toc" }, + }, + }, + }, { "nvim-treesitter/nvim-treesitter", opts = function(_, opts) From ae6d8f1a34fff49f9f1abf9fdd8a559c95b85cf3 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Tue, 21 May 2024 23:05:29 +0200 Subject: [PATCH 15/15] feat(markdown): add formatter for mdx --- lua/lazyvim/plugins/extras/lang/markdown.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/lazyvim/plugins/extras/lang/markdown.lua b/lua/lazyvim/plugins/extras/lang/markdown.lua index dcffbad0..81f4cc88 100644 --- a/lua/lazyvim/plugins/extras/lang/markdown.lua +++ b/lua/lazyvim/plugins/extras/lang/markdown.lua @@ -10,7 +10,8 @@ return { optional = true, opts = { formatters_by_ft = { - markdown = { { "prettierd", "prettier" }, "markdownlint", "markdown-toc" }, + ["markdown"] = { { "prettierd", "prettier" }, "markdownlint", "markdown-toc" }, + ["markdown.mdx"] = { { "prettierd", "prettier" }, "markdownlint", "markdown-toc" }, }, }, },