refactor: deal with code-smell

Instead of mashing two types together, pass them as separate params.

Later on when I have time I'll improve the type annotations (currently
just calling them `any`).

Author: wincent

lua/wincent/commandt/finder.lua

@@ -3,7 +3,6 @@
 
 local UI = require('wincent.commandt.private.ui')
 
-local merge = require('wincent.commandt.private.merge')
 local popd = require('wincent.commandt.popd')
 local pushd = require('wincent.commandt.pushd')
 local relativize = require('wincent.commandt.private.relativize')
@@ -17,16 +16,13 @@ local function file_finder(directory)
   local finder = require('wincent.commandt.private.finders.file')('.', options)
 
   ui = UI.new()
-  ui:show(
-    finder,
-    merge(options, {
-      name = 'file',
-      on_open = function(result)
-        return relativize(directory, result)
-      end,
-      on_close = popd,
-    })
-  )
+  ui:show(finder, options, {
+    name = 'file',
+    on_open = function(result)
+      return relativize(directory, result)
+    end,
+    on_close = popd,
+  })
 end
 
 local function watchman_finder(directory)
@@ -35,15 +31,12 @@ local function watchman_finder(directory)
   local finder = require('wincent.commandt.private.finders.watchman')(directory, options)
 
   ui = UI.new()
-  ui:show(
-    finder,
-    merge(options, {
-      name = 'watchman',
-      on_open = function(result)
-        return relativize(directory, result)
-      end,
-    })
-  )
+  ui:show(finder, options, {
+    name = 'watchman',
+    on_open = function(result)
+      return relativize(directory, result)
+    end,
+  })
 end
 
 local function finder(name, directory)
@@ -92,17 +85,12 @@ local function finder(name, directory)
     finder.fallback = require('wincent.commandt.private.finders.fallback')(finder, directory, options)
   end
 
-  -- TODO: fix type smell here. we're merging "mode", a property that exists
-  -- inside matcher configs, into the top level, along with "name".
   ui = UI.new()
-  ui:show(
-    finder,
-    merge(options, {
-      name = name,
-      mode = mode,
-      on_close = config.on_close,
-    })
-  )
+  ui:show(finder, options, {
+    name = name,
+    mode = mode,
+    on_close = config.on_close,
+  })
 end
 
 return finder

lua/wincent/commandt/private/ui.lua

@@ -91,14 +91,20 @@ function UI:_open(ex_command)
   self.on_open = nil
 end
 
-function UI:show(finder, options)
+--- Display the Command-T UI, consisting of a Prompt window and a MatchListing
+--- window.
+---
+--- @param finder any
+--- @param options any Top-level Command-T options.
+--- @param config any `UI`-specific config.
+function UI:show(finder, options, config)
   -- TODO validate options
   self.current_finder = finder
 
   self.current_window = vim.api.nvim_get_current_win()
 
-  self.on_close = options.on_close
-  self.on_open = options.on_open
+  self.on_close = config.on_close
+  self.on_open = config.on_open
 
   -- Temporarily override global settings.
   -- For now just 'hlsearch', but may add more later (see
@@ -115,7 +121,7 @@ function UI:show(finder, options)
   self.match_listing = MatchListing.new({
     border = border,
     height = options.height,
-    icons = options.mode ~= 'virtual' and options.match_listing.icons or false,
+    icons = config.mode ~= 'virtual' and options.match_listing.icons or false,
     margin = options.margin,
     position = options.position,
     selection_highlight = options.selection_highlight,
@@ -131,7 +137,7 @@ function UI:show(finder, options)
     height = options.height,
     mappings = options.mappings,
     margin = options.margin,
-    name = options.name,
+    name = config.name,
     on_change = function(query)
       self.results, self.candidate_count = self.current_finder.run(query)
       if #self.results > 0 or self.candidate_count > 0 then