Skip to content

Commit 796964f

Browse files
KvanTTTSpace Team
authored andcommitted
[FIR] Don't report NOT_A_MULTIPLATFORM_COMPILATION for declarations with enabled shouldSkipErrorTypeReporting
^KT-64103 Fixed (cherry picked from commit 80bd87b)
1 parent 46de1a6 commit 796964f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.descriptors.ClassKind
1212
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
1313
import org.jetbrains.kotlin.diagnostics.SourceElementPositioningStrategies
1414
import org.jetbrains.kotlin.diagnostics.reportOn
15-
import org.jetbrains.kotlin.diagnostics.requireNotNull
1615
import org.jetbrains.kotlin.fir.*
1716
import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind
1817
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
@@ -38,7 +37,9 @@ object FirExpectActualDeclarationChecker : FirBasicDeclarationChecker(MppChecker
3837
override fun check(declaration: FirDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
3938
if (declaration !is FirMemberDeclaration) return
4039
if (!context.session.languageVersionSettings.supportsFeature(LanguageFeature.MultiPlatformProjects)) {
41-
if ((declaration.isExpect || declaration.isActual) && containsExpectOrActualModifier(declaration)) {
40+
if ((declaration.isExpect || declaration.isActual) && containsExpectOrActualModifier(declaration) &&
41+
declaration.source?.kind?.shouldSkipErrorTypeReporting == false
42+
) {
4243
reporter.reportOn(
4344
declaration.source,
4445
FirErrors.NOT_A_MULTIPLATFORM_COMPILATION,

compiler/testData/diagnostics/tests/sourceCompatibility/noMultiplatformProjects.fir.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<!NOT_A_MULTIPLATFORM_COMPILATION!>expect<!> class ExplicitExpect {
1010
<!NOT_A_MULTIPLATFORM_COMPILATION, WRONG_MODIFIER_TARGET!>expect<!> fun explicitFoo()
11-
<!NOT_A_MULTIPLATFORM_COMPILATION, NOT_A_MULTIPLATFORM_COMPILATION, NOT_A_MULTIPLATFORM_COMPILATION, WRONG_MODIFIER_TARGET!>expect<!> val explicitX: Int
11+
<!NOT_A_MULTIPLATFORM_COMPILATION, WRONG_MODIFIER_TARGET!>expect<!> val explicitX: Int
1212
<!NOT_A_MULTIPLATFORM_COMPILATION, WRONG_MODIFIER_TARGET!>expect<!> class ExplicitInner
1313
}
1414

@@ -21,4 +21,4 @@
2121
}
2222
<!NOT_A_MULTIPLATFORM_COMPILATION!>actual<!> val x: Int = 0
2323
<!NOT_A_MULTIPLATFORM_COMPILATION!>actual<!> class Inner
24-
}
24+
}

0 commit comments

Comments
 (0)