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

KTIJ-27050 [Analysis API] Refactor FirShorteningContext

Browse Source 
Use `AvailableSymbol<FirClassLikeSymbol<*>>` instead
of `AvailableSymbol<ClassId>`
This commit is contained in:
Roman Golyshev
2023-09-14 16:21:52 +02:00
committed by teamcity
parent 020f8c0742
commit e2019ceb95
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt
+9 -10
View File
@@ -262,9 +262,9 @@ private class FirShorteningContext(val analysisSession: KtFirAnalysisSession) {
private val firSession: FirSession private val firSession: FirSession
get() = firResolveSession.useSiteFirSession get() = firResolveSession.useSiteFirSession
class ClassifierCandidate(val scope: FirScope, val availableSymbol: AvailableSymbol<ClassId>) class ClassifierCandidate(val scope: FirScope, val availableSymbol: AvailableSymbol<FirClassLikeSymbol<*>>)
fun findFirstClassifierInScopesByName(positionScopes: List<FirScope>, targetClassName: Name): AvailableSymbol<ClassId>? = fun findFirstClassifierInScopesByName(positionScopes: List<FirScope>, targetClassName: Name): AvailableSymbol<FirClassLikeSymbol<*>>? =
positionScopes.firstNotNullOfOrNull { scope -> findFirstClassifierSymbolByName(scope, targetClassName) } positionScopes.firstNotNullOfOrNull { scope -> findFirstClassifierSymbolByName(scope, targetClassName) }
fun findClassifiersInScopesByName(scopes: List<FirScope>, targetClassName: Name): List<ClassifierCandidate> = fun findClassifiersInScopesByName(scopes: List<FirScope>, targetClassName: Name): List<ClassifierCandidate> =
@@ -274,11 +274,10 @@ private class FirShorteningContext(val analysisSession: KtFirAnalysisSession) {
ClassifierCandidate(scope, classifierSymbol) ClassifierCandidate(scope, classifierSymbol)
} }
private fun findFirstClassifierSymbolByName(scope: FirScope, targetClassName: Name): AvailableSymbol<ClassId>? { private fun findFirstClassifierSymbolByName(scope: FirScope, targetClassName: Name): AvailableSymbol<FirClassLikeSymbol<*>>? {
val classifierSymbol = scope.findFirstClassifierByName(targetClassName) ?: return null val classifierSymbol = scope.findFirstClassifierByName(targetClassName) as? FirClassLikeSymbol<*> ?: return null
val classifierLookupTag = classifierSymbol.toLookupTag() as? ConeClassLikeLookupTag ?: return null
return AvailableSymbol(classifierLookupTag.classId, ImportKind.fromScope(scope)) return AvailableSymbol(classifierSymbol, ImportKind.fromScope(scope))
} }
fun findFunctionsInScopes(scopes: List<FirScope>, name: Name): List<AvailableSymbol<FirFunctionSymbol<*>>> { fun findFunctionsInScopes(scopes: List<FirScope>, name: Name): List<AvailableSymbol<FirFunctionSymbol<*>>> {
@@ -747,7 +746,7 @@ private class ElementsToShortenCollector(
val name = classId.shortClassName val name = classId.shortClassName
val availableClassifiers = shorteningContext.findClassifiersInScopesByName(scopes, name) val availableClassifiers = shorteningContext.findClassifiersInScopesByName(scopes, name)
val matchingAvailableSymbol = availableClassifiers.firstOrNull { it.availableSymbol.symbol == classId } val matchingAvailableSymbol = availableClassifiers.firstOrNull { it.availableSymbol.symbol.classId == classId }
val scopeForClass = matchingAvailableSymbol?.scope ?: return false val scopeForClass = matchingAvailableSymbol?.scope ?: return false
if (availableClassifiers.map { it.scope }.hasScopeCloserThan(scopeForClass, element)) return false if (availableClassifiers.map { it.scope }.hasScopeCloserThan(scopeForClass, element)) return false
@@ -804,7 +803,7 @@ private class ElementsToShortenCollector(
) )
} }
// The class with name `classId.shortClassName` happens to be the same class referenced by this qualified access. // The class with name `classId.shortClassName` happens to be the same class referenced by this qualified access.
availableClassifier.symbol == classId -> { availableClassifier.symbol.classId == classId -> {
// Respect caller's request to use star import, if it's not already star-imported. // Respect caller's request to use star import, if it's not already star-imported.
return when { return when {
availableClassifier.importKind == ImportKind.EXPLICIT && importAllInParent -> { availableClassifier.importKind == ImportKind.EXPLICIT && importAllInParent -> {
@@ -839,7 +838,7 @@ private class ElementsToShortenCollector(
} }
private fun importedClassifierOverwritesAvailableClassifier( private fun importedClassifierOverwritesAvailableClassifier(
availableClassifier: AvailableSymbol<ClassId>, availableClassifier: AvailableSymbol<FirClassLikeSymbol<*>>,
importAllInParent: Boolean importAllInParent: Boolean
): Boolean { ): Boolean {
val importKindFromOption = if (importAllInParent) ImportKind.STAR else ImportKind.EXPLICIT val importKindFromOption = if (importAllInParent) ImportKind.STAR else ImportKind.EXPLICIT
@@ -869,7 +868,7 @@ private class ElementsToShortenCollector(
val positionScopes = shorteningContext.findScopesAtPosition(expression, getNamesToImport(), contextProvider) ?: return val positionScopes = shorteningContext.findScopesAtPosition(expression, getNamesToImport(), contextProvider) ?: return
val availableClassifier = shorteningContext.findFirstClassifierInScopesByName(positionScopes, shortClassName) ?: return val availableClassifier = shorteningContext.findFirstClassifierInScopesByName(positionScopes, shortClassName) ?: return
when { when {
availableClassifier.symbol == classToImport -> return availableClassifier.symbol.classId == classToImport -> return
importedClassifierOverwritesAvailableClassifier(availableClassifier, importAllInParent) -> { importedClassifierOverwritesAvailableClassifier(availableClassifier, importAllInParent) -> {
importAffectsUsages = true importAffectsUsages = true
} }