From 8c87d31212bbaf2df0e592ff670eb048de3c07de Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Mon, 10 Sep 2012 19:52:20 +0400 Subject: [PATCH] change signature of 'resolveStandardLibrarySymbol' --- .../jetbrains/jet/plugin/references/JetPsiReference.java | 6 +++--- .../plugin/references/StandardLibraryReferenceResolver.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java index 11ea9dd79b4..1229392cc8a 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java +++ b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java @@ -110,7 +110,7 @@ public abstract class JetPsiReference implements PsiPolyVariantReference { if (psiElements.size() > 1) { return null; } - List stdlibSymbols = resolveStandardLibrarySymbol(bindingContext); + Collection stdlibSymbols = resolveStandardLibrarySymbol(bindingContext); if (stdlibSymbols.size() == 1) { return stdlibSymbols.iterator().next(); } @@ -126,7 +126,7 @@ public abstract class JetPsiReference implements PsiPolyVariantReference { if (psiElements.size() > 1) { return PsiElementResolveResult.createResults(psiElements); } - List standardLibraryElements = resolveStandardLibrarySymbol(bindingContext); + Collection standardLibraryElements = resolveStandardLibrarySymbol(bindingContext); if (standardLibraryElements.size() > 1) { return PsiElementResolveResult.createResults(standardLibraryElements); } @@ -143,7 +143,7 @@ public abstract class JetPsiReference implements PsiPolyVariantReference { return results.toArray(new ResolveResult[results.size()]); } - private List resolveStandardLibrarySymbol(@NotNull BindingContext bindingContext) { + private Collection resolveStandardLibrarySymbol(@NotNull BindingContext bindingContext) { return myExpression.getProject().getComponent(StandardLibraryReferenceResolver.class) .resolveStandardLibrarySymbol(bindingContext, myExpression); } diff --git a/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java index 357eac03d54..649a4139916 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java +++ b/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java @@ -168,7 +168,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent { } @NotNull - public List resolveStandardLibrarySymbol(@NotNull BindingContext originalContext, + public Collection resolveStandardLibrarySymbol(@NotNull BindingContext originalContext, @Nullable JetReferenceExpression referenceExpression) { ensureInitialized(); DeclarationDescriptor declarationDescriptor = originalContext.get(BindingContext.REFERENCE_TARGET, referenceExpression); @@ -177,7 +177,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent { } @NotNull - public List resolveStandardLibrarySymbol(@NotNull DeclarationDescriptor declarationDescriptor) { + public Collection resolveStandardLibrarySymbol(@NotNull DeclarationDescriptor declarationDescriptor) { ensureInitialized(); DeclarationDescriptor descriptor = declarationDescriptor;