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

[FIR] Introduce FirPropertySymbol.initializerSource

Browse Source
This commit is contained in:
Nikolay Lunyak
2024-01-12 13:29:17 +02:00
committed by Space Team
parent f08c167729
commit d66b38b7a9
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt
+3 -7
View File
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.references.toResolvedPropertySymbol import org.jetbrains.kotlin.fir.references.toResolvedPropertySymbol
import org.jetbrains.kotlin.fir.resolve.dfa.cfg.* import org.jetbrains.kotlin.fir.resolve.dfa.cfg.*
import org.jetbrains.kotlin.fir.symbols.SymbolInternals
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase
import org.jetbrains.kotlin.name.SpecialNames import org.jetbrains.kotlin.name.SpecialNames
@@ -65,9 +64,7 @@ object UnusedChecker : AbstractFirPropertyInitializationChecker() {
val data = dataPerNode.values.mapNotNull { it[variableSymbol] }.reduceOrNull { acc, it -> acc.merge(it) } val data = dataPerNode.values.mapNotNull { it[variableSymbol] }.reduceOrNull { acc, it -> acc.merge(it) }
if (data != null) { if (data != null) {
variableSymbol.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE) variableSymbol.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE)
@OptIn(SymbolInternals::class) val variableSource = variableSymbol.source
val variable = variableSymbol.fir
val variableSource = variable.source
if (variableSource?.elementType == KtNodeTypes.DESTRUCTURING_DECLARATION) { if (variableSource?.elementType == KtNodeTypes.DESTRUCTURING_DECLARATION) {
return return
@@ -84,7 +81,7 @@ object UnusedChecker : AbstractFirPropertyInitializationChecker() {
} }
} }
data.isRedundantInit -> { data.isRedundantInit -> {
val source = variable.initializer?.source val source = variableSymbol.initializerSource
reporter.reportOn(source, FirErrors.VARIABLE_INITIALIZER_IS_REDUNDANT, context) reporter.reportOn(source, FirErrors.VARIABLE_INITIALIZER_IS_REDUNDANT, context)
} }
data == VariableStatus.ONLY_WRITTEN_NEVER_READ -> { data == VariableStatus.ONLY_WRITTEN_NEVER_READ -> {
@@ -297,8 +294,7 @@ object UnusedChecker : AbstractFirPropertyInitializationChecker() {
private val FirPropertySymbol.isLoopIterator: Boolean private val FirPropertySymbol.isLoopIterator: Boolean
get() { get() {
@OptIn(SymbolInternals::class) return initializerSource?.kind == KtFakeSourceElementKind.DesugaredForLoop
return fir.initializer?.source?.kind == KtFakeSourceElementKind.DesugaredForLoop
} }
} }
compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirVariableSymbol.kt
+3
View File
@@ -48,6 +48,9 @@ open class FirPropertySymbol(callableId: CallableId, ) : FirVariableSymbol<FirPr
val hasInitializer: Boolean val hasInitializer: Boolean
get() = fir.initializer != null get() = fir.initializer != null
val initializerSource: KtSourceElement?
get() = fir.initializer?.source
val resolvedInitializer: FirExpression? val resolvedInitializer: FirExpression?
get() { get() {
lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE) lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE)