From c8920b8158265fa2f7288110a547888d36782170 Mon Sep 17 00:00:00 2001 From: Ilya Ryzhenkov Date: Fri, 24 Apr 2015 14:29:54 +0300 Subject: [PATCH] Include arrayOf() into list of constant values for annotations --- .../jetbrains/kotlin/resolve/CompileTimeConstantUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java index aae2f988c6c..73f938103ca 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java @@ -50,7 +50,10 @@ public class CompileTimeConstantUtils { private final static Set ARRAY_CALL_NAMES = KotlinPackage.hashSetOf( "kotlin.array", "kotlin.doubleArray", "kotlin.floatArray", "kotlin.longArray", "kotlin.intArray", "kotlin.charArray", - "kotlin.shortArray", "kotlin.byteArray", "kotlin.booleanArray"); + "kotlin.shortArray", "kotlin.byteArray", "kotlin.booleanArray", + "kotlin.arrayOf", "kotlin.doubleArrayOf", "kotlin.floatArrayOf", "kotlin.longArrayOf", "kotlin.intArrayOf", "kotlin.charArrayOf", + "kotlin.shortArrayOf", "kotlin.byteArrayOf", "kotlin.booleanArrayOf" + ); public static void checkConstructorParametersType(@NotNull List parameters, @NotNull BindingTrace trace) { for (JetParameter parameter : parameters) {