Skip to content

Commit f7e9c34

Browse files
mglukhikhSpace Team
authored andcommitted
K2: drop FirClassLikeSymbol.isLocalInFunction
KT-78895 In Progress
1 parent 2b6d3b7 commit f7e9c34

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirModifierChecker.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration
88
import org.jetbrains.kotlin.KtFakeSourceElementKind
99
import org.jetbrains.kotlin.KtSourceElement
1010
import org.jetbrains.kotlin.config.LanguageFeature
11+
import org.jetbrains.kotlin.descriptors.Visibilities
1112
import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget
1213
import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget.Companion.classActualTargets
1314
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
@@ -80,7 +81,7 @@ object FirModifierChecker : FirBasicDeclarationChecker(MppCheckerKind.Common) {
8081
parent.classKind,
8182
isInnerClass = parent.isInner,
8283
isCompanionObject = parent.isCompanion,
83-
isLocalClass = parent.isLocalInFunction
84+
isLocalClass = parent.visibility == Visibilities.Local && parent.isReplSnippetDeclaration != true,
8485
)
8586
is FirPropertyAccessorSymbol -> if (parent.isSetter) KotlinTarget.PROPERTY_SETTER_LIST else KotlinTarget.PROPERTY_GETTER_LIST
8687
is FirFunctionSymbol -> KotlinTarget.FUNCTION_LIST

compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/FirStatusUtils.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.fir.declarations.utils
88
import org.jetbrains.kotlin.descriptors.*
99
import org.jetbrains.kotlin.fir.declarations.*
1010
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
11-
import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
1211
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
1312

1413
inline val FirMemberDeclaration.modality: Modality? get() = status.modality
@@ -62,8 +61,6 @@ inline val FirMemberDeclaration.isFun: Boolean get() = status.isFun
6261
inline val FirMemberDeclaration.hasStableParameterNames: Boolean get() = status.hasStableParameterNames
6362

6463
inline val FirClassLikeDeclaration.isLocal: Boolean get() = symbol.classId.isLocal
65-
inline val FirClassLikeDeclaration.isLocalInFunction: Boolean get() = symbol.classId.isLocal && isReplSnippetDeclaration != true
66-
inline val FirClassLikeSymbol<*>.isLocalInFunction: Boolean get() = fir.isLocalInFunction
6764

6865
fun FirDeclaration?.isLocalClassOrAnonymousObject(): Boolean = ((this as? FirRegularClass)?.isLocal == true) || this is FirAnonymousObject
6966
fun FirBasedSymbol<*>?.isLocalClassOrAnonymousObject(): Boolean = this?.fir.isLocalClassOrAnonymousObject()

0 commit comments

Comments
 (0)