From 74325743e7ff9d9efe9172ba96ec063c65ee219c Mon Sep 17 00:00:00 2001 From: Seth Buntin Date: Wed, 2 Oct 2024 02:24:02 -0500 Subject: [PATCH 01/10] fix(extras): rename `lspconfig.server_configurations` to `lspconfig.configs` (#4518) ## Description https://github.com/neovim/nvim-lspconfig/commit/bedb2a0df105f68a624a49b867f269b6d55a2c89 introduces a change to the Lua module structure for `nvim-lspconfig` that broke `tailwindcss`. Tried to also address all the other usages of `lspconfig.server_configurations` within the ecosystem. ## Screenshots ![mason-lspconfig nvim](https://github.com/user-attachments/assets/bc9f80f0-3386-436f-8f86-abfcb311cec2) ## Checklist - [X] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/plugins/extras/lang/java.lua | 4 ++-- lua/lazyvim/plugins/extras/lang/lean.lua | 2 +- lua/lazyvim/plugins/extras/lang/tailwind.lua | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua index 97e37ef5..71d32e0c 100644 --- a/lua/lazyvim/plugins/extras/lang/java.lua +++ b/lua/lazyvim/plugins/extras/lang/java.lua @@ -1,4 +1,4 @@ --- This is the same as in lspconfig.server_configurations.jdtls, but avoids +-- This is the same as in lspconfig.configs.jdtls, but avoids -- needing to require that when this module loads. local java_filetypes = { "java" } @@ -76,7 +76,7 @@ return { return { -- How to find the root dir for a given filename. The default comes from -- lspconfig which provides a function specifically for java projects. - root_dir = require("lspconfig.server_configurations.jdtls").default_config.root_dir, + root_dir = require("lspconfig.configs.jdtls").default_config.root_dir, -- How to find the project name for a given root dir. project_name = function(root_dir) diff --git a/lua/lazyvim/plugins/extras/lang/lean.lua b/lua/lazyvim/plugins/extras/lang/lean.lua index 9ac37f7d..58488372 100644 --- a/lua/lazyvim/plugins/extras/lang/lean.lua +++ b/lua/lazyvim/plugins/extras/lang/lean.lua @@ -17,7 +17,7 @@ return { -- -- false to disable, otherwise should be a table of options to pass to `leanls` -- - -- See https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#leanls for details. + -- See https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#leanls for details. -- In particular ensure you have followed instructions setting up a callback -- for `LspAttach` which sets your key bindings! lsp = { diff --git a/lua/lazyvim/plugins/extras/lang/tailwind.lua b/lua/lazyvim/plugins/extras/lang/tailwind.lua index da6a3291..5c7ae355 100644 --- a/lua/lazyvim/plugins/extras/lang/tailwind.lua +++ b/lua/lazyvim/plugins/extras/lang/tailwind.lua @@ -28,7 +28,7 @@ return { }, setup = { tailwindcss = function(_, opts) - local tw = require("lspconfig.server_configurations.tailwindcss") + local tw = require("lspconfig.configs.tailwindcss") opts.filetypes = opts.filetypes or {} -- Add default filetypes From b6ff54bb9589a21bdbec0b5572368c68bfa6bc40 Mon Sep 17 00:00:00 2001 From: folke Date: Wed, 2 Oct 2024 07:25:07 +0000 Subject: [PATCH 02/10] 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 f7962147..9589c8d9 100644 --- a/doc/LazyVim.txt +++ b/doc/LazyVim.txt @@ -1,4 +1,4 @@ -*LazyVim.txt* For Neovim Last change: 2024 September 18 +*LazyVim.txt* For Neovim Last change: 2024 October 02 ============================================================================== Table of Contents *LazyVim-table-of-contents* From 9b1767205cffd958ee9c74ceca299bd6c128b5f8 Mon Sep 17 00:00:00 2001 From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com> Date: Wed, 2 Oct 2024 10:26:05 +0300 Subject: [PATCH 03/10] fix(render-markdown): remove redundant `opts.file_types` (#4506) ## Description After https://github.com/MeanderingProgrammer/render-markdown.nvim/commit/cb9a5e2412d21c7a89627e0d6da5459acbc0eb9c there's no need for defining filetypes both in Lazy's `ft` and the plugin's `opts.file_types`. ## 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/extras/lang/markdown.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/lazyvim/plugins/extras/lang/markdown.lua b/lua/lazyvim/plugins/extras/lang/markdown.lua index 7ecf01e8..4829098b 100644 --- a/lua/lazyvim/plugins/extras/lang/markdown.lua +++ b/lua/lazyvim/plugins/extras/lang/markdown.lua @@ -95,7 +95,6 @@ return { { "MeanderingProgrammer/render-markdown.nvim", opts = { - file_types = { "markdown", "norg", "rmd", "org" }, code = { sign = false, width = "block", From 34f0e568d4e853cc2b4f0d628749cb66cd1b9aaf Mon Sep 17 00:00:00 2001 From: Arthur <82575487+arthur-mountain@users.noreply.github.com> Date: Wed, 2 Oct 2024 15:32:17 +0800 Subject: [PATCH 04/10] feat(lang): add ts_ls to lsp config (#4406) ## Description In this [PR](https://github.com/neovim/nvim-lspconfig/pull/3232), tsserver is renamed to ts_ls, but it hasn't been released yet. Therefore, ts_ls is added to the LSP configuration in case the user updates their plugins locally. ## Related Issue(s) N/A! ## Screenshots N/A! ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/plugins/extras/lang/typescript.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lua/lazyvim/plugins/extras/lang/typescript.lua b/lua/lazyvim/plugins/extras/lang/typescript.lua index 71ec4604..dd5ca25c 100644 --- a/lua/lazyvim/plugins/extras/lang/typescript.lua +++ b/lua/lazyvim/plugins/extras/lang/typescript.lua @@ -19,9 +19,14 @@ return { opts = { -- make sure mason installs the server servers = { + --- @deprecated -- tsserver renamed to ts_ls but not yet released, so keep this for now + --- the proper approach is to check the nvim-lspconfig release version when it's released to determine the server name dynamically tsserver = { enabled = false, }, + ts_ls = { + enabled = false, + }, vtsls = { -- explicitly add default filetypes, so that we can extend -- them in related extras @@ -114,10 +119,16 @@ return { }, }, setup = { + --- @deprecated -- tsserver renamed to ts_ls but not yet released, so keep this for now + --- the proper approach is to check the nvim-lspconfig release version when it's released to determine the server name dynamically tsserver = function() -- disable tsserver return true end, + ts_ls = function() + -- disable tsserver + return true + end, vtsls = function(_, opts) LazyVim.lsp.on_attach(function(client, buffer) client.commands["_typescript.moveToFileRefactoring"] = function(command, ctx) From 6e4025229d4628a7278cf7c09f942af6dfea05dd Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Wed, 2 Oct 2024 10:18:21 +0200 Subject: [PATCH 05/10] fix(lsp): backward compat with lspconfig refactor. Fixes #4525. See #4518 --- lua/lazyvim/plugins/extras/lang/java.lua | 2 +- lua/lazyvim/plugins/extras/lang/tailwind.lua | 2 +- lua/lazyvim/util/lsp.lua | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua index 71d32e0c..6b83fe29 100644 --- a/lua/lazyvim/plugins/extras/lang/java.lua +++ b/lua/lazyvim/plugins/extras/lang/java.lua @@ -76,7 +76,7 @@ return { return { -- How to find the root dir for a given filename. The default comes from -- lspconfig which provides a function specifically for java projects. - root_dir = require("lspconfig.configs.jdtls").default_config.root_dir, + root_dir = LazyVim.lsp.get_raw_config("jdtls").default_config.root_dir, -- How to find the project name for a given root dir. project_name = function(root_dir) diff --git a/lua/lazyvim/plugins/extras/lang/tailwind.lua b/lua/lazyvim/plugins/extras/lang/tailwind.lua index 5c7ae355..8f43d25b 100644 --- a/lua/lazyvim/plugins/extras/lang/tailwind.lua +++ b/lua/lazyvim/plugins/extras/lang/tailwind.lua @@ -28,7 +28,7 @@ return { }, setup = { tailwindcss = function(_, opts) - local tw = require("lspconfig.configs.tailwindcss") + local tw = LazyVim.lsp.get_raw_config("tailwindcss") opts.filetypes = opts.filetypes or {} -- Add default filetypes diff --git a/lua/lazyvim/util/lsp.lua b/lua/lazyvim/util/lsp.lua index 59c35314..7efd8622 100644 --- a/lua/lazyvim/util/lsp.lua +++ b/lua/lazyvim/util/lsp.lua @@ -181,6 +181,15 @@ function M.get_config(server) return rawget(configs, server) end +---@return {default_config:lspconfig.Config} +function M.get_raw_config(server) + local ok, ret = pcall(require, "lspconfig.configs." .. server) + if ok then + return ret + end + return require("lspconfig.server_configurations." .. server) +end + function M.is_enabled(server) local c = M.get_config(server) return c and c.enabled ~= false From dee5e18cf62da644b3518a56021bb6dd29df77f8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 10:19:57 +0200 Subject: [PATCH 06/10] chore(main): release 12.40.0 (#4522) :robot: I have created a release *beep* *boop* --- ## [12.40.0](https://github.com/LazyVim/LazyVim/compare/v12.39.0...v12.40.0) (2024-10-02) ### Features * **lang:** add ts_ls to lsp config ([#4406](https://github.com/LazyVim/LazyVim/issues/4406)) ([34f0e56](https://github.com/LazyVim/LazyVim/commit/34f0e568d4e853cc2b4f0d628749cb66cd1b9aaf)) ### Bug Fixes * **extras:** rename `lspconfig.server_configurations` to `lspconfig.configs` ([#4518](https://github.com/LazyVim/LazyVim/issues/4518)) ([7432574](https://github.com/LazyVim/LazyVim/commit/74325743e7ff9d9efe9172ba96ec063c65ee219c)) * **lsp:** backward compat with lspconfig refactor. Fixes [#4525](https://github.com/LazyVim/LazyVim/issues/4525). See [#4518](https://github.com/LazyVim/LazyVim/issues/4518) ([6e40252](https://github.com/LazyVim/LazyVim/commit/6e4025229d4628a7278cf7c09f942af6dfea05dd)) * **render-markdown:** remove redundant `opts.file_types` ([#4506](https://github.com/LazyVim/LazyVim/issues/4506)) ([9b17672](https://github.com/LazyVim/LazyVim/commit/9b1767205cffd958ee9c74ceca299bd6c128b5f8)) --- 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 06b9e409..42fc34cb 100644 --- a/.github/.release-please-manifest.json +++ b/.github/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "12.39.0" + ".": "12.40.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 22c46d22..aa8ed9d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [12.40.0](https://github.com/LazyVim/LazyVim/compare/v12.39.0...v12.40.0) (2024-10-02) + + +### Features + +* **lang:** add ts_ls to lsp config ([#4406](https://github.com/LazyVim/LazyVim/issues/4406)) ([34f0e56](https://github.com/LazyVim/LazyVim/commit/34f0e568d4e853cc2b4f0d628749cb66cd1b9aaf)) + + +### Bug Fixes + +* **extras:** rename `lspconfig.server_configurations` to `lspconfig.configs` ([#4518](https://github.com/LazyVim/LazyVim/issues/4518)) ([7432574](https://github.com/LazyVim/LazyVim/commit/74325743e7ff9d9efe9172ba96ec063c65ee219c)) +* **lsp:** backward compat with lspconfig refactor. Fixes [#4525](https://github.com/LazyVim/LazyVim/issues/4525). See [#4518](https://github.com/LazyVim/LazyVim/issues/4518) ([6e40252](https://github.com/LazyVim/LazyVim/commit/6e4025229d4628a7278cf7c09f942af6dfea05dd)) +* **render-markdown:** remove redundant `opts.file_types` ([#4506](https://github.com/LazyVim/LazyVim/issues/4506)) ([9b17672](https://github.com/LazyVim/LazyVim/commit/9b1767205cffd958ee9c74ceca299bd6c128b5f8)) + ## [12.39.0](https://github.com/LazyVim/LazyVim/compare/v12.38.2...v12.39.0) (2024-09-18) diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua index b15f7bec..83a07530 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.39.0" -- x-release-please-version +M.version = "12.40.0" -- x-release-please-version LazyVim.config = M ---@class LazyVimOptions From 57c0c0bc9f86467d90c0c10aac680bdba8e56469 Mon Sep 17 00:00:00 2001 From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:22:08 +0300 Subject: [PATCH 07/10] feat(toggle): add more `M.wk` fields for better user customization (#4521) ## Description Add to `M.wk` fields for `icon`, `color_enabled` and `color_disabled` for more granual user customization. ## Related Issue(s) No, rather a discussion #4512 ## Screenshots ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/util/toggle.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lua/lazyvim/util/toggle.lua b/lua/lazyvim/util/toggle.lua index 46e92c78..d693dd9d 100644 --- a/lua/lazyvim/util/toggle.lua +++ b/lua/lazyvim/util/toggle.lua @@ -3,6 +3,9 @@ local M = {} ---@class lazyvim.Toggle ---@field name string +---@field icon? string +---@field color_enabled? string +---@field color_disabled? string ---@field get fun():boolean ---@field set fun(state:boolean) @@ -50,7 +53,8 @@ function M.wk(lhs, toggle) { lhs, icon = function() - return safe_get() and { icon = " ", color = "green" } or { icon = " ", color = "yellow" } + return safe_get() and { icon = toggle.icon or " ", color = toggle.color_enabled or "green" } + or { icon = toggle.icon or " ", color = toggle.color_disabled or "yellow" } end, desc = function() return (safe_get() and "Disable " or "Enable ") .. toggle.name From b110550393957a3434db1f4f0dc5804a9d31820f Mon Sep 17 00:00:00 2001 From: Torin Rudeen Date: Wed, 2 Oct 2024 01:23:26 -0700 Subject: [PATCH 08/10] fix(extras): migrate away from deprecated `get_target_window()` in mini-files (#4479) ## Description This method is deprecated in the most recent version of mini-files: https://github.com/echasnovski/mini.files/blob/a3a9cce82115a69dba161ac45bda16f4e606f73b/lua/mini/files.lua#L1060-L1068, which causes a warning message to be displayed every time the `wv` and similar commands are used from the mini file browser. I've tested this change locally and it gets rid of the warning message. ## Screenshots Warning message without this fix: image ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/plugins/extras/editor/mini-files.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/lazyvim/plugins/extras/editor/mini-files.lua b/lua/lazyvim/plugins/extras/editor/mini-files.lua index 7f677ebf..461e6dca 100644 --- a/lua/lazyvim/plugins/extras/editor/mini-files.lua +++ b/lua/lazyvim/plugins/extras/editor/mini-files.lua @@ -48,7 +48,7 @@ return { local map_split = function(buf_id, lhs, direction, close_on_file) local rhs = function() local new_target_window - local cur_target_window = require("mini.files").get_target_window() + local cur_target_window = require("mini.files").get_explorer_state().target_window if cur_target_window ~= nil then vim.api.nvim_win_call(cur_target_window, function() vim.cmd("belowright " .. direction .. " split") From 04515b139973173e90604f700d70f4e6d714da1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cruz?= Date: Wed, 2 Oct 2024 09:41:44 +0100 Subject: [PATCH 09/10] feat(rust): update rustaceanvim (#4477) The recommended version of rustaceanvim has changed to 5.x, which brings in a lot of improvements. ## Description Version 5.x of rustaceanvim has a lot of improvements over 4.x, and is the recommended version according to its maintainer. ## Checklist - [x] I've read the [CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md) guidelines. --- lua/lazyvim/plugins/extras/lang/rust.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua index 9e8655b4..4caeaef8 100644 --- a/lua/lazyvim/plugins/extras/lang/rust.lua +++ b/lua/lazyvim/plugins/extras/lang/rust.lua @@ -42,7 +42,7 @@ return { { "mrcjkb/rustaceanvim", - version = "^4", -- Recommended + version = vim.fn.has("nvim-0.10.0") == 0 and "^4" or false, ft = { "rust" }, opts = { server = { From d5a4ced75acadb6ae151c0d2960a531c691c88b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:29:17 +0200 Subject: [PATCH 10/10] chore(main): release 12.41.0 (#4526) :robot: I have created a release *beep* *boop* --- ## [12.41.0](https://github.com/LazyVim/LazyVim/compare/v12.40.0...v12.41.0) (2024-10-02) ### Features * **rust:** update rustaceanvim ([#4477](https://github.com/LazyVim/LazyVim/issues/4477)) ([04515b1](https://github.com/LazyVim/LazyVim/commit/04515b139973173e90604f700d70f4e6d714da1f)) * **toggle:** add more `M.wk` fields for better user customization ([#4521](https://github.com/LazyVim/LazyVim/issues/4521)) ([57c0c0b](https://github.com/LazyVim/LazyVim/commit/57c0c0bc9f86467d90c0c10aac680bdba8e56469)) ### Bug Fixes * **extras:** migrate away from deprecated `get_target_window()` in mini-files ([#4479](https://github.com/LazyVim/LazyVim/issues/4479)) ([b110550](https://github.com/LazyVim/LazyVim/commit/b110550393957a3434db1f4f0dc5804a9d31820f)) --- 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 | 13 +++++++++++++ lua/lazyvim/config/init.lua | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json index 42fc34cb..0bd6430d 100644 --- a/.github/.release-please-manifest.json +++ b/.github/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "12.40.0" + ".": "12.41.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index aa8ed9d4..850bd8e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [12.41.0](https://github.com/LazyVim/LazyVim/compare/v12.40.0...v12.41.0) (2024-10-02) + + +### Features + +* **rust:** update rustaceanvim ([#4477](https://github.com/LazyVim/LazyVim/issues/4477)) ([04515b1](https://github.com/LazyVim/LazyVim/commit/04515b139973173e90604f700d70f4e6d714da1f)) +* **toggle:** add more `M.wk` fields for better user customization ([#4521](https://github.com/LazyVim/LazyVim/issues/4521)) ([57c0c0b](https://github.com/LazyVim/LazyVim/commit/57c0c0bc9f86467d90c0c10aac680bdba8e56469)) + + +### Bug Fixes + +* **extras:** migrate away from deprecated `get_target_window()` in mini-files ([#4479](https://github.com/LazyVim/LazyVim/issues/4479)) ([b110550](https://github.com/LazyVim/LazyVim/commit/b110550393957a3434db1f4f0dc5804a9d31820f)) + ## [12.40.0](https://github.com/LazyVim/LazyVim/compare/v12.39.0...v12.40.0) (2024-10-02) diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua index 83a07530..6ad0cd03 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.40.0" -- x-release-please-version +M.version = "12.41.0" -- x-release-please-version LazyVim.config = M ---@class LazyVimOptions