From 88ee0bf6af1ef825f9cf45b639f9a2cf4d1b8f57 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Wed, 6 Mar 2019 10:42:04 +0300 Subject: [PATCH] Swap arguments for diagnostic message about incompatible enums This commit is restoring previous behavior changed in c4b69b65 and fixing `DiagnosticMessageTestGenerated.testIncompatibleEnums` test --- .../kotlin/types/expressions/PatternMatchingTypingVisitor.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.kt index a66225e067a..4fbeade41d2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.kt @@ -684,7 +684,7 @@ class PatternMatchingTypingVisitor internal constructor(facade: ExpressionTyping return } - checkEnumsForCompatibility(context, reportErrorOn, type, subjectType) + checkEnumsForCompatibility(context, reportErrorOn, subjectType, type) // check if the pattern is essentially a 'null' expression if (KotlinBuiltIns.isNullableNothing(type) && !TypeUtils.isNullableType(subjectType)) {