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
8efcad7991
27 changed files with 135 additions and 121 deletions
2
.github/.release-please-manifest.json
vendored
2
.github/.release-please-manifest.json
vendored
|
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
".": "15.12.2"
|
".": "15.14.0"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
3
.markdownlint-cli2.yaml
Normal file
3
.markdownlint-cli2.yaml
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
config:
|
||||||
|
MD013: false
|
||||||
|
MD033: false
|
||||||
38
CHANGELOG.md
38
CHANGELOG.md
|
|
@ -1,5 +1,43 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [15.14.0](https://github.com/LazyVim/LazyVim/compare/v15.13.0...v15.14.0) (2026-03-01)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **bufferline:** add <leader>bj keymap for BufferLinePick ([#6968](https://github.com/LazyVim/LazyVim/issues/6968)) ([a50072f](https://github.com/LazyVim/LazyVim/commit/a50072fa16cfc1f00b1ae282150bc667f1d1e096))
|
||||||
|
* **dap:** close dap-float window with `q`. ([#6884](https://github.com/LazyVim/LazyVim/issues/6884)) ([87c0027](https://github.com/LazyVim/LazyVim/commit/87c002789220d922bb94637c690b444bd1ba5611))
|
||||||
|
* **treesitter:** support query table in treesitter-textobjects mappings ([#6736](https://github.com/LazyVim/LazyVim/issues/6736)) ([42c9f71](https://github.com/LazyVim/LazyVim/commit/42c9f7152b9bd1a4f739b115390370c208dc2a55))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **editor.overseer:** migrate to v2 ([#6907](https://github.com/LazyVim/LazyVim/issues/6907)) ([27824d7](https://github.com/LazyVim/LazyVim/commit/27824d79a952c54cd9d93c85a699543e4a031dd4))
|
||||||
|
* **fzf:** correct git_diff description from 'hunks' to 'files' ([#6983](https://github.com/LazyVim/LazyVim/issues/6983)) ([e77d4ab](https://github.com/LazyVim/LazyVim/commit/e77d4ab0d6574efb7142ec40f4f5dcff750a3ee9))
|
||||||
|
* **lang.clang:** fix `clangd_extensions.nvim` ([#6804](https://github.com/LazyVim/LazyVim/issues/6804)) ([730b691](https://github.com/LazyVim/LazyVim/commit/730b69114d56834f4499fd3e5aecf18920234c39))
|
||||||
|
* **leap:** update urls to new leap.nvim repo. Fixes [#6958](https://github.com/LazyVim/LazyVim/issues/6958) ([244af66](https://github.com/LazyVim/LazyVim/commit/244af66f8b4e376d60c6604f9b3fd758165f5799))
|
||||||
|
* **news:** resolve news.txt from $VIMRUNTIME first ([60fea62](https://github.com/LazyVim/LazyVim/commit/60fea6236e342e1f4aa34d078461746d5f587c74)), closes [#7019](https://github.com/LazyVim/LazyVim/issues/7019)
|
||||||
|
* **python:** set venv-selector.nvim override_notify = false ([#6936](https://github.com/LazyVim/LazyVim/issues/6936)) ([b2917bd](https://github.com/LazyVim/LazyVim/commit/b2917bd3bfe61c40e686f5a2c20f540430945b73))
|
||||||
|
* **terminal:** add -NoProfile to powershell shellcmdflag ([#6757](https://github.com/LazyVim/LazyVim/issues/6757)) ([a507822](https://github.com/LazyVim/LazyVim/commit/a507822c0f67df661d1411f9274a65ca9cc832f5))
|
||||||
|
* **terminal:** partially revert previous mappings ([#6770](https://github.com/LazyVim/LazyVim/issues/6770)) ([c64a617](https://github.com/LazyVim/LazyVim/commit/c64a61734fc9d45470a72603395c02137802bc6f))
|
||||||
|
* **treesitter:** fix `]c` textobject mappings when in diff mode ([#6911](https://github.com/LazyVim/LazyVim/issues/6911)) ([16713e6](https://github.com/LazyVim/LazyVim/commit/16713e6e1200eb90ad4b4a394bb7254fb5612484))
|
||||||
|
* **treesitter:** remove deleted jsonc parser ([#6848](https://github.com/LazyVim/LazyVim/issues/6848)) ([92607e7](https://github.com/LazyVim/LazyVim/commit/92607e79e09a2761d930877a09edc00438b97fc3))
|
||||||
|
* **util.lsp:** `LazyVim.lsp.execute` only request single client ([#6904](https://github.com/LazyVim/LazyVim/issues/6904)) ([a4e19e9](https://github.com/LazyVim/LazyVim/commit/a4e19e9c9c939c1a3fc2f30ffefe37311d3ecadf))
|
||||||
|
* **util.lsp:** pass `formatters_by_ft` to `opts` ([#6894](https://github.com/LazyVim/LazyVim/issues/6894)) ([03f1293](https://github.com/LazyVim/LazyVim/commit/03f1293e33541073288f23abdaf581a8e0dec4c4))
|
||||||
|
* **vtsls:** remove redundant deno logic, upstreamed in `nvim-lspconfig` ([#7011](https://github.com/LazyVim/LazyVim/issues/7011)) ([8652c95](https://github.com/LazyVim/LazyVim/commit/8652c9570377678a78ecb19dbd33695e0e4ec4fc))
|
||||||
|
|
||||||
|
## [15.13.0](https://github.com/LazyVim/LazyVim/compare/v15.12.2...v15.13.0) (2025-11-01)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **snacks:** `snacks.gh` integration. Enabled by default, unless the `util.octo` extra is enabled. ([5e981f9](https://github.com/LazyVim/LazyVim/commit/5e981f9a8cd75eb6f49756e188411037b82b8045))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **treesitter:** remove node requirement ([6b52a30](https://github.com/LazyVim/LazyVim/commit/6b52a3059e52eed062b6ff3f56e70cffcbf879fe))
|
||||||
|
|
||||||
## [15.12.2](https://github.com/LazyVim/LazyVim/compare/v15.12.1...v15.12.2) (2025-10-26)
|
## [15.12.2](https://github.com/LazyVim/LazyVim/compare/v15.12.1...v15.12.2) (2025-10-26)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,7 @@ vim.api.nvim_create_autocmd("FileType", {
|
||||||
pattern = {
|
pattern = {
|
||||||
"PlenaryTestPopup",
|
"PlenaryTestPopup",
|
||||||
"checkhealth",
|
"checkhealth",
|
||||||
|
"dap-float",
|
||||||
"dbout",
|
"dbout",
|
||||||
"gitsigns-blame",
|
"gitsigns-blame",
|
||||||
"grug-far",
|
"grug-far",
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
|
||||||
---@class LazyVimConfig: LazyVimOptions
|
---@class LazyVimConfig: LazyVimOptions
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
M.version = "15.12.2" -- x-release-please-version
|
M.version = "15.14.0" -- x-release-please-version
|
||||||
LazyVim.config = M
|
LazyVim.config = M
|
||||||
|
|
||||||
---@class LazyVimOptions
|
---@class LazyVimOptions
|
||||||
|
|
@ -34,7 +34,9 @@ local defaults = {
|
||||||
dots = "",
|
dots = "",
|
||||||
},
|
},
|
||||||
ft = {
|
ft = {
|
||||||
octo = "",
|
octo = " ",
|
||||||
|
gh = " ",
|
||||||
|
["markdown.gh"] = " ",
|
||||||
},
|
},
|
||||||
dap = {
|
dap = {
|
||||||
Stopped = { " ", "DiagnosticWarn", "DapStoppedLine" },
|
Stopped = { " ", "DiagnosticWarn", "DapStoppedLine" },
|
||||||
|
|
|
||||||
|
|
@ -53,20 +53,6 @@ return {
|
||||||
cyclic = true,
|
cyclic = true,
|
||||||
})
|
})
|
||||||
|
|
||||||
local weekdays = augend.constant.new({
|
|
||||||
elements = {
|
|
||||||
"Monday",
|
|
||||||
"Tuesday",
|
|
||||||
"Wednesday",
|
|
||||||
"Thursday",
|
|
||||||
"Friday",
|
|
||||||
"Saturday",
|
|
||||||
"Sunday",
|
|
||||||
},
|
|
||||||
word = true,
|
|
||||||
cyclic = true,
|
|
||||||
})
|
|
||||||
|
|
||||||
local months = augend.constant.new({
|
local months = augend.constant.new({
|
||||||
elements = {
|
elements = {
|
||||||
"January",
|
"January",
|
||||||
|
|
@ -86,15 +72,6 @@ return {
|
||||||
cyclic = true,
|
cyclic = true,
|
||||||
})
|
})
|
||||||
|
|
||||||
local capitalized_boolean = augend.constant.new({
|
|
||||||
elements = {
|
|
||||||
"True",
|
|
||||||
"False",
|
|
||||||
},
|
|
||||||
word = true,
|
|
||||||
cyclic = true,
|
|
||||||
})
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
dials_by_ft = {
|
dials_by_ft = {
|
||||||
css = "css",
|
css = "css",
|
||||||
|
|
@ -116,11 +93,12 @@ return {
|
||||||
augend.integer.alias.decimal_int, -- nonnegative and negative decimal number
|
augend.integer.alias.decimal_int, -- nonnegative and negative decimal number
|
||||||
augend.integer.alias.hex, -- nonnegative hex number (0x01, 0x1a1f, etc.)
|
augend.integer.alias.hex, -- nonnegative hex number (0x01, 0x1a1f, etc.)
|
||||||
augend.date.alias["%Y/%m/%d"], -- date (2022/02/19, etc.)
|
augend.date.alias["%Y/%m/%d"], -- date (2022/02/19, etc.)
|
||||||
|
augend.constant.alias.en_weekday, -- Mon, Tue, ..., Sat, Sun
|
||||||
|
augend.constant.alias.en_weekday_full, -- Monday, Tuesday, ..., Saturday, Sunday
|
||||||
ordinal_numbers,
|
ordinal_numbers,
|
||||||
weekdays,
|
|
||||||
months,
|
months,
|
||||||
capitalized_boolean,
|
|
||||||
augend.constant.alias.bool, -- boolean value (true <-> false)
|
augend.constant.alias.bool, -- boolean value (true <-> false)
|
||||||
|
augend.constant.alias.Bool, -- boolean value (True <-> False)
|
||||||
logical_alias,
|
logical_alias,
|
||||||
},
|
},
|
||||||
vue = {
|
vue = {
|
||||||
|
|
|
||||||
|
|
@ -227,7 +227,7 @@ return {
|
||||||
{ "<leader>fR", LazyVim.pick("oldfiles", { cwd = vim.uv.cwd() }), desc = "Recent (cwd)" },
|
{ "<leader>fR", LazyVim.pick("oldfiles", { cwd = vim.uv.cwd() }), desc = "Recent (cwd)" },
|
||||||
-- git
|
-- git
|
||||||
{ "<leader>gc", "<cmd>FzfLua git_commits<CR>", desc = "Commits" },
|
{ "<leader>gc", "<cmd>FzfLua git_commits<CR>", desc = "Commits" },
|
||||||
{ "<leader>gd", "<cmd>FzfLua git_diff<cr>", desc = "Git Diff (hunks)" },
|
{ "<leader>gd", "<cmd>FzfLua git_diff<cr>", desc = "Git Diff (files)" },
|
||||||
{ "<leader>gl", "<cmd>FzfLua git_commits<CR>", desc = "Commits" },
|
{ "<leader>gl", "<cmd>FzfLua git_commits<CR>", desc = "Commits" },
|
||||||
{ "<leader>gs", "<cmd>FzfLua git_status<CR>", desc = "Status" },
|
{ "<leader>gs", "<cmd>FzfLua git_status<CR>", desc = "Status" },
|
||||||
{ "<leader>gS", "<cmd>FzfLua git_stash<cr>", desc = "Git Stash" },
|
{ "<leader>gS", "<cmd>FzfLua git_stash<cr>", desc = "Git Stash" },
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ return {
|
||||||
|
|
||||||
-- easily jump to any location and enhanced f/t motions for Leap
|
-- easily jump to any location and enhanced f/t motions for Leap
|
||||||
{
|
{
|
||||||
"ggandor/flit.nvim",
|
url = "https://codeberg.org/andyg/leap.nvim.git",
|
||||||
enabled = true,
|
enabled = true,
|
||||||
keys = function()
|
keys = function()
|
||||||
---@type LazyKeysSpec[]
|
---@type LazyKeysSpec[]
|
||||||
|
|
@ -17,7 +17,7 @@ return {
|
||||||
opts = { labeled_modes = "nx" },
|
opts = { labeled_modes = "nx" },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ggandor/leap.nvim",
|
url = "https://codeberg.org/andyg/leap.nvim.git",
|
||||||
enabled = true,
|
enabled = true,
|
||||||
keys = {
|
keys = {
|
||||||
{ "s", mode = { "n", "x", "o" }, desc = "Leap Forward to" },
|
{ "s", mode = { "n", "x", "o" }, desc = "Leap Forward to" },
|
||||||
|
|
|
||||||
|
|
@ -8,29 +8,20 @@ return {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"stevearc/overseer.nvim",
|
"stevearc/overseer.nvim",
|
||||||
|
lazy = false, -- plugin is self-lazy-loading
|
||||||
cmd = {
|
cmd = {
|
||||||
"OverseerOpen",
|
"OverseerOpen",
|
||||||
"OverseerClose",
|
"OverseerClose",
|
||||||
"OverseerToggle",
|
"OverseerToggle",
|
||||||
"OverseerSaveBundle",
|
|
||||||
"OverseerLoadBundle",
|
|
||||||
"OverseerDeleteBundle",
|
|
||||||
"OverseerRunCmd",
|
|
||||||
"OverseerRun",
|
"OverseerRun",
|
||||||
"OverseerInfo",
|
|
||||||
"OverseerBuild",
|
|
||||||
"OverseerQuickAction",
|
|
||||||
"OverseerTaskAction",
|
"OverseerTaskAction",
|
||||||
"OverseerClearCache",
|
|
||||||
},
|
},
|
||||||
opts = {
|
opts = {
|
||||||
dap = false,
|
dap = false,
|
||||||
task_list = {
|
task_list = {
|
||||||
bindings = {
|
keymaps = {
|
||||||
["<C-h>"] = false,
|
|
||||||
["<C-j>"] = false,
|
["<C-j>"] = false,
|
||||||
["<C-k>"] = false,
|
["<C-k>"] = false,
|
||||||
["<C-l>"] = false,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
form = {
|
form = {
|
||||||
|
|
@ -38,11 +29,6 @@ return {
|
||||||
winblend = 0,
|
winblend = 0,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
confirm = {
|
|
||||||
win_opts = {
|
|
||||||
winblend = 0,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
task_win = {
|
task_win = {
|
||||||
win_opts = {
|
win_opts = {
|
||||||
winblend = 0,
|
winblend = 0,
|
||||||
|
|
@ -51,13 +37,9 @@ return {
|
||||||
},
|
},
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>ow", "<cmd>OverseerToggle<cr>", desc = "Task list" },
|
{ "<leader>ow", "<cmd>OverseerToggle!<cr>", desc = "Task list" },
|
||||||
{ "<leader>oo", "<cmd>OverseerRun<cr>", desc = "Run task" },
|
{ "<leader>oo", "<cmd>OverseerRun<cr>", desc = "Run task" },
|
||||||
{ "<leader>oq", "<cmd>OverseerQuickAction<cr>", desc = "Action recent task" },
|
{ "<leader>ot", "<cmd>OverseerTaskAction<cr>", desc = "Task action" },
|
||||||
{ "<leader>oi", "<cmd>OverseerInfo<cr>", desc = "Overseer Info" },
|
|
||||||
{ "<leader>ob", "<cmd>OverseerBuild<cr>", desc = "Task builder" },
|
|
||||||
{ "<leader>ot", "<cmd>OverseerTaskAction<cr>", desc = "Task action" },
|
|
||||||
{ "<leader>oc", "<cmd>OverseerClearCache<cr>", desc = "Clear cache" },
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -73,9 +73,13 @@ return {
|
||||||
{ "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
|
{ "<leader>fp", function() Snacks.picker.projects() end, desc = "Projects" },
|
||||||
-- git
|
-- git
|
||||||
{ "<leader>gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (hunks)" },
|
{ "<leader>gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (hunks)" },
|
||||||
{ "<leader>gD", function() Snacks.picker.git_diff({ base = "origin" }) end, desc = "Git Diff (origin)" },
|
{ "<leader>gD", function() Snacks.picker.git_diff({ base = "origin", group = true }) end, desc = "Git Diff (origin)" },
|
||||||
{ "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },
|
{ "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },
|
||||||
{ "<leader>gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" },
|
{ "<leader>gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" },
|
||||||
|
{ "<leader>gi", function() Snacks.picker.gh_issue() end, desc = "GitHub Issues (open)" },
|
||||||
|
{ "<leader>gI", function() Snacks.picker.gh_issue({ state = "all" }) end, desc = "GitHub Issues (all)" },
|
||||||
|
{ "<leader>gp", function() Snacks.picker.gh_pr() end, desc = "GitHub Pull Requests (open)" },
|
||||||
|
{ "<leader>gP", function() Snacks.picker.gh_pr({ state = "all" }) end, desc = "GitHub Pull Requests (all)" },
|
||||||
-- Grep
|
-- Grep
|
||||||
{ "<leader>sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" },
|
{ "<leader>sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" },
|
||||||
{ "<leader>sB", function() Snacks.picker.grep_buffers() end, desc = "Grep Open Buffers" },
|
{ "<leader>sB", function() Snacks.picker.grep_buffers() end, desc = "Grep Open Buffers" },
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,7 @@ return {
|
||||||
|
|
||||||
{
|
{
|
||||||
"p00f/clangd_extensions.nvim",
|
"p00f/clangd_extensions.nvim",
|
||||||
lazy = true,
|
ft = { "c", "cpp", "objc", "objcpp" },
|
||||||
config = function() end,
|
|
||||||
opts = {
|
opts = {
|
||||||
inlay_hints = {
|
inlay_hints = {
|
||||||
inline = false,
|
inline = false,
|
||||||
|
|
@ -94,13 +93,6 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
setup = {
|
|
||||||
clangd = function(_, opts)
|
|
||||||
local clangd_ext_opts = LazyVim.opts("clangd_extensions.nvim")
|
|
||||||
require("clangd_extensions").setup(vim.tbl_deep_extend("force", clangd_ext_opts or {}, { server = opts }))
|
|
||||||
return false
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,8 @@ return {
|
||||||
function()
|
function()
|
||||||
local params = vim.lsp.util.make_position_params()
|
local params = vim.lsp.util.make_position_params()
|
||||||
LazyVim.lsp.execute({
|
LazyVim.lsp.execute({
|
||||||
|
title = "toPipe",
|
||||||
|
filter = "elixirls",
|
||||||
command = "manipulatePipes:serverid",
|
command = "manipulatePipes:serverid",
|
||||||
arguments = { "toPipe", params.textDocument.uri, params.position.line, params.position.character },
|
arguments = { "toPipe", params.textDocument.uri, params.position.line, params.position.character },
|
||||||
})
|
})
|
||||||
|
|
@ -27,6 +29,8 @@ return {
|
||||||
function()
|
function()
|
||||||
local params = vim.lsp.util.make_position_params()
|
local params = vim.lsp.util.make_position_params()
|
||||||
LazyVim.lsp.execute({
|
LazyVim.lsp.execute({
|
||||||
|
title = "fromPipe",
|
||||||
|
filter = "elixirls",
|
||||||
command = "manipulatePipes:serverid",
|
command = "manipulatePipes:serverid",
|
||||||
arguments = { "fromPipe", params.textDocument.uri, params.position.line, params.position.character },
|
arguments = { "fromPipe", params.textDocument.uri, params.position.line, params.position.character },
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -114,6 +114,7 @@ return {
|
||||||
opts = {
|
opts = {
|
||||||
options = {
|
options = {
|
||||||
notify_user_on_venv_activation = true,
|
notify_user_on_venv_activation = true,
|
||||||
|
override_notify = false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
-- Call config for Python files and load the cached venv automatically
|
-- Call config for Python files and load the cached venv automatically
|
||||||
|
|
|
||||||
|
|
@ -130,7 +130,11 @@ return {
|
||||||
{
|
{
|
||||||
"<leader>cV",
|
"<leader>cV",
|
||||||
function()
|
function()
|
||||||
LazyVim.lsp.execute({ command = "typescript.selectTypeScriptVersion" })
|
LazyVim.lsp.execute({
|
||||||
|
title = "Select TypeScript Version",
|
||||||
|
filter = "vtsls",
|
||||||
|
command = "typescript.selectTypeScriptVersion",
|
||||||
|
})
|
||||||
end,
|
end,
|
||||||
desc = "Select TS workspace version",
|
desc = "Select TS workspace version",
|
||||||
},
|
},
|
||||||
|
|
@ -149,28 +153,6 @@ return {
|
||||||
return true
|
return true
|
||||||
end,
|
end,
|
||||||
vtsls = function(_, opts)
|
vtsls = function(_, opts)
|
||||||
if vim.lsp.config.denols and vim.lsp.config.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
|
|
||||||
|
|
||||||
Snacks.util.lsp.on({ name = "vtsls" }, function(buffer, client)
|
Snacks.util.lsp.on({ name = "vtsls" }, function(buffer, client)
|
||||||
client.commands["_typescript.moveToFileRefactoring"] = function(command, ctx)
|
client.commands["_typescript.moveToFileRefactoring"] = function(command, ctx)
|
||||||
---@type string, string, lsp.Range
|
---@type string, string, lsp.Range
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,8 @@ return {
|
||||||
local buf_name = vim.api.nvim_buf_get_name(0)
|
local buf_name = vim.api.nvim_buf_get_name(0)
|
||||||
local file_name = vim.fn.fnamemodify(buf_name, ":t")
|
local file_name = vim.fn.fnamemodify(buf_name, ":t")
|
||||||
LazyVim.lsp.execute({
|
LazyVim.lsp.execute({
|
||||||
|
title = "Pin Main",
|
||||||
|
filter = "tinymist",
|
||||||
command = "tinymist.pinMain",
|
command = "tinymist.pinMain",
|
||||||
arguments = { buf_name },
|
arguments = { buf_name },
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
-- disable snacks scroll when mini-indentscope is enabled
|
-- disable snacks scope when mini-indentscope is enabled
|
||||||
{
|
{
|
||||||
"snacks.nvim",
|
"snacks.nvim",
|
||||||
opts = {
|
opts = {
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,16 @@ return {
|
||||||
-- depends on the git extra for highlighting and auto-completion of github issues/prs
|
-- depends on the git extra for highlighting and auto-completion of github issues/prs
|
||||||
{ import = "lazyvim.plugins.extras.lang.git" },
|
{ import = "lazyvim.plugins.extras.lang.git" },
|
||||||
|
|
||||||
|
{
|
||||||
|
"folke/snacks.nvim",
|
||||||
|
keys = { -- disable conflicting keymaps
|
||||||
|
{ "<leader>gi", false },
|
||||||
|
{ "<leader>gI", false },
|
||||||
|
{ "<leader>gp", false },
|
||||||
|
{ "<leader>gP", false },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
-- Octo
|
-- Octo
|
||||||
{
|
{
|
||||||
"pwntester/octo.nvim",
|
"pwntester/octo.nvim",
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ return {
|
||||||
-- lspconfig
|
-- lspconfig
|
||||||
{
|
{
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
event = "LazyFile",
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"mason.nvim",
|
"mason.nvim",
|
||||||
{ "mason-org/mason-lspconfig.nvim", config = function() end },
|
{ "mason-org/mason-lspconfig.nvim", config = function() end },
|
||||||
|
|
@ -150,7 +150,7 @@ return {
|
||||||
return ret
|
return ret
|
||||||
end,
|
end,
|
||||||
---@param opts PluginLspOpts
|
---@param opts PluginLspOpts
|
||||||
config = vim.schedule_wrap(function(_, opts)
|
config = function(_, opts)
|
||||||
-- setup autoformat
|
-- setup autoformat
|
||||||
LazyVim.format.register(LazyVim.lsp.formatter())
|
LazyVim.format.register(LazyVim.lsp.formatter())
|
||||||
|
|
||||||
|
|
@ -259,7 +259,7 @@ return {
|
||||||
automatic_enable = { exclude = mason_exclude },
|
automatic_enable = { exclude = mason_exclude },
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end),
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
-- cmdline tools and lsp servers
|
-- cmdline tools and lsp servers
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,6 @@ return {
|
||||||
"javascript",
|
"javascript",
|
||||||
"jsdoc",
|
"jsdoc",
|
||||||
"json",
|
"json",
|
||||||
"jsonc",
|
|
||||||
"lua",
|
"lua",
|
||||||
"luadoc",
|
"luadoc",
|
||||||
"luap",
|
"luap",
|
||||||
|
|
@ -171,19 +170,26 @@ return {
|
||||||
|
|
||||||
for method, keymaps in pairs(moves) do
|
for method, keymaps in pairs(moves) do
|
||||||
for key, query in pairs(keymaps) do
|
for key, query in pairs(keymaps) do
|
||||||
local desc = query:gsub("@", ""):gsub("%..*", "")
|
local queries = type(query) == "table" and query or { query }
|
||||||
desc = desc:sub(1, 1):upper() .. desc:sub(2)
|
local parts = {}
|
||||||
|
for _, q in ipairs(queries) do
|
||||||
|
local part = q:gsub("@", ""):gsub("%..*", "")
|
||||||
|
part = part:sub(1, 1):upper() .. part:sub(2)
|
||||||
|
table.insert(parts, part)
|
||||||
|
end
|
||||||
|
local desc = table.concat(parts, " or ")
|
||||||
desc = (key:sub(1, 1) == "[" and "Prev " or "Next ") .. desc
|
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")
|
desc = desc .. (key:sub(2, 2) == key:sub(2, 2):upper() and " End" or " Start")
|
||||||
if not (vim.wo.diff and key:find("[cC]")) then
|
vim.keymap.set({ "n", "x", "o" }, key, function()
|
||||||
vim.keymap.set({ "n", "x", "o" }, key, function()
|
if vim.wo.diff and key:find("[cC]") then
|
||||||
require("nvim-treesitter-textobjects.move")[method](query, "textobjects")
|
return vim.cmd("normal! " .. key)
|
||||||
end, {
|
end
|
||||||
buffer = buf,
|
require("nvim-treesitter-textobjects.move")[method](query, "textobjects")
|
||||||
desc = desc,
|
end, {
|
||||||
silent = true,
|
buffer = buf,
|
||||||
})
|
desc = desc,
|
||||||
end
|
silent = true,
|
||||||
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ return {
|
||||||
{ "]b", "<cmd>BufferLineCycleNext<cr>", desc = "Next Buffer" },
|
{ "]b", "<cmd>BufferLineCycleNext<cr>", desc = "Next Buffer" },
|
||||||
{ "[B", "<cmd>BufferLineMovePrev<cr>", desc = "Move buffer prev" },
|
{ "[B", "<cmd>BufferLineMovePrev<cr>", desc = "Move buffer prev" },
|
||||||
{ "]B", "<cmd>BufferLineMoveNext<cr>", desc = "Move buffer next" },
|
{ "]B", "<cmd>BufferLineMoveNext<cr>", desc = "Move buffer next" },
|
||||||
|
{ "<leader>bj", "<cmd>BufferLinePick<cr>", desc = "Pick Buffer" },
|
||||||
},
|
},
|
||||||
opts = {
|
opts = {
|
||||||
options = {
|
options = {
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,6 @@ return {
|
||||||
nav_j = { "<C-j>", term_nav("j"), desc = "Go to Lower Window", expr = true, mode = "t" },
|
nav_j = { "<C-j>", term_nav("j"), desc = "Go to Lower Window", expr = true, mode = "t" },
|
||||||
nav_k = { "<C-k>", term_nav("k"), desc = "Go to Upper Window", expr = true, mode = "t" },
|
nav_k = { "<C-k>", term_nav("k"), desc = "Go to Upper Window", expr = true, mode = "t" },
|
||||||
nav_l = { "<C-l>", term_nav("l"), desc = "Go to Right Window", expr = true, mode = "t" },
|
nav_l = { "<C-l>", term_nav("l"), desc = "Go to Right Window", expr = true, mode = "t" },
|
||||||
hide_slash = { "<C-/>", "hide", desc = "Hide Terminal", mode = { "t", "n" } },
|
|
||||||
hide_underscore = { "<c-_>", "hide", desc = "which_key_ignore", mode = { "t", "n" } },
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -35,18 +35,14 @@ end
|
||||||
|
|
||||||
---@param opts? lsp.Client.format
|
---@param opts? lsp.Client.format
|
||||||
function M.format(opts)
|
function M.format(opts)
|
||||||
opts = vim.tbl_deep_extend(
|
opts = vim.tbl_deep_extend("force", {}, opts or {}, LazyVim.opts("nvim-lspconfig").format or {})
|
||||||
"force",
|
|
||||||
{},
|
|
||||||
opts or {},
|
|
||||||
LazyVim.opts("nvim-lspconfig").format or {},
|
|
||||||
LazyVim.opts("conform.nvim").format or {}
|
|
||||||
)
|
|
||||||
local ok, conform = pcall(require, "conform")
|
local ok, conform = pcall(require, "conform")
|
||||||
-- use conform for formatting with LSP when available,
|
-- use conform for formatting with LSP when available,
|
||||||
-- since it has better format diffing
|
-- since it has better format diffing
|
||||||
if ok then
|
if ok then
|
||||||
opts.formatters = {}
|
-- It should be `nil`, otherwise it doesn't fetch options from `formatters_by_ft`,
|
||||||
|
-- see https://github.com/stevearc/conform.nvim/blob/5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25/lua/conform/init.lua#L417-L418
|
||||||
|
opts.formatters = nil
|
||||||
conform.format(opts)
|
conform.format(opts)
|
||||||
else
|
else
|
||||||
vim.lsp.buf.format(opts)
|
vim.lsp.buf.format(opts)
|
||||||
|
|
@ -70,9 +66,18 @@ M.action = setmetatable({}, {
|
||||||
---@class LspCommand: lsp.ExecuteCommandParams
|
---@class LspCommand: lsp.ExecuteCommandParams
|
||||||
---@field open? boolean
|
---@field open? boolean
|
||||||
---@field handler? lsp.Handler
|
---@field handler? lsp.Handler
|
||||||
|
---@field filter? string|vim.lsp.get_clients.Filter
|
||||||
|
---@field title? string
|
||||||
|
|
||||||
---@param opts LspCommand
|
---@param opts LspCommand
|
||||||
function M.execute(opts)
|
function M.execute(opts)
|
||||||
|
local filter = opts.filter or {}
|
||||||
|
filter = type(filter) == "string" and { name = filter } or filter
|
||||||
|
local buf = vim.api.nvim_get_current_buf()
|
||||||
|
|
||||||
|
---@cast filter vim.lsp.get_clients.Filter
|
||||||
|
local client = vim.lsp.get_clients(LazyVim.merge({}, filter, { bufnr = buf }))[1]
|
||||||
|
|
||||||
local params = {
|
local params = {
|
||||||
command = opts.command,
|
command = opts.command,
|
||||||
arguments = opts.arguments,
|
arguments = opts.arguments,
|
||||||
|
|
@ -83,7 +88,8 @@ function M.execute(opts)
|
||||||
params = params,
|
params = params,
|
||||||
})
|
})
|
||||||
else
|
else
|
||||||
return vim.lsp.buf_request(0, "workspace/executeCommand", params, opts.handler)
|
vim.list_extend(params, { title = opts.title })
|
||||||
|
return client:exec_cmd(params, { bufnr = buf }, opts.handler)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,9 @@ function M.open(file, opts)
|
||||||
end
|
end
|
||||||
file = plugin.dir .. "/" .. file
|
file = plugin.dir .. "/" .. file
|
||||||
elseif opts.rtp then
|
elseif opts.rtp then
|
||||||
file = vim.api.nvim_get_runtime_file(file, false)[1]
|
-- first check if file exists in VIMRUNTIME, then check the full runtimepath
|
||||||
|
local path = vim.env.VIMRUNTIME .. "/" .. file --[[@as string]]
|
||||||
|
file = vim.uv.fs_stat(path) and path or vim.api.nvim_get_runtime_file(file, false)[1]
|
||||||
end
|
end
|
||||||
|
|
||||||
if not file then
|
if not file then
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ M.renames = {
|
||||||
["markdown.nvim"] = "render-markdown.nvim",
|
["markdown.nvim"] = "render-markdown.nvim",
|
||||||
["williamboman/mason.nvim"] = "mason-org/mason.nvim",
|
["williamboman/mason.nvim"] = "mason-org/mason.nvim",
|
||||||
["williamboman/mason-lspconfig.nvim"] = "mason-org/mason-lspconfig.nvim",
|
["williamboman/mason-lspconfig.nvim"] = "mason-org/mason-lspconfig.nvim",
|
||||||
|
["ggandor/leap.nvim"] = "https://codeberg.org/andyg/leap.nvim.git",
|
||||||
}
|
}
|
||||||
|
|
||||||
function M.save_core()
|
function M.save_core()
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ function M.setup(shell)
|
||||||
|
|
||||||
-- Setting shell command flags
|
-- Setting shell command flags
|
||||||
vim.o.shellcmdflag =
|
vim.o.shellcmdflag =
|
||||||
"-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;"
|
"-NoProfile -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'
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,6 @@ function M.check()
|
||||||
["C compiler"] = have_cc,
|
["C compiler"] = have_cc,
|
||||||
tar = have("tar"),
|
tar = have("tar"),
|
||||||
curl = have("curl"),
|
curl = have("curl"),
|
||||||
node = have("node"),
|
|
||||||
}
|
}
|
||||||
local ok = true
|
local ok = true
|
||||||
for _, v in pairs(ret) do
|
for _, v in pairs(ret) do
|
||||||
|
|
|
||||||
|
|
@ -77,10 +77,12 @@ describe("Extra", function()
|
||||||
it("it has no renamed plugins", function()
|
it("it has no renamed plugins", function()
|
||||||
for _, p in pairs(spec.plugins) do
|
for _, p in pairs(spec.plugins) do
|
||||||
local short_url = p[1]
|
local short_url = p[1]
|
||||||
assert(
|
if short_url then
|
||||||
not LazyVim.plugin.renames[short_url],
|
assert(
|
||||||
"Plugin " .. short_url .. " has been renamed to " .. (LazyVim.plugin.renames[short_url] or "")
|
not LazyVim.plugin.renames[short_url],
|
||||||
)
|
"Plugin " .. short_url .. " has been renamed to " .. (LazyVim.plugin.renames[short_url] or "")
|
||||||
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue