From 738513042549ff27b877671469e351a75d4584be Mon Sep 17 00:00:00 2001 From: Micah Halter Date: Thu, 30 May 2024 13:34:35 -0400 Subject: [PATCH] fix(trouble-nvim)!: update to `trouble.nvim` v3 (#1014) --- .../diagnostics/trouble-nvim/init.lua | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/lua/astrocommunity/diagnostics/trouble-nvim/init.lua b/lua/astrocommunity/diagnostics/trouble-nvim/init.lua index 07adbfeb8..686b6c060 100644 --- a/lua/astrocommunity/diagnostics/trouble-nvim/init.lua +++ b/lua/astrocommunity/diagnostics/trouble-nvim/init.lua @@ -1,7 +1,7 @@ return { { "folke/trouble.nvim", - cmd = { "TroubleToggle", "Trouble" }, + cmd = "Trouble", dependencies = { { "AstroNvim/astroui", opts = { icons = { Trouble = "󱍼" } } }, { @@ -10,18 +10,17 @@ return { local maps = opts.mappings local prefix = "x" maps.n[prefix] = { desc = require("astroui").get_icon("Trouble", 1, true) .. "Trouble" } - maps.n[prefix .. "X"] = - { "TroubleToggle workspace_diagnostics", desc = "Workspace Diagnostics (Trouble)" } + maps.n[prefix .. "X"] = { "Trouble diagnostics toggle", desc = "Workspace Diagnostics (Trouble)" } maps.n[prefix .. "x"] = - { "TroubleToggle document_diagnostics", desc = "Document Diagnostics (Trouble)" } - maps.n[prefix .. "l"] = { "TroubleToggle loclist", desc = "Location List (Trouble)" } - maps.n[prefix .. "q"] = { "TroubleToggle quickfix", desc = "Quickfix List (Trouble)" } + { "Trouble diagnostics toggle filter.buf=0", desc = "Document Diagnostics (Trouble)" } + maps.n[prefix .. "l"] = { "Trouble loclist toggle", desc = "Location List (Trouble)" } + maps.n[prefix .. "q"] = { "Trouble quickfix toggle", desc = "Quickfix List (Trouble)" } if require("astrocore").is_available "todo-comments.nvim" then - maps.n["xt"] = { + maps.n[prefix .. "t"] = { "TodoTrouble", desc = "Todo (Trouble)", } - maps.n["xT"] = { + maps.n[prefix .. "T"] = { "TodoTrouble keywords=TODO,FIX,FIXME", desc = "Todo/Fix/Fixme (Trouble)", } @@ -29,14 +28,28 @@ return { end, }, }, - opts = { - use_diagnostic_signs = true, - action_keys = { - close = { "q", "" }, - cancel = "", - }, - }, + opts = function() + local get_icon = require("astroui").get_icon + local lspkind_avail, lspkind = pcall(require, "lspkind") + return { + keys = { + [""] = "close", + ["q"] = "close", + [""] = "close", + }, + icons = { + indent = { + fold_open = get_icon "FoldOpened", + fold_closed = get_icon "FoldClosed", + }, + folder_closed = get_icon "FolderClosed", + folder_open = get_icon "FolderOpen", + kinds = lspkind_avail and lspkind.symbol_map, + }, + } + end, }, + { "lewis6991/gitsigns.nvim", opts = { trouble = true } }, { "folke/edgy.nvim", optional = true,