From 5f4233e4bfc6bd7b78004cfa0380615458914241 Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Fri, 20 Oct 2017 09:07:52 +0300
Subject: [PATCH] Don't suggest "Remove explicit type specification" for an
 annotated type

So #KT-20622 Fixed
---
 .../kotlin/idea/intentions/RemoveExplicitTypeIntention.kt   | 1 +
 .../testData/intentions/removeExplicitType/hasAnnotation.kt | 5 +++++
 .../kotlin/idea/intentions/IntentionTestGenerated.java      | 6 ++++++
 3 files changed, 12 insertions(+)
 create mode 100644 idea/testData/intentions/removeExplicitType/hasAnnotation.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt
index b335106f371..2ee47848540 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt
@@ -42,6 +42,7 @@ class RemoveExplicitTypeIntention : SelfTargetingRangeIntention<KtCallableDeclar
         fun getRange(element: KtCallableDeclaration): TextRange? {
             if (element.containingFile is KtCodeFragment) return null
             val typeReference = element.typeReference ?: return null
+            if (typeReference.annotationEntries.isNotEmpty()) return null
 
             if (element is KtParameter) {
                 if (element.isLoopParameter) return element.textRange
diff --git a/idea/testData/intentions/removeExplicitType/hasAnnotation.kt b/idea/testData/intentions/removeExplicitType/hasAnnotation.kt
new file mode 100644
index 00000000000..4f6e3891616
--- /dev/null
+++ b/idea/testData/intentions/removeExplicitType/hasAnnotation.kt
@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+@Target(AnnotationTarget.TYPE)
+annotation class Foo
+
+fun foo(): @Foo Int<caret> = 1
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 220d906d583..163700df7b0 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -13184,6 +13184,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("hasAnnotation.kt")
+        public void testHasAnnotation() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/hasAnnotation.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("notOnParameterOfFunctionType.kt")
         public void testNotOnParameterOfFunctionType() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/notOnParameterOfFunctionType.kt");