feat: accept "winborder"

See:

- #436

Author: wincent

doc/command-t.txt

@@ -462,8 +462,8 @@ notice at any time; for example:
       },
       margin = 10,
       match_listing = {
-        -- 'double', 'none', 'rounded', 'shadow', 'single', 'solid', or a
-        -- list of strings.
+        -- 'double', 'none', 'rounded', 'shadow', 'single', 'solid',
+        -- 'winborder', or a list of strings.
         border = { '', '', '', '│', '┘', '─', '└', '│' },
         icons = true,
         truncate = 'middle', -- 'beginning', 'end', true, false.
@@ -472,8 +472,8 @@ notice at any time; for example:
       order = 'forward', -- 'forward' or 'reverse'.
       position = 'center', -- 'bottom', 'center' or 'top'.
       prompt = {
-        -- 'double', 'none', 'rounded', 'shadow', 'single', 'solid', or a
-        -- list of strings.
+        -- 'double', 'none', 'rounded', 'shadow', 'single', 'solid',
+        -- 'winborder', or a list of strings.
         border = { '┌', '─', '┐', '│', '┤', '─', '├', '│' },
 
       },
@@ -508,9 +508,11 @@ passed to |commandt.setup()|:
 
 - |commandt.setup.always_show_dot_files|
 - |commandt.setup.ignore_case|
+- |commandt.setup.match_listing.border|
 - |commandt.setup.match_listing.icons|
 - |commandt.setup.match_listing.truncate|
 - |commandt.setup.never_show_dot_files|
+- |commandt.setup.prompt.border|
 - |commandt.setup.root_markers|
 - |commandt.setup.scanners.max_files|
 - |commandt.setup.smart_case|
@@ -549,6 +551,17 @@ the value of Neovim's |'ignorecase'| setting is used instead.
 
 See also |commandt.setup.smart_case|.
 
+                                          *commandt.setup.match_listing.border*
+            string or list (default: { '', '', '', '│', '┘', '─', '└', '│' })
+
+Controls the border of the match listing window. Valid string values are
+"double", "none", "rounded", "shadow", "single", or "solid". The special
+value, "winborder", can be used to indicate that the value of the
+|'winborder'| setting should be used instead.
+
+Alternatively, a list of characters can be used to completely control the
+appearance of the border.
+
                                            *commandt.setup.match_listing.icons*
                                           boolean or function (default: true)
 
@@ -616,6 +629,16 @@ Note that this setting has no effect in buffer listings (ie. those shown by
 
     require('wincent.commandt').setup({ never_show_dot_files = true })
 
+                                                 *commandt.setup.prompt.border*
+         string or list (default: { '┌', '─', '┐', '│', '┤', '─', '├', '│' })
+
+Controls the border of the prompt window. Valid string values are "double",
+"none", "rounded", "shadow", "single", or "solid". The special value,
+"winborder", can be used to indicate that the value of the |'winborder'|
+setting should be used instead.
+
+Alternatively, a list of characters can be used to completely control the
+appearance of the border.
                                                   *commandt.setup.root_markers*
                                            list of strings (default: various)
 
@@ -945,7 +968,10 @@ HISTORY                                                     *command-t-history*
 
 main (not yet released) ~
 
-- ...
+- feat: |commandt.setup.match_listing.border| and |commandt.setup.prompt.border|
+  now accept "winborder" as a possible value, instructing Command-T to use the
+  value of the |'winborder'| setting to control the border appearance
+  (https://github.com/wincent/command-t/issues/436).
 
 6.1 (14 June 2025) ~
 

lua/wincent/commandt/init.lua

@@ -214,6 +214,7 @@ local options_spec = {
               'shadow',
               'single',
               'solid',
+              'winborder',
               { kind = 'list', of = { kind = 'string' } },
             },
           },
@@ -255,6 +256,7 @@ local options_spec = {
               'shadow',
               'single',
               'solid',
+              'winborder',
               { kind = 'list', of = { kind = 'string' } },
             },
           },
@@ -586,15 +588,15 @@ local default_options = {
   },
   margin = 10,
   match_listing = {
-    border = { '', '', '', '│', '┘', '─', '└', '│' }, -- 'double', 'none', 'rounded', 'shadow', 'single', 'solid', or a list of strings.
+    border = { '', '', '', '│', '┘', '─', '└', '│' }, -- 'double', 'none', 'rounded', 'shadow', 'single', 'solid', 'winborder', or a list of strings.
     icons = true,
     truncate = 'middle',
   },
   never_show_dot_files = false,
   order = 'forward', -- 'forward', 'reverse'.
   position = 'center', -- 'bottom', 'center', 'top'.
   prompt = {
-    border = { '┌', '─', '┐', '│', '┤', '─', '├', '│' }, -- 'double', 'none', 'rounded', 'shadow', 'single', 'solid', or a list of strings.
+    border = { '┌', '─', '┐', '│', '┤', '─', '├', '│' }, -- 'double', 'none', 'rounded', 'shadow', 'single', 'solid', 'winborder', or a list of strings.
   },
   open = smart_open,
   root_markers = { '.git', '.hg', '.svn', '.bzr', '_darcs' },

lua/wincent/commandt/private/match_listing.lua

@@ -19,7 +19,7 @@ local mt = {
 
 function MatchListing.new(options)
   options = merge({
-    border = { '', '', '', ' ', '', '', '', ' ' },
+    border = nil,
     height = 15,
     icons = true,
     margin = 0,

lua/wincent/commandt/private/prompt.lua

@@ -21,7 +21,7 @@ local mt = {
 
 function Prompt.new(options)
   options = merge({
-    border = 'single',
+    border = nil,
     mappings = {},
     margin = 0,
     height = 15,

lua/wincent/commandt/private/ui.lua

@@ -105,8 +105,9 @@ ui.show = function(finder, options)
   -- reset every time we show a new UI.
   vim.api.nvim_create_augroup('CommandTWindow', { clear = true })
 
+  local border = options.match_listing.border ~= 'winborder' and options.match_listing.border or nil
   match_listing = MatchListing.new({
-    border = options.match_listing.border,
+    border = border,
     height = options.height,
     icons = options.kind ~= 'virtual' and options.match_listing.icons or false,
     margin = options.margin,
@@ -118,8 +119,9 @@ ui.show = function(finder, options)
 
   results = nil
   selected = nil
+  border = options.prompt.border ~= 'winborder' and options.prompt.border or nil
   prompt = Prompt.new({
-    border = options.prompt.border,
+    border = border,
     height = options.height,
     mappings = options.mappings,
     margin = options.margin,

lua/wincent/commandt/private/window.lua

@@ -58,7 +58,7 @@ end
 
 function Window.new(options)
   options = merge({
-    border = 'single',
+    border = nil,
     bottom = nil,
     buftype = 'nofile', -- Also, 'prompt'.
     filetype = nil,