Fix nav logic of overlapping 'first' ranges

Ericsson · Feb 11, 2022 · 1b79403 · 1b79403
1 parent 4a40aea
commit 1b79403
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/editor/navigation.ts b/src/editor/navigation.ts
@@ -104,18 +104,21 @@ export class NavigationHandler {
             }
 
             if (cursor.isEqual(new Position(path.line-1, path.column-1))) {
+                // Set the first result if there's no exact-position match yet,
+                // or always set the last result
+                if ((which === 'first' && isExactPosition)) {
+                    continue;
+                }
+
                 foundIdx = idx;
                 isExactPosition = true;
 
-                if (which === 'first') {
-                    break;
-                }
-
                 continue;
             }
 
-            // Check inside the ranges, but only if no exact match was found
-            if (!path.range || isExactPosition) {
+            // Set the first result if there's a range, there's nothing found yet,
+            // or set the last result if there's no exact-position match yet
+            if (!path.range || (which === 'first' && foundIdx !== null) || isExactPosition) {
                 continue;
             }
 
@@ -128,10 +131,6 @@ export class NavigationHandler {
 
             if (range.contains(cursor)) {
                 foundIdx = idx;
-
-                if (which === 'first') {
-                    break;
-                }
             }
         }