Catch exceptions and create a J.Unknown in visitKtFile. (#383)

openrewrite · Nov 11, 2023 · 940cdd4 · 940cdd4 · kunli2 · Nov 13, 2023
1 parent bbea9f7
commit 940cdd4
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java b/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java
@@ -39,6 +39,7 @@
 import org.jetbrains.kotlin.types.Variance;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.FileAttributes;
+import org.openrewrite.ParseExceptionResult;
 import org.openrewrite.Tree;
 import org.openrewrite.internal.EncodingDetectingInputStream;
 import org.openrewrite.internal.ListUtils;
@@ -48,6 +49,7 @@
 import org.openrewrite.java.marker.OmitParentheses;
 import org.openrewrite.java.marker.TrailingComma;
 import org.openrewrite.java.tree.*;
+import org.openrewrite.kotlin.KotlinParser;
 import org.openrewrite.kotlin.marker.*;
 import org.openrewrite.kotlin.tree.K;
 import org.openrewrite.marker.Markers;
@@ -62,6 +64,7 @@
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
 import static org.openrewrite.Tree.randomId;
+import static org.openrewrite.java.tree.Space.EMPTY;
 
 /**
  * PSI based parser
@@ -1644,7 +1647,22 @@ public J visitKtFile(KtFile file, ExecutionContext data) {
         List<JRightPadded<Statement>> statements = new ArrayList<>(file.getDeclarations().size());
         List<KtDeclaration> declarations = file.getDeclarations();
         for (KtDeclaration declaration : declarations) {
-            Statement statement = convertToStatement(declaration.accept(this, data));
+            Statement statement;
+            try {
+                statement = convertToStatement(declaration.accept(this, data));
+            } catch (Exception e) {
+                statement = new J.Unknown(
+                        randomId(),
+                        deepPrefix(declaration),
+                        Markers.EMPTY,
+                        new J.Unknown.Source(
+                                randomId(),
+                                EMPTY,
+                                Markers.build(singletonList(ParseExceptionResult.build(KotlinParser.builder().build(), e)
+                                        .withTreeType(declaration.getClass().getName()))),
+                                file.getText().substring(PsiUtilsKt.getStartOffsetSkippingComments(declaration),
+                                        declaration.getTextRange().getEndOffset())));
+            }
             statements.add(padRight(statement, Space.EMPTY));
         }
 

diff --git a/src/test/java/org/openrewrite/kotlin/tree/ClassDeclarationTest.java b/src/test/java/org/openrewrite/kotlin/tree/ClassDeclarationTest.java
@@ -29,15 +29,6 @@
 @SuppressWarnings("ALL")
 class ClassDeclarationTest implements RewriteTest {
 
-    @Test
-    void whitespaceInPackage() {
-        rewriteRun(
-          kotlin(
-            "package foo . bar"
-          )
-        );
-    }
-
     @Test
     void whitespaceInImport() {
         rewriteRun(

diff --git a/src/test/java/org/openrewrite/kotlin/tree/PackageTest.java b/src/test/java/org/openrewrite/kotlin/tree/PackageTest.java
@@ -23,6 +23,15 @@
 
 class PackageTest implements RewriteTest {
 
+    @Test
+    void whitespaceInPackage() {
+        rewriteRun(
+          kotlin(
+            "package foo . bar"
+          )
+        );
+    }
+
     @Test
     void regular() {
         rewriteRun(