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

FIR IDE: fix containing KtFirSymbolContainingDeclarationProvider for implicit constructors

Browse Source
This commit is contained in:
Ilya Kirillov
2021-07-20 19:16:38 +02:00
committed by teamcityserver
parent eb69153fbc
commit 55489b6249
1 changed files with 26 additions and 21 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/KtFirSymbolContainingDeclarationProvider.kt
+26 -21
View File
@@ -7,16 +7,20 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.components
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.fir.FirFakeSourceElementKind
import org.jetbrains.kotlin.fir.FirRealSourceElementKind
import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import org.jetbrains.kotlin.fir.psi
import org.jetbrains.kotlin.idea.fir.low.level.api.util.parentOfType
import org.jetbrains.kotlin.idea.frontend.api.tokens.ValidityToken
import org.jetbrains.kotlin.idea.frontend.api.components.KtSymbolContainingDeclarationProvider
import org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSession
import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirSymbol
import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef
import org.jetbrains.kotlin.idea.frontend.api.symbols.*
import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithKind
import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtObjectLiteralExpression
import org.jetbrains.kotlin.psi.KtPrimaryConstructor
@@ -54,19 +58,9 @@ internal class KtFirSymbolContainingDeclarationProvider(
private fun getContainingDeclarationForKotlinInSourceSymbol(symbol: KtSymbolWithKind): KtSymbolWithKind = with(analysisSession) {
require(symbol.origin == KtSymbolOrigin.SOURCE || symbol.origin == KtSymbolOrigin.SOURCE_MEMBER_GENERATED)
require(symbol is KtFirSymbol<*>)
val psi = when (val psi = symbol.getPsi()) {
is KtDeclaration -> psi
is KtObjectLiteralExpression -> psi.objectDeclaration
else -> error { "PSI of kotlin declaration should be KtDeclaration but was ${psi::class.simpleName}" }
}
val containingDeclaration = when (symbol.origin) {
KtSymbolOrigin.SOURCE -> psi.parentOfType()
?: error("Containing declaration should present for non-toplevel declaration")
KtSymbolOrigin.SOURCE_MEMBER_GENERATED -> psi
else -> error("Unsupported declaration origin ${symbol.origin}")
}
val containingDeclaration = getContainingPsi(symbol)
return with(analysisSession) {
val containingSymbol = containingDeclaration.getSymbol()
@@ -75,16 +69,23 @@ internal class KtFirSymbolContainingDeclarationProvider(
}
}
private fun KtSymbolWithKind.getPsi(): PsiElement {
require(this is KtFirSymbol<*>)
return getPropertyByParameterPsi()
?: psi
?: error("PSI should present for declaration built by Kotlin code")
}
private fun getContainingPsi(symbol: KtFirSymbol<*>): KtDeclaration {
val source = symbol.firRef.withFir(action = FirDeclaration::source)
val thisSource = when (source?.kind) {
null -> error("PSI should present for declaration built by Kotlin code")
FirFakeSourceElementKind.ImplicitConstructor ->
return source.psi as KtDeclaration
FirFakeSourceElementKind.PropertyFromParameter -> return source.psi?.parentOfType<KtPrimaryConstructor>()!!
FirRealSourceElementKind -> source.psi!!
else -> error("Unexpected FirSourceElement: kind=${source.kind} element=${source.psi!!::class.simpleName}")
}
private fun KtFirSymbol<*>.getPropertyByParameterPsi() = firRef.withFir { fir ->
if (fir.source?.kind == FirFakeSourceElementKind.PropertyFromParameter) fir.psi?.parentOfType<KtPrimaryConstructor>()
else null
return when (symbol.origin) {
KtSymbolOrigin.SOURCE -> thisSource.parentOfType()
?: error("Containing declaration should present for non-toplevel declaration")
KtSymbolOrigin.SOURCE_MEMBER_GENERATED -> thisSource as KtDeclaration
else -> error("Unsupported declaration origin ${symbol.origin}")
}
}
private fun getContainingDeclarationForLibrarySymbol(symbol: KtSymbolWithKind): KtSymbolWithKind = with(analysisSession) {
@@ -108,6 +109,10 @@ internal class KtFirSymbolContainingDeclarationProvider(
val fqName = symbol.callableIdIfNonLocal ?: error("fqName should not be null for non-local declaration")
fqName.classId
}
is KtConstructorSymbol -> {
symbol.containingClassIdIfNonLocal
?: error("fqName should not be null for non-local declaration")
}
else -> error("We should not have a ${symbol::class} from a library")
} ?: error("outerClassId should not be null for member declaration")
val containingClass = containingClassId.getCorrespondingToplevelClassOrObjectSymbol()