Skip to content

Commit 9f4e039

Browse files
nikitabobkoteamcity
authored and
teamcity
committed
[FIR] FirExpectActualDeclarationChecker. Code cleanup
KT-67202 - Drop redundant "declaration" parameter - Drop redundant "else" in when
1 parent c36665b commit 9f4e039

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ object FirExpectActualDeclarationChecker : FirBasicDeclarationChecker(MppChecker
173173

174174
when {
175175
checkingCompatibility is ExpectActualCheckingCompatibility.ClassScopes -> {
176-
reportClassScopesIncompatibility(symbol, expectedSingleCandidate, declaration, checkingCompatibility, reporter, source, context)
176+
reportClassScopesIncompatibility(symbol, expectedSingleCandidate, checkingCompatibility, reporter, source, context)
177177
}
178178

179179
ExpectActualMatchingCompatibility.MatchedSuccessfully !in matchingCompatibilityToMembersMap ||
@@ -204,8 +204,6 @@ object FirExpectActualDeclarationChecker : FirBasicDeclarationChecker(MppChecker
204204
)
205205
}
206206
}
207-
208-
else -> {}
209207
}
210208
if (expectedSingleCandidate != null) {
211209
checkOptInAnnotation(declaration, expectedSingleCandidate, context, reporter)
@@ -215,14 +213,13 @@ object FirExpectActualDeclarationChecker : FirBasicDeclarationChecker(MppChecker
215213
private fun reportClassScopesIncompatibility(
216214
symbol: FirBasedSymbol<FirDeclaration>,
217215
expectedSingleCandidate: FirBasedSymbol<*>?,
218-
declaration: FirMemberDeclaration,
219216
checkingCompatibility: ExpectActualCheckingCompatibility.ClassScopes<FirBasedSymbol<*>>,
220217
reporter: DiagnosticReporter,
221218
source: KtSourceElement?,
222219
context: CheckerContext,
223220
) {
224221
require((symbol is FirRegularClassSymbol || symbol is FirTypeAliasSymbol) && expectedSingleCandidate is FirRegularClassSymbol) {
225-
"Incompatible.ClassScopes is only possible for a class or a typealias: $declaration"
222+
"Incompatible.ClassScopes is only possible for a class or a typealias: $symbol $expectedSingleCandidate"
226223
}
227224

228225
// Do not report "expected members have no actual ones" for those expected members, for which there's a clear

0 commit comments

Comments
 (0)