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

[FIR-IDE] Use delegating KtScope for type param scope

Browse Source
This commit is contained in:
Pavel Kirpichenkov
2020-09-02 12:23:35 +03:00
parent 0d3f1af6e4
commit 26982d1b48
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt
+5 -5
View File
@@ -132,9 +132,9 @@ internal class KtFirScopeProvider(
@OptIn(ExperimentalStdlibApi::class) @OptIn(ExperimentalStdlibApi::class)
val allKtScopes = buildList { val allKtScopes = buildList {
implicitReceiverScopes.mapNotNullTo(this, ::convertToKtScope) implicitReceiverScopes.mapTo(this, ::convertToKtScope)
nonLocalScopes.mapNotNullTo(this, ::convertToKtScope) nonLocalScopes.mapTo(this, ::convertToKtScope)
firLocalScopes.mapNotNullTo(this, ::convertToKtScope) firLocalScopes.mapTo(this, ::convertToKtScope)
} }
KtScopeContext(getCompositeScope(allKtScopes), implicitReceiversTypes) KtScopeContext(getCompositeScope(allKtScopes), implicitReceiversTypes)
@@ -145,14 +145,14 @@ internal class KtFirScopeProvider(
?.getNonStrictParentOfType<KtNamedFunction>() ?.getNonStrictParentOfType<KtNamedFunction>()
?.takeIf { it.textOffset == offset } ?.takeIf { it.textOffset == offset }
private fun convertToKtScope(firScope: FirScope): KtScope? { private fun convertToKtScope(firScope: FirScope): KtScope {
firScopeStorage.register(firScope) firScopeStorage.register(firScope)
return when (firScope) { return when (firScope) {
is FirAbstractSimpleImportingScope -> KtFirNonStarImportingScope(firScope, builder, token) is FirAbstractSimpleImportingScope -> KtFirNonStarImportingScope(firScope, builder, token)
is FirAbstractStarImportingScope -> KtFirStarImportingScope(firScope, builder, project, token) is FirAbstractStarImportingScope -> KtFirStarImportingScope(firScope, builder, project, token)
is FirPackageMemberScope -> KtFirPackageScope(firScope, project, builder, token) is FirPackageMemberScope -> KtFirPackageScope(firScope, project, builder, token)
is FirContainingNamesAwareScope -> KtFirDelegatingScopeImpl(firScope, builder, token) is FirContainingNamesAwareScope -> KtFirDelegatingScopeImpl(firScope, builder, token)
is FirMemberTypeParameterScope -> null is FirMemberTypeParameterScope -> KtFirDelegatingScopeImpl(firScope, builder, token)
else -> TODO(firScope::class.toString()) else -> TODO(firScope::class.toString())
} }
} }