Preserve leading comments.

openrewrite · Nov 13, 2023 · 5238a69 · 5238a69
1 parent 0357e24
commit 5238a69
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/openrewrite/javascript/internal/TypeScriptParserVisitor.java b/src/main/java/org/openrewrite/javascript/internal/TypeScriptParserVisitor.java
@@ -3069,7 +3069,9 @@ private Integer getCursor() {
      * Consume the provided text if it matches the current cursor position.
      */
     private void skip(String text) {
-        if (source.getText().startsWith(text, getCursor())) {
+        if (source.hasProperty("text") && source.getStringProperty("text").startsWith(text, getCursor())) {
+            cursor(getCursor() + text.length());
+        } else if (source.getText().startsWith(text, getCursor())) {
             cursor(getCursor() + text.length());
         }
     }

diff --git a/src/main/java/org/openrewrite/javascript/internal/tsc/TSCRuntime.java b/src/main/java/org/openrewrite/javascript/internal/tsc/TSCRuntime.java
@@ -163,7 +163,7 @@ public void parseSourceTexts(Map<Path, String> sourceTexts, BiConsumer<TSCNode,
                     }
 
                     V8ValueObject sourceFileV8 = (V8ValueObject) maybeSourceFileV8;
-                    String sourceText = sourceFileV8.invokeString("getText");
+                    String sourceText = sourceFileV8.getPropertyString("text");
                     Path filePath = Paths.get(filePathV8.getValue());
                     try (TSCSourceFileContext sourceFileContext = new TSCSourceFileContext(programContext, sourceText, filePath)) {
                         TSCNode node = programContext.tscNode(sourceFileV8);

diff --git a/src/test/java/org/openrewrite/javascript/tree/CommentTest.java b/src/test/java/org/openrewrite/javascript/tree/CommentTest.java
@@ -16,7 +16,6 @@
 package org.openrewrite.javascript.tree;
 
 import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.ExpectedToFail;
 
 @SuppressWarnings("JSUnusedLocalSymbols")
 class CommentTest extends ParserTest {
@@ -100,7 +99,6 @@ function f ( p1 , p2 ) {
         );
     }
 
-    @ExpectedToFail
     @Test
     void leadingComment() {
         rewriteRun(