phyer/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sidebar): the sidebar height is incorrect when selecting code

Browse Source
This commit is contained in:
yetone 2024-08-31 23:35:35 +08:00
parent ff887af901
commit faa46975cf
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/avante/config.lua
View File

@ -138,8 +138,8 @@ M.defaults = {
}, },
windows = { windows = {
wrap = true, -- similar to vim.o.wrap wrap = true, -- similar to vim.o.wrap
width = 30, -- default % based on available width width = 30, -- default % based on available width in vertical layout
height = 30, -- default % based on available height height = 30, -- default % based on available height in horizontal layout
sidebar_header = { sidebar_header = {
align = "center", -- left, center, right for title align = "center", -- left, center, right for title
rounded = true, rounded = true,

12
lua/avante/sidebar.lua
View File

@ -681,7 +681,7 @@ function Sidebar:render_selected_code()
end end
local selected_code_lines_count = 0 local selected_code_lines_count = 0
local selected_code_max_lines_count = 10 local selected_code_max_lines_count = 12
if self.code.selection ~= nil then if self.code.selection ~= nil then
local selected_code_lines = vim.split(self.code.selection.content, "\n") local selected_code_lines = vim.split(self.code.selection.content, "\n")
@ -1225,6 +1225,9 @@ function Sidebar:create_selected_code()
}, },
}) })
self.selected_code:mount() self.selected_code:mount()
if Config.layout == "horizontal" then
api.nvim_win_set_height(self.result.winid, api.nvim_win_get_height(self.result.winid) - selected_code_size - 3)
end
end end
end end
@ -1388,9 +1391,11 @@ function Sidebar:create_input()
} }
end end
local selected_code_size = self:get_selected_code_size()
return { return {
width = "40%", width = "40%",
height = api.nvim_win_get_height(self.result.winid), height = math.max(1, api.nvim_win_get_height(self.result.winid) - selected_code_size),
} }
end end
@ -1584,7 +1589,6 @@ end
function Sidebar:render() function Sidebar:render()
local chat_history = History.load(self.code.bufnr) local chat_history = History.load(self.code.bufnr)
local sidebar_height = api.nvim_win_get_height(self.code.winid)
local get_position = function() local get_position = function()
if Config.layout == "vertical" then if Config.layout == "vertical" then
return "right" return "right"
@ -1594,7 +1598,7 @@ function Sidebar:render()
local get_height = function() local get_height = function()
local selected_code_size = self:get_selected_code_size() local selected_code_size = self:get_selected_code_size()
vim.print(selected_code_size)
if Config.layout == "horizontal" then if Config.layout == "horizontal" then
return math.floor(Config.windows.height / 100 * api.nvim_win_get_height(self.code.winid)) return math.floor(Config.windows.height / 100 * api.nvim_win_get_height(self.code.winid))
end end