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

[Analysis API] fix getScopeContextForFile and clarify its semantic

Browse Source 
It was used to get importing scope, so it was renamed to getImportingScopeContext.

It was broken after changing the behaviour of `LowLevelFirApiFacadeForResolveOnAir.onAirGetTowerContextProvider` for the whole file

^KT-57966
This commit is contained in:
Ilya Kirillov
2023-05-01 12:25:36 +02:00
committed by Space Team
parent 254092a267
commit 20f921c0bf
4 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10ScopeProvider.kt
+7
View File
@@ -210,6 +210,13 @@ internal class KtFe10ScopeProvider(
return KtScopeContext(listOf(KtScopeWithKind(compositeScope, scopeKind, token)), collectImplicitReceivers(fileScope), token)
}
override fun getImportingScopeContext(file: KtFile): KtScopeContext {
val importingScopes = getScopeContextForPosition(originalFile = file, positionInFakeFile = file)
.scopes
.filter { it.kind is KtScopeKind.ImportingScope }
return KtScopeContext(importingScopes, _implicitReceivers = emptyList(), token)
}
private inline fun <reified T : DeclarationDescriptor> getDescriptor(symbol: KtSymbol): T? {
return when (symbol) {
is KtFe10DescSymbol<*> -> symbol.descriptor as? T
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10ScopeResolution.kt
+17 -4
View File
@@ -17,12 +17,10 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtClassifierSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtPackageSymbol
import org.jetbrains.kotlin.analysis.api.symbols.markers.KtPossiblyNamedSymbol
import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.LexicalScope
import org.jetbrains.kotlin.resolve.scopes.MemberScope
import org.jetbrains.kotlin.resolve.scopes.ResolutionScope
import org.jetbrains.kotlin.resolve.scopes.*
internal abstract class KtFe10ScopeResolution : KtScope, KtLifetimeOwner {
abstract val analysisContext: Fe10AnalysisContext
@@ -90,4 +88,19 @@ internal open class KtFe10ScopeMember(
override fun getConstructors(): Sequence<KtConstructorSymbol> = sequence {
constructors.forEach { yield(it.toKtConstructorSymbol(analysisContext)) }
}
}
internal class KtFe10ScopeImporting(
override val scope: ImportingScope,
override val analysisContext: Fe10AnalysisContext
) : KtFe10ScopeResolution() {
override fun getPossibleCallableNames(): Set<Name> = withValidityAssertion {
return getCallableSymbols().mapNotNullTo(mutableSetOf()) { (it as? KtPossiblyNamedSymbol)?.name }
}
override fun getPossibleClassifierNames(): Set<Name> = withValidityAssertion {
return getClassifierSymbols().mapNotNullTo(mutableSetOf()) { (it as? KtPossiblyNamedSymbol)?.name }
}
override fun getConstructors(): Sequence<KtConstructorSymbol> = withValidityAssertion { emptySequence() }
}