Skip over synthetic type parameters from outer class

openrewrite · Sep 10, 2023 · 8b210b7 · 8b210b7
1 parent ba19d83
commit 8b210b7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/main/kotlin/org/openrewrite/kotlin/internal/KotlinParserVisitor.kt b/src/main/kotlin/org/openrewrite/kotlin/internal/KotlinParserVisitor.kt
@@ -3965,7 +3965,7 @@ class KotlinParserVisitor(
             val before = sourceBefore("<")
             val typeParameters: MutableList<JRightPadded<J.TypeParameter?>> =
                 ArrayList(regularClass.typeParameters.size)
-            val parameters = regularClass.typeParameters
+            val parameters = regularClass.typeParameters.filter { it.source != null }
             for (i in parameters.indices) {
                 val j: J = visitElement(parameters[i], data)!!
                 typeParameters.add(

diff --git a/src/test/java/org/openrewrite/kotlin/tree/ClassDeclarationTest.java b/src/test/java/org/openrewrite/kotlin/tree/ClassDeclarationTest.java
@@ -254,8 +254,12 @@ void explicitInlineConstructor() {
     @Test
     void implicitConstructorWithSuperType() {
         rewriteRun(
-          kotlin("class Other"),
-          kotlin("class Test ( val answer : Int ) : Other ( ) { }")
+          kotlin(
+            """
+              open class Other
+              class Test constructor ( val answer : Int ) : Other ( ) { }
+              """
+          )
         );
     }
 
@@ -416,7 +420,7 @@ abstract class BaseSubProjectionNode < T , R > (
                   val root : R
               ) {
                   
-                  constructor ( parent : T , root : R ) : this ( parent , root )
+                  constructor ( parent : T , root : R , id : Int ) : this ( parent , root )
                   
                   fun parent ( ) : T {
                       return parent
@@ -454,10 +458,7 @@ void mixedAnnotationsAndModifiers() {
             """
               @Repeatable
               annotation class A ( val s : String )
-              """
-          ),
-          kotlin(
-            """
+              
               open @A ( "1" ) public @A ( "2" ) class TestA
               @A ( "1" ) open @A ( "2" ) public class TestB
               """
@@ -564,4 +565,19 @@ void coneProjection() {
           )
         );
     }
+
+    @Test
+    void outerClassTypeParameters() {
+        rewriteRun(
+          kotlin(
+            """
+              class Test<K, V> {
+                  abstract inner class LinkedTreeMapIterator<T> : MutableIterator<T> {
+                      var lastReturned: Map.Entry<K, V>? = null
+                  }
+              }
+              """
+          )
+        );
+    }
 }