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

Introduced resolveStandardLibrarySymbol() taking DeclarationDescriptor.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-05-11 20:15:06 +04:00
parent 7c96aec630
commit ec021e05c8
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
+12 -6
View File
@@ -146,12 +146,18 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
ensureInitialized(); ensureInitialized();
DeclarationDescriptor declarationDescriptor = BindingContextUtils.referenceToDescriptor(originalContext, referenceExpression); DeclarationDescriptor declarationDescriptor = BindingContextUtils.referenceToDescriptor(originalContext, referenceExpression);
if (declarationDescriptor != null) { return declarationDescriptor != null ? resolveStandardLibrarySymbol(declarationDescriptor) : null;
declarationDescriptor = declarationDescriptor.getOriginal(); }
declarationDescriptor = findCurrentDescriptor(declarationDescriptor);
if (declarationDescriptor != null) { @Nullable
return BindingContextUtils.descriptorToDeclaration(bindingContext, declarationDescriptor); public PsiElement resolveStandardLibrarySymbol(@NotNull DeclarationDescriptor declarationDescriptor) {
} ensureInitialized();
DeclarationDescriptor descriptor = declarationDescriptor;
descriptor = descriptor.getOriginal();
descriptor = findCurrentDescriptor(descriptor);
if (descriptor != null) {
return BindingContextUtils.descriptorToDeclaration(bindingContext, descriptor);
} }
return null; return null;
} }