azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, drop handling of deprecated kotlin.Extension annotation

Browse Source
This commit is contained in:
Alexander Udalov
2016-03-09 14:19:37 +03:00
parent 90a48d3b35
commit 52309cd10e
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+3 -7
View File
@@ -204,9 +204,6 @@ public abstract class KotlinBuiltIns {
public final FqNameUnsafe kCallable = reflect("KCallable"); public final FqNameUnsafe kCallable = reflect("KCallable");
public final ClassId kProperty = ClassId.topLevel(reflect("KProperty").toSafe()); 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> fqNameToPrimitiveType;
public final Map<FqNameUnsafe, PrimitiveType> arrayClassFqNameToPrimitiveType; public final Map<FqNameUnsafe, PrimitiveType> arrayClassFqNameToPrimitiveType;
{ {
@@ -813,14 +810,13 @@ public abstract class KotlinBuiltIns {
} }
@NotNull @NotNull
public AnnotationDescriptor createExtensionAnnotation() { private AnnotationDescriptor createExtensionFunctionTypeAnnotation() {
return new AnnotationDescriptorImpl(getBuiltInClassByName(FQ_NAMES.extensionFunctionType.shortName()).getDefaultType(), return new AnnotationDescriptorImpl(getBuiltInClassByName(FQ_NAMES.extensionFunctionType.shortName()).getDefaultType(),
Collections.<ValueParameterDescriptor, ConstantValue<?>>emptyMap(), SourceElement.NO_SOURCE); Collections.<ValueParameterDescriptor, ConstantValue<?>>emptyMap(), SourceElement.NO_SOURCE);
} }
private static boolean isTypeAnnotatedWithExtension(@NotNull KotlinType type) { private static boolean isTypeAnnotatedWithExtension(@NotNull KotlinType type) {
return type.getAnnotations().findAnnotation(FQ_NAMES.extensionFunctionType) != null || return type.getAnnotations().findAnnotation(FQ_NAMES.extensionFunctionType) != null;
type.getAnnotations().findAnnotation(FQ_NAMES.deprecatedExtensionAnnotation) != null;
} }
@NotNull @NotNull
@@ -844,7 +840,7 @@ public abstract class KotlinBuiltIns {
if (annotations.findAnnotation(FQ_NAMES.extensionFunctionType) != null) return annotations; if (annotations.findAnnotation(FQ_NAMES.extensionFunctionType) != null) return annotations;
// TODO: preserve laziness of given annotations // TODO: preserve laziness of given annotations
return new AnnotationsImpl(plus(annotations, listOf(createExtensionAnnotation()))); return new AnnotationsImpl(plus(annotations, listOf(createExtensionFunctionTypeAnnotation())));
} }
@NotNull @NotNull
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+1 -2
View File
@@ -81,8 +81,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
&& type.argumentList.none { it.projection == Projection.STAR } && type.argumentList.none { it.projection == Projection.STAR }
if (shouldBuildAsFunctionType) { if (shouldBuildAsFunctionType) {
val extension = annotations.any { annotation -> val extension = annotations.any { annotation ->
val fqName = annotation.asSingleFqName() annotation.asSingleFqName() == KotlinBuiltIns.FQ_NAMES.extensionFunctionType
fqName == KotlinBuiltIns.FQ_NAMES.extensionFunctionType || fqName == KotlinBuiltIns.FQ_NAMES.deprecatedExtensionAnnotation
} }
createFunctionTypeStub(parent, type, extension) createFunctionTypeStub(parent, type, extension)
return return