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

Merge declarationsByLabel in chained scopes

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-27 15:01:54 +04:00
parent 19bc996d1b
commit 1dd57b5f6e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java
+5 -7
View File
@@ -25,10 +25,7 @@ import org.jetbrains.jet.lang.resolve.name.LabelName;
import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer; import org.jetbrains.jet.utils.Printer;
import java.util.Collection; import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import static org.jetbrains.jet.lang.resolve.scopes.JetScopeSelectorUtil.*; import static org.jetbrains.jet.lang.resolve.scopes.JetScopeSelectorUtil.*;
@@ -94,11 +91,12 @@ public class ChainedScope implements JetScope {
@NotNull @NotNull
@Override @Override
public Collection<DeclarationDescriptor> getDeclarationsByLabel(@NotNull LabelName labelName) { public Collection<DeclarationDescriptor> getDeclarationsByLabel(@NotNull LabelName labelName) {
ArrayList<DeclarationDescriptor> result = new ArrayList<DeclarationDescriptor>();
for (JetScope jetScope : scopeChain) { for (JetScope jetScope : scopeChain) {
Collection<DeclarationDescriptor> declarationsByLabel = jetScope.getDeclarationsByLabel(labelName); result.addAll(jetScope.getDeclarationsByLabel(labelName));
if (!declarationsByLabel.isEmpty()) return declarationsByLabel; // TODO : merge?
} }
return Collections.emptyList(); result.trimToSize();
return result;
} }
@NotNull @NotNull