refactor: consolidate, replacing on_directory() with get_directory()

Author: wincent

lua/wincent/commandt/finder.lua

@@ -11,10 +11,7 @@ local relativize = require('wincent.commandt.private.relativize')
 local ui = nil
 
 local function file_finder(directory)
-  directory = vim.trim(directory)
-  if directory == '' then
-    directory = require('wincent.commandt.private.get_directory')()
-  end
+  directory = require('wincent.commandt.get_directory')(directory)
   pushd(directory)
   local options = require('wincent.commandt.private.options'):get()
   local finder = require('wincent.commandt.private.finders.file')('.', options)
@@ -33,10 +30,7 @@ local function file_finder(directory)
 end
 
 local function watchman_finder(directory)
-  directory = vim.trim(directory)
-  if directory == '' then
-    directory = require('wincent.commandt.private.get_directory')()
-  end
+  directory = require('wincent.commandt.get_directory')(directory)
   local options = require('wincent.commandt.private.options'):get()
   local finder = require('wincent.commandt.private.finders.watchman')(directory, options)
 

lua/wincent/commandt/get_directory.lua

@@ -0,0 +1,29 @@
+-- SPDX-FileCopyrightText: Copyright 2025-present Greg Hurrell and contributors.
+-- SPDX-License-Identifier: BSD-2-Clause
+
+--- Infers which directory a scanner should operate in.
+---
+--- - If passed a non-blank `directory`, returns that.
+--- - Otherwise, based on the `'traverse'` setting, either returns the nearest
+---   SCM root directory, or the current working directory.
+---
+--- @param directory string | nil
+--- @return string
+local function get_directory(directory)
+  if directory and vim.trim(directory) ~= '' then
+    return directory
+  else
+    local options = require('wincent.commandt.private.options'):get()
+    local find_root = require('wincent.commandt.private.find_root')
+    if options.traverse == 'file' then
+      local file = vim.fn.expand('%:p:h') -- If no current file, returns current dir.
+      return find_root(file, options.root_markers)
+    elseif options.traverse == 'pwd' then
+      return find_root(vim.fn.getcwd(), options.root_markers)
+    else
+      return vim.fn.getcwd()
+    end
+  end
+end
+
+return get_directory

lua/wincent/commandt/on_directory.lua

@@ -1,7 +1,7 @@
 -- SPDX-FileCopyrightText: Copyright 2025-present Greg Hurrell and contributors.
 -- SPDX-License-Identifier: BSD-2-Clause
 
-local on_directory = require('wincent.commandt.on_directory')
+local get_directory = require('wincent.commandt.get_directory')
 local on_open = require('wincent.commandt.on_open')
 local popd = require('wincent.commandt.popd')
 local pushd = require('wincent.commandt.pushd')
@@ -18,7 +18,7 @@ local fd = {
     return options.scanners.fd.max_files
   end,
   on_close = popd,
-  on_directory = on_directory,
+  on_directory = get_directory,
   open = on_open,
 }
 

lua/wincent/commandt/private/finders/fd.lua

@@ -1,7 +1,7 @@
 -- SPDX-FileCopyrightText: Copyright 2025-present Greg Hurrell and contributors.
 -- SPDX-License-Identifier: BSD-2-Clause
 
-local on_directory = require('wincent.commandt.on_directory')
+local get_directory = require('wincent.commandt.get_directory')
 local on_open = require('wincent.commandt.on_open')
 local popd = require('wincent.commandt.popd')
 local pushd = require('wincent.commandt.pushd')
@@ -18,7 +18,7 @@ local find = {
     return options.scanners.find.max_files
   end,
   on_close = popd,
-  on_directory = on_directory,
+  on_directory = get_directory,
   open = on_open,
 }
 

lua/wincent/commandt/private/finders/find.lua

@@ -1,7 +1,7 @@
 -- SPDX-FileCopyrightText: Copyright 2025-present Greg Hurrell and contributors.
 -- SPDX-License-Identifier: BSD-2-Clause
 
-local on_directory = require('wincent.commandt.on_directory')
+local get_directory = require('wincent.commandt.get_directory')
 local on_open = require('wincent.commandt.on_open')
 
 local git = {
@@ -26,7 +26,7 @@ local git = {
   max_files = function(options)
     return options.scanners.git.max_files
   end,
-  on_directory = on_directory,
+  on_directory = get_directory,
   open = on_open,
 }
 

lua/wincent/commandt/private/finders/git.lua

@@ -1,7 +1,7 @@
 -- SPDX-FileCopyrightText: Copyright 2025-present Greg Hurrell and contributors.
 -- SPDX-License-Identifier: BSD-2-Clause
 
-local on_directory = require('wincent.commandt.on_directory')
+local get_directory = require('wincent.commandt.get_directory')
 local on_open = require('wincent.commandt.on_open')
 local popd = require('wincent.commandt.popd')
 local pushd = require('wincent.commandt.pushd')
@@ -18,7 +18,7 @@ local rg = {
     return options.scanners.rg.max_files
   end,
   on_close = popd,
-  on_directory = on_directory,
+  on_directory = get_directory,
   open = on_open,
 }