feat: allow top-level filter

folke · May 30, 2024 · 12447df · 12447df
1 parent 9fb1be0
commit 12447df
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/lua/trouble/config/init.lua b/lua/trouble/config/init.lua
@@ -2,6 +2,7 @@
 local M = {}
 
 ---@class trouble.Mode: trouble.Config
+---@field filter? trouble.spec.filter
 ---@field sections? trouble.spec.section[]|trouble.spec.section
 
 ---@class trouble.Config
@@ -72,9 +73,7 @@ local defaults = {
   modes = {
     diagnostics_buffer = {
       mode = "diagnostics",
-      sections = {
-        filter = { buf = 0 },
-      },
+      filter = { buf = 0 },
     },
   },
 }
@@ -113,7 +112,10 @@ end
 
 function M.modes()
   require("trouble.source").load()
-  return vim.tbl_keys(options.modes)
+  ---@type string[]
+  local ret = vim.tbl_keys(options.modes)
+  table.sort(ret)
+  return ret
 end
 
 ---@param ...? trouble.Config|string

diff --git a/lua/trouble/view/init.lua b/lua/trouble/view/init.lua
@@ -242,13 +242,15 @@ function M:refresh()
   for s, section in ipairs(self.sections) do
     self.fetching = self.fetching + 1
     Source.get(section.source, function(items)
-      self.items[s] = Filter.filter(items, section.filter, self)
-      self.items[s] = Sort.sort(self.items[s], section.sort, self)
-      for i, item in ipairs(self.items[s]) do
+      items = Filter.filter(items, self.opts.filter, self)
+      items = Filter.filter(items, section.filter, self)
+      items = Sort.sort(items, section.sort, self)
+      for i, item in ipairs(items) do
         item.idx = i
       end
+      self.items[s] = items
       -- self.items[s] = vim.list_slice(self.items[s], 1, 10)
-      self.nodes[s] = Tree.build(self.items[s], section)
+      self.nodes[s] = Tree.build(items, section)
       self.fetching = self.fetching - 1
       self:update()
     end, { filter = section.filter, view = self })