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

Refactoring: extract method for getting lexical scope without facade

Browse Source
This commit is contained in:
Nikolay Krasko
2017-03-09 15:37:14 +03:00
parent 9120ccc054
commit 0a7a73d4be
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/util/scopeUtils.kt
+12 -4
View File
@@ -59,7 +59,7 @@ fun LexicalScope.getVariableFromImplicitReceivers(name: Name): VariableDescripto
return null return null
} }
fun PsiElement.getResolutionScope(bindingContext: BindingContext, resolutionFacade: ResolutionFacade/*TODO: get rid of this parameter*/): LexicalScope { fun PsiElement.getResolutionScope(bindingContext: BindingContext): LexicalScope? {
for (parent in parentsWithSelf) { for (parent in parentsWithSelf) {
if (parent is KtElement) { if (parent is KtElement) {
val scope = bindingContext[BindingContext.LEXICAL_SCOPE, parent] val scope = bindingContext[BindingContext.LEXICAL_SCOPE, parent]
@@ -72,12 +72,20 @@ fun PsiElement.getResolutionScope(bindingContext: BindingContext, resolutionFaca
return classDescriptor.scopeForMemberDeclarationResolution return classDescriptor.scopeForMemberDeclarationResolution
} }
} }
if (parent is KtFile) { if (parent is KtFile) {
return resolutionFacade.getFileResolutionScope(parent) break
} }
} }
error("Not in KtFile")
return null
}
fun PsiElement.getResolutionScope(bindingContext: BindingContext, resolutionFacade: ResolutionFacade/*TODO: get rid of this parameter*/): LexicalScope {
return getResolutionScope(bindingContext) ?:
when (containingFile) {
is KtFile -> resolutionFacade.getFileResolutionScope(containingFile as KtFile)
else -> error("Not in KtFile")
}
} }
fun KtElement.getResolutionScope(): LexicalScope { fun KtElement.getResolutionScope(): LexicalScope {