Only compute line ending when match is found

openrewrite · Dec 11, 2024 · 988c910 · 988c910
1 parent 4c375f9
commit 988c910
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/rewrite-core/src/main/java/org/openrewrite/text/Find.java b/rewrite-core/src/main/java/org/openrewrite/text/Find.java
@@ -28,7 +28,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -92,8 +91,8 @@ public String getDescription() {
     @Nullable
     String filePattern;
 
-    private static LinkedList<Integer> findAllNewLineIndexes(String input) {
-        LinkedList<Integer> indexes = new LinkedList<>();
+    private static List<Integer> findAllNewLineIndexes(String input) {
+        List<Integer> indexes = new ArrayList<>();
         int index = input.indexOf('\n'); // Find the first occurrence
 
         while (index != -1) {
@@ -142,17 +141,21 @@ public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
                 List<PlainText.Snippet> snippets = new ArrayList<>();
                 int previousEnd = 0;
 
-                LinkedList<Integer> newlineIndexes = findAllNewLineIndexes(rawText);
+                List<Integer> newlineIndexes = null;
                 int lastNewLineIndex = -1;
 
                 while (matcher.find()) {
+                    if (newlineIndexes == null) {
+                        newlineIndexes = findAllNewLineIndexes(rawText);
+                    }
+
                     int matchStart = matcher.start();
                     snippets.add(snippet(rawText.substring(previousEnd, matchStart)));
                     snippets.add(SearchResult.found(snippet(rawText.substring(matchStart, matcher.end()))));
                     previousEnd = matcher.end();
 
-                    while (!newlineIndexes.isEmpty() && newlineIndexes.peek() < matchStart) {
-                        lastNewLineIndex = newlineIndexes.pop();
+                    while (!newlineIndexes.isEmpty() && newlineIndexes.get(0) < matchStart) {
+                        lastNewLineIndex = newlineIndexes.remove(0);
                     }
                     int startLine = Math.max(0, lastNewLineIndex + 1);
 

diff --git a/rewrite-core/src/test/java/org/openrewrite/text/FindTest.java b/rewrite-core/src/test/java/org/openrewrite/text/FindTest.java
@@ -144,6 +144,7 @@ void regexWithoutMultilineAndDotall() {
           )
         );
     }
+
     @Test
     void regexMatchingWhitespaceWithoutMultilineWithDotall() {
         rewriteRun(
@@ -154,11 +155,6 @@ void regexMatchingWhitespaceWithoutMultilineWithDotall() {
               Zero
               One Two
               Three
-              """,
-            """
-              Zero
-              ~~>One Two
-              Three
               """
           )
         );
-Original file line number
+Diff line change
@@ Expand Up / @@ -144,6 +144,7 @@ void regexWithoutMultilineAndDotall() { @@
               )
             );
         }
         @Test
         void regexMatchingWhitespaceWithoutMultilineWithDotall() {
             rewriteRun(
@@ Expand All / @@ -154,11 +155,6 @@ void regexMatchingWhitespaceWithoutMultilineWithDotall() { @@
                   Zero
                   One Two
                   Three
-                  """,
-                """
-                  Zero
-                  ~~>One Two
-                  Three
                   """
               )
             );
@@ Expand Down @@