fix(trouble-nvim)!: update to trouble.nvim v3 (#1014)

AstroNvim · May 30, 2024 · 7385130 · 7385130
1 parent 622869b
commit 7385130
Showing 1 changed file with 28 additions and 15 deletions.
diff --git 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,33 +10,46 @@ return {
           local maps = opts.mappings
           local prefix = "<Leader>x"
           maps.n[prefix] = { desc = require("astroui").get_icon("Trouble", 1, true) .. "Trouble" }
-          maps.n[prefix .. "X"] =
-            { "<Cmd>TroubleToggle workspace_diagnostics<CR>", desc = "Workspace Diagnostics (Trouble)" }
+          maps.n[prefix .. "X"] = { "<Cmd>Trouble diagnostics toggle<CR>", desc = "Workspace Diagnostics (Trouble)" }
           maps.n[prefix .. "x"] =
-            { "<Cmd>TroubleToggle document_diagnostics<CR>", desc = "Document Diagnostics (Trouble)" }
-          maps.n[prefix .. "l"] = { "<Cmd>TroubleToggle loclist<CR>", desc = "Location List (Trouble)" }
-          maps.n[prefix .. "q"] = { "<Cmd>TroubleToggle quickfix<CR>", desc = "Quickfix List (Trouble)" }
+            { "<Cmd>Trouble diagnostics toggle filter.buf=0<CR>", desc = "Document Diagnostics (Trouble)" }
+          maps.n[prefix .. "l"] = { "<Cmd>Trouble loclist toggle<CR>", desc = "Location List (Trouble)" }
+          maps.n[prefix .. "q"] = { "<Cmd>Trouble quickfix toggle<CR>", desc = "Quickfix List (Trouble)" }
           if require("astrocore").is_available "todo-comments.nvim" then
-            maps.n["<leader>xt"] = {
+            maps.n[prefix .. "t"] = {
               "<cmd>TodoTrouble<cr>",
               desc = "Todo (Trouble)",
             }
-            maps.n["<leader>xT"] = {
+            maps.n[prefix .. "T"] = {
               "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>",
               desc = "Todo/Fix/Fixme (Trouble)",
             }
           end
         end,
       },
     },
-    opts = {
-      use_diagnostic_signs = true,
-      action_keys = {
-        close = { "q", "<ESC>" },
-        cancel = "<C-e>",
-      },
-    },
+    opts = function()
+      local get_icon = require("astroui").get_icon
+      local lspkind_avail, lspkind = pcall(require, "lspkind")
+      return {
+        keys = {
+          ["<ESC>"] = "close",
+          ["q"] = "close",
+          ["<C-E>"] = "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,