Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite75c4b4

Browse files
committed
Merge branch 'main' of github.com:ManiProjs/lazyvim.github.io
2 parents8804bae +788beb6 commite75c4b4

File tree

18 files changed

+1026
-393
lines changed

18 files changed

+1026
-393
lines changed

‎docs/configuration/general.md‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,21 @@ map("n", "<leader>l", "<cmd>Lazy<cr>", { desc = "Lazy" })
293293
-- new file
294294
map("n","<leader>fn","<cmd>enew<cr>", {desc="New File"})
295295

296-
map("n","<leader>xl","<cmd>lopen<cr>", {desc="Location List"})
297-
map("n","<leader>xq","<cmd>copen<cr>", {desc="Quickfix List"})
296+
-- location list
297+
map("n","<leader>xl",function()
298+
localsuccess,err=pcall(vim.fn.getloclist(0, {winid=0 }).winid~=0andvim.cmd.lcloseorvim.cmd.lopen)
299+
ifnotsuccessanderrthen
300+
vim.notify(err,vim.log.levels.ERROR)
301+
end
302+
end, {desc="Location List"})
303+
304+
-- quickfix list
305+
map("n","<leader>xq",function()
306+
localsuccess,err=pcall(vim.fn.getqflist({winid=0 }).winid~=0andvim.cmd.ccloseorvim.cmd.copen)
307+
ifnotsuccessanderrthen
308+
vim.notify(err,vim.log.levels.ERROR)
309+
end
310+
end, {desc="Quickfix List"})
298311

299312
map("n","[q",vim.cmd.cprev, {desc="Previous Quickfix"})
300313
map("n","]q",vim.cmd.cnext, {desc="Next Quickfix"})
@@ -365,7 +378,7 @@ map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit All" })
365378

366379
-- highlights under cursor
367380
map("n","<leader>ui",vim.show_pos, {desc="Inspect Pos"})
368-
map("n","<leader>uI","<cmd>InspectTree<cr>", {desc="Inspect Tree"})
381+
map("n","<leader>uI",function()vim.treesitter.inspect_tree()vim.api.nvim_input("I")end, {desc="Inspect Tree"})
369382

370383
-- LazyVim Changelog
371384
map("n","<leader>L",function()LazyVim.news.changelog()end, {desc="LazyVim Changelog"})

‎docs/extras/ai/copilot-chat.md‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,25 @@ end
8282
{
8383
"<leader>aq",
8484
function()
85-
localinput=vim.fn.input("Quick Chat:")
86-
ifinput~=""then
87-
require("CopilotChat").ask(input)
88-
end
85+
vim.ui.input({
86+
prompt="Quick Chat:",
87+
},function(input)
88+
ifinput~=""then
89+
require("CopilotChat").ask(input)
90+
end
91+
end)
8992
end,
9093
desc="Quick Chat (CopilotChat)",
9194
mode= {"n","v"},
9295
},
93-
-- Show prompts actions with telescope
94-
{"<leader>ap",M.pick("prompt"),desc="Prompt Actions (CopilotChat)",mode= {"n","v"} },
96+
{
97+
"<leader>ap",
98+
function()
99+
require("CopilotChat").select_prompt()
100+
end,
101+
desc="Prompt Actions (CopilotChat)",
102+
mode= {"n","v"},
103+
},
95104
},
96105
config=function(_,opts)
97106
localchat=require("CopilotChat")

‎docs/extras/coding/blink.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ opts = {
7979
-- with blink.compat
8080
compat= {},
8181
default= {"lsp","path","snippets","buffer"},
82-
cmdline= {},
82+
},
83+
84+
cmdline= {
85+
enabled=false,
8386
},
8487

8588
keymap= {
@@ -162,7 +165,10 @@ opts = {
162165
-- with blink.compat
163166
compat= {},
164167
default= {"lsp","path","snippets","buffer"},
165-
cmdline= {},
168+
},
169+
170+
cmdline= {
171+
enabled=false,
166172
},
167173

168174
keymap= {
@@ -223,6 +229,7 @@ opts = {
223229
items=transform_itemsandtransform_items(ctx,items)oritems
224230
for_,iteminipairs(items)do
225231
item.kind=kind_idxoritem.kind
232+
item.kind_icon=LazyVim.config.icons.kinds[item.kind_name]oritem.kind_iconornil
226233
end
227234
returnitems
228235
end

‎docs/extras/coding/mini-snippets.md‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,21 +257,25 @@ opts = function(_, opts)
257257
end
258258

259259
-- Standalone --
260+
localblink=require("blink.cmp")
260261
expand_select_override=function(snippets,insert)
261262
-- Schedule, otherwise blink's virtual text is not removed on vim.ui.select
262-
require("blink.cmp").cancel()
263+
blink.cancel()
263264
vim.schedule(function()
264265
MiniSnippets.default_select(snippets,insert)
265266
end)
266267
end
267268
--
268269
-- Blink performs a require on blink.cmp.sources.snippets.default
269-
-- By removing the source,the default engine will not be used
270+
-- By removing the source,that default engine will not be used
270271
opts.sources.default=vim.tbl_filter(function(source)
271272
returnsource~="snippets"
272273
end,opts.sources.default)
273274
opts.snippets= {-- need to repeat blink's preset here
274-
expand=expand_from_lsp,
275+
expand=function(snippet)
276+
expand_from_lsp(snippet)
277+
blink.resubscribe()
278+
end,
275279
active=function()
276280
returnMiniSnippets.session.get(false)~=nil
277281
end,
@@ -299,21 +303,25 @@ end
299303
end
300304

301305
-- Standalone --
306+
localblink=require("blink.cmp")
302307
expand_select_override=function(snippets,insert)
303308
-- Schedule, otherwise blink's virtual text is not removed on vim.ui.select
304-
require("blink.cmp").cancel()
309+
blink.cancel()
305310
vim.schedule(function()
306311
MiniSnippets.default_select(snippets,insert)
307312
end)
308313
end
309314
--
310315
-- Blink performs a require on blink.cmp.sources.snippets.default
311-
-- By removing the source,the default engine will not be used
316+
-- By removing the source,that default engine will not be used
312317
opts.sources.default=vim.tbl_filter(function(source)
313318
returnsource~="snippets"
314319
end,opts.sources.default)
315320
opts.snippets= {-- need to repeat blink's preset here
316-
expand=expand_from_lsp,
321+
expand=function(snippet)
322+
expand_from_lsp(snippet)
323+
blink.resubscribe()
324+
end,
317325
active=function()
318326
returnMiniSnippets.session.get(false)~=nil
319327
end,

‎docs/extras/coding/mini-surround.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ opts = {
4545
```lua
4646
{
4747
"echasnovski/mini.surround",
48-
recommended=true,
4948
keys=function(_,keys)
5049
-- Populate the keys based on the user's options
5150
localopts=LazyVim.opts("mini.surround")

‎docs/extras/coding/neogen.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ opts = function(_, opts)
3131

3232
localmap= {
3333
["LuaSnip"]="luasnip",
34+
["mini.snippets"]="mini",
3435
["nvim-snippy"]="snippy",
3536
["vim-vsnip"]="vsnip",
3637
}
@@ -56,6 +57,7 @@ end
5657
```lua
5758
{
5859
"danymat/neogen",
60+
dependencies=LazyVim.has("mini.snippets")and {"mini.snippets"}or {},
5961
cmd="Neogen",
6062
keys= {
6163
{
@@ -73,6 +75,7 @@ end
7375

7476
localmap= {
7577
["LuaSnip"]="luasnip",
78+
["mini.snippets"]="mini",
7679
["nvim-snippy"]="snippy",
7780
["vim-vsnip"]="vsnip",
7881
}

‎docs/extras/editor/fzf.md‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -444,16 +444,13 @@ opts = nil
444444

445445
```lua
446446
opts=function()
447-
ifLazyVim.pick.want()~="fzf"then
448-
return
449-
end
450447
localKeys=require("lazyvim.plugins.lsp.keymaps").get()
451448
-- stylua: ignore
452449
vim.list_extend(Keys, {
453-
{"gd","<cmd>FzfLua lsp_definitionsjump_to_single_result=true ignore_current_line=true<cr>",desc="Goto Definition",has="definition"},
454-
{"gr","<cmd>FzfLua lsp_referencesjump_to_single_result=true ignore_current_line=true<cr>",desc="References",nowait=true },
455-
{"gI","<cmd>FzfLua lsp_implementationsjump_to_single_result=true ignore_current_line=true<cr>",desc="Goto Implementation"},
456-
{"gy","<cmd>FzfLua lsp_typedefsjump_to_single_result=true ignore_current_line=true<cr>",desc="Goto T[y]pe Definition"},
450+
{"gd","<cmd>FzfLua lsp_definitionsjump1=true ignore_current_line=true<cr>",desc="Goto Definition",has="definition"},
451+
{"gr","<cmd>FzfLua lsp_referencesjump1=true ignore_current_line=true<cr>",desc="References",nowait=true },
452+
{"gI","<cmd>FzfLua lsp_implementationsjump1=true ignore_current_line=true<cr>",desc="Goto Implementation"},
453+
{"gy","<cmd>FzfLua lsp_typedefsjump1=true ignore_current_line=true<cr>",desc="Goto T[y]pe Definition"},
457454
})
458455
end
459456
```
@@ -467,16 +464,13 @@ end
467464
{
468465
"neovim/nvim-lspconfig",
469466
opts=function()
470-
ifLazyVim.pick.want()~="fzf"then
471-
return
472-
end
473467
localKeys=require("lazyvim.plugins.lsp.keymaps").get()
474468
-- stylua: ignore
475469
vim.list_extend(Keys, {
476-
{"gd","<cmd>FzfLua lsp_definitionsjump_to_single_result=true ignore_current_line=true<cr>",desc="Goto Definition",has="definition"},
477-
{"gr","<cmd>FzfLua lsp_referencesjump_to_single_result=true ignore_current_line=true<cr>",desc="References",nowait=true },
478-
{"gI","<cmd>FzfLua lsp_implementationsjump_to_single_result=true ignore_current_line=true<cr>",desc="Goto Implementation"},
479-
{"gy","<cmd>FzfLua lsp_typedefsjump_to_single_result=true ignore_current_line=true<cr>",desc="Goto T[y]pe Definition"},
470+
{"gd","<cmd>FzfLua lsp_definitionsjump1=true ignore_current_line=true<cr>",desc="Goto Definition",has="definition"},
471+
{"gr","<cmd>FzfLua lsp_referencesjump1=true ignore_current_line=true<cr>",desc="References",nowait=true },
472+
{"gI","<cmd>FzfLua lsp_implementationsjump1=true ignore_current_line=true<cr>",desc="Goto Implementation"},
473+
{"gy","<cmd>FzfLua lsp_typedefsjump1=true ignore_current_line=true<cr>",desc="Goto T[y]pe Definition"},
480474
})
481475
end,
482476
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp