File tree Expand file tree Collapse file tree 2 files changed +2
-4
lines changed
checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration
tree/src/org/jetbrains/kotlin/fir/declarations/utils Expand file tree Collapse file tree 2 files changed +2
-4
lines changed Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration
8
8
import org.jetbrains.kotlin.KtFakeSourceElementKind
9
9
import org.jetbrains.kotlin.KtSourceElement
10
10
import org.jetbrains.kotlin.config.LanguageFeature
11
+ import org.jetbrains.kotlin.descriptors.Visibilities
11
12
import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget
12
13
import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget.Companion.classActualTargets
13
14
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
@@ -80,7 +81,7 @@ object FirModifierChecker : FirBasicDeclarationChecker(MppCheckerKind.Common) {
80
81
parent.classKind,
81
82
isInnerClass = parent.isInner,
82
83
isCompanionObject = parent.isCompanion,
83
- isLocalClass = parent.isLocalInFunction
84
+ isLocalClass = parent.visibility == Visibilities . Local && parent.isReplSnippetDeclaration != true ,
84
85
)
85
86
is FirPropertyAccessorSymbol -> if (parent.isSetter) KotlinTarget .PROPERTY_SETTER_LIST else KotlinTarget .PROPERTY_GETTER_LIST
86
87
is FirFunctionSymbol -> KotlinTarget .FUNCTION_LIST
Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.fir.declarations.utils
8
8
import org.jetbrains.kotlin.descriptors.*
9
9
import org.jetbrains.kotlin.fir.declarations.*
10
10
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
11
- import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
12
11
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
13
12
14
13
inline val FirMemberDeclaration .modality: Modality ? get() = status.modality
@@ -62,8 +61,6 @@ inline val FirMemberDeclaration.isFun: Boolean get() = status.isFun
62
61
inline val FirMemberDeclaration .hasStableParameterNames: Boolean get() = status.hasStableParameterNames
63
62
64
63
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
67
64
68
65
fun FirDeclaration?.isLocalClassOrAnonymousObject (): Boolean = ((this as ? FirRegularClass )?.isLocal == true ) || this is FirAnonymousObject
69
66
fun FirBasedSymbol <* >?.isLocalClassOrAnonymousObject (): Boolean = this ?.fir.isLocalClassOrAnonymousObject()
You can’t perform that action at this time.
0 commit comments