From 3f47038ba360cdc13f750e1b10f6a279ec7f0ae9 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Fri, 16 Sep 2022 12:47:23 +0200 Subject: [PATCH] Fix "data object" tests "data object" is postponed till 1.9 Related commit in kotlin repo: https://github.com/JetBrains/kotlin/commit/f643cdf90b5c4af9d6988b6167957c9b76f02647 Use `// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects` instead of `// LANGUAGE_VERSION: 1.8` because it's more reliable and less invasive (cherry picked from commit 3a15873dc9191b7da4155b321826fe28c90b40a8) GitOrigin-RevId: 025ea414210241bfc537ebc7bfbf21ce4f07dfb0 --- .../inspections/LocalInspectionTestGenerated.java | 12 ++++++------ .../alreadyAnnotatedWithData.kt | 2 +- .../convertObjectToDataObject/anonymousObject.kt | 2 +- .../convertObjectToDataObject/companionObject.kt | 2 +- .../convertObjectToDataObject/compatibleEquals.kt | 2 +- .../compatibleEquals.kt.after | 2 +- .../compatibleReadResolve.kt | 2 +- .../compatibleReadResolve.kt.after | 2 +- .../convertObjectToDataObject/constHashCode.kt | 2 +- .../convertObjectToDataObject/constHashCode.kt.after | 2 +- .../doubleBangReflectToString.kt | 2 +- .../doubleBangReflectToString.kt.after | 2 +- .../elvisReflectToString.kt | 2 +- .../elvisReflectToString.kt.after | 2 +- .../expressionBodyToString.kt | 2 +- .../expressionBodyToString.kt.after | 2 +- .../convertObjectToDataObject/javaReflectToString.kt | 2 +- .../javaReflectToString.kt.after | 2 +- .../convertObjectToDataObject/notCompatibleEquals.kt | 2 +- .../notCompatibleToString.kt | 2 +- .../convertObjectToDataObject/notConstHashCode.kt | 2 +- .../notSingleExpressionToString.kt | 2 +- .../convertObjectToDataObject/plainObject.kt | 2 +- .../preserveNotRelatedMembers.kt | 2 +- .../preserveNotRelatedMembers.kt.after | 2 +- .../preserveUnrelatedReadResolve.kt | 2 +- .../preserveUnrelatedReadResolve.kt.after | 2 +- .../preserveUnrelatedReadResolve2.kt | 2 +- .../preserveUnrelatedReadResolve2.kt.after | 2 +- .../convertObjectToDataObject/publicReadResolve.kt | 2 +- .../convertObjectToDataObject/sealedSubObject.kt | 2 +- .../sealedSubObject.kt.after | 2 +- .../sealedSubObjectIncompatibleToString.kt | 2 +- .../sealedSubObjectWithCompatibleToString.kt | 2 +- .../sealedSubObjectWithCompatibleToString.kt.after | 2 +- .../serializableButIncompatibleToString.kt | 2 +- .../convertObjectToDataObject/serializableDirect.kt | 2 +- .../serializableDirect.kt.after | 2 +- .../serializableTransitive.kt | 2 +- .../serializableTransitive.kt.after | 2 +- ...lass17Lv.kt => dataClass_dataObjectIsDisabled.kt} | 1 + ...Class18Lv.kt => dataClass_dataObjectIsEnabled.kt} | 2 +- ....after => dataClass_dataObjectIsEnabled.kt.after} | 2 +- .../convertSealedSubClassToObject/dataObject.kt | 2 +- .../dataObject.kt.after | 2 +- .../convertEnumToSealedClass/useDataObjectSince18.kt | 2 +- .../useDataObjectSince18.kt.after | 2 +- .../Fe10BindingLocalInspectionTestGenerated.java | 12 ++++++------ 48 files changed, 58 insertions(+), 57 deletions(-) rename plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/{dataClass17Lv.kt => dataClass_dataObjectIsDisabled.kt} (63%) rename plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/{dataClass18Lv.kt => dataClass_dataObjectIsEnabled.kt} (57%) rename plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/{dataClass18Lv.kt.after => dataClass_dataObjectIsEnabled.kt.after} (55%) diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java index 2446b23d837d..0611a67347b8 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java @@ -3988,14 +3988,14 @@ public abstract class LocalInspectionTestGenerated extends AbstractLocalInspecti runTest("testData/inspectionsLocal/convertSealedSubClassToObject/convertSubClassWithoutParentheses.kt"); } - @TestMetadata("dataClass17Lv.kt") - public void testDataClass17Lv() throws Exception { - runTest("testData/inspectionsLocal/convertSealedSubClassToObject/dataClass17Lv.kt"); + @TestMetadata("dataClass_dataObjectIsDisabled.kt") + public void testDataClass_dataObjectIsDisabled() throws Exception { + runTest("testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsDisabled.kt"); } - @TestMetadata("dataClass18Lv.kt") - public void testDataClass18Lv() throws Exception { - runTest("testData/inspectionsLocal/convertSealedSubClassToObject/dataClass18Lv.kt"); + @TestMetadata("dataClass_dataObjectIsEnabled.kt") + public void testDataClass_dataObjectIsEnabled() throws Exception { + runTest("testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsEnabled.kt"); } @TestMetadata("dataObject.kt") diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/alreadyAnnotatedWithData.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/alreadyAnnotatedWithData.kt index 02fe70501b4f..afd3da60ecba 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/alreadyAnnotatedWithData.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/alreadyAnnotatedWithData.kt @@ -1,5 +1,5 @@ // PROBLEM: none -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects import java.io.Serializable data object Foo : Serializable diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/anonymousObject.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/anonymousObject.kt index a714a604fc2f..f4af281edb1b 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/anonymousObject.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/anonymousObject.kt @@ -1,5 +1,5 @@ // PROBLEM: none -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects import java.io.Serializable fun main() { diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/companionObject.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/companionObject.kt index 934f16f3ae14..d7f708259170 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/companionObject.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/companionObject.kt @@ -1,5 +1,5 @@ // PROBLEM: none -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects import java.io.Serializable class Foo { diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleEquals.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleEquals.kt index 78699e9c9118..4aec09f07a5c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleEquals.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleEquals.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects object Foo { override fun toString(): String = "Foo" override fun equals(other: Any?): Boolean = other is Foo diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleEquals.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleEquals.kt.after index 2258108e7926..033d0cd1c8ee 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleEquals.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleEquals.kt.after @@ -1,2 +1,2 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects data object Foo diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleReadResolve.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleReadResolve.kt index 5dc2012796e9..d15df47e2f2d 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleReadResolve.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleReadResolve.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects import java.io.Serializable object Foo : Serializable { diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleReadResolve.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleReadResolve.kt.after index 8393be635672..6b5b19f7dbd1 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleReadResolve.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/compatibleReadResolve.kt.after @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects import java.io.Serializable data object Foo : Serializable diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/constHashCode.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/constHashCode.kt index 8254e6de65de..700317be336c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/constHashCode.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/constHashCode.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects object Foo { override fun toString(): String = "Foo" override fun hashCode(): Int = 42 diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/constHashCode.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/constHashCode.kt.after index 2258108e7926..033d0cd1c8ee 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/constHashCode.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/constHashCode.kt.after @@ -1,2 +1,2 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects data object Foo diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/doubleBangReflectToString.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/doubleBangReflectToString.kt index d64be3aa5c6b..ffa1d62a0617 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/doubleBangReflectToString.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/doubleBangReflectToString.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects object Foo { override fun toString(): String = Foo::class.simpleName!! } \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/doubleBangReflectToString.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/doubleBangReflectToString.kt.after index 77d981e1a048..b9fb84888b77 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/doubleBangReflectToString.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/doubleBangReflectToString.kt.after @@ -1,2 +1,2 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects data object Foo \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/elvisReflectToString.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/elvisReflectToString.kt index 7fabe91d524a..b452f8048af7 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/elvisReflectToString.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/elvisReflectToString.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects object Foo { override fun toString(): String = Foo::class.simpleName ?: throw Exception() } \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/elvisReflectToString.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/elvisReflectToString.kt.after index 77d981e1a048..b9fb84888b77 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/elvisReflectToString.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/elvisReflectToString.kt.after @@ -1,2 +1,2 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects data object Foo \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/expressionBodyToString.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/expressionBodyToString.kt index 3c67e5ee73b0..9797fca79a9f 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/expressionBodyToString.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/expressionBodyToString.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects object Foo { override fun toString(): String = "Foo" } \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/expressionBodyToString.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/expressionBodyToString.kt.after index 77d981e1a048..b9fb84888b77 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/expressionBodyToString.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/expressionBodyToString.kt.after @@ -1,2 +1,2 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects data object Foo \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/javaReflectToString.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/javaReflectToString.kt index 6e9c488c6eda..28f06372a85e 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/javaReflectToString.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/javaReflectToString.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects object Foo { override fun toString(): String = Foo::class.java.simpleName } \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/javaReflectToString.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/javaReflectToString.kt.after index 77d981e1a048..b9fb84888b77 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/javaReflectToString.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/javaReflectToString.kt.after @@ -1,2 +1,2 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects data object Foo \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notCompatibleEquals.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notCompatibleEquals.kt index 8e1f98218bde..e426d67f7b10 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notCompatibleEquals.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notCompatibleEquals.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects // PROBLEM: none object Foo { override fun toString(): String = "Foo" diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notCompatibleToString.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notCompatibleToString.kt index eb5346cbf942..5876bf6c7ff7 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notCompatibleToString.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notCompatibleToString.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects // PROBLEM: none object Foo { override fun toString(): String { diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notConstHashCode.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notConstHashCode.kt index 06d18ae0bff4..0d233c1243f0 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notConstHashCode.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notConstHashCode.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects // PROBLEM: none object Foo { override fun toString(): String = "Foo" diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notSingleExpressionToString.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notSingleExpressionToString.kt index 3047d08fe01c..77a651499262 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notSingleExpressionToString.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/notSingleExpressionToString.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects // PROBLEM: none object Foo { override fun toString(): String { diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/plainObject.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/plainObject.kt index d3cf7120780c..4b3653cfe020 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/plainObject.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/plainObject.kt @@ -1,5 +1,5 @@ // PROBLEM: none -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects object Foo : Bar() open class Bar diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveNotRelatedMembers.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveNotRelatedMembers.kt index 3e574691f305..4761c5fd655c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveNotRelatedMembers.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveNotRelatedMembers.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects object Foo { override fun toString(): String { return "Foo" diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveNotRelatedMembers.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveNotRelatedMembers.kt.after index f851c6b54f42..3601392dd92a 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveNotRelatedMembers.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveNotRelatedMembers.kt.after @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects data object Foo { fun foo() = 42 diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve.kt index 56c275dc7c3d..940f7c88068b 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects object Foo { override fun toString(): String = "Foo" fun readResolve(): Any = Foo diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve.kt.after index 3d55c6305594..c47683facca1 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve.kt.after @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects data object Foo { fun readResolve(): Any = Foo } diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve2.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve2.kt index 9703e55a4e2b..57ff826a009b 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve2.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve2.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects import java.io.Serializable object Foo : Serializable { diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve2.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve2.kt.after index 2277f6a867af..5a145a16061c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve2.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/preserveUnrelatedReadResolve2.kt.after @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects import java.io.Serializable data object Foo : Serializable { diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/publicReadResolve.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/publicReadResolve.kt index 4924e456ffdf..5e9ec1aa8286 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/publicReadResolve.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/publicReadResolve.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects // PROBLEM: none import java.io.Serializable diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObject.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObject.kt index ec04fad825a1..0c00f216749e 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObject.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObject.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects sealed class Seal object Foo : Seal() diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObject.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObject.kt.after index d7d14c954eb8..6b9441aea78a 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObject.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObject.kt.after @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects sealed class Seal data object Foo : Seal() diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectIncompatibleToString.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectIncompatibleToString.kt index 459ce755498e..9efe1045f706 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectIncompatibleToString.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectIncompatibleToString.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects // PROBLEM: none sealed class Seal diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectWithCompatibleToString.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectWithCompatibleToString.kt index e7ede799d9ba..ec1121b8b56c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectWithCompatibleToString.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectWithCompatibleToString.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects sealed class Seal object Foo : Seal() { diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectWithCompatibleToString.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectWithCompatibleToString.kt.after index ecba408e07a8..7f2aa43dbff0 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectWithCompatibleToString.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/sealedSubObjectWithCompatibleToString.kt.after @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects sealed class Seal data object Foo : Seal() diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableButIncompatibleToString.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableButIncompatibleToString.kt index ac1280f4af96..2b7f7488111f 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableButIncompatibleToString.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableButIncompatibleToString.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects // PROBLEM: none object Foo : java.io.Serializable { override fun toString(): String = "FOO" diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableDirect.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableDirect.kt index 921554300007..c39132f07d90 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableDirect.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableDirect.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects import java.io.Serializable object Foo : Serializable diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableDirect.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableDirect.kt.after index 8393be635672..6b5b19f7dbd1 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableDirect.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableDirect.kt.after @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects import java.io.Serializable data object Foo : Serializable diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableTransitive.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableTransitive.kt index c04332126e26..a3e34bf7035d 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableTransitive.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableTransitive.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects import java.io.Serializable object Foo : Bar() diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableTransitive.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableTransitive.kt.after index ffeaf0f9d14d..753545659775 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableTransitive.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertObjectToDataObject/serializableTransitive.kt.after @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects import java.io.Serializable data object Foo : Bar() diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass17Lv.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsDisabled.kt similarity index 63% rename from plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass17Lv.kt rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsDisabled.kt index 011eb081a638..9f9c49ca8029 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass17Lv.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsDisabled.kt @@ -1,4 +1,5 @@ // PROBLEM: none +// COMPILER_ARGUMENTS: -XXLanguage:-DataObjects // DISABLE-ERRORS sealed class Bar diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass18Lv.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsEnabled.kt similarity index 57% rename from plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass18Lv.kt rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsEnabled.kt index 2dd7b1e44a02..f784c224ded5 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass18Lv.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsEnabled.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects // DISABLE-ERRORS sealed class Bar diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass18Lv.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsEnabled.kt.after similarity index 55% rename from plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass18Lv.kt.after rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsEnabled.kt.after index 05b2376538b9..4a64b3c9863b 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass18Lv.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsEnabled.kt.after @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects // DISABLE-ERRORS sealed class Bar diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataObject.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataObject.kt index 5ab785a2f917..ad1a7e6d94ac 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataObject.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataObject.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects // FIX: Convert sealed subclass to object sealed class Sealed diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataObject.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataObject.kt.after index f20b12e81d76..593162ad87c5 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataObject.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataObject.kt.after @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects // FIX: Convert sealed subclass to object sealed class Sealed diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertEnumToSealedClass/useDataObjectSince18.kt b/plugins/kotlin/idea/tests/testData/intentions/convertEnumToSealedClass/useDataObjectSince18.kt index dca1d1124956..3138e5892889 100644 --- a/plugins/kotlin/idea/tests/testData/intentions/convertEnumToSealedClass/useDataObjectSince18.kt +++ b/plugins/kotlin/idea/tests/testData/intentions/convertEnumToSealedClass/useDataObjectSince18.kt @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects enum class MyEnum() { FOO, BAR diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertEnumToSealedClass/useDataObjectSince18.kt.after b/plugins/kotlin/idea/tests/testData/intentions/convertEnumToSealedClass/useDataObjectSince18.kt.after index ba94db5c9010..9bb218b0fb40 100644 --- a/plugins/kotlin/idea/tests/testData/intentions/convertEnumToSealedClass/useDataObjectSince18.kt.after +++ b/plugins/kotlin/idea/tests/testData/intentions/convertEnumToSealedClass/useDataObjectSince18.kt.after @@ -1,4 +1,4 @@ -// LANGUAGE_VERSION: 1.8 +// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects sealed class MyEnum() { data object FOO : MyEnum() diff --git a/plugins/kotlin/k2-fe10-bindings/test/org/jetbrains/kotlin/idea/k2/fe10bindings/inspections/Fe10BindingLocalInspectionTestGenerated.java b/plugins/kotlin/k2-fe10-bindings/test/org/jetbrains/kotlin/idea/k2/fe10bindings/inspections/Fe10BindingLocalInspectionTestGenerated.java index 8418595f5142..fd257fe777b4 100644 --- a/plugins/kotlin/k2-fe10-bindings/test/org/jetbrains/kotlin/idea/k2/fe10bindings/inspections/Fe10BindingLocalInspectionTestGenerated.java +++ b/plugins/kotlin/k2-fe10-bindings/test/org/jetbrains/kotlin/idea/k2/fe10bindings/inspections/Fe10BindingLocalInspectionTestGenerated.java @@ -186,14 +186,14 @@ public abstract class Fe10BindingLocalInspectionTestGenerated extends AbstractFe runTest("../idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/convertSubClassWithoutParentheses.kt"); } - @TestMetadata("dataClass17Lv.kt") - public void testDataClass17Lv() throws Exception { - runTest("../idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass17Lv.kt"); + @TestMetadata("dataClass_dataObjectIsDisabled.kt") + public void testDataClass_dataObjectIsDisabled() throws Exception { + runTest("../idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsDisabled.kt"); } - @TestMetadata("dataClass18Lv.kt") - public void testDataClass18Lv() throws Exception { - runTest("../idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass18Lv.kt"); + @TestMetadata("dataClass_dataObjectIsEnabled.kt") + public void testDataClass_dataObjectIsEnabled() throws Exception { + runTest("../idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsEnabled.kt"); } @TestMetadata("dataObject.kt")