From 52309cd10e23bcbcff53768d9eb0d62760b10872 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 9 Mar 2016 14:19:37 +0300
Subject: [PATCH] Minor, drop handling of deprecated kotlin.Extension
 annotation

---
 .../org/jetbrains/kotlin/builtins/KotlinBuiltIns.java  | 10 +++-------
 .../idea/decompiler/stubBuilder/TypeClsStubBuilder.kt  |  3 +--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
index f52ae31aed1..f8251d1796b 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
@@ -204,9 +204,6 @@ public abstract class KotlinBuiltIns {
         public final FqNameUnsafe kCallable = reflect("KCallable");
         public final ClassId kProperty = ClassId.topLevel(reflect("KProperty").toSafe());
 
-        // TODO: remove in 1.0
-        public final FqName deprecatedExtensionAnnotation = fqName("Extension");
-
         public final Map<FqNameUnsafe, PrimitiveType> fqNameToPrimitiveType;
         public final Map<FqNameUnsafe, PrimitiveType> arrayClassFqNameToPrimitiveType;
         {
@@ -813,14 +810,13 @@ public abstract class KotlinBuiltIns {
     }
 
     @NotNull
-    public AnnotationDescriptor createExtensionAnnotation() {
+    private AnnotationDescriptor createExtensionFunctionTypeAnnotation() {
         return new AnnotationDescriptorImpl(getBuiltInClassByName(FQ_NAMES.extensionFunctionType.shortName()).getDefaultType(),
                                             Collections.<ValueParameterDescriptor, ConstantValue<?>>emptyMap(), SourceElement.NO_SOURCE);
     }
 
     private static boolean isTypeAnnotatedWithExtension(@NotNull KotlinType type) {
-        return type.getAnnotations().findAnnotation(FQ_NAMES.extensionFunctionType) != null ||
-               type.getAnnotations().findAnnotation(FQ_NAMES.deprecatedExtensionAnnotation) != null;
+        return type.getAnnotations().findAnnotation(FQ_NAMES.extensionFunctionType) != null;
     }
 
     @NotNull
@@ -844,7 +840,7 @@ public abstract class KotlinBuiltIns {
         if (annotations.findAnnotation(FQ_NAMES.extensionFunctionType) != null) return annotations;
 
         // TODO: preserve laziness of given annotations
-        return new AnnotationsImpl(plus(annotations, listOf(createExtensionAnnotation())));
+        return new AnnotationsImpl(plus(annotations, listOf(createExtensionFunctionTypeAnnotation())));
     }
 
     @NotNull
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
index 1498e3b9495..dc8630dde35 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
@@ -81,8 +81,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
                                         && type.argumentList.none { it.projection == Projection.STAR }
         if (shouldBuildAsFunctionType) {
             val extension = annotations.any { annotation ->
-                val fqName = annotation.asSingleFqName()
-                fqName == KotlinBuiltIns.FQ_NAMES.extensionFunctionType || fqName == KotlinBuiltIns.FQ_NAMES.deprecatedExtensionAnnotation
+                annotation.asSingleFqName() == KotlinBuiltIns.FQ_NAMES.extensionFunctionType
             }
             createFunctionTypeStub(parent, type, extension)
             return