diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java index 36bce349745..11ea9dd79b4 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java +++ b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java @@ -107,6 +107,9 @@ public abstract class JetPsiReference implements PsiPolyVariantReference { if (psiElements.size() == 1) { return psiElements.iterator().next(); } + if (psiElements.size() > 1) { + return null; + } List stdlibSymbols = resolveStandardLibrarySymbol(bindingContext); if (stdlibSymbols.size() == 1) { return stdlibSymbols.iterator().next(); @@ -120,11 +123,11 @@ public abstract class JetPsiReference implements PsiPolyVariantReference { Collection declarationDescriptors = bindingContext.get(AMBIGUOUS_REFERENCE_TARGET, myExpression); if (declarationDescriptors == null) { List psiElements = BindingContextUtils.resolveToDeclarationPsiElements(bindingContext, myExpression); - if (!psiElements.isEmpty()) { + if (psiElements.size() > 1) { return PsiElementResolveResult.createResults(psiElements); } List standardLibraryElements = resolveStandardLibrarySymbol(bindingContext); - if (!standardLibraryElements.isEmpty()) { + if (standardLibraryElements.size() > 1) { return PsiElementResolveResult.createResults(standardLibraryElements); } return ResolveResult.EMPTY_ARRAY;