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

Minor, use String instead of DeprecationLevel

Browse Source 
Using classes from runtime in the compiler is confusing and doesn't allow to
incompatibly change them
This commit is contained in:
Alexander Udalov
2015-12-21 17:39:18 +03:00
parent c10cc30f40
commit 6d40d94127
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+2 -3
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.builtins; package org.jetbrains.kotlin.builtins;
import kotlin.DeprecationLevel;
import kotlin.SetsKt; import kotlin.SetsKt;
import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -393,8 +392,8 @@ public abstract class KotlinBuiltIns {
} }
@Nullable @Nullable
public ClassDescriptor getDeprecationLevelEnumEntry(@NotNull DeprecationLevel level) { public ClassDescriptor getDeprecationLevelEnumEntry(@NotNull String level) {
return getEnumEntry(getDeprecationLevelEnum(), level.name()); return getEnumEntry(getDeprecationLevelEnum(), level);
} }
@NotNull @NotNull
core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/annotationUtil.kt
+2 -2
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.types.Variance
public fun KotlinBuiltIns.createDeprecatedAnnotation( public fun KotlinBuiltIns.createDeprecatedAnnotation(
message: String, message: String,
replaceWith: String, replaceWith: String,
level: DeprecationLevel = DeprecationLevel.WARNING level: String = "WARNING"
): AnnotationDescriptor { ): AnnotationDescriptor {
val deprecatedAnnotation = deprecatedAnnotation val deprecatedAnnotation = deprecatedAnnotation
val parameters = deprecatedAnnotation.unsubstitutedPrimaryConstructor!!.valueParameters val parameters = deprecatedAnnotation.unsubstitutedPrimaryConstructor!!.valueParameters
@@ -52,7 +52,7 @@ public fun KotlinBuiltIns.createDeprecatedAnnotation(
SourceElement.NO_SOURCE SourceElement.NO_SOURCE
) )
), ),
parameters["level"] to EnumValue(getDeprecationLevelEnumEntry(level)!!) parameters["level"] to EnumValue(getDeprecationLevelEnumEntry(level) ?: error("Deprecation level $level not found"))
), ),
SourceElement.NO_SOURCE) SourceElement.NO_SOURCE)
} }
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java
+3 -6
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.resolve; package org.jetbrains.kotlin.resolve;
import kotlin.DeprecationLevel;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.*;
@@ -133,11 +132,9 @@ public class DescriptorFactory {
@NotNull @NotNull
public static PropertyDescriptor createEnumValuesProperty(@NotNull ClassDescriptor enumClass) { public static PropertyDescriptor createEnumValuesProperty(@NotNull ClassDescriptor enumClass) {
AnnotationsImpl annotations = AnnotationsImpl.createWithNoTarget( AnnotationsImpl annotations = AnnotationsImpl.createWithNoTarget(AnnotationUtilKt.createDeprecatedAnnotation(
AnnotationUtilKt.createDeprecatedAnnotation(getBuiltIns(enumClass), getBuiltIns(enumClass), "Use 'values()' function instead", "this.values()", "ERROR"
"Use 'values()' function instead", "this.values()", ));
DeprecationLevel.ERROR)
);
PropertyDescriptorImpl values = PropertyDescriptorImpl values =
PropertyDescriptorImpl.create( PropertyDescriptorImpl.create(