Renamed FileSuffix marker to AnnotationCallSite.

Added support for AnnotationCallSite property getter.
fixes #80

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

@@ -59,7 +59,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import static java.lang.Math.max;
 import static java.util.Collections.*;
@@ -184,7 +183,12 @@ public J visitAnnotationCall(FirAnnotationCall annotationCall, ExecutionContext
         skip("@");
         if (annotationCall.getUseSiteTarget() == AnnotationUseSiteTarget.FILE) {
             skip("file");
-            markers = markers.addIfAbsent(new FileSuffix(randomId(), sourceBefore(":")));
+            markers = markers.addIfAbsent(new AnnotationCallSite(randomId(), "file", sourceBefore(":")));
+        }
+
+        if (annotationCall.getUseSiteTarget() == AnnotationUseSiteTarget.PROPERTY_GETTER) {
+            skip("get");
+            markers = markers.addIfAbsent(new AnnotationCallSite(randomId(), "get", sourceBefore(":")));
         }
 
         J.Identifier name = (J.Identifier) visitElement(annotationCall.getCalleeReference(), ctx);
@@ -1507,7 +1511,15 @@ public J visitProperty(FirProperty property, ExecutionContext ctx) {
         Markers markers = Markers.EMPTY;
 
         List<J> modifiers = emptyList();
-        List<J.Annotation> annotations = mapModifiers(property.getAnnotations(), property.getName().asString());
+        List<FirAnnotation> mapAnnotations = new ArrayList<>(property.getAnnotations());
+        // Note: it might be possible to have annotations on both the property associated to the getter
+        // AND the getter itself. In that case, we to use a single list to avoid duplicates and add
+        // the target annotations to the appropriate LST element.
+        if (property.getGetter() != null && !property.getGetter().getAnnotations().isEmpty()) {
+            mapAnnotations.addAll(property.getGetter().getAnnotations());
+        }
+
+        List<J.Annotation> annotations = mapModifiers(mapAnnotations, property.getName().asString());
 
         JRightPadded<J.VariableDeclarations.NamedVariable> receiver = null;
         if (property.getReceiverTypeRef() != null) {
@@ -1699,7 +1711,7 @@ public J visitPropertyAccessor(FirPropertyAccessor propertyAccessor, ExecutionCo
         if (propertyAccessor.isGetter()) {
             Markers markers = Markers.EMPTY;
             List<J> modifiers = emptyList();
-            List<J.Annotation> annotations = mapAnnotations(propertyAccessor.getAnnotations());
+            List<J.Annotation> annotations = emptyList();
 
             JRightPadded<J.VariableDeclarations.NamedVariable> infixReceiver = null;
 

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

@@ -210,10 +210,10 @@ public J visitAnnotation(J.Annotation annotation, PrintOutputCapture<P> p) {
                 p.append("@");
             }
 
-            FileSuffix suffix = annotation.getMarkers().findFirst(FileSuffix.class).orElse(null);
-            if (suffix != null) {
-                p.append("file");
-                KotlinPrinter.this.visitSpace(suffix.getSuffix(), KSpace.Location.FILE_ANNOTATION_SUFFIX, p);
+            AnnotationCallSite callSite = annotation.getMarkers().findFirst(AnnotationCallSite.class).orElse(null);
+            if (callSite != null) {
+                p.append(callSite.getName());
+                KotlinPrinter.this.visitSpace(callSite.getSuffix(), KSpace.Location.FILE_ANNOTATION_SUFFIX, p);
                 p.append(":");
             }
             visit(annotation.getAnnotationType(), p);

src/main/java/org/openrewrite/kotlin/marker/FileSuffix.java → src/main/java/org/openrewrite/kotlin/marker/AnnotationCallSite.java

@@ -28,7 +28,8 @@
 @Incubating(since = "0.0")
 @Value
 @With
-public class FileSuffix implements Marker {
+public class AnnotationCallSite implements Marker {
     UUID id;
+    String name;
     Space suffix;
 }

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

@@ -16,6 +16,7 @@
 package org.openrewrite.kotlin.tree;
 
 import org.junit.jupiter.api.Test;
+import org.openrewrite.Issue;
 import org.openrewrite.test.RewriteTest;
 
 import static org.openrewrite.kotlin.tree.ParserAssertions.kotlin;
@@ -66,4 +67,19 @@ annotation class Test ( val values : Array < String > ) {
           )
         );
     }
+
+    @Issue("https://github.com/openrewrite/rewrite-kotlin/issues/80")
+    @Test
+    void jvmNameAnnotation() {
+        rewriteRun(
+          kotlin(
+            """
+            import kotlin.jvm.JvmName
+            @get : JvmName ( "getCount" )
+            val count : Int ?
+                get ( ) = 1
+            """
+          )
+        );
+    }
 }

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

@@ -268,10 +268,10 @@ void genericIntersectionType() {
         rewriteRun(
           kotlin(
             """
-            val first: String = "1"
-            val second: Int = 2
+            val first : String = "1"
+            val second : Int = 2
            
-            val l = listOf("foo" to first, "bar" to second)
+            val l = listOf ( "foo" to first , "bar" to second )
             """
           )
         );