fix: window placement with border

Author: Saghen

lua/blink/cmp/windows/autocomplete.lua

@@ -17,9 +17,9 @@ function autocomplete.setup()
     max_width = autocmp_config.max_width,
     max_height = autocmp_config.max_height,
     border = autocmp_config.border,
+    winhighlight = autocmp_config.winhighlight,
     cursorline = true,
-    winhighlight = autocmp_config.winhighlight or 'Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None',
-    scrolloff = 2,
+    scrolloff = autocmp_config.scrolloff,
   })
 
   -- Setting highlights is slow and we update on every keystroke so we instead use a decoration provider
@@ -107,7 +107,7 @@ function autocomplete.update_position(context)
 
   win:update_size()
 
-  local height = vim.api.nvim_win_get_height(winnr)
+  local height = win:get_height()
   local screen_height = vim.api.nvim_win_get_height(0)
   local screen_scroll_range = win.get_screen_scroll_range()
 

lua/blink/cmp/windows/documentation.lua

@@ -110,8 +110,8 @@ function docs.update_position()
   local direction_priority = autocomplete_win_is_up and config.direction_priority.autocomplete_north
     or config.direction_priority.autocomplete_south
 
-  local height = vim.api.nvim_win_get_height(winnr)
-  local width = vim.api.nvim_win_get_width(winnr)
+  local height = docs.win:get_height()
+  local width = docs.win:get_width()
 
   local space_above = autocomplete_win_config.row - 1 > height
   local space_below = screen_height - autocomplete_win_config.height - autocomplete_win_config.row > height

lua/blink/cmp/windows/lib.lua

@@ -105,11 +105,53 @@ function win:update_size()
 end
 
 -- todo: fix nvim_win_text_height
+-- @return number
 function win:get_content_height()
   if not self:is_open() then return 0 end
   return vim.api.nvim_win_text_height(self:get_win(), {}).all
 end
 
+--- @return { vertical: number, horizontal: number }
+function win:get_border_size()
+  if not self:is_open() then return { vertical = 0, horizontal = 0 } end
+
+  local border = self.config.border
+  if border == 'none' then
+    return { vertical = 0, horizontal = 0 }
+  elseif border == 'padded' then
+    return { vertical = 0, horizontal = 1 }
+  elseif border == 'shadow' then
+    return { vertical = 1, horizontal = 1 }
+  elseif type(border) == 'string' then
+    return { vertical = 2, horizontal = 2 }
+  elseif type(border) == 'table' and border ~= nil then
+    -- borders can be a table of strings and act differently with different # of chars
+    -- so we normalize it: https://neovim.io/doc/user/api.html#nvim_open_win()
+    -- based on nvim-cmp
+    local resolved_border = {}
+    while #resolved_border <= 8 do
+      for _, b in ipairs(border) do
+        table.insert(resolved_border, type(b) == 'string' and b or b[1])
+      end
+    end
+
+    local top = resolved_border[2] == '' and 0 or 1
+    local bottom = resolved_border[6] == '' and 0 or 1
+    local left = resolved_border[8] == '' and 0 or 1
+    local right = resolved_border[4] == '' and 0 or 1
+    return { vertical = top + bottom, horizontal = left + right }
+  end
+
+  return { vertical = 0, horizontal = 0 }
+end
+
+--- @return number
+function win:get_height()
+  if not self:is_open() then return 0 end
+  return vim.api.nvim_win_get_height(self:get_win()) + self:get_border_size().vertical
+end
+
+--- @return number
 function win:get_content_width()
   if not self:is_open() then return 0 end
   local max_width = 0
@@ -119,6 +161,13 @@ function win:get_content_width()
   return max_width
 end
 
+--- @return number
+function win:get_width()
+  if not self:is_open() then return 0 end
+  return vim.api.nvim_win_get_width(self:get_win()) + self:get_border_size().horizontal
+end
+
+--- @return { bufnr: number, start_line: number, end_line: number, horizontal_offset: number }
 function win.get_screen_scroll_range()
   local bufnr = vim.api.nvim_win_get_buf(0)
   local line_count = vim.api.nvim_buf_line_count(bufnr)

lua/blink/cmp/windows/signature.lua

@@ -101,26 +101,18 @@ function signature.update_position(context)
   local autocomplete_win_is_up = autocomplete_win_config and autocomplete_win_config.row - cursor_screen_row < 0
   local direction = autocomplete_win_is_up and 's' or 'n'
 
-  local height = vim.api.nvim_win_get_height(winnr)
+  local height = signature.win:get_height()
   local screen_height = vim.api.nvim_win_get_height(0)
   local screen_scroll_range = signature.win.get_screen_scroll_range()
 
-  local cursor = vim.api.nvim_win_get_cursor(0)
-  local cursor_row = cursor[1]
-  local cursor_col = cursor[2]
-
-  -- place the window at the start col of the current text we're fuzzy matching against
-  -- so the window doesnt move around as we type
-  local col = context.start_col - cursor_col - 1
-
   -- detect if there's space above/below the cursor
-  local is_space_below = autocomplete_win_is_up ~= false
-    and screen_height - cursor_row - screen_scroll_range.start_line > height
-  local is_space_above = not autocomplete_win_is_up and cursor_row - screen_scroll_range.start_line > height
+  local cursor_row = vim.api.nvim_win_get_cursor(0)[1]
+  local is_space_below = screen_height - cursor_row - screen_scroll_range.start_line > height
+  local is_space_above = cursor_row - screen_scroll_range.start_line > height
 
   -- default to the user's preference but attempt to use the other options
   local row = direction == 's' and 1 or -height
-  vim.api.nvim_win_set_config(winnr, { relative = 'cursor', row = row, col = col })
+  vim.api.nvim_win_set_config(winnr, { relative = 'cursor', row = row, col = -1 })
 end
 
 return signature