From 7c4f88606cdcd837027cedfd668335c08fbe4133 Mon Sep 17 00:00:00 2001
From: yetone <yetoneful@gmail.com>
Date: Sun, 31 Aug 2025 23:02:42 +0800
Subject: [PATCH] fix: full view width (#2662)

---
 lua/avante/init.lua       |  1 -
 lua/avante/sidebar.lua    | 29 ++++++++++++++++++++---------
 lua/avante/utils/init.lua |  4 +++-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/lua/avante/init.lua b/lua/avante/init.lua
index 524336b..8cceb2e 100644
--- a/lua/avante/init.lua
+++ b/lua/avante/init.lua
@@ -246,7 +246,6 @@ function H.autocmds()
       local sidebar = M.get()
       if not sidebar then return end
       if not sidebar:is_open() then return end
-      if sidebar.is_in_full_view then return end
       sidebar:resize()
     end,
   })
diff --git a/lua/avante/sidebar.lua b/lua/avante/sidebar.lua
index 6238b4d..8c01de9 100644
--- a/lua/avante/sidebar.lua
+++ b/lua/avante/sidebar.lua
@@ -186,8 +186,12 @@ function Sidebar:setup_colors()
   self:set_code_winhl()
   vim.api.nvim_create_autocmd("WinNew", {
     group = self.augroup,
-    callback = function()
-      for _, winid in ipairs(vim.api.nvim_list_wins()) do
+    callback = function(env)
+      if Utils.is_floating_window(env.id) then
+        Utils.debug("WinNew ignore floating window")
+        return
+      end
+      for _, winid in ipairs(vim.api.nvim_tabpage_list_wins(self.id)) do
         if not vim.api.nvim_win_is_valid(winid) or self:is_sidebar_winid(winid) then goto continue end
         local winhl = vim.wo[winid].winhl
         if
@@ -1476,7 +1480,11 @@ end
 function Sidebar:resize()
   for _, container in pairs(self.containers) do
     if container.winid and api.nvim_win_is_valid(container.winid) then
-      api.nvim_win_set_width(container.winid, Config.get_window_width())
+      if self.is_in_full_view then
+        api.nvim_win_set_width(container.winid, vim.o.columns - 1)
+      else
+        api.nvim_win_set_width(container.winid, Config.get_window_width())
+      end
     end
   end
   self:render_result()
@@ -1516,7 +1524,7 @@ function Sidebar:toggle_code_window()
   if win_width == 0 then
     self.is_in_full_view = false
     for _, winid in ipairs(winids) do
-      if not vim.tbl_contains(container_winids, winid) and api.nvim_win_is_valid(winid) then
+      if api.nvim_win_is_valid(winid) and not vim.tbl_contains(container_winids, winid) then
         local old_width = self.win_width_store[winid]
         if old_width ~= nil then api.nvim_win_set_width(winid, old_width) end
       end
@@ -1524,7 +1532,7 @@ function Sidebar:toggle_code_window()
   else
     self.is_in_full_view = true
     for _, winid in ipairs(winids) do
-      if not vim.tbl_contains(container_winids, winid) and api.nvim_win_is_valid(winid) then
+      if api.nvim_win_is_valid(winid) and not vim.tbl_contains(container_winids, winid) then
         if Utils.is_floating_window(winid) then
           api.nvim_win_close(winid, true)
         else
@@ -1660,13 +1668,10 @@ function Sidebar:update_content(content, opts)
 
   if opts.scroll then Utils.buf_scroll_to_end(bufnr) end
 
-  -- 延迟执行回调和状态渲染
   if opts.callback then vim.schedule(opts.callback) end
 
-  -- 最后渲染状态
   vim.schedule(function()
     self:render_state()
-    -- 延迟重绘，避免阻塞
     vim.defer_fn(function() vim.cmd("redraw") end, 10)
   end)
 
@@ -1844,7 +1849,11 @@ function Sidebar.get_history_lines(history, ignore_record_prefix)
   local res = {}
   for idx, item in ipairs(group) do
     if idx ~= 1 then
-      res = vim.list_extend(res, { Line:new({ { "" } }), Line:new({ { RESP_SEPARATOR } }), Line:new({ { "" } }) })
+      if ignore_record_prefix then
+        res = vim.list_extend(res, { Line:new({ { "" } }) })
+      else
+        res = vim.list_extend(res, { Line:new({ { "" } }), Line:new({ { RESP_SEPARATOR } }), Line:new({ { "" } }) })
+      end
     end
     res = vim.list_extend(res, item)
   end
@@ -2974,6 +2983,8 @@ function Sidebar:adjust_result_container_layout()
   local width = self:get_result_container_width()
   local height = self:get_result_container_height()
 
+  if self.is_in_full_view then width = vim.o.columns - 1 end
+
   api.nvim_win_set_width(self.containers.result.winid, width)
   api.nvim_win_set_height(self.containers.result.winid, height)
 end
diff --git a/lua/avante/utils/init.lua b/lua/avante/utils/init.lua
index a3cf7c5..1497f58 100644
--- a/lua/avante/utils/init.lua
+++ b/lua/avante/utils/init.lua
@@ -1755,7 +1755,9 @@ function M.get_unified_diff(text1, text2, opts)
 end
 
 function M.is_floating_window(win_id)
-  local config = vim.api.nvim_win_get_config(win_id or 0)
+  win_id = win_id or 0
+  if not vim.api.nvim_win_is_valid(win_id) then return false end
+  local config = vim.api.nvim_win_get_config(win_id)
   return config.relative ~= ""
 end