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

change signature of 'resolveStandardLibrarySymbol'

Browse Source
This commit is contained in:
Svetlana Isakova
2012-09-10 19:52:20 +04:00
parent c03190910c
commit 8c87d31212
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java
+3 -3
View File
@@ -110,7 +110,7 @@ public abstract class JetPsiReference implements PsiPolyVariantReference {
if (psiElements.size() > 1) { if (psiElements.size() > 1) {
return null; return null;
} }
List<PsiElement> stdlibSymbols = resolveStandardLibrarySymbol(bindingContext); Collection<PsiElement> stdlibSymbols = resolveStandardLibrarySymbol(bindingContext);
if (stdlibSymbols.size() == 1) { if (stdlibSymbols.size() == 1) {
return stdlibSymbols.iterator().next(); return stdlibSymbols.iterator().next();
} }
@@ -126,7 +126,7 @@ public abstract class JetPsiReference implements PsiPolyVariantReference {
if (psiElements.size() > 1) { if (psiElements.size() > 1) {
return PsiElementResolveResult.createResults(psiElements); return PsiElementResolveResult.createResults(psiElements);
} }
List<PsiElement> standardLibraryElements = resolveStandardLibrarySymbol(bindingContext); Collection<PsiElement> standardLibraryElements = resolveStandardLibrarySymbol(bindingContext);
if (standardLibraryElements.size() > 1) { if (standardLibraryElements.size() > 1) {
return PsiElementResolveResult.createResults(standardLibraryElements); return PsiElementResolveResult.createResults(standardLibraryElements);
} }
@@ -143,7 +143,7 @@ public abstract class JetPsiReference implements PsiPolyVariantReference {
return results.toArray(new ResolveResult[results.size()]); return results.toArray(new ResolveResult[results.size()]);
} }
private List<PsiElement> resolveStandardLibrarySymbol(@NotNull BindingContext bindingContext) { private Collection<PsiElement> resolveStandardLibrarySymbol(@NotNull BindingContext bindingContext) {
return myExpression.getProject().getComponent(StandardLibraryReferenceResolver.class) return myExpression.getProject().getComponent(StandardLibraryReferenceResolver.class)
.resolveStandardLibrarySymbol(bindingContext, myExpression); .resolveStandardLibrarySymbol(bindingContext, myExpression);
} }
idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
+2 -2
View File
@@ -168,7 +168,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
} }
@NotNull @NotNull
public List<PsiElement> resolveStandardLibrarySymbol(@NotNull BindingContext originalContext, public Collection<PsiElement> resolveStandardLibrarySymbol(@NotNull BindingContext originalContext,
@Nullable JetReferenceExpression referenceExpression) { @Nullable JetReferenceExpression referenceExpression) {
ensureInitialized(); ensureInitialized();
DeclarationDescriptor declarationDescriptor = originalContext.get(BindingContext.REFERENCE_TARGET, referenceExpression); DeclarationDescriptor declarationDescriptor = originalContext.get(BindingContext.REFERENCE_TARGET, referenceExpression);
@@ -177,7 +177,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
} }
@NotNull @NotNull
public List<PsiElement> resolveStandardLibrarySymbol(@NotNull DeclarationDescriptor declarationDescriptor) { public Collection<PsiElement> resolveStandardLibrarySymbol(@NotNull DeclarationDescriptor declarationDescriptor) {
ensureInitialized(); ensureInitialized();
DeclarationDescriptor descriptor = declarationDescriptor; DeclarationDescriptor descriptor = declarationDescriptor;