Merge pull request #4956 from anijanyan/find-all

Find all in a range bug fixed
ajaxorg · Oct 18, 2022 · bd3573c · bd3573c
2 parents be8eb12 + 8642199
commit bd3573c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/search.js b/src/search.js
@@ -149,12 +149,13 @@ var Search = function() {
 
         if (range) {
             var startColumn = range.start.column;
-            var endColumn = range.start.column;
+            var endColumn = range.end.column;
             var i = 0, j = ranges.length - 1;
-            while (i < j && ranges[i].start.column < startColumn && ranges[i].start.row == range.start.row)
+            while (i < j && ranges[i].start.column < startColumn && ranges[i].start.row == 0)
                 i++;
 
-            while (i < j && ranges[j].end.column > endColumn && ranges[j].end.row == range.end.row)
+            var endRow = range.end.row - range.start.row;
+            while (i < j && ranges[j].end.column > endColumn && ranges[j].end.row == endRow)
                 j--;
 
             ranges = ranges.slice(i, j + 1);

diff --git a/src/search_test.js b/src/search_test.js
@@ -483,6 +483,33 @@ module.exports = {
         check(2, 2, 3, 4);
         check(0, 2, 1, 4);
         check(4, 2, 5, 4);
+    },
+
+    "test: find all matches in a range" : function() {
+        var session = new EditSession([
+            "",
+            "    var myVar1 = 1; var myVar2 = 2; var myVar3 = 3;",
+            "    var myVar4 = 4; var myVar5 = 5; var myVar6 = 6;"
+        ]);
+
+        var search = new Search().set({
+            needle: "var",
+            backwards: true,
+            caseSensitive: true,
+            range: {start: {row: 1, column: 20}, end: {row: 2, column: 22}},
+            wholeWord: false,
+            regExp: false
+        });
+
+        var ranges = search.findAll(session);
+
+        assert.equal(ranges.length, 3);
+        assert.position(ranges[0].start, 1, 20);
+        assert.position(ranges[0].end, 1, 23);
+        assert.position(ranges[1].start, 1, 36);
+        assert.position(ranges[1].end, 1, 39);
+        assert.position(ranges[2].start, 2, 4);
+        assert.position(ranges[2].end, 2, 7);
     }
 };