From 36839df8417329b295ddfc0882527ef69a6fbf0d Mon Sep 17 00:00:00 2001
From: Krzosa Karol <krzosa@proton.me>
Date: Wed, 21 Jan 2026 09:05:30 +0100
Subject: [PATCH] Make GotoNextInList only skip things that are in range of
 first caret

---
 src/text_editor/window.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/text_editor/window.cpp b/src/text_editor/window.cpp
index 0a832dd..61e314f 100644
--- a/src/text_editor/window.cpp
+++ b/src/text_editor/window.cpp
@@ -295,20 +295,18 @@ void GotoNextInList(Window *window, Int line_offset = 1) {
         }
 
         Buffer *active_view_buffer = GetBuffer(active_view->active_buffer);
-        Int p = active_view->carets[0].range.min;
-        Int active_view_line = PosToLine(active_view_buffer, p);
+        Range before_jump_range = active_view->carets[0].range;
 
         BSet set = Open(line, ResolveOpenMeta_DontError | ResolveOpenMeta_DontExec);
         if (set.window == NULL) {
             continue;
         }
 
-        // if (set.view == active_view) {
-        //     Int new_line = PosToLine(set.buffer, set.view->carets[0].range.min);
-        //     if (active_view_line == new_line) {
-        //         continue;
-        //     }
-        // }
+        if (set.view == active_view) {
+            if (AreOverlapping(set.view->carets[0].range, before_jump_range)) {
+                continue;
+            }
+        }
 
         opened = true;
         break;