From 856276328ed9e3f8de4b057cfed56c32af410634 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 9 Aug 2017 19:03:39 +0300 Subject: [PATCH] Treat JS class annotation list change as class signature change --- .../org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt | 4 ++-- .../classAnnotationListChanged/result-js.out | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt b/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt index 8c45a478b6f..644db0ca0c5 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt @@ -249,12 +249,12 @@ private class DifferenceCalculatorForClass( ProtoBufClassKind.FQ_NAME, ProtoBufClassKind.TYPE_PARAMETER_LIST, ProtoBufClassKind.SUPERTYPE_LIST, - ProtoBufClassKind.SUPERTYPE_ID_LIST-> { + ProtoBufClassKind.SUPERTYPE_ID_LIST, + ProtoBufClassKind.JS_EXT_CLASS_ANNOTATION_LIST -> { isClassAffected = true areSubclassesAffected = true } ProtoBufClassKind.JVM_EXT_CLASS_MODULE_NAME, - ProtoBufClassKind.JS_EXT_CLASS_ANNOTATION_LIST, ProtoBufClassKind.JS_EXT_CLASS_CONTAINING_FILE_ID -> { // TODO } diff --git a/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result-js.out b/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result-js.out index ddbe12d5569..78f93fce59a 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result-js.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result-js.out @@ -1,7 +1,10 @@ PROTO DIFFERENCE in test/AnnotationAdded: JS_EXT_CLASS_ANNOTATION_LIST +CHANGES in test/AnnotationAdded: CLASS_SIGNATURE PROTO DIFFERENCE in test/AnnotationListBecomeEmpty: FLAGS, JS_EXT_CLASS_ANNOTATION_LIST CHANGES in test/AnnotationListBecomeEmpty: CLASS_SIGNATURE PROTO DIFFERENCE in test/AnnotationListBecomeNotEmpty: FLAGS, JS_EXT_CLASS_ANNOTATION_LIST CHANGES in test/AnnotationListBecomeNotEmpty: CLASS_SIGNATURE PROTO DIFFERENCE in test/AnnotationRemoved: JS_EXT_CLASS_ANNOTATION_LIST +CHANGES in test/AnnotationRemoved: CLASS_SIGNATURE PROTO DIFFERENCE in test/AnnotationReplaced: JS_EXT_CLASS_ANNOTATION_LIST +CHANGES in test/AnnotationReplaced: CLASS_SIGNATURE