Added type validation to Assertions.

Disabled type validation on tests with intentionally unresolvable types. Fixed NPE in KotlinPrinter. Fixed errors in AnnotationTest.
openrewrite · Dec 13, 2023 · 25bf1ca · 25bf1ca
1 parent d2b4cae
commit 25bf1ca
Show file tree

Hide file tree

Showing 11 changed files with 493 additions and 139 deletions.
diff --git a/src/main/java/org/openrewrite/kotlin/Assertions.java b/src/main/java/org/openrewrite/kotlin/Assertions.java
diff --git a/src/main/java/org/openrewrite/kotlin/internal/KotlinPrinter.java b/src/main/java/org/openrewrite/kotlin/internal/KotlinPrinter.java
@@ -1162,7 +1162,7 @@ public J visitVariableDeclarations(J.VariableDeclarations multiVariable, PrintOu
                     p.append("val");
                 }
 
-                if (m.getType() == J.Modifier.Type.LanguageExtension && m.getKeyword().equals("typealias")) {
+                if (m.getType() == J.Modifier.Type.LanguageExtension && m.getKeyword() != null && m.getKeyword().equals("typealias")) {
                     isTypeAlias = true;
                 }
             }

diff --git a/src/main/java/org/openrewrite/kotlin/search/package-info.java b/src/main/java/org/openrewrite/kotlin/search/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2023 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@NonNullApi
+@NonNullFields
+package org.openrewrite.kotlin.search;
+
+import org.openrewrite.internal.lang.NonNullApi;
+import org.openrewrite.internal.lang.NonNullFields;
diff --git a/src/test/java/org/openrewrite/kotlin/KotlinTypeMappingTest.java b/src/test/java/org/openrewrite/kotlin/KotlinTypeMappingTest.java
@@ -31,6 +31,7 @@
 import org.openrewrite.java.tree.TypeUtils;
 import org.openrewrite.kotlin.tree.K;
 import org.openrewrite.test.RewriteTest;
+import org.openrewrite.test.TypeValidation;
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
@@ -947,6 +948,7 @@ class A : RemoteStub()
         @Test
         void unknownIdentifier() {
             rewriteRun(
+              spec -> spec.typeValidationOptions(TypeValidation.none()),
               kotlin(
                 //language=none
                 "class A : RemoteStub",

diff --git a/src/test/java/org/openrewrite/kotlin/RemoveImportTest.java b/src/test/java/org/openrewrite/kotlin/RemoveImportTest.java
@@ -20,6 +20,7 @@
 import org.openrewrite.Recipe;
 import org.openrewrite.kotlin.tree.K;
 import org.openrewrite.test.RewriteTest;
+import org.openrewrite.test.TypeValidation;
 
 import static org.openrewrite.kotlin.Assertions.kotlin;
 import static org.openrewrite.test.RewriteTest.toRecipe;
@@ -34,9 +35,9 @@ void jvmStaticMember() {
             """
               import java.lang.Integer
               import java.lang.Long
-
+              
               import java.lang.Integer.MAX_VALUE
-
+              
               class A
               """,
             """
@@ -56,7 +57,7 @@ void removeStarFoldPackage() {
           kotlin(
             """
               import java.io.*
-
+              
               class A {
                   val f = File("foo")
               }
@@ -79,7 +80,7 @@ void keepStarFoldPackage() {
           kotlin(
             """
               import java.io.*
-
+              
               class A {
                   val c : Closeable? = null
                   val f : File? = null
@@ -99,7 +100,7 @@ void removeStarFoldTypeMembers() {
           kotlin(
             """
               import java.util.regex.Pattern.*
-
+              
               class A {
                   val i = CASE_INSENSITIVE
                   val x = COMMENTS
@@ -108,7 +109,7 @@ class A {
             """
               import java.util.regex.Pattern.CASE_INSENSITIVE
               import java.util.regex.Pattern.COMMENTS
-
+              
               class A {
                   val i = CASE_INSENSITIVE
                   val x = COMMENTS
@@ -125,7 +126,7 @@ void keepStarFoldTypeMembers() {
           kotlin(
             """
               import java.util.regex.Pattern.*
-
+              
               class A {
                   val i = CASE_INSENSITIVE
                   val x = COMMENTS
@@ -139,12 +140,13 @@ class A {
     @Test
     void keepImportAlias() {
         rewriteRun(
-          spec -> spec.recipe(removeMemberImportRecipe("java.util.regex.Pattern", "COMMENTS")),
+          spec -> spec.typeValidationOptions(TypeValidation.none())
+            .recipe(removeMemberImportRecipe("java.util.regex.Pattern", "COMMENTS")),
           kotlin(
             """
               import java.util.regex.Pattern.CASE_INSENSITIVE as i
               import java.util.regex.Pattern.COMMENTS as x
-
+              
               class A {
                   val f = arrayOf(i, x)
               }
@@ -157,19 +159,21 @@ class A {
     void removeImportAlias() {
         // TODO check if this is really what we want to happen
         rewriteRun(
-          spec -> spec.recipe(removeMemberImportRecipe("java.util.regex.Pattern", "COMMENTS")),
+          // Type validation is disabled until https://github.com/openrewrite/rewrite-kotlin/issues/545 is implemented.
+          spec -> spec.typeValidationOptions(TypeValidation.none())
+            .recipe(removeMemberImportRecipe("java.util.regex.Pattern", "COMMENTS")),
           kotlin(
             """
               import java.util.regex.Pattern.CASE_INSENSITIVE as i
               import java.util.regex.Pattern.COMMENTS as x
-
+              
               class A {
                   val f = arrayOf(i)
               }
               """,
             """
               import java.util.regex.Pattern.CASE_INSENSITIVE as i
-
+              
               class A {
                   val f = arrayOf(i)
               }

diff --git a/src/test/java/org/openrewrite/kotlin/format/TabsAndIndentsTest.java b/src/test/java/org/openrewrite/kotlin/format/TabsAndIndentsTest.java
@@ -28,6 +28,7 @@
 import org.openrewrite.style.NamedStyles;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
+import org.openrewrite.test.TypeValidation;
 
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
@@ -2223,8 +2224,11 @@ fun test0() {
     @Test
     void trailingLambdaCall() {
         rewriteRun(
+          spec -> spec.typeValidationOptions(TypeValidation.none()),
           kotlin(
             """
+              import kotlin.reflect.full.memberProperties
+              
               inline fun <reified T : Any> T.destruct(): Map<String, Any?> {
                   return T::class.memberProperties.map {
                       it.name to it.get(this)