fix(state): stop searching when max matches reached

folke · Jun 10, 2023 · 4245e49 · 4245e49
1 parent 959af4e
commit 4245e49
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lua/flash/searcher.lua b/lua/flash/searcher.lua
@@ -89,7 +89,7 @@ function M._search(win, state)
       visible = from[1] >= info.topline and from[1] <= info.botline,
       first = vim.deep_equal(from, first),
     })
-    if #matches > Config.search.max_matches then
+    if #matches >= Config.search.max_matches then
       -- vim.notify("Too many matches", vim.log.levels.WARN, { title = "flash.nvim" })
       break
     end

diff --git a/lua/flash/state.lua b/lua/flash/state.lua
@@ -166,12 +166,10 @@ function M:search(pattern)
   local results = {}
   if pattern ~= "" then
     for _, win in ipairs(self.wins) do
-      local r = Searcher.search(win, self)
-      -- max results reached, so stop searching
-      if not r then
+      vim.list_extend(results, Searcher.search(win, self))
+      if #results >= self.config.search.max_matches then
         break
       end
-      vim.list_extend(results, r)
     end
   end
   self:set(results)