refactor(ui): remove auto option (#2591)

Closes #2590

Author: olimorris

doc/codecompanion.txt

@@ -1,4 +1,4 @@
-*codecompanion.txt*        For NVIM v0.11        Last change: 2025 December 22
+*codecompanion.txt*        For NVIM v0.11        Last change: 2025 December 24
 
 ==============================================================================
 Table of Contents                            *codecompanion-table-of-contents*

doc/configuration/chat-buffer.md

@@ -565,8 +565,8 @@ require("codecompanion").setup({
         full_height = true, -- for vertical layout
         position = nil, -- left|right|top|bottom (nil will default depending on vim.opt.splitright|vim.opt.splitbelow)
 
-        width = 0.5, ---@type number|"auto" using "auto" will allow full_height buffers to act like normal buffers
-        height = 0.8,
+        width = 0.5, ---@return number|fun(): number
+        height = 0.8, ---@return number|fun(): number
         border = "single",
         relative = "editor",
 

lua/codecompanion/config.lua

@@ -882,8 +882,8 @@ The user is working on a %s machine. Please respond with system specific command
         full_height = true, -- for vertical layout
         position = nil, -- left|right|top|bottom (nil will default depending on vim.opt.splitright|vim.opt.splitbelow)
 
-        width = 0.5, ---@type number|"auto" using "auto" will allow full_height buffers to act like normal buffers
-        height = 0.8,
+        width = 0.5, ---@return number|fun(): number
+        height = 0.8, ---@return number|fun(): number
         border = "single",
         relative = "editor",
 
@@ -1099,13 +1099,6 @@ M.can_send_code = function()
   return false
 end
 
----Resolve a config value that might be a function or static value
----@param value any
----@return any
-function M.resolve_value(value)
-  return type(value) == "function" and value() or value
-end
-
 return setmetatable(M, {
   __index = function(_, key)
     if key == "setup" then

lua/codecompanion/interactions/chat/ui/init.lua

@@ -130,19 +130,39 @@ function UI:open(opts)
   else
     window = config.display.chat.window
   end
-  local width = math.floor(vim.o.columns * 0.45)
-  if window.width ~= "auto" then
-    width = window.width > 1 and window.width or math.floor(vim.o.columns * window.width)
+
+  local function cols()
+    return vim.o.columns
+  end
+  local function rows()
+    return vim.o.lines
+  end
+
+  --NOTE: Previously we allowed "auto" values for the width, so guarding against that here
+  if type(window.height) == "string" then
+    window.height = rows()
+  end
+  if type(window.width) == "string" then
+    window.width = cols()
   end
-  local height = window.height > 1 and window.height or math.floor(vim.o.lines * window.height)
+
+  if type(window.height) == "function" then
+    window.height = window.height()
+  end
+  if type(window.width) == "function" then
+    window.width = window.width()
+  end
+
+  local height = window.height > 1 and window.height or math.floor(rows() * window.height)
+  local width = window.width > 1 and window.width or math.floor(cols() * window.width)
 
   if window.layout == "float" then
     local win_opts = {
       relative = window.relative,
       width = width,
       height = height,
-      row = window.row or math.floor((vim.o.lines - height) / 2),
-      col = window.col or math.floor((vim.o.columns - width) / 2),
+      col = window.col or math.floor((cols() - width) / 2),
+      row = window.row or math.floor((rows() - height) / 2),
       border = window.border,
       title = window.title or "CodeCompanion",
       title_pos = "center",
@@ -171,9 +191,7 @@ function UI:open(opts)
     if position == "right" and not vim.opt.splitright:get() then
       vim.cmd("wincmd l")
     end
-    if window.width ~= "auto" then
-      vim.cmd("vertical resize " .. width)
-    end
+    vim.cmd("vertical resize " .. width)
     self.winnr = api.nvim_get_current_win()
     api.nvim_win_set_buf(self.winnr, self.chat_bufnr)
     apply_window_config(self.winnr, self.chat_bufnr, window.opts)

lua/codecompanion/utils/ui.lua

@@ -57,16 +57,34 @@ end
 M.create_float = function(lines, opts)
   local window = opts.window
 
+  ---TODO: Remove this and remove all background dimming
   -- Create background window for dimming effect if enabled
   if opts.show_dim then
     M.create_background_window()
   end
 
-  local config = require("codecompanion.config")
-  local window_width = config.resolve_value(window.width)
-  local width = window_width and (window_width > 1 and window_width or opts.width or 85) or opts.width or 85
-  local window_height = config.resolve_value(window.height)
-  local height = window_height and (window_height > 1 and window_height or opts.height or 17) or opts.height or 17
+  local cols = function()
+    return vim.o.columns
+  end
+  local rows = function()
+    return vim.o.lines
+  end
+
+  if type(window.height) == "function" then
+    window.height = window.height()
+  end
+  if type(window.width) == "function" then
+    window.width = window.width()
+  end
+  if type(window.height) == "string" then
+    window.height = rows()
+  end
+  if type(window.width) == "string" then
+    window.width = cols()
+  end
+
+  local width = window.width and (window.width > 1 and window.width or opts.width or 85) or opts.width or 85
+  local height = window.height and (window.height > 1 and window.height or opts.height or 17) or opts.height or 17
 
   local bufnr = opts.bufnr or api.nvim_create_buf(false, true)
 
@@ -76,10 +94,10 @@ M.create_float = function(lines, opts)
   local row = opts.row or window.row or 10
   local col = opts.col or window.col or 0
   if row == "center" then
-    row = math.floor((vim.o.lines - height) / 2 - 1) -- Account for status line for better UX
+    row = math.floor((rows() - height) / 2 - 1) -- Account for status line for better UX
   end
   if col == "center" then
-    col = math.floor((vim.o.columns - width) / 2)
+    col = math.floor((cols() - width) / 2)
   end
 
   local winnr = api.nvim_open_win(bufnr, true, {
@@ -293,31 +311,6 @@ function M.scroll_to_line(bufnr, line_num)
   end)
 end
 
----Scroll to line and briefly highlight the edit area
----@param bufnr number The buffer number
----@param line_num number The line number to scroll to
----@param num_lines? number Number of lines that were changed
-function M.scroll_and_highlight(bufnr, line_num, num_lines)
-  num_lines = num_lines or 1
-
-  M.scroll_to_line(bufnr, line_num)
-
-  local ns_id = api.nvim_create_namespace("codecompanion_edit_highlight")
-
-  -- Highlight the edited lines
-  for i = 0, num_lines - 1 do
-    local highlight_line = line_num + i - 1 -- Convert to 0-based
-    if highlight_line >= 0 and highlight_line < api.nvim_buf_line_count(bufnr) then
-      api.nvim_buf_add_highlight(bufnr, ns_id, "DiffAdd", highlight_line, 0, -1)
-    end
-  end
-
-  -- Clear highlight after a short delay
-  vim.defer_fn(function()
-    api.nvim_buf_clear_namespace(bufnr, ns_id, 0, -1)
-  end, 2000) -- 2 seconds
-end
-
 ---@param bufnr nil|number
 ---@return nil|number
 M.buf_get_win = function(bufnr)