From aed26f9926ea12b077633e2f5e93a945aa210bef Mon Sep 17 00:00:00 2001
From: DBL2017 <1578770584@qq.com>
Date: Thu, 9 Apr 2026 22:08:27 +0800
Subject: [PATCH 1/2] fix: invalid window id

---
 lua/treesitter-context/context.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/treesitter-context/context.lua b/lua/treesitter-context/context.lua
index 1b370180..16a2070b 100644
--- a/lua/treesitter-context/context.lua
+++ b/lua/treesitter-context/context.lua
@@ -319,6 +319,11 @@ end
 --- @return Range4[]?, string[]?
 function M.get(winid)
   winid = winid or api.nvim_get_current_win()
+
+  if not api.nvim_win_is_valid(winid) then
+    winid = api.nvim_get_current_win()
+  end
+
   local bufnr = api.nvim_win_get_buf(winid)
 
   -- vim.treesitter.get_parser() calls bufload(), but we don't actually want to load the buffer:

From bf8a75ad1e307f1f5c222dd1a96ba9638ab301b2 Mon Sep 17 00:00:00 2001
From: DBL2017 <1578770584@qq.com>
Date: Thu, 9 Apr 2026 22:35:42 +0800
Subject: [PATCH 2/2] fix: test case failed

---
 lua/treesitter-context/context.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/treesitter-context/context.lua b/lua/treesitter-context/context.lua
index 16a2070b..69afddb0 100644
--- a/lua/treesitter-context/context.lua
+++ b/lua/treesitter-context/context.lua
@@ -321,7 +321,7 @@ function M.get(winid)
   winid = winid or api.nvim_get_current_win()
 
   if not api.nvim_win_is_valid(winid) then
-    winid = api.nvim_get_current_win()
+    return
   end
 
   local bufnr = api.nvim_win_get_buf(winid)