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

return more than one references from multi-resolve

Browse Source
This commit is contained in:
Svetlana Isakova
2012-09-05 17:45:43 +04:00
parent b4e3c36c5e
commit 04daf73245
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java
+5 -2
View File
@@ -107,6 +107,9 @@ public abstract class JetPsiReference implements PsiPolyVariantReference {
if (psiElements.size() == 1) { if (psiElements.size() == 1) {
return psiElements.iterator().next(); return psiElements.iterator().next();
} }
if (psiElements.size() > 1) {
return null;
}
List<PsiElement> stdlibSymbols = resolveStandardLibrarySymbol(bindingContext); List<PsiElement> stdlibSymbols = resolveStandardLibrarySymbol(bindingContext);
if (stdlibSymbols.size() == 1) { if (stdlibSymbols.size() == 1) {
return stdlibSymbols.iterator().next(); return stdlibSymbols.iterator().next();
@@ -120,11 +123,11 @@ public abstract class JetPsiReference implements PsiPolyVariantReference {
Collection<? extends DeclarationDescriptor> declarationDescriptors = bindingContext.get(AMBIGUOUS_REFERENCE_TARGET, myExpression); Collection<? extends DeclarationDescriptor> declarationDescriptors = bindingContext.get(AMBIGUOUS_REFERENCE_TARGET, myExpression);
if (declarationDescriptors == null) { if (declarationDescriptors == null) {
List<PsiElement> psiElements = BindingContextUtils.resolveToDeclarationPsiElements(bindingContext, myExpression); List<PsiElement> psiElements = BindingContextUtils.resolveToDeclarationPsiElements(bindingContext, myExpression);
if (!psiElements.isEmpty()) { if (psiElements.size() > 1) {
return PsiElementResolveResult.createResults(psiElements); return PsiElementResolveResult.createResults(psiElements);
} }
List<PsiElement> standardLibraryElements = resolveStandardLibrarySymbol(bindingContext); List<PsiElement> standardLibraryElements = resolveStandardLibrarySymbol(bindingContext);
if (!standardLibraryElements.isEmpty()) { if (standardLibraryElements.size() > 1) {
return PsiElementResolveResult.createResults(standardLibraryElements); return PsiElementResolveResult.createResults(standardLibraryElements);
} }
return ResolveResult.EMPTY_ARRAY; return ResolveResult.EMPTY_ARRAY;