From c2b031e442c9f2572c6cf2a27848e372bcccf495 Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Fri, 6 Apr 2018 05:04:26 +0300
Subject: [PATCH] Preserve annotation arguments in "Add use-site target"
 intention

So #KT-23634 Fixed

GitOrigin-RevId: 608e617b701c05fa270ad9c8e7911e0b36e428f7
---
 .../intentions/AddAnnotationUseSiteTargetIntention.kt     | 2 +-
 .../kotlin/idea/intentions/IntentionTestGenerated.java    | 6 ++++++
 .../addAnnotationUseSiteTarget/hasAnnotationArgs.kt       | 8 ++++++++
 .../addAnnotationUseSiteTarget/hasAnnotationArgs.kt.after | 8 ++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 plugins/kotlin/idea/tests/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt
 create mode 100644 plugins/kotlin/idea/tests/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt.after

diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/AddAnnotationUseSiteTargetIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/AddAnnotationUseSiteTargetIntention.kt
index de4cbe40ec97..595849715a38 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/AddAnnotationUseSiteTargetIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/AddAnnotationUseSiteTargetIntention.kt
@@ -141,6 +141,6 @@ private fun KtAnnotationEntry.applicableUseSiteTargets(): List<AnnotationUseSite
 
 private fun KtAnnotationEntry.addUseSiteTarget(useSiteTarget: AnnotationUseSiteTarget, project: Project) {
     project.executeWriteCommand("Add use-site target") {
-        replace(KtPsiFactory(this).createAnnotationEntry("@${useSiteTarget.renderName}:$shortName"))
+        replace(KtPsiFactory(this).createAnnotationEntry("@${useSiteTarget.renderName}:$shortName${valueArgumentList?.text ?: ""}"))
     }
 }
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 8328343bac05..d764ac704429 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -33,6 +33,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addAnnotationUseSiteTarget"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
+        @TestMetadata("hasAnnotationArgs.kt")
+        public void testHasAnnotationArgs() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("hasTarget1.kt")
         public void testHasTarget1() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addAnnotationUseSiteTarget/hasTarget1.kt");
diff --git a/plugins/kotlin/idea/tests/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt b/plugins/kotlin/idea/tests/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt
new file mode 100644
index 000000000000..350e4b94c575
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt
@@ -0,0 +1,8 @@
+// CHOOSE_USE_SITE_TARGET: field
+
+annotation class A(val s: String)
+
+class Test {
+    @A("...")<caret>
+    val foo: String = ""
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt.after b/plugins/kotlin/idea/tests/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt.after
new file mode 100644
index 000000000000..5d7bca06efb2
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt.after
@@ -0,0 +1,8 @@
+// CHOOSE_USE_SITE_TARGET: field
+
+annotation class A(val s: String)
+
+class Test {
+    @field:A("...")
+    val foo: String = ""
+}
\ No newline at end of file