refactor: separate sorting logic to expand

lua/frecency/config.lua

@@ -21,6 +21,7 @@ local os_util = require "frecency.os_util"
 ---@field scoring_function? fun(recency: integer, fzy_score: number): number default: see lua/frecency/config.lua
 ---@field max_timestamps? integer default: 10
 ---@field path_display? table default: nil
+---@field preceding? "opened"|"same_repo" default: nil
 ---@field show_filter_column? boolean|string[] default: true
 ---@field show_scores? boolean default: false
 ---@field show_unindexed? boolean default: true
@@ -53,6 +54,7 @@ local Config = {}
 ---@field scoring_function fun(recency: integer, fzy_score: number): number default: see lua/frecency/config.lua
 ---@field max_timestamps integer default: 10
 ---@field path_display? table default: nil
+---@field preceding? "opened"|"same_repo" default: nil
 ---@field show_filter_column boolean|string[] default: true
 ---@field show_scores boolean default: false
 ---@field show_unindexed boolean default: true
@@ -81,6 +83,7 @@ Config.new = function()
     matcher = true,
     max_timestamps = true,
     path_display = true,
+    preceding = true,
     scoring_function = true,
     show_filter_column = true,
     show_scores = true,
@@ -177,7 +180,7 @@ Config.setup = function(ext_config)
     debug = { opts.debug, "b" },
     default_workspace = { opts.default_workspace, "s", true },
     disable_devicons = { opts.disable_devicons, "b" },
-    enable_prompt_mappings={opts.enable_prompt_mappings,'b'},
+    enable_prompt_mappings = { opts.enable_prompt_mappings, "b" },
     filter_delimiter = { opts.filter_delimiter, "s" },
     hide_current_buffer = { opts.hide_current_buffer, "b" },
     ignore_patterns = { opts.ignore_patterns, "t" },
@@ -195,6 +198,13 @@ Config.setup = function(ext_config)
       end,
       "positive number",
     },
+    preceding = {
+      opts.preceding,
+      function(v)
+        return v == "opened" or v == "same_repo" or v == nil
+      end,
+      '"opened" or "same_repo" or nil',
+    },
     show_filter_column = { opts.show_filter_column, { "b", "t" }, true },
     show_scores = { opts.show_scores, "b" },
     show_unindexed = { opts.show_unindexed, "b" },

lua/frecency/finder.lua

@@ -5,6 +5,7 @@ local recency = require "frecency.recency"
 local log = require "frecency.log"
 local timer = require "frecency.timer"
 local lazy_require = require "frecency.lazy_require"
+local Sorter = require "frecency.sorter"
 local Job = lazy_require "plenary.job" --[[@as FrecencyPlenaryJob]]
 local async = lazy_require "plenary.async" --[[@as FrecencyPlenaryAsync]]
 
@@ -25,6 +26,7 @@ local async = lazy_require "plenary.async" --[[@as FrecencyPlenaryAsync]]
 ---@field private seen table<string, boolean>
 ---@field private process table<string, { obj: VimSystemObj, done: boolean }>
 ---@field private state FrecencyState
+---@field private sorter FrecencySorter
 local Finder = {
   ---@type fun(): string[]?
   cmd = (function()
@@ -81,6 +83,7 @@ Finder.new = function(database, entry_maker, need_scandir, paths, state, finder_
     paths = paths,
     process = {},
     state = state,
+    sorter = Sorter.new(),
 
     seen = {},
     entries = {},
@@ -315,11 +318,9 @@ function Finder:get_results(workspaces, epoch)
   end
   timer.track "making results"
 
-  table.sort(files, function(a, b)
-    return a.score > b.score or (a.score == b.score and a.path > b.path)
-  end)
+  local sorted = self.sorter:sort(files)
   timer.track "sorting finish"
-  return files
+  return sorted
 end
 
 function Finder:close()

lua/frecency/sorter/default.lua

@@ -0,0 +1,18 @@
+---@class FrecencySorterDefault: FrecencySorter
+local Default = {}
+
+---@return FrecencySorterDefault
+Default.new = function()
+  return setmetatable({}, { __index = Default })
+end
+
+---@param files FrecencyDatabaseEntry[]
+---@return FrecencyDatabaseEntry[]
+function Default.sort(_, files)
+  table.sort(files, function(a, b)
+    return a.score > b.score or (a.score == b.score and a.path > b.path)
+  end)
+  return files
+end
+
+return Default

lua/frecency/sorter/init.lua

@@ -0,0 +1,10 @@
+local config = require "frecency.config"
+local Default = require "frecency.sorter.default"
+local Opened = require "frecency.sorter.opened"
+local SameRepo = require "frecency.sorter.same_repo"
+
+---@class FrecencySorter
+---@field new fun(): FrecencySorter
+---@field sort fun(self: FrecencySorter, files: FrecencyDatabaseEntry[]): FrecencyDatabaseEntry[]
+
+return config.preceding == "opened" and Opened or config.preceding == "same_repo" and SameRepo or Default

lua/frecency/sorter/opened.lua

@@ -0,0 +1,11 @@
+local Default = require "frecency.sorter.default"
+
+---@class FrecencySorterOpened: FrecencySorter
+local Opened = setmetatable({}, { __index = Opened })
+
+---@return FrecencySorterOpened
+Opened.new = function()
+  return setmetatable({}, { __index = Opened })
+end
+
+return Opened

lua/frecency/sorter/same_repo.lua

@@ -0,0 +1,11 @@
+local Default = require "frecency.sorter.default"
+
+---@class FrecencySorterSameRepo: FrecencySorterDefault
+local SameRepo = setmetatable({}, { __index = Default })
+
+---@return FrecencySorterSameRepo
+SameRepo.new = function()
+  return setmetatable({}, { __index = SameRepo })
+end
+
+return SameRepo