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

Better completion for static members: special behavior in case of imports from same class exist

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-11-02 21:21:11 +03:00
parent ca437e51c4
commit 06812aed11
20 changed files with 281 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt
+2 -2
View File
@@ -97,9 +97,9 @@ public fun ThisReceiver.asExpression(resolutionScope: LexicalScope, psiFactory:
return expressionFactory.createExpression(psiFactory)
}
public fun KtImportDirective.targetDescriptors(): Collection<DeclarationDescriptor> {
public fun KtImportDirective.targetDescriptors(resolutionFacade: ResolutionFacade = this.getResolutionFacade()): Collection<DeclarationDescriptor> {
val nameExpression = importedReference?.getQualifiedElementSelector() as? KtSimpleNameExpression ?: return emptyList()
return nameExpression.mainReference.resolveToDescriptors(nameExpression.analyze())
return nameExpression.mainReference.resolveToDescriptors(resolutionFacade.analyze(nameExpression))
}
public fun Call.resolveCandidates(