fix(completion): make info window respect new 'pumblend' option

Resolve #2062

Author: echasnovski

lua/mini/completion.lua

@@ -689,6 +689,10 @@ H.keys = {
   ctrl_n = vim.api.nvim_replace_termcodes('<C-g><C-g><C-n>', true, false, true),
 }
 
+-- Flags for whether there is support for dedicated options
+H.has_winborder = vim.fn.has('nvim-0.11') == 1
+H.has_pumborder = vim.fn.exists('+pumborder') == 1 -- Neovim>=0.12
+
 -- Caches for different actions -----------------------------------------------
 -- Field `lsp` is a table describing state of all used LSP requests. It has the
 -- following structure:
@@ -1528,8 +1532,9 @@ end
 
 H.info_window_options = function()
   local win_config = H.get_config().window.info
-  local default_border = (vim.fn.exists('+winborder') == 1 and vim.o.winborder ~= '') and vim.o.winborder or 'single'
+  local default_border = (H.has_winborder and vim.o.winborder ~= '') and vim.o.winborder or 'single'
   local border = win_config.border or default_border
+  local pumborder = H.has_pumborder and vim.o.pumborder or ''
 
   -- Compute dimensions based on actually visible lines to be displayed
   local lines = H.compute_visible_md_lines(vim.api.nvim_buf_get_lines(H.info.bufnr, 0, -1, false))
@@ -1538,7 +1543,8 @@ H.info_window_options = function()
   -- Compute position
   local event = H.info.event
   local left_to_pum = event.col - 1
-  local right_to_pum = event.col + event.width + (event.scrollbar and 1 or 0)
+  local pumborder_offset = (pumborder == '' or pumborder == 'none') and 0 or 2
+  local right_to_pum = event.col + event.width + (event.scrollbar and 1 or 0) + pumborder_offset
 
   local border_offset = border == 'none' and 0 or 2
   local space_left = left_to_pum - border_offset
@@ -1702,7 +1708,7 @@ end
 
 H.signature_window_opts = function()
   local win_config = H.get_config().window.signature
-  local default_border = (vim.fn.exists('+winborder') == 1 and vim.o.winborder ~= '') and vim.o.winborder or 'single'
+  local default_border = (H.has_winborder and vim.o.winborder ~= '') and vim.o.winborder or 'single'
   local border = win_config.border or default_border
   local lines = vim.api.nvim_buf_get_lines(H.signature.bufnr, 0, -1, false)
   local height, width = H.floating_dimensions(lines, win_config.height, win_config.width)

tests/screenshots/tests-test_completion.lua---Information-window---respects-'pumborder'-option

@@ -0,0 +1,33 @@
+--|---------|---------|---------|--
+01|       January                  
+02|~     ┌──────────────────┐┌…fo ┐
+03|~     │ January Text     ││Mont│
+04|~     │ June    Function ││h   │
+05|~     │ July    Function ││#01 │
+06|~     └──────────────────┘└────┘
+07|~                               
+08|~                               
+09|~                               
+10|~                               
+11|~                               
+12|~                               
+13|~                               
+14|[No Name] 1,15                  
+15|-- INSERT --                    
+
+--|---------|---------|---------|--
+01|00000000000000000000000000000000
+02|11111122222222222222222222344443
+03|11111125555555555555555552366663
+04|11111122222222222222222222366663
+05|11111122222222222222222222366663
+06|11111122222222222222222222333333
+07|11111111111111111111111111111111
+08|11111111111111111111111111111111
+09|11111111111111111111111111111111
+10|11111111111111111111111111111111
+11|11111111111111111111111111111111
+12|11111111111111111111111111111111
+13|11111111111111111111111111111111
+14|77777777777777777777777777777777
+15|88888888888899999999999999999999

tests/screenshots/tests-test_completion.lua---Information-window---respects-'pumborder'-option-002

@@ -0,0 +1,33 @@
+--|---------|---------|---------|--
+01|        January                 
+02|┌…nfo ┐┌──────────────────┐     
+03|│Month││ January Text     │     
+04|│ #01 ││ June    Function │     
+05|└─────┘│ July    Function │     
+06|~      └──────────────────┘     
+07|~                               
+08|~                               
+09|~                               
+10|~                               
+11|~                               
+12|~                               
+13|~                               
+14|[No Name] 1,16                  
+15|-- INSERT --                    
+
+--|---------|---------|---------|--
+01|00000000000000000000000000000000
+02|12222213333333333333333333344444
+03|15555513666666666666666666344444
+04|15555513333333333333333333344444
+05|11111113333333333333333333344444
+06|44444443333333333333333333344444
+07|44444444444444444444444444444444
+08|44444444444444444444444444444444
+09|44444444444444444444444444444444
+10|44444444444444444444444444444444
+11|44444444444444444444444444444444
+12|44444444444444444444444444444444
+13|44444444444444444444444444444444
+14|77777777777777777777777777777777
+15|88888888888899999999999999999999

tests/screenshots/tests-test_completion.lua---Information-window---respects-'pumborder'-option-003

@@ -0,0 +1,33 @@
+--|---------|---------|---------|--
+01|January                         
+02|┌─────────────────┐Month #01    
+03|│January Text     │             
+04|│June    Function │             
+05|│July    Function │             
+06|└─────────────────┘             
+07|~                               
+08|~                               
+09|~                               
+10|~                               
+11|~                               
+12|~                               
+13|~                               
+14|[No Name] 1,8                   
+15|-- INSERT --                    
+
+--|---------|---------|---------|--
+01|00000000000000000000000000000000
+02|11111111111111111112222222223333
+03|14444444444444444413333333333333
+04|11111111111111111113333333333333
+05|11111111111111111113333333333333
+06|11111111111111111113333333333333
+07|33333333333333333333333333333333
+08|33333333333333333333333333333333
+09|33333333333333333333333333333333
+10|33333333333333333333333333333333
+11|33333333333333333333333333333333
+12|33333333333333333333333333333333
+13|33333333333333333333333333333333
+14|55555555555555555555555555555555
+15|66666666666677777777777777777777

tests/test_completion.lua

@@ -1622,6 +1622,39 @@ T['Information window']["respects 'winborder' option"] = function()
   validate({ '╔', '═', '╗', '║', '╝', '═', '╚', '║' })
 end
 
+T['Information window']["respects 'pumborder' option"] = function()
+  if child.fn.has('nvim-0.12') == 0 then MiniTest.skip("'pumborder' option is present on Neovim>=0.12") end
+  child.set_size(15, 32)
+
+  local validate = function(offset, pumborder)
+    child.o.pumborder = pumborder
+    set_lines({ string.rep(' ', offset) })
+    type_keys('A', 'J', '<C-Space>')
+    type_keys('<C-n>')
+    sleep(default_info_delay + small_time)
+    child.expect_screenshot()
+
+    type_keys('<C-e>')
+    child.ensure_normal_mode()
+    set_lines({})
+  end
+
+  -- Should properly adjust coordinates and pick side
+  validate(7, 'single')
+  validate(8, 'single')
+
+  -- Should respect no border in both windows
+  -- NOTE: Does not fully work for `pumborder=none` due to Neovim issue:
+  -- https://github.com/neovim/neovim/issues/36246
+  -- TODO: Uncomment both `'none'` validations after the issue is resolved
+  --
+  -- validate(0, 'none')
+
+  child.lua('MiniCompletion.config.window.info.border = "none"')
+  validate(0, 'single')
+  -- validate(0, 'none')
+end
+
 T['Information window']['triggers relevant events'] = function()
   mock_event_log()
   local validate_log = function(ref)