Fix typeAliasWithModifier

openrewrite · Nov 10, 2023 · dadb295 · dadb295 · kunli2 · Nov 10, 2023
1 parent 314267f
commit dadb295
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java b/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java
@@ -1224,10 +1224,9 @@ public J visitTypeAlias(KtTypeAlias typeAlias, ExecutionContext data) {
         List<J.Annotation> lastAnnotations = new ArrayList<>();
         Set<PsiElement> consumedSpaces = preConsumedInfix(typeAlias);
 
+        modifiers.addAll(mapModifiers(typeAlias.getModifierList(), leadingAnnotations, lastAnnotations, data));
         modifiers.add(new J.Modifier(randomId(), prefix(typeAlias.getTypeAliasKeyword(), consumedSpaces), markers, "typealias", J.Modifier.Type.LanguageExtension, emptyList()));
 
-        mapModifiers(typeAlias.getModifierList(), leadingAnnotations, lastAnnotations, data);
-
         if (typeAlias.getIdentifyingElement() == null) {
             throw new UnsupportedOperationException("TODO");
         }

diff --git a/src/test/java/org/openrewrite/kotlin/tree/TypeAliasTest.java b/src/test/java/org/openrewrite/kotlin/tree/TypeAliasTest.java
@@ -61,4 +61,16 @@ void typeAliasForFunctionType() {
           )
         );
     }
+
+    @Issue("https://github.com/openrewrite/rewrite-kotlin/issues/375")
+    @Test
+    void typeAliasWithModifier() {
+        rewriteRun(
+          kotlin(
+            """
+              internal  typealias   Action = (String) -> Unit
+              """
+          )
+        );
+    }
 }