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

One usage of asLexicalScope removed

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-24 15:52:58 +03:00
parent b4dbb666fc
commit 6b85bf24a0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+4 -3
View File
@@ -44,7 +44,7 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
import org.jetbrains.kotlin.resolve.lazy.* import org.jetbrains.kotlin.resolve.lazy.*
import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor
import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope
import org.jetbrains.kotlin.resolve.scopes.utils.asLexicalScope import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope
import org.jetbrains.kotlin.utils.addToStdlib.check import org.jetbrains.kotlin.utils.addToStdlib.check
public class ResolveElementCache( public class ResolveElementCache(
@@ -309,9 +309,10 @@ public class ResolveElementCache(
if (ktElement is KtSimpleNameExpression) { if (ktElement is KtSimpleNameExpression) {
val header = ktElement.getParentOfType<KtPackageDirective>(true)!! val header = ktElement.getParentOfType<KtPackageDirective>(true)!!
//TODO: temporary code until we don't have top-level scope in file
if (trace.getBindingContext()[BindingContext.LEXICAL_SCOPE, ktElement] == null) { if (trace.getBindingContext()[BindingContext.LEXICAL_SCOPE, ktElement] == null) {
val scope = resolveSession.getModuleDescriptor().getPackage(header.getFqName(ktElement).parent()).memberScope val scope = resolveSession.getModuleDescriptor().getPackage(header.getFqName(ktElement).parent()).memberScope.memberScopeAsImportingScope()
trace.record(BindingContext.LEXICAL_SCOPE, ktElement, scope.asLexicalScope()) trace.record(BindingContext.LEXICAL_SCOPE, ktElement, scope)
} }
if (Name.isValidIdentifier(ktElement.getReferencedName())) { if (Name.isValidIdentifier(ktElement.getReferencedName())) {