Fixed some annotation parsing. (#554)

Author: traceyyoshima

src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java

@@ -912,7 +912,7 @@ public J visitParameter(KtParameter parameter, ExecutionContext data) {
             }
 
             if (parameter.getValOrVarKeyword() != null) {
-                modifiers.add(mapModifier(parameter.getValOrVarKeyword(), Collections.emptyList(), consumedSpaces));
+                modifiers.add(mapModifier(parameter.getValOrVarKeyword(), lastAnnotations, consumedSpaces));
             }
         }
 
@@ -1027,9 +1027,9 @@ public J visitPrimaryConstructor(KtPrimaryConstructor constructor, ExecutionCont
     public J visitPropertyAccessor(KtPropertyAccessor accessor, ExecutionContext data) {
         Markers markers = Markers.EMPTY;
         List<J.Annotation> leadingAnnotations = new ArrayList<>();
-        List<J.Modifier> modifiers = mapModifiers(accessor.getModifierList(), leadingAnnotations, emptyList(), data);
-        TypeTree returnTypeExpression = null;
         List<J.Annotation> lastAnnotations = new ArrayList<>();
+        List<J.Modifier> modifiers = mapModifiers(accessor.getModifierList(), leadingAnnotations, lastAnnotations, data);
+        TypeTree returnTypeExpression = null;
         JContainer<Statement> params;
         J.Block body = null;
         Set<PsiElement> consumedSpaces = preConsumedInfix(accessor);
@@ -1164,7 +1164,7 @@ public J visitSecondaryConstructor(KtSecondaryConstructor constructor, Execution
         List<J.Annotation> leadingAnnotations = new ArrayList<>();
         List<J.Annotation> lastAnnotations = new ArrayList<>();
         List<J.Modifier> modifiers = mapModifiers(constructor.getModifierList(), leadingAnnotations, lastAnnotations, data);
-        modifiers.add(mapModifier(constructor.getConstructorKeyword(), emptyList(), preConsumedInfix(constructor)));
+        modifiers.add(mapModifier(constructor.getConstructorKeyword(), lastAnnotations, preConsumedInfix(constructor)));
 
         JavaType.Method type = methodDeclarationType(constructor);
         J.Identifier name = createIdentifier(requireNonNull(constructor.getName()), prefix(constructor.getConstructorKeyword()), type)
@@ -2609,7 +2609,7 @@ private J visitNamedFunction0(KtNamedFunction function, ExecutionContext data) {
             modifiers.add(buildFinalModifier().withPrefix(Space.EMPTY));
         }
 
-        modifiers.add(new J.Modifier(randomId(), prefix(function.getFunKeyword(), prefixConsumedSet), Markers.EMPTY, "fun", J.Modifier.Type.LanguageExtension, emptyList()));
+        modifiers.add(new J.Modifier(randomId(), prefix(function.getFunKeyword(), prefixConsumedSet), Markers.EMPTY, "fun", J.Modifier.Type.LanguageExtension, lastAnnotations));
         J.Identifier name;
 
         JavaType.Method type = methodDeclarationType(function);

src/test/java/org/openrewrite/kotlin/tree/AnnotationTest.java

@@ -690,4 +690,61 @@ annotation class Ann2
           )
         );
     }
+
+    @Issue("https://github.com/openrewrite/rewrite-kotlin/issues/552")
+    @Test
+    void trailingAnnotationOnSecondaryConstructor() {
+        rewriteRun(
+          kotlin(
+            """
+              annotation class A1
+              class Test ( val answer : Int ) {
+                  private @A1 constructor  (   )    : this  (   42    )
+              }
+              """
+          )
+        );
+    }
+
+    @Issue("https://github.com/openrewrite/rewrite-kotlin/issues/552")
+    @Test
+    void trailingAnnotationOnPropertyAccessor() {
+        rewriteRun(
+          kotlin(
+            """
+              annotation class Ann
+              var s : String = ""
+                  internal @Ann set  (   value    )     {
+                      field  =   value
+                  }
+              """
+          )
+        );
+    }
+
+    @Issue("https://github.com/openrewrite/rewrite-kotlin/issues/552")
+    @Test
+    void trailingAnnotationOnTypeReference() {
+        rewriteRun(
+          kotlin(
+            """
+              annotation class Anno
+              class Example  (   public    @Anno val  quux   :     String )
+              """
+          )
+        );
+    }
+
+    @Issue("https://github.com/openrewrite/rewrite-kotlin/issues/552")
+    @Test
+    void trailingAnnotationNamedFunction() {
+        rewriteRun(
+          kotlin(
+            """
+              annotation class Anno
+              internal @Anno fun method() {}
+              """
+          )
+        );
+    }
 }