From f0ad738e5aa15605a73d34b3b0a803b48e47d519 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 17 Oct 2025 02:05:04 -0700
Subject: [PATCH] fix(sidebar): avoid crashing in WinNew handler (#2777)

---
 lua/avante/sidebar.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/avante/sidebar.lua b/lua/avante/sidebar.lua
index 8a00162..d774ec2 100644
--- a/lua/avante/sidebar.lua
+++ b/lua/avante/sidebar.lua
@@ -214,8 +214,8 @@ function Sidebar:setup_colors()
         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
-          winhl:find(Highlights.AVANTE_SIDEBAR_WIN_SEPARATOR)
-          and not Utils.should_hidden_border(self.code.winid, winid)
+          winhl:find("WinSeparator:" .. Highlights.AVANTE_SIDEBAR_WIN_SEPARATOR)
+          and not (vim.api.nvim_win_is_valid(self.code.winid) and Utils.should_hidden_border(self.code.winid, winid))
         then
           vim.wo[winid].winhl = self.code.old_winhl or ""
         end