From f5bfec68dbf858f479720a27783270d699b9c2be Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 10 Dec 2015 12:12:44 +0300 Subject: [PATCH] COMMA_IN_WHEN_CONDITION_WITHOUT_ARGUMENT is an ERROR now. Migrated code. Updated test data in IDE tests. Dropped whenWithRangeTestsAndMultiConditions.kt: "Introduce subject" is not applicable to 'when' with ||-ed conditions. Original commit: 0fe74a8b4355a6927154a11bd93dc016501d0688 --- .../kotlin/jps/incremental/AbstractProtoComparisonTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 0a80f2626bc..07353e5ed9c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -102,8 +102,8 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { ) val diff = when { - newClassHeader.isCompatibleClassKind(), - newClassHeader.isCompatibleFileFacadeKind(), + newClassHeader.isCompatibleClassKind() || + newClassHeader.isCompatibleFileFacadeKind() || newClassHeader.isCompatibleMultifileClassPartKind() -> difference(oldProto, newProto) else -> {