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

Multiple rewrites to the same key in a map replaced by one write

Browse Source
This commit is contained in:
Andrey Breslav
2014-03-21 15:40:33 +04:00
parent 27d4e583a8
commit cbb24a7d4e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+4 -2
View File
@@ -18,6 +18,7 @@ package org.jetbrains.jet.lang.resolve;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Pair;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
@@ -234,8 +235,9 @@ public class AnnotationResolver {
annotationDescriptor.setValueArgument(parameterDescriptor, new ArrayValue(constants, arrayType, true)); annotationDescriptor.setValueArgument(parameterDescriptor, new ArrayValue(constants, arrayType, true));
} }
else { else {
for (CompileTimeConstant<?> constant : constants) { // we should actually get only one element, but just in case of getting many, we take the last one
annotationDescriptor.setValueArgument(parameterDescriptor, constant); if (!constants.isEmpty()) {
annotationDescriptor.setValueArgument(parameterDescriptor, KotlinPackage.last(constants));
} }
} }
} }