mirror of
https://github.com/LazyVim/LazyVim.git
synced 2026-07-25 14:01:06 +00:00
Merge branch 'LazyVim:main' into main
This commit is contained in:
commit
61816c7c4f
14 changed files with 146 additions and 20 deletions
2
.github/.release-please-manifest.json
vendored
2
.github/.release-please-manifest.json
vendored
|
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
".": "13.2.0"
|
".": "13.4.0"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
46
CHANGELOG.md
46
CHANGELOG.md
|
|
@ -1,5 +1,51 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [13.4.0](https://github.com/LazyVim/LazyVim/compare/v13.3.1...v13.4.0) (2024-11-16)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **blink:** auto-enable catppuccin integration ([#4799](https://github.com/LazyVim/LazyVim/issues/4799)) ([ffce089](https://github.com/LazyVim/LazyVim/commit/ffce089a9f1268ff73c7de7c4f45e1a366dc4d34))
|
||||||
|
* **copilot-chat:** remove deprecated options ([#4802](https://github.com/LazyVim/LazyVim/issues/4802)) ([7a1414b](https://github.com/LazyVim/LazyVim/commit/7a1414b5e5950bde34b9bdc0dbc3dd20109f2ac9))
|
||||||
|
* **dial:** support vue filetype ([#4785](https://github.com/LazyVim/LazyVim/issues/4785)) ([8235126](https://github.com/LazyVim/LazyVim/commit/8235126a321eaae093f319398ffec5949f1ab8be))
|
||||||
|
* **extras:** add biome formatter ([#4448](https://github.com/LazyVim/LazyVim/issues/4448)) ([b8407f4](https://github.com/LazyVim/LazyVim/commit/b8407f4b128891c3bdf35a2c403ba23d1e01f3ff))
|
||||||
|
* **vscode:** automatically enable the vscode extra when running in vscode ([1c5a330](https://github.com/LazyVim/LazyVim/commit/1c5a330b6be8007088d84361fee5d2b08771598c))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **terminal:** set shellcmdflags for powershell to recommended values. Closes [#4805](https://github.com/LazyVim/LazyVim/issues/4805) ([1db2af2](https://github.com/LazyVim/LazyVim/commit/1db2af267eeb9046550ac29bd543f3b3021cdd7b))
|
||||||
|
|
||||||
|
## [13.3.1](https://github.com/LazyVim/LazyVim/compare/v13.3.0...v13.3.1) (2024-11-15)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **copilot:** don't enable blink when using copilot when blink is not installed. Fixes [#4795](https://github.com/LazyVim/LazyVim/issues/4795) ([07a0468](https://github.com/LazyVim/LazyVim/commit/07a046867dc3407b30801e539ab026fb7c180e7b))
|
||||||
|
|
||||||
|
## [13.3.0](https://github.com/LazyVim/LazyVim/compare/v13.2.0...v13.3.0) (2024-11-14)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **copilot:** added support for blink.cmp source ([a7eca05](https://github.com/LazyVim/LazyVim/commit/a7eca056096486b20ce37b20979c0d712e49fe76))
|
||||||
|
* **extras:** add supermaven ([#3491](https://github.com/LazyVim/LazyVim/issues/3491)) ([c1e8e3c](https://github.com/LazyVim/LazyVim/commit/c1e8e3c80d1d9d44e3795022b3f7d2703abccec6))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **dial.nvim:** added boolean and logical toggles to default group. Fixes [#4515](https://github.com/LazyVim/LazyVim/issues/4515) ([5e485d3](https://github.com/LazyVim/LazyVim/commit/5e485d39b4cc5aca1aedae4d441fb2bfb3bfbf67))
|
||||||
|
* **fzf:** decouple `defaults` from `opts` to easy switch profiles ([#4190](https://github.com/LazyVim/LazyVim/issues/4190)) ([0819f93](https://github.com/LazyVim/LazyVim/commit/0819f9396e94a4188522b6739ade3d6024d2b8a7))
|
||||||
|
* **lsp:** wrap signature_help ([#4791](https://github.com/LazyVim/LazyVim/issues/4791)) ([deb9fd8](https://github.com/LazyVim/LazyVim/commit/deb9fd85b150e50053e127f94f3df6273a9f5faf))
|
||||||
|
* **lualine:** dynamically fetch the color used in lualine ([#4788](https://github.com/LazyVim/LazyVim/issues/4788)) ([e50b435](https://github.com/LazyVim/LazyVim/commit/e50b43544f1261d140bc391a9a1de6e3923b490d))
|
||||||
|
* **lualine:** normalize paths before calculating pretty path. Fixes [#4763](https://github.com/LazyVim/LazyVim/issues/4763) ([ea266e7](https://github.com/LazyVim/LazyVim/commit/ea266e73265e32183acbec0bd39f8108e213770f))
|
||||||
|
* **snacks:** explicitely enable snakcs plugins ([c0b623c](https://github.com/LazyVim/LazyVim/commit/c0b623c332b42b3d75e78e06fa1912417bfca71f))
|
||||||
|
|
||||||
|
|
||||||
|
### Performance Improvements
|
||||||
|
|
||||||
|
* **treesitter:** better foldtext and foldexpr ([1d7b9a1](https://github.com/LazyVim/LazyVim/commit/1d7b9a1a61596a61019d5d84be9ed679d90c4a38))
|
||||||
|
|
||||||
## [13.2.0](https://github.com/LazyVim/LazyVim/compare/v13.1.0...v13.2.0) (2024-11-11)
|
## [13.2.0](https://github.com/LazyVim/LazyVim/compare/v13.1.0...v13.2.0) (2024-11-11)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
*LazyVim.txt* For Neovim Last change: 2024 November 13
|
*LazyVim.txt* For Neovim Last change: 2024 November 16
|
||||||
|
|
||||||
==============================================================================
|
==============================================================================
|
||||||
Table of Contents *LazyVim-table-of-contents*
|
Table of Contents *LazyVim-table-of-contents*
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
|
||||||
---@class LazyVimConfig: LazyVimOptions
|
---@class LazyVimConfig: LazyVimOptions
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
M.version = "13.2.0" -- x-release-please-version
|
M.version = "13.4.0" -- x-release-please-version
|
||||||
LazyVim.config = M
|
LazyVim.config = M
|
||||||
|
|
||||||
---@class LazyVimOptions
|
---@class LazyVimOptions
|
||||||
|
|
|
||||||
|
|
@ -24,16 +24,11 @@ return {
|
||||||
user = user:sub(1, 1):upper() .. user:sub(2)
|
user = user:sub(1, 1):upper() .. user:sub(2)
|
||||||
return {
|
return {
|
||||||
auto_insert_mode = true,
|
auto_insert_mode = true,
|
||||||
show_help = true,
|
|
||||||
question_header = " " .. user .. " ",
|
question_header = " " .. user .. " ",
|
||||||
answer_header = " Copilot ",
|
answer_header = " Copilot ",
|
||||||
window = {
|
window = {
|
||||||
width = 0.4,
|
width = 0.4,
|
||||||
},
|
},
|
||||||
selection = function(source)
|
|
||||||
local select = require("CopilotChat.select")
|
|
||||||
return select.visual(source) or select.buffer(source)
|
|
||||||
end,
|
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
keys = {
|
keys = {
|
||||||
|
|
@ -66,8 +61,6 @@ return {
|
||||||
desc = "Quick Chat (CopilotChat)",
|
desc = "Quick Chat (CopilotChat)",
|
||||||
mode = { "n", "v" },
|
mode = { "n", "v" },
|
||||||
},
|
},
|
||||||
-- Show help actions with telescope
|
|
||||||
{ "<leader>ad", M.pick("help"), desc = "Diagnostic Help (CopilotChat)", mode = { "n", "v" } },
|
|
||||||
-- Show prompts actions with telescope
|
-- Show prompts actions with telescope
|
||||||
{ "<leader>ap", M.pick("prompt"), desc = "Prompt Actions (CopilotChat)", mode = { "n", "v" } },
|
{ "<leader>ap", M.pick("prompt"), desc = "Prompt Actions (CopilotChat)", mode = { "n", "v" } },
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,7 @@ return {
|
||||||
specs = {
|
specs = {
|
||||||
{
|
{
|
||||||
"nvim-cmp",
|
"nvim-cmp",
|
||||||
|
optional = true,
|
||||||
---@param opts cmp.ConfigSchema
|
---@param opts cmp.ConfigSchema
|
||||||
opts = function(_, opts)
|
opts = function(_, opts)
|
||||||
table.insert(opts.sources, 1, {
|
table.insert(opts.sources, 1, {
|
||||||
|
|
@ -104,6 +105,7 @@ return {
|
||||||
specs = {
|
specs = {
|
||||||
{
|
{
|
||||||
"blink.cmp",
|
"blink.cmp",
|
||||||
|
optional = true,
|
||||||
opts = {
|
opts = {
|
||||||
sources = {
|
sources = {
|
||||||
providers = {
|
providers = {
|
||||||
|
|
|
||||||
|
|
@ -121,4 +121,12 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
-- catppuccin support
|
||||||
|
{
|
||||||
|
"catppuccin",
|
||||||
|
optional = true,
|
||||||
|
opts = {
|
||||||
|
integrations = { blink_cmp = true },
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,10 @@ return {
|
||||||
return {
|
return {
|
||||||
dials_by_ft = {
|
dials_by_ft = {
|
||||||
css = "css",
|
css = "css",
|
||||||
|
vue = "vue",
|
||||||
javascript = "typescript",
|
javascript = "typescript",
|
||||||
|
typescript = "typescript",
|
||||||
|
typescriptreact = "typescript",
|
||||||
javascriptreact = "typescript",
|
javascriptreact = "typescript",
|
||||||
json = "json",
|
json = "json",
|
||||||
lua = "lua",
|
lua = "lua",
|
||||||
|
|
@ -106,8 +109,6 @@ return {
|
||||||
python = "python",
|
python = "python",
|
||||||
sass = "css",
|
sass = "css",
|
||||||
scss = "css",
|
scss = "css",
|
||||||
typescript = "typescript",
|
|
||||||
typescriptreact = "typescript",
|
|
||||||
yaml = "yaml",
|
yaml = "yaml",
|
||||||
},
|
},
|
||||||
groups = {
|
groups = {
|
||||||
|
|
@ -122,6 +123,14 @@ return {
|
||||||
augend.constant.alias.bool, -- boolean value (true <-> false)
|
augend.constant.alias.bool, -- boolean value (true <-> false)
|
||||||
logical_alias,
|
logical_alias,
|
||||||
},
|
},
|
||||||
|
vue = {
|
||||||
|
augend.integer.alias.decimal_int, -- nonnegative and negative decimal number
|
||||||
|
augend.constant.alias.bool, -- boolean value (true <-> false)
|
||||||
|
logical_alias,
|
||||||
|
augend.constant.new({ elements = { "let", "const" } }),
|
||||||
|
augend.hexcolor.new({ case = "lower" }),
|
||||||
|
augend.hexcolor.new({ case = "upper" }),
|
||||||
|
},
|
||||||
typescript = {
|
typescript = {
|
||||||
augend.integer.alias.decimal_int, -- nonnegative and negative decimal number
|
augend.integer.alias.decimal_int, -- nonnegative and negative decimal number
|
||||||
augend.constant.alias.bool, -- boolean value (true <-> false)
|
augend.constant.alias.bool, -- boolean value (true <-> false)
|
||||||
|
|
|
||||||
59
lua/lazyvim/plugins/extras/formatting/biome.lua
Normal file
59
lua/lazyvim/plugins/extras/formatting/biome.lua
Normal file
|
|
@ -0,0 +1,59 @@
|
||||||
|
---@diagnostic disable: inject-field
|
||||||
|
if lazyvim_docs then
|
||||||
|
-- Enable this option to avoid conflicts with Prettier.
|
||||||
|
vim.g.lazyvim_prettier_needs_config = true
|
||||||
|
end
|
||||||
|
|
||||||
|
-- https://biomejs.dev/internals/language-support/
|
||||||
|
local supported = {
|
||||||
|
"astro",
|
||||||
|
"css",
|
||||||
|
"graphql",
|
||||||
|
-- "html",
|
||||||
|
"javascript",
|
||||||
|
"javascriptreact",
|
||||||
|
"json",
|
||||||
|
"jsonc",
|
||||||
|
-- "markdown",
|
||||||
|
"svelte",
|
||||||
|
"typescript",
|
||||||
|
"typescriptreact",
|
||||||
|
"vue",
|
||||||
|
-- "yaml",
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"williamboman/mason.nvim",
|
||||||
|
opts = { ensure_installed = { "biome" } },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"stevearc/conform.nvim",
|
||||||
|
optional = true,
|
||||||
|
---@param opts ConformOpts
|
||||||
|
opts = function(_, opts)
|
||||||
|
opts.formatters_by_ft = opts.formatters_by_ft or {}
|
||||||
|
for _, ft in ipairs(supported) do
|
||||||
|
opts.formatters_by_ft[ft] = opts.formatters_by_ft[ft] or {}
|
||||||
|
table.insert(opts.formatters_by_ft[ft], "biome")
|
||||||
|
end
|
||||||
|
|
||||||
|
opts.formatters = opts.formatters or {}
|
||||||
|
opts.formatters.biome = {
|
||||||
|
require_cwd = true,
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
|
-- none-ls support
|
||||||
|
{
|
||||||
|
"nvimtools/none-ls.nvim",
|
||||||
|
optional = true,
|
||||||
|
opts = function(_, opts)
|
||||||
|
local nls = require("null-ls")
|
||||||
|
opts.sources = opts.sources or {}
|
||||||
|
table.insert(opts.sources, nls.builtins.formatting.biome)
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
@ -30,6 +30,10 @@ return {
|
||||||
opts = function()
|
opts = function()
|
||||||
---@type snacks.Config
|
---@type snacks.Config
|
||||||
return {
|
return {
|
||||||
|
notifier = { enabled = true },
|
||||||
|
quickfile = { enabled = true },
|
||||||
|
bigfile = { enabled = true },
|
||||||
|
words = { enabled = true },
|
||||||
toggle = { map = LazyVim.safe_keymap_set },
|
toggle = { map = LazyVim.safe_keymap_set },
|
||||||
statuscolumn = { enabled = false }, -- we set this in options.lua
|
statuscolumn = { enabled = false }, -- we set this in options.lua
|
||||||
terminal = {
|
terminal = {
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ function M.get()
|
||||||
{ "gD", vim.lsp.buf.declaration, desc = "Goto Declaration" },
|
{ "gD", vim.lsp.buf.declaration, desc = "Goto Declaration" },
|
||||||
{ "K", function() return vim.lsp.buf.hover() end, desc = "Hover" },
|
{ "K", function() return vim.lsp.buf.hover() end, desc = "Hover" },
|
||||||
{ "gK", function() return vim.lsp.buf.signature_help() end, desc = "Signature Help", has = "signatureHelp" },
|
{ "gK", function() return vim.lsp.buf.signature_help() end, desc = "Signature Help", has = "signatureHelp" },
|
||||||
{ "<c-k>", vim.lsp.buf.signature_help, mode = "i", desc = "Signature Help", has = "signatureHelp" },
|
{ "<c-k>", function() return vim.lsp.buf.signature_help() end, mode = "i", desc = "Signature Help", has = "signatureHelp" },
|
||||||
{ "<leader>ca", vim.lsp.buf.code_action, desc = "Code Action", mode = { "n", "v" }, has = "codeAction" },
|
{ "<leader>ca", vim.lsp.buf.code_action, desc = "Code Action", mode = { "n", "v" }, has = "codeAction" },
|
||||||
{ "<leader>cc", vim.lsp.codelens.run, desc = "Run Codelens", mode = { "n", "v" }, has = "codeLens" },
|
{ "<leader>cc", vim.lsp.codelens.run, desc = "Run Codelens", mode = { "n", "v" }, has = "codeLens" },
|
||||||
{ "<leader>cC", vim.lsp.codelens.refresh, desc = "Refresh & Display Codelens", mode = { "n" }, has = "codeLens" },
|
{ "<leader>cC", vim.lsp.codelens.refresh, desc = "Refresh & Display Codelens", mode = { "n" }, has = "codeLens" },
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,9 @@ LazyVim.plugin.save_core()
|
||||||
if vim.tbl_contains(compat, v) then
|
if vim.tbl_contains(compat, v) then
|
||||||
table.insert(extras, 1, "lazyvim.plugins.compat.nvim-" .. v)
|
table.insert(extras, 1, "lazyvim.plugins.compat.nvim-" .. v)
|
||||||
end
|
end
|
||||||
|
if vim.g.vscode then
|
||||||
|
table.insert(extras, 1, "lazyvim.plugins.extras.vscode")
|
||||||
|
end
|
||||||
|
|
||||||
table.sort(extras, function(a, b)
|
table.sort(extras, function(a, b)
|
||||||
local pa = prios[a] or 50
|
local pa = prios[a] or 50
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@ local M = {}
|
||||||
---@param status fun(): nil|"ok"|"error"|"pending"
|
---@param status fun(): nil|"ok"|"error"|"pending"
|
||||||
function M.status(icon, status)
|
function M.status(icon, status)
|
||||||
local colors = {
|
local colors = {
|
||||||
ok = LazyVim.ui.fg("Special"),
|
ok = "Special",
|
||||||
error = LazyVim.ui.fg("DiagnosticError"),
|
error = "DiagnosticError",
|
||||||
pending = LazyVim.ui.fg("DiagnosticWarn"),
|
pending = "DiagnosticWarn",
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
function()
|
function()
|
||||||
|
|
@ -17,7 +17,7 @@ function M.status(icon, status)
|
||||||
return status() ~= nil
|
return status() ~= nil
|
||||||
end,
|
end,
|
||||||
color = function()
|
color = function()
|
||||||
return colors[status()] or colors.ok
|
return LazyVim.ui.fg(colors[status()] or colors.ok)
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
@ -145,7 +145,9 @@ function M.root_dir(opts)
|
||||||
parent = true,
|
parent = true,
|
||||||
other = true,
|
other = true,
|
||||||
icon = " ",
|
icon = " ",
|
||||||
color = LazyVim.ui.fg("Special"),
|
color = function()
|
||||||
|
return LazyVim.ui.fg("Special")
|
||||||
|
end,
|
||||||
}, opts or {})
|
}, opts or {})
|
||||||
|
|
||||||
local function get()
|
local function get()
|
||||||
|
|
|
||||||
|
|
@ -18,13 +18,13 @@ function M.setup(shell)
|
||||||
|
|
||||||
-- Setting shell command flags
|
-- Setting shell command flags
|
||||||
vim.o.shellcmdflag =
|
vim.o.shellcmdflag =
|
||||||
"-NoLogo -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new();$PSDefaultParameterValues['Out-File:Encoding']='utf8';"
|
"-NoLogo -NonInteractive -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new();$PSDefaultParameterValues['Out-File:Encoding']='utf8';$PSStyle.OutputRendering='plaintext';Remove-Alias -Force -ErrorAction SilentlyContinue tee;"
|
||||||
|
|
||||||
-- Setting shell redirection
|
-- Setting shell redirection
|
||||||
vim.o.shellredir = '2>&1 | %%{ "$_" } | Out-File %s; exit $LastExitCode'
|
vim.o.shellredir = '2>&1 | %%{ "$_" } | Out-File %s; exit $LastExitCode'
|
||||||
|
|
||||||
-- Setting shell pipe
|
-- Setting shell pipe
|
||||||
vim.o.shellpipe = '2>&1 | %%{ "$_" } | Tee-Object %s; exit $LastExitCode'
|
vim.o.shellpipe = '2>&1 | %%{ "$_" } | tee %s; exit $LastExitCode'
|
||||||
|
|
||||||
-- Setting shell quote options
|
-- Setting shell quote options
|
||||||
vim.o.shellquote = ""
|
vim.o.shellquote = ""
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue