Skip to content

Commit 5f0f185

Browse files
committed
feat: readd trouble
1 parent d9dc62f commit 5f0f185

File tree

2 files changed

+74
-27
lines changed

2 files changed

+74
-27
lines changed

lua/plugins/telescope.lua

+37-27
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,43 @@ return {
3434
end,
3535
},
3636
},
37-
keys = {
38-
{ "<leader>/", t.telescope("live_grep"), desc = "Grep (root dir)" },
39-
{ "<leader>:", "<cmd>Telescope command_history<cr>", desc = "Command History" },
40-
{ "<leader><space>", t.telescope("find_files"), desc = "Find Files (root dir)" },
41-
-- find
42-
{ "<leader>ff", t.telescope("find_files"), desc = "Find Files (root dir)" },
43-
{ "<leader>fb", "<cmd>Telescope buffers sort_mru=true sort_lastused=true<cr>", desc = "Buffers" },
44-
{ "<leader>fg", "<cmd>Telescope git_files<cr>", desc = "Find Files (git-files)" },
45-
{ "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Recent" },
46-
-- git
47-
{ "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "commits" },
48-
-- search
49-
{ "<leader>sa", "<cmd>Telescope autocommands<cr>", desc = "Auto Commands" },
50-
{ "<leader>sC", "<cmd>Telescope commands<cr>", desc = "Commands" },
51-
{ "<leader>sD", "<cmd>Telescope diagnostics<cr>", desc = "Workspace diagnostics" },
52-
{ "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" },
53-
{ "<leader>sH", "<cmd>Telescope highlights<cr>", desc = "Search Highlight Groups" },
54-
{ "<leader>sk", "<cmd>Telescope keymaps<cr>", desc = "Key Maps" },
55-
{ "<leader>sM", "<cmd>Telescope man_pages<cr>", desc = "Man Pages" },
56-
{ "<leader>sm", "<cmd>Telescope marks<cr>", desc = "Jump to Mark" },
57-
{ "<leader>so", "<cmd>Telescope vim_options<cr>", desc = "Options" },
58-
{ "<leader>sw", t.telescope("grep_string", { word_match = "-w" }), desc = "Word (root dir)" },
59-
{ "<leader>sw", t.telescope("grep_string"), mode = "v", desc = "Selection (root dir)" },
60-
{ "<leader>uc", "<cmd>Telescope colorscheme enable_preview=true<cr>", desc = "Colorscheme with preview" },
61-
{ "<leader>xx", "<cmd>Telescope diagnostics<cr>", desc = "Workspace Diagnostics" },
62-
{ "<leader>xX", "<cmd>Telescope diagnostics bufnr=0<cr>", desc = "Document Diagnostics" },
63-
},
37+
keys = function()
38+
local keys = {
39+
{ "<leader>/", t.telescope("live_grep"), desc = "Grep (root dir)" },
40+
{ "<leader>:", "<cmd>Telescope command_history<cr>", desc = "Command History" },
41+
{ "<leader><space>", t.telescope("find_files"), desc = "Find Files (root dir)" },
42+
-- find
43+
{ "<leader>ff", t.telescope("find_files"), desc = "Find Files (root dir)" },
44+
{ "<leader>fb", "<cmd>Telescope buffers sort_mru=true sort_lastused=true<cr>", desc = "Buffers" },
45+
{ "<leader>fg", "<cmd>Telescope git_files<cr>", desc = "Find Files (git-files)" },
46+
{ "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Recent" },
47+
-- git
48+
{ "<leader>gc", "<cmd>Telescope git_commits<CR>", desc = "commits" },
49+
-- search
50+
{ "<leader>sa", "<cmd>Telescope autocommands<cr>", desc = "Auto Commands" },
51+
{ "<leader>sC", "<cmd>Telescope commands<cr>", desc = "Commands" },
52+
{ "<leader>sD", "<cmd>Telescope diagnostics<cr>", desc = "Workspace diagnostics" },
53+
{ "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help Pages" },
54+
{ "<leader>sH", "<cmd>Telescope highlights<cr>", desc = "Search Highlight Groups" },
55+
{ "<leader>sk", "<cmd>Telescope keymaps<cr>", desc = "Key Maps" },
56+
{ "<leader>sM", "<cmd>Telescope man_pages<cr>", desc = "Man Pages" },
57+
{ "<leader>sm", "<cmd>Telescope marks<cr>", desc = "Jump to Mark" },
58+
{ "<leader>so", "<cmd>Telescope vim_options<cr>", desc = "Options" },
59+
{ "<leader>sw", t.telescope("grep_string", { word_match = "-w" }), desc = "Word (root dir)" },
60+
{ "<leader>sw", t.telescope("grep_string"), mode = "v", desc = "Selection (root dir)" },
61+
{ "<leader>uc", "<cmd>Telescope colorscheme enable_preview=true<cr>", desc = "Colorscheme with preview" },
62+
}
63+
64+
local has_trouble = require("lazy.core.config").plugins["trouble.nvim"]
65+
if not has_trouble then
66+
vim.list_extend(keys, {
67+
{ "<leader>xx", "<cmd>Telescope diagnostics<cr>", desc = "Workspace Diagnostics" },
68+
{ "<leader>xX", "<cmd>Telescope diagnostics bufnr=0<cr>", desc = "Document Diagnostics" },
69+
})
70+
end
71+
72+
return keys
73+
end,
6474
opts = {
6575
pickers = {
6676
find_files = {

lua/plugins/trouble.lua

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
return {
2+
"folke/trouble.nvim",
3+
opts = {},
4+
cmd = "Trouble",
5+
keys = {
6+
{
7+
"<leader>xx",
8+
"<cmd>Trouble diagnostics toggle<cr>",
9+
desc = "Diagnostics (Trouble)",
10+
},
11+
{
12+
"<leader>xX",
13+
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
14+
desc = "Buffer Diagnostics (Trouble)",
15+
},
16+
{
17+
"<leader>cs",
18+
"<cmd>Trouble symbols toggle focus=false<cr>",
19+
desc = "Symbols (Trouble)",
20+
},
21+
{
22+
"<leader>cl",
23+
"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
24+
desc = "LSP Definitions / references / ... (Trouble)",
25+
},
26+
{
27+
"<leader>xL",
28+
"<cmd>Trouble loclist toggle<cr>",
29+
desc = "Location List (Trouble)",
30+
},
31+
{
32+
"<leader>xQ",
33+
"<cmd>Trouble qflist toggle<cr>",
34+
desc = "Quickfix List (Trouble)",
35+
},
36+
},
37+
}

0 commit comments

Comments
 (0)