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

Merge branch 'main' into dev

Browse source
This commit is contained in:
chuyanlong 2025-09-16 08:40:00 +08:00
commit b06b1a2b35
54 changed files with 337 additions and 393 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,3 @@
{
".": "14.15.0"
".": "14.15.1"
}

10
CHANGELOG.md
View file

@ -1,5 +1,15 @@
# Changelog
## [14.15.1](https://github.com/LazyVim/LazyVim/compare/v14.15.0...v14.15.1) (2025-09-15)
### Bug Fixes
* **blink:** use .get method to access presets ([#6183](https://github.com/LazyVim/LazyVim/issues/6183)) ([1a729e2](https://github.com/LazyVim/LazyVim/commit/1a729e2d4c4162501fe13224d669a654849deb36))
* **extras.ai.copilot:** update status retrieval for lualine ([#5900](https://github.com/LazyVim/LazyVim/issues/5900)) ([55e9944](https://github.com/LazyVim/LazyVim/commit/55e9944e2b1e152b5acdc9cc015978a905fc2966))
* **lang.python:** enable venv-selector even when telescope is not available ([#5829](https://github.com/LazyVim/LazyVim/issues/5829)) ([10e5bf5](https://github.com/LazyVim/LazyVim/commit/10e5bf5c5b5fb4da0afbb2d4d2b75595502c9690))
* **lsp:** fixed deprecated warnings ([bed725a](https://github.com/LazyVim/LazyVim/commit/bed725a054ed3e8c8c56dce7e2100335e567cf01))
## [14.15.0](https://github.com/LazyVim/LazyVim/compare/v14.14.0...v14.15.0) (2025-05-12)

23
NEWS.md
View file

@ -1,5 +1,19 @@
# What's new?
## 15.x
**Neovim** `>= 0.11.0` includes a lot of changes to the underlying LSP implementation.
Going forward, **LazyVim** requires **Neovim** `>= 0.11.0`, and drops support for older versions.
### Changes
- removed compatibility code for Neovim `< 0.11`
- updated all LSP code to use the new LSP implementation
- migrated **mason.nvim** and **mason-lspconfig.nvim** to `v2.x`
- added new `treesitter-main` extra to test the new `main` branch of `nvim-treesitter`
- after enabling, you will get errors. Update with `:Lazy` and restart Neovim
## 14.x
Big new release with a lot of changes and improvements!
@ -110,7 +124,6 @@ vim.g.snacks_animate = false
## 11.x
- **Keymaps:**
- `<leader>gB` to open the current repo in the browser
- `gco` and `gcO` to add a comment below or above the current line
- `<leader>wm` to toggle window maximize
@ -123,7 +136,6 @@ vim.g.snacks_animate = false
It's a great plugin that enhances the native text objects.
- `:LazyExtras` now has multiple new sections:
- **Enabled**: extras that are currently enabled
- **Recommended Languages**: language extras recommended for the current buffer / directory
- **Recommended Plugins**: extras that are recommended for most users
@ -161,7 +173,6 @@ Additionally, some core plugins have been moved to extras.
```
- plugins moved to extras:
- `mini.surround`
- `mini.indentscope` scopes are now also highlighted with `indent-blankline`
- `nvim-treesitter-context`
@ -179,7 +190,6 @@ Additionally, some core plugins have been moved to extras.
You can find the updated docs [here](https://github.com/folke/trouble.nvim/tree/dev)
- The **lazygit** integration now configures:
- the theme based on the colorscheme
- nerd font icons (v3)
- editor preset is set to `nvim-remote` for better interop with Neovim
@ -220,9 +230,7 @@ Additionally, some core plugins have been moved to extras.
- New `:LazyExtras` command for managing **LazyVim** extras
- Improved **formatting**:
- **LazyVim** can now work with multiple formatters. Types:
- **primary**: only one primary formatter can be active at a time.
_(conform, none-ls, LSP)_
- **secondary**: multiple secondary formatters can be active _(eslint, ...)_
@ -241,18 +249,15 @@ Additionally, some core plugins have been moved to extras.
```
- `none-ls.nvim` is no longer installed by default
- `conform.nvim` is now the default formatter
- `nvim-lint` is now the default linter
- If you want to keep using `none-ls.nvim`,
you can enable the **lsp.none-ls** extra
- `dashboard.nvim` is the new default dashboard plugin
- If you want to keep using `alpha.nvim`, you can enable the **ui.alpha** extra
- Improved **root detection**:
- New `:LazyRoot` command that shows info about the root dir detection
- Configurable with `vim.g.root_spec`

2
README.md
View file

@ -56,7 +56,7 @@ to tweak your config as needed, along with the convenience of a pre-configured s
## ⚡️ Requirements
- Neovim >= **0.9.0** (needs to be built with **LuaJIT**)
- Neovim >= **0.11.0** (needs to be built with **LuaJIT**)
- Git >= **2.19.0** (for partial clones support)
- a [Nerd Font](https://www.nerdfonts.com/) **_(optional)_**
- a **C** compiler for `nvim-treesitter`. See [here](https://github.com/nvim-treesitter/nvim-treesitter#requirements)

2
doc/LazyVim.txt
View file

@ -53,7 +53,7 @@ FEATURES *LazyVim-features*
REQUIREMENTS *LazyVim-requirements*
- Neovim >= **0.9.0** (needs to be built with **LuaJIT**)
- Neovim >= **0.11.0** (needs to be built with **LuaJIT**)
- Git >= **2.19.0** (for partial clones support)
- a Nerd Font <https://www.nerdfonts.com/> **(optional)**
- a **C** compiler for `nvim-treesitter`. See here <https://github.com/nvim-treesitter/nvim-treesitter#requirements>

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

@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
---@class LazyVimConfig: LazyVimOptions
local M = {}
M.version = "14.15.0" -- x-release-please-version
M.version = "14.15.1" -- x-release-please-version
LazyVim.config = M
---@class LazyVimOptions
@ -353,7 +353,7 @@ function M.get_defaults()
{ name = "telescope", extra = "editor.telescope" },
},
cmp = {
{ name = "blink.cmp", extra = "coding.blink", enabled = vim.fn.has("nvim-0.10") == 1 },
{ name = "blink.cmp", extra = "coding.blink" },
{ name = "nvim-cmp", extra = "coding.nvim-cmp" },
},
explorer = {

10
lua/lazyvim/config/keymaps.lua
View file

@ -207,13 +207,3 @@ map("n", "<leader><tab><tab>", "<cmd>tabnew<cr>", { desc = "New Tab" })
map("n", "<leader><tab>]", "<cmd>tabnext<cr>", { desc = "Next Tab" })
map("n", "<leader><tab>d", "<cmd>tabclose<cr>", { desc = "Close Tab" })
map("n", "<leader><tab>[", "<cmd>tabprevious<cr>", { desc = "Previous Tab" })
-- native snippets. only needed on < 0.11, as 0.11 creates these by default
if vim.fn.has("nvim-0.11") == 0 then
map("s", "<Tab>", function()
return vim.snippet.active({ direction = 1 }) and "<cmd>lua vim.snippet.jump(1)<cr>" or "<Tab>"
end, { expr = true, desc = "Jump Next" })
map({ "i", "s" }, "<S-Tab>", function()
return vim.snippet.active({ direction = -1 }) and "<cmd>lua vim.snippet.jump(-1)<cr>" or "<S-Tab>"
end, { expr = true, desc = "Jump Previous" })
end

14
lua/lazyvim/config/options.lua
View file

@ -68,7 +68,10 @@ opt.fillchars = {
diff = "╱",
eob = " ",
}
opt.foldexpr = "v:lua.require'lazyvim.util'.ui.foldexpr()"
opt.foldlevel = 99
opt.foldmethod = "expr"
opt.foldtext = ""
opt.formatexpr = "v:lua.require'lazyvim.util'.format.formatexpr()"
opt.formatoptions = "jcroqlnt" -- tcqj
opt.grepformat = "%f:%l:%c:%m"
@ -95,6 +98,7 @@ opt.sidescrolloff = 8 -- Columns of context
opt.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shift the text each time
opt.smartcase = true -- Don't ignore case with capitals
opt.smartindent = true -- Insert indents automatically
opt.smoothscroll = true
opt.spelllang = { "en" }
opt.splitbelow = true -- Put new windows below current
opt.splitkeep = "screen"
@ -111,15 +115,5 @@ opt.wildmode = "longest:full,full" -- Command-line completion mode
opt.winminwidth = 5 -- Minimum window width
opt.wrap = false -- Disable line wrap
if vim.fn.has("nvim-0.10") == 1 then
opt.smoothscroll = true
opt.foldexpr = "v:lua.require'lazyvim.util'.ui.foldexpr()"
opt.foldmethod = "expr"
opt.foldtext = ""
else
opt.foldmethod = "indent"
opt.foldtext = "v:lua.require'lazyvim.util'.ui.foldtext()"
end
-- Fix markdown indentation settings
vim.g.markdown_recommended_style = 0

9
lua/lazyvim/health.lua
View file

@ -8,13 +8,10 @@ local error = vim.health.error or vim.health.report_error
function M.check()
start("LazyVim")
if vim.fn.has("nvim-0.9.0") == 1 then
ok("Using Neovim >= 0.9.0")
if vim.fn.has("nvim-0.10.0") == 0 then
warn("Use Neovim >= 0.10.0 for the best experience")
end
if vim.fn.has("nvim-0.11.0") == 1 then
ok("Using Neovim >= 0.11.0")
else
error("Neovim >= 0.9.0 is required")
error("Neovim >= 0.11.0 is required")
end
for _, cmd in ipairs({ "git", "rg", { "fd", "fdfind" }, "lazygit", "fzf", "curl" }) do

4
lua/lazyvim/plugins/coding.lua
View file

@ -1,7 +1,7 @@
return {
-- auto pairs
{
"echasnovski/mini.pairs",
"nvim-mini/mini.pairs",
event = "VeryLazy",
opts = {
modes = { insert = true, command = true, terminal = false },
@ -29,7 +29,7 @@ return {
-- Better text-objects
{
"echasnovski/mini.ai",
"nvim-mini/mini.ai",
event = "VeryLazy",
opts = function()
local ai = require("mini.ai")

2
lua/lazyvim/plugins/colorscheme.lua
View file

@ -58,7 +58,7 @@ return {
optional = true,
opts = function(_, opts)
if (vim.g.colors_name or ""):find("catppuccin") then
opts.highlights = require("catppuccin.groups.integrations.bufferline").get()
opts.highlights = require("catppuccin.groups.integrations.bufferline").get_theme()
end
end,
},

41
lua/lazyvim/plugins/compat/nvim-0_9.lua
View file

@ -1,41 +0,0 @@
-- Compatibility with Neovim 0.9
return {
-- Use LuaSnip instead of native snippets
{ "garymjr/nvim-snippets", enabled = false },
{ import = "lazyvim.plugins.extras.coding.luasnip" },
-- Use nvim-cmp instead of blink.cmp
{ import = "lazyvim.plugins.extras.coding.nvim-cmp" },
-- Use mini.comment instead of ts-comments
{ "folke/ts-comments.nvim", enabled = false },
{ import = "lazyvim.plugins.extras.coding.mini-comment" },
-- Use neodev-types with lazydev
{ "folke/neodev.nvim", config = function() end },
{
"folke/lazydev.nvim",
opts = function(_, opts)
opts.library = opts.library or {}
table.insert(opts.library, { "neodev.nvim/types/stable" })
end,
config = function(_, opts)
-- force lazydev to load on Neovim 0.9
require("lazydev.config").have_0_10 = true
require("lazydev").setup(opts)
end,
},
{
"neovim/nvim-lspconfig",
dependencies = {},
},
-- dummy import to save core imports
{
import = "foobar",
enabled = function()
LazyVim.plugin.save_core()
return false
end,
},
}

20
lua/lazyvim/plugins/extras/ai/copilot-chat.lua
View file

@ -85,4 +85,24 @@ return {
})
end,
},
-- Blink integration
{
"saghen/blink.cmp",
optional = true,
---@module 'blink.cmp'
---@type blink.cmp.Config
opts = {
sources = {
providers = {
path = {
-- Path sources triggered by "/" interfere with CopilotChat commands
enabled = function()
return vim.bo.filetype ~= "copilot-chat"
end,
},
},
},
},
},
}

2
lua/lazyvim/plugins/extras/coding/mini-comment.lua
View file

@ -1,6 +1,6 @@
return {
{
"echasnovski/mini.comment",
"nvim-mini/mini.comment",
event = "VeryLazy",
opts = {
options = {

6
lua/lazyvim/plugins/extras/coding/mini-snippets.lua
View file

@ -4,14 +4,14 @@ if lazyvim_docs then
vim.g.lazyvim_mini_snippets_in_completion = true
-- NOTE: Please also read:
-- https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-snippets.md#expand
-- https://github.com/nvim-mini/mini.nvim/blob/main/readmes/mini-snippets.md#expand
-- :h MiniSnippets-session
-- Example override for your own config:
--[[
return {
{
"echasnovski/mini.snippets",
"nvim-mini/mini.snippets",
opts = function(_, opts)
-- By default, for opts.snippets, the extra for mini.snippets only adds gen_loader.from_lang()
-- This provides a sensible quickstart, integrating with friendly-snippets
@ -63,7 +63,7 @@ return {
-- add mini.snippets
desc = "Manage and expand snippets (alternative to Luasnip)",
{
"echasnovski/mini.snippets",
"nvim-mini/mini.snippets",
event = "InsertEnter", -- don't depend on other plugins to load...
dependencies = "rafamadriz/friendly-snippets",
opts = function()

2
lua/lazyvim/plugins/extras/coding/mini-surround.lua
View file

@ -3,7 +3,7 @@
-- to select the text inside, change or modify the surrounding characters,
-- and more.
return {
"echasnovski/mini.surround",
"nvim-mini/mini.surround",
keys = function(_, keys)
-- Populate the keys based on the user's options
local opts = LazyVim.opts("mini.surround")

2
lua/lazyvim/plugins/extras/editor/harpoon2.lua
View file

@ -28,7 +28,7 @@ return {
},
}
for i = 1, 5 do
for i = 1, 9 do
table.insert(keys, {
"<leader>" .. i,
function()

2
lua/lazyvim/plugins/extras/editor/leap.lua
View file

@ -37,7 +37,7 @@ return {
-- rename surround mappings from gs to gz to prevent conflict with leap
{
"echasnovski/mini.surround",
"nvim-mini/mini.surround",
optional = true,
opts = {
mappings = {

2
lua/lazyvim/plugins/extras/editor/mini-diff.lua
View file

@ -7,7 +7,7 @@ return {
-- setup mini.diff
{
"echasnovski/mini.diff",
"nvim-mini/mini.diff",
event = "VeryLazy",
keys = {
{

2
lua/lazyvim/plugins/extras/editor/mini-files.lua
View file

@ -1,5 +1,5 @@
return {
"echasnovski/mini.files",
"nvim-mini/mini.files",
opts = {
windows = {
preview = true,

2
lua/lazyvim/plugins/extras/editor/mini-move.lua
View file

@ -1,6 +1,6 @@
return {
{
"echasnovski/mini.move",
"nvim-mini/mini.move",
event = "VeryLazy",
opts = {},
},

2
lua/lazyvim/plugins/extras/editor/navic.lua
View file

@ -8,7 +8,7 @@ return {
init = function()
vim.g.navic_silence = true
LazyVim.lsp.on_attach(function(client, buffer)
if client.supports_method("textDocument/documentSymbol") then
if client:supports_method("textDocument/documentSymbol") then
require("nvim-navic").attach(client, buffer)
end
end)

2
lua/lazyvim/plugins/extras/editor/snacks_picker.lua
View file

@ -178,7 +178,7 @@ return {
end,
},
{
"echasnovski/mini.starter",
"nvim-mini/mini.starter",
optional = true,
opts = function(_, opts)
local items = {

29
lua/lazyvim/plugins/extras/lang/clangd.lua
View file

@ -60,19 +60,22 @@ return {
keys = {
{ "<leader>ch", "<cmd>ClangdSwitchSourceHeader<cr>", desc = "Switch Source/Header (C/C++)" },
},
root_dir = function(fname)
return require("lspconfig.util").root_pattern(
"Makefile",
"configure.ac",
"configure.in",
"config.h.in",
"meson.build",
"meson_options.txt",
"build.ninja"
)(fname) or require("lspconfig.util").root_pattern("compile_commands.json", "compile_flags.txt")(
fname
) or require("lspconfig.util").find_git_ancestor(fname)
end,
root_markers = {
".clangd",
".clang-tidy",
".clang-format",
"compile_commands.json",
"compile_flags.txt",
"configure.ac", -- AutoTools
"Makefile",
"configure.ac",
"configure.in",
"config.h.in",
"meson.build",
"meson_options.txt",
"build.ninja",
".git",
},
capabilities = {
offsetEncoding = { "utf-16" },
},

2
lua/lazyvim/plugins/extras/lang/go.lua
View file

@ -139,7 +139,7 @@ return {
-- Filetype icons
{
"echasnovski/mini.icons",
"nvim-mini/mini.icons",
opts = {
file = {
[".go-version"] = { glyph = "", hl = "MiniIconsBlue" },

18
lua/lazyvim/plugins/extras/lang/java.lua
View file

@ -87,14 +87,10 @@ return {
opts = function()
local cmd = { vim.fn.exepath("jdtls") }
if LazyVim.has("mason.nvim") then
local mason_registry = require("mason-registry")
local lombok_jar = mason_registry.get_package("jdtls"):get_install_path() .. "/lombok.jar"
local lombok_jar = vim.fn.expand("$MASON/share/jdtls/lombok.jar")
table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
end
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 = 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)
@ -151,17 +147,13 @@ return {
if LazyVim.has("mason.nvim") then
local mason_registry = require("mason-registry")
if opts.dap and LazyVim.has("nvim-dap") and mason_registry.is_installed("java-debug-adapter") then
local java_dbg_pkg = mason_registry.get_package("java-debug-adapter")
local java_dbg_path = java_dbg_pkg:get_install_path()
local jar_patterns = {
java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar",
vim.fn.expand("$MASON/share/java-debug-adapter/com.microsoft.java.debug.plugin-*.jar"),
}
-- java-test also depends on java-debug-adapter.
if opts.test and mason_registry.is_installed("java-test") then
local java_test_pkg = mason_registry.get_package("java-test")
local java_test_path = java_test_pkg:get_install_path()
vim.list_extend(jar_patterns, {
java_test_path .. "/extension/server/*.jar",
vim.fn.expand("$MASON/share/java-test/*.jar"),
})
end
for _, jar_pattern in ipairs(jar_patterns) do
@ -172,12 +164,10 @@ return {
end
end
local function attach_jdtls()
local fname = vim.api.nvim_buf_get_name(0)
-- Configuration can be augmented and overridden by opts.jdtls
local config = extend_or_override({
cmd = opts.full_cmd(opts),
root_dir = opts.root_dir(fname),
root_dir = vim.fs.root(0, vim.lsp.config.jdtls.root_markers),
init_options = {
bundles = bundles,
},

2
lua/lazyvim/plugins/extras/lang/json.lua
View file

@ -27,7 +27,7 @@ return {
servers = {
jsonls = {
-- lazy-load schemastore when needed
on_new_config = function(new_config)
before_init = function(_, new_config)
new_config.settings.json.schemas = new_config.settings.json.schemas or {}
vim.list_extend(new_config.settings.json.schemas, require("schemastore").json.schemas())
end,

20
lua/lazyvim/plugins/extras/lang/ocaml.lua
View file

@ -26,17 +26,15 @@ return {
"reason",
"dune",
},
root_dir = function(fname)
return require("lspconfig.util").root_pattern(
"*.opam",
"esy.json",
"package.json",
".git",
"dune-project",
"dune-workspace",
"*.ml"
)(fname)
end,
root_markers = {
"*.opam",
"esy.json",
"package.json",
".git",
"dune-project",
"dune-workspace",
"*.ml",
},
},
},
},

5
lua/lazyvim/plugins/extras/lang/php.lua
View file

@ -48,11 +48,10 @@ return {
optional = true,
opts = function()
local dap = require("dap")
local path = require("mason-registry").get_package("php-debug-adapter"):get_install_path()
dap.adapters.php = {
type = "executable",
command = "node",
args = { path .. "/extension/out/phpDebug.js" },
command = "php-debug-adapter",
args = {},
}
end,
},

6
lua/lazyvim/plugins/extras/lang/r.lua
View file

@ -65,11 +65,7 @@ return {
opts = {
servers = {
r_language_server = {
root_dir = function(fname)
return require("lspconfig.util").root_pattern("DESCRIPTION", "NAMESPACE", ".Rbuildignore")(fname)
or require("lspconfig.util").find_git_ancestor(fname)
or vim.loop.os_homedir()
end,
root_markers = { "DESCRIPTION", "NAMESPACE", ".Rbuildignore" },
},
},
},

7
lua/lazyvim/plugins/extras/lang/ruby.lua
View file

@ -6,10 +6,6 @@ if lazyvim_docs then
end
local lsp = vim.g.lazyvim_ruby_lsp or "ruby_lsp"
if vim.fn.has("nvim-0.10") == 0 then
-- ruby_lsp does not work well with Neovim < 0.10
lsp = vim.g.lazyvim_ruby_lsp or "solargraph"
end
local formatter = vim.g.lazyvim_ruby_formatter or "rubocop"
return {
@ -25,9 +21,8 @@ return {
},
{
"neovim/nvim-lspconfig",
---@class PluginLspOpts
---@type PluginLspOpts
opts = {
---@type lspconfig.options
servers = {
ruby_lsp = {
enabled = lsp == "ruby_lsp",

11
lua/lazyvim/plugins/extras/lang/rust.lua
View file

@ -56,7 +56,6 @@ return {
{
"mrcjkb/rustaceanvim",
version = vim.fn.has("nvim-0.10.0") == 0 and "^4" or false,
ft = { "rust" },
opts = {
server = {
@ -111,13 +110,9 @@ return {
},
config = function(_, opts)
if LazyVim.has("mason.nvim") then
local package_path = require("mason-registry").get_package("codelldb"):get_install_path()
local codelldb = package_path .. "/extension/adapter/codelldb"
local library_path = package_path .. "/extension/lldb/lib/liblldb.dylib"
local uname = io.popen("uname"):read("*l")
if uname == "Linux" then
library_path = package_path .. "/extension/lldb/lib/liblldb.so"
end
local codelldb = vim.fn.exepath("codelldb")
local codelldb_lib_ext = io.popen("uname"):read("*l") == "Linux" and ".so" or ".dylib"
local library_path = vim.fn.expand("$MASON/opt/lldb/lib/liblldb" .. codelldb_lib_ext)
opts.dap = {
adapter = require("rustaceanvim.config").get_codelldb_adapter(codelldb, library_path),
}

5
lua/lazyvim/plugins/extras/lang/svelte.lua
View file

@ -31,11 +31,6 @@ return {
desc = "Organize Imports",
},
},
capabilities = {
workspace = {
didChangeWatchedFiles = vim.fn.has("nvim-0.10") == 0 and { dynamicRegistration = true },
},
},
},
},
},

3
lua/lazyvim/plugins/extras/lang/tailwind.lua
View file

@ -28,11 +28,10 @@ return {
},
setup = {
tailwindcss = function(_, opts)
local tw = LazyVim.lsp.get_raw_config("tailwindcss")
opts.filetypes = opts.filetypes or {}
-- Add default filetypes
vim.list_extend(opts.filetypes, tw.default_config.filetypes)
vim.list_extend(opts.filetypes, vim.lsp.config.tailwindcss.filetypes)
-- Remove excluded filetypes
--- @param ft string

6
lua/lazyvim/plugins/extras/lang/typescript.lua
View file

@ -137,14 +137,14 @@ return {
local action, uri, range = unpack(command.arguments)
local function move(newf)
client.request("workspace/executeCommand", {
client:request("workspace/executeCommand", {
command = command.command,
arguments = { action, uri, range, newf },
})
end
local fname = vim.uri_to_fname(uri)
client.request("workspace/executeCommand", {
client:request("workspace/executeCommand", {
command = "typescript.tsserverRequest",
arguments = {
"getMoveToRefactoringFileSuggestions",
@ -263,7 +263,7 @@ return {
-- Filetype icons
{
"echasnovski/mini.icons",
"nvim-mini/mini.icons",
opts = {
file = {
[".eslintrc.js"] = { glyph = "󰱺", hl = "MiniIconsYellow" },

12
lua/lazyvim/plugins/extras/lang/yaml.lua
View file

@ -29,7 +29,7 @@ return {
},
},
-- lazy-load schemastore when needed
on_new_config = function(new_config)
before_init = function(_, new_config)
new_config.settings.yaml.schemas = vim.tbl_deep_extend(
"force",
new_config.settings.yaml.schemas or {},
@ -55,16 +55,6 @@ return {
},
},
},
setup = {
yamlls = function()
-- Neovim < 0.10 does not have dynamic registration for formatting
if vim.fn.has("nvim-0.10") == 0 then
LazyVim.lsp.on_attach(function(client, _)
client.server_capabilities.documentFormattingProvider = true
end, "yamlls")
end
end,
},
},
},
}

2
lua/lazyvim/plugins/extras/ui/mini-animate.lua
View file

@ -10,7 +10,7 @@ return {
-- setup animate
{
"echasnovski/mini.animate",
"nvim-mini/mini.animate",
event = "VeryLazy",
cond = vim.g.neovide == nil,
opts = function(_, opts)

2
lua/lazyvim/plugins/extras/ui/mini-indentscope.lua
View file

@ -3,7 +3,7 @@ return {
-- code, this highlights the current level of indentation, and animates
-- the highlighting.
{
"echasnovski/mini.indentscope",
"nvim-mini/mini.indentscope",
version = false, -- wait till new 0.7.0 release to put it back on semver
event = "LazyFile",
opts = {

4
lua/lazyvim/plugins/extras/ui/mini-starter.lua
View file

@ -5,7 +5,7 @@ return {
-- enable mini.starter
{
"echasnovski/mini.starter",
"nvim-mini/mini.starter",
version = false, -- wait till new 0.7.0 release to put it back on semver
event = "VimEnter",
opts = function()
@ -67,7 +67,7 @@ return {
local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
local pad_footer = string.rep(" ", 8)
starter.config.footer = pad_footer .. "⚡ Neovim loaded " .. stats.count .. " plugins in " .. ms .. "ms"
-- INFO: based on @echasnovski's recommendation (thanks a lot!!!)
-- INFO: based on @nvim-mini's recommendation (thanks a lot!!!)
if vim.bo[ev.buf].filetype == "ministarter" then
pcall(starter.refresh)
end

2
lua/lazyvim/plugins/extras/ui/smear-cursor.lua
View file

@ -9,7 +9,7 @@ return {
specs = {
-- disable mini.animate cursor
{
"echasnovski/mini.animate",
"nvim-mini/mini.animate",
optional = true,
opts = {
cursor = { enable = false },

88
lua/lazyvim/plugins/extras/ui/treesitter-main.lua Normal file
View file

@ -0,0 +1,88 @@
return {
{
"nvim-treesitter/nvim-treesitter",
version = false, -- last release is way too old and doesn't work on Windows
branch = "main",
build = ":TSUpdate",
lazy = true,
cmd = { "TSUpdate", "TSInstall", "TSLog", "TSUninstall" },
init = function() end,
---@param opts TSConfig
config = function(_, opts)
if vim.fn.executable("tree-sitter") == 0 then
LazyVim.error("**treesitter-main** requires the `tree-sitter` executable to be installed")
return
end
if type(opts.ensure_installed) ~= "table" then
error("opts.ensure_installed must be a table")
end
local TS = require("nvim-treesitter")
TS.setup(opts)
local needed = LazyVim.dedup(opts.ensure_installed --[[@as string[] ]])
local installed = TS.get_installed("parsers")
local install = vim.tbl_filter(function(lang)
return not vim.tbl_contains(installed, lang)
end, needed)
if #install > 0 then
TS.install(install, { summary = true })
vim.list_extend(installed, install)
end
-- backwards compatibility with the old treesitter config for indent
if vim.tbl_get(opts, "indent", "enable") then
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
end
-- backwards compatibility with the old treesitter config for highlight
if vim.tbl_get(opts, "highlight", "enable") then
vim.api.nvim_create_autocmd("FileType", {
callback = function(ev)
local lang = vim.treesitter.language.get_lang(ev.match)
if vim.tbl_contains(installed, lang) then
pcall(vim.treesitter.start)
end
end,
})
end
end,
},
{
"nvim-treesitter/nvim-treesitter-textobjects",
branch = "main",
event = "VeryLazy",
opts = {},
keys = function()
local moves = {
goto_next_start = { ["]f"] = "@function.outer", ["]c"] = "@class.outer", ["]a"] = "@parameter.inner" },
goto_next_end = { ["]F"] = "@function.outer", ["]C"] = "@class.outer", ["]A"] = "@parameter.inner" },
goto_previous_start = { ["[f"] = "@function.outer", ["[c"] = "@class.outer", ["[a"] = "@parameter.inner" },
goto_previous_end = { ["[F"] = "@function.outer", ["[C"] = "@class.outer", ["[A"] = "@parameter.inner" },
}
local ret = {} ---@type LazyKeysSpec[]
for method, keymaps in pairs(moves) do
for key, query in pairs(keymaps) do
local desc = query:gsub("@", ""):gsub("%..*", "")
desc = desc:sub(1, 1):upper() .. desc:sub(2)
desc = (key:sub(1, 1) == "[" and "Prev " or "Next ") .. desc
desc = desc .. (key:sub(2, 2) == key:sub(2, 2):upper() and " End" or " Start")
ret[#ret + 1] = {
key,
function()
require("nvim-treesitter-textobjects.move")[method](query, "textobjects")
end,
desc = desc,
mode = { "n", "x", "o" },
silent = true,
}
end
end
return ret
end,
config = function(_, opts)
require("nvim-treesitter-textobjects").setup(opts)
end,
},
}

2
lua/lazyvim/plugins/extras/util/chezmoi.lua
View file

@ -135,7 +135,7 @@ return {
-- Filetype icons
{
"echasnovski/mini.icons",
"nvim-mini/mini.icons",
opts = {
file = {
[".chezmoiignore"] = { glyph = "", hl = "MiniIconsGrey" },

2
lua/lazyvim/plugins/extras/util/mini-hipatterns.lua
View file

@ -4,7 +4,7 @@ local M = {}
M.hl = {}
M.plugin = {
"echasnovski/mini.hipatterns",
"nvim-mini/mini.hipatterns",
recommended = true,
desc = "Highlight colors in your code. Also includes Tailwind CSS support.",
event = "LazyFile",

2
lua/lazyvim/plugins/extras/util/project.lua
View file

@ -134,7 +134,7 @@ return {
},
{
"echasnovski/mini.starter",
"nvim-mini/mini.starter",
optional = true,
opts = function(_, opts)
local items = {

5
lua/lazyvim/plugins/init.lua
View file

@ -1,6 +1,7 @@
if vim.fn.has("nvim-0.9.0") == 0 then
if vim.fn.has("nvim-0.11.0") == 0 then
vim.api.nvim_echo({
{ "LazyVim requires Neovim >= 0.9.0\n", "ErrorMsg" },
{ "LazyVim requires Neovim >= 0.11.0\n", "ErrorMsg" },
{ "For more info, see: https://github.com/LazyVim/LazyVim/issues/6421\n", "Comment" },
{ "Press any key to exit", "MoreMsg" },
}, true, {})
vim.fn.getchar()

180
lua/lazyvim/plugins/lsp/init.lua
View file

@ -2,7 +2,7 @@ return {
-- lspconfig
{
"neovim/nvim-lspconfig",
event = "LazyFile",
event = { "BufReadPre", "BufNewFile", "BufWritePre" },
dependencies = {
"mason.nvim",
{ "mason-org/mason-lspconfig.nvim", config = function() end },
@ -63,7 +63,7 @@ return {
timeout_ms = nil,
},
-- LSP Server Settings
---@type lspconfig.options
---@type table<string, vim.lsp.Config>
servers = {
lua_ls = {
-- mason = false, -- set to false if you don't want this server to be installed with mason
@ -99,7 +99,7 @@ return {
},
-- you can do any additional lsp server setup here
-- return true if you don't want this server to be setup with lspconfig
---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
---@type table<string, fun(server:string, opts: vim.lsp.Config):boolean?>
setup = {
-- example to setup with typescript.nvim
-- tsserver = function(_, opts)
@ -125,131 +125,129 @@ return {
LazyVim.lsp.setup()
LazyVim.lsp.on_dynamic_capability(require("lazyvim.plugins.lsp.keymaps").on_attach)
-- diagnostics signs
if vim.fn.has("nvim-0.10.0") == 0 then
if type(opts.diagnostics.signs) ~= "boolean" then
for severity, icon in pairs(opts.diagnostics.signs.text) do
local name = vim.diagnostic.severity[severity]:lower():gsub("^%l", string.upper)
name = "DiagnosticSign" .. name
vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" })
-- inlay hints
if opts.inlay_hints.enabled then
LazyVim.lsp.on_supports_method("textDocument/inlayHint", function(client, buffer)
if
vim.api.nvim_buf_is_valid(buffer)
and vim.bo[buffer].buftype == ""
and not vim.tbl_contains(opts.inlay_hints.exclude, vim.bo[buffer].filetype)
then
vim.lsp.inlay_hint.enable(true, { bufnr = buffer })
end
end
end)
end
if vim.fn.has("nvim-0.10") == 1 then
-- inlay hints
if opts.inlay_hints.enabled then
LazyVim.lsp.on_supports_method("textDocument/inlayHint", function(client, buffer)
if
vim.api.nvim_buf_is_valid(buffer)
and vim.bo[buffer].buftype == ""
and not vim.tbl_contains(opts.inlay_hints.exclude, vim.bo[buffer].filetype)
then
vim.lsp.inlay_hint.enable(true, { bufnr = buffer })
end
end)
end
-- code lens
if opts.codelens.enabled and vim.lsp.codelens then
LazyVim.lsp.on_supports_method("textDocument/codeLens", function(client, buffer)
vim.lsp.codelens.refresh()
vim.api.nvim_create_autocmd({ "BufEnter", "CursorHold", "InsertLeave" }, {
buffer = buffer,
callback = vim.lsp.codelens.refresh,
})
end)
end
-- code lens
if opts.codelens.enabled and vim.lsp.codelens then
LazyVim.lsp.on_supports_method("textDocument/codeLens", function(client, buffer)
vim.lsp.codelens.refresh()
vim.api.nvim_create_autocmd({ "BufEnter", "CursorHold", "InsertLeave" }, {
buffer = buffer,
callback = vim.lsp.codelens.refresh,
})
end)
end
-- diagnostics
if type(opts.diagnostics.virtual_text) == "table" and opts.diagnostics.virtual_text.prefix == "icons" then
opts.diagnostics.virtual_text.prefix = vim.fn.has("nvim-0.10.0") == 0 and "●"
or function(diagnostic)
local icons = LazyVim.config.icons.diagnostics
for d, icon in pairs(icons) do
if diagnostic.severity == vim.diagnostic.severity[d:upper()] then
return icon
end
opts.diagnostics.virtual_text.prefix = function(diagnostic)
local icons = LazyVim.config.icons.diagnostics
for d, icon in pairs(icons) do
if diagnostic.severity == vim.diagnostic.severity[d:upper()] then
return icon
end
end
return "●"
end
end
vim.diagnostic.config(vim.deepcopy(opts.diagnostics))
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 {},
LazyVim.has("nvim-cmp") and require("cmp_nvim_lsp").default_capabilities() or {},
LazyVim.has("blink.nvim") and require("blink.cmp").get_lsp_capabilities() or {},
opts.capabilities or {}
)
local function setup(server)
-- get all the servers that are available through mason-lspconfig
local have_mason = LazyVim.has("mason-lspconfig.nvim")
local mason_all = have_mason
and vim.tbl_keys(require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package)
or {} --[[ @as string[] ]]
local exclude_automatic_enable = {} ---@type string[]
local function configure(server)
local server_opts = vim.tbl_deep_extend("force", {
capabilities = vim.deepcopy(capabilities),
}, servers[server] or {})
if server_opts.enabled == false then
return
}, opts.servers[server] or {})
local setup = opts.setup[server] or opts.setup["*"]
if setup and setup(server, server_opts) then
return true -- lsp will be setup by the setup function
end
if opts.setup[server] then
if opts.setup[server](server, server_opts) then
return
end
elseif opts.setup["*"] then
if opts.setup["*"](server, server_opts) then
return
end
end
require("lspconfig")[server].setup(server_opts)
end
vim.lsp.config(server, server_opts)
-- get all the servers that are available through mason-lspconfig
local have_mason, mlsp = pcall(require, "mason-lspconfig")
local all_mslp_servers = {}
if have_mason then
all_mslp_servers = vim.tbl_keys(require("mason-lspconfig.mappings.server").lspconfig_to_package)
-- manually enable if mason=false or if this is a server that cannot be installed with mason-lspconfig
if server_opts.mason == false or not vim.tbl_contains(mason_all, server) then
vim.lsp.enable(server)
return true
end
return false
end
local ensure_installed = {} ---@type string[]
for server, server_opts in pairs(servers) do
if server_opts then
server_opts = server_opts == true and {} or server_opts
if server_opts.enabled ~= false then
-- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig
if server_opts.mason == false or not vim.tbl_contains(all_mslp_servers, server) then
setup(server)
else
ensure_installed[#ensure_installed + 1] = server
end
for server, server_opts in pairs(opts.servers) do
server_opts = server_opts == true and {} or server_opts or false
if server_opts and server_opts.enabled ~= false then
-- run manual setup if mason=false or if this is a server that cannot be installed with mason-lspconfig
if configure(server) then
exclude_automatic_enable[#exclude_automatic_enable + 1] = server
else
ensure_installed[#ensure_installed + 1] = server
end
else
exclude_automatic_enable[#exclude_automatic_enable + 1] = server
end
end
if have_mason then
mlsp.setup({
require("mason-lspconfig").setup({
ensure_installed = vim.tbl_deep_extend(
"force",
ensure_installed,
LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {}
),
handlers = { setup },
automatic_enable = {
exclude = exclude_automatic_enable,
},
})
end
if LazyVim.lsp.is_enabled("denols") and LazyVim.lsp.is_enabled("vtsls") then
local is_deno = require("lspconfig.util").root_pattern("deno.json", "deno.jsonc")
LazyVim.lsp.disable("vtsls", is_deno)
LazyVim.lsp.disable("denols", function(root_dir, config)
if not is_deno(root_dir) then
config.settings.deno.enable = false
end
return false
end)
if vim.lsp.is_enabled("denols") and vim.lsp.is_enabled("vtsls") then
---@param server string
local resolve = function(server)
local markers, root_dir = vim.lsp.config[server].root_markers, vim.lsp.config[server].root_dir
vim.lsp.config(server, {
root_dir = function(bufnr, on_dir)
local is_deno = vim.fs.root(bufnr, { "deno.json", "deno.jsonc" }) ~= nil
if is_deno == (server == "denols") then
if root_dir then
return root_dir(bufnr, on_dir)
elseif type(markers) == "table" then
local root = vim.fs.root(bufnr, markers)
return root and on_dir(root)
end
end
end,
})
end
resolve("denols")
resolve("vtsls")
end
end,
},
@ -292,8 +290,4 @@ return {
end)
end,
},
-- pin to v1 for now
{ "mason-org/mason.nvim", version = "^1.0.0" },
{ "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
}

2
lua/lazyvim/plugins/ui.lua
View file

@ -245,7 +245,7 @@ return {
-- icons
{
"echasnovski/mini.icons",
"nvim-mini/mini.icons",
lazy = true,
opts = {
file = {

11
lua/lazyvim/plugins/xtras.lua
View file

@ -3,7 +3,8 @@ local prios = {
["lazyvim.plugins.extras.test.core"] = 1,
["lazyvim.plugins.extras.dap.core"] = 1,
["lazyvim.plugins.extras.coding.nvim-cmp"] = 2,
["lazyvim.plugins.extras.ui.edgy"] = 2,
["lazyvim.plugins.extras.editor.neo-tree"] = 2,
["lazyvim.plugins.extras.ui.edgy"] = 3,
["lazyvim.plugins.extras.lang.typescript"] = 5,
["lazyvim.plugins.extras.coding.blink"] = 5,
["lazyvim.plugins.extras.formatting.prettier"] = 10,
@ -42,15 +43,7 @@ end
---@type string[]
extras = LazyVim.dedup(extras)
local version = vim.version()
local v = version.major .. "_" .. version.minor
local compat = { "0_9" }
LazyVim.plugin.save_core()
if vim.tbl_contains(compat, v) then
table.insert(extras, 1, "lazyvim.plugins.compat.nvim-" .. v)
end
if vim.g.vscode then
table.insert(extras, 1, "lazyvim.plugins.extras.vscode")
end

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

@ -253,11 +253,18 @@ function M.get_pkg_path(pkg, path, opts)
opts = opts or {}
opts.warn = opts.warn == nil and true or opts.warn
path = path or ""
local ret = root .. "/packages/" .. pkg .. "/" .. path
if opts.warn and not vim.loop.fs_stat(ret) and not require("lazy.core.config").headless() then
M.warn(
("Mason package path not found for **%s**:\n- `%s`\nYou may need to force update the package."):format(pkg, path)
)
local ret = vim.fs.normalize(root .. "/packages/" .. pkg .. "/" .. path)
if opts.warn then
vim.schedule(function()
if not require("lazy.core.config").headless() and not vim.loop.fs_stat(ret) then
M.warn(
("Mason package path not found for **%s**:\n- `%s`\nYou may need to force update the package."):format(
pkg,
path
)
)
end
end)
end
return ret
end

89
lua/lazyvim/util/lsp.lua
View file

@ -3,56 +3,10 @@ local M = {}
---@alias lsp.Client.filter {id?: number, bufnr?: number, name?: string, method?: string, filter?:fun(client: vim.lsp.Client):boolean}
--- Neovim 0.11 uses a lua class for clients, while older versions use a table.
--- Wraps older style clients to be compatible with the new style.
---@param client vim.lsp.Client
---@return vim.lsp.Client
local function wrap(client)
local meta = getmetatable(client)
if meta and meta.request then
return client
end
---@diagnostic disable-next-line: undefined-field
if client.wrapped then
return client
end
local methods = { "request", "supports_method", "cancel_request", "notify" }
-- old style
return setmetatable({ wrapped = true }, {
__index = function(_, k)
if k == "supports_method" then
-- supports_method doesn't support the bufnr argument
return function(_, method)
return client[k](method)
end
end
if vim.tbl_contains(methods, k) then
return function(_, ...)
return client[k](...)
end
end
return client[k]
end,
})
end
---@param opts? lsp.Client.filter
function M.get_clients(opts)
local ret = {} ---@type vim.lsp.Client[]
if vim.lsp.get_clients then
ret = vim.lsp.get_clients(opts)
ret = vim.tbl_map(wrap, ret)
else
---@diagnostic disable-next-line: deprecated
ret = vim.lsp.get_active_clients(opts)
ret = vim.tbl_map(wrap, ret)
if opts and opts.method then
---@param client vim.lsp.Client
ret = vim.tbl_filter(function(client)
return client.supports_method(opts.method, { bufnr = opts.bufnr })
end, ret)
end
end
ret = vim.lsp.get_clients(opts)
return opts and opts.filter and vim.tbl_filter(opts.filter, ret) or ret
end
@ -64,7 +18,7 @@ function M.on_attach(on_attach, name)
local buffer = args.buf ---@type number
local client = vim.lsp.get_client_by_id(args.data.client_id)
if client and (not name or client.name == name) then
return on_attach(wrap(client), buffer)
return on_attach(client, buffer)
end
end,
})
@ -110,7 +64,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 and client:supports_method(method, { bufnr = buffer }) then
if client.supports_method and client:supports_method(method, buffer) then
clients[client][buffer] = true
vim.api.nvim_exec_autocmds("User", {
pattern = "LspSupportsMethod",
@ -153,39 +107,6 @@ function M.on_supports_method(method, fn)
})
end
---@return _.lspconfig.options
function M.get_config(server)
local configs = require("lspconfig.configs")
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
end
---@param server string
---@param cond fun( root_dir, config): boolean
function M.disable(server, cond)
local util = require("lspconfig.util")
local def = M.get_config(server)
---@diagnostic disable-next-line: undefined-field
def.document_config.on_new_config = util.add_hook_before(def.document_config.on_new_config, function(config, root_dir)
if cond(root_dir, config) then
config.enabled = false
end
end)
end
---@param opts? LazyFormatter| {filter?: (string|lsp.Client.filter)}
function M.formatter(opts)
opts = opts or {}
@ -204,8 +125,8 @@ function M.formatter(opts)
local clients = M.get_clients(LazyVim.merge({}, filter, { bufnr = buf }))
---@param client vim.lsp.Client
local ret = vim.tbl_filter(function(client)
return client.supports_method("textDocument/formatting")
or client.supports_method("textDocument/rangeFormatting")
return client:supports_method("textDocument/formatting")
or client:supports_method("textDocument/rangeFormatting")
end, clients)
---@param client vim.lsp.Client
return vim.tbl_map(function(client)

15
lua/lazyvim/util/plugin.lua
View file

@ -1,3 +1,4 @@
local Meta = require("lazy.core.meta")
local Plugin = require("lazy.core.plugin")
---@class lazyvim.util.plugin
@ -102,9 +103,17 @@ function M.fix_imports()
end
function M.fix_renames()
Plugin.Spec.add = LazyVim.inject.args(Plugin.Spec.add, function(self, plugin)
---@param plugin LazyPluginSpec
Meta.add = LazyVim.inject.args(Meta.add, function(self, plugin)
if type(plugin) == "table" then
if M.renames[plugin[1]] then
local name = plugin[1]
if not name then
return
end
if name:find("echasnovski") then
M.renames[name] = name:gsub("echasnovski", "nvim-mini")
end
if M.renames[name] then
LazyVim.warn(
("Plugin `%s` was renamed to `%s`.\nPlease update your config for `%s`"):format(
plugin[1],
@ -113,7 +122,7 @@ function M.fix_renames()
),
{ title = "LazyVim" }
)
plugin[1] = M.renames[plugin[1]]
plugin[1] = M.renames[name]
end
end
end)

5
lua/lazyvim/util/ui.lua
View file

@ -1,11 +1,6 @@
---@class lazyvim.util.ui
local M = {}
-- foldtext for Neovim < 0.10.0
function M.foldtext()
return vim.api.nvim_buf_get_lines(0, vim.v.lnum - 1, vim.v.lnum, false)[1]
end
-- optimized treesitter foldexpr for Neovim >= 0.10.0
function M.foldexpr()
local buf = vim.api.nvim_get_current_buf()

3
tests/extras/extra_spec.lua
View file

@ -26,7 +26,8 @@ describe("Extra", function()
return not vim.tbl_contains(ignore, extra.modname)
end, extras)
local lsp_to_pkg = require("mason-lspconfig.mappings.server").lspconfig_to_package
local lsp_to_pkg = {}
lsp_to_pkg = require("mason-lspconfig.mappings").get_mason_map().lspconfig_to_package
local tsspec = Plugin.Spec.new({
import = "lazyvim.plugins.treesitter",

6
tests/minit.lua
View file

@ -9,8 +9,8 @@ require("lazy.minit").setup({
{ dir = vim.uv.cwd() },
{ "LazyVim/starter" },
{ "nvim-treesitter/nvim-treesitter" },
{ "mason-org/mason-lspconfig.nvim", version = "^1.0.0" },
{ "mason-org/mason.nvim", version = "^1.0.0" },
{ "echasnovski/mini.icons", opts = {} },
{ "mason-org/mason-lspconfig.nvim" },
{ "mason-org/mason.nvim" },
{ "nvim-mini/mini.icons", opts = {} },
},
})