diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt index a7d6548172c..541164fac70 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt @@ -155,6 +155,7 @@ val MODIFIERS_ORDER = listOf( ENUM_KEYWORD, ANNOTATION_KEYWORD, FUN_KEYWORD, COMPANION_KEYWORD, INLINE_KEYWORD, + VALUE_KEYWORD, INFIX_KEYWORD, OPERATOR_KEYWORD, DATA_KEYWORD diff --git a/idea/testData/multiModuleQuickFix/createActual/valueClass/common/ic.kt b/idea/testData/multiModuleQuickFix/createActual/valueClass/common/ic.kt new file mode 100644 index 00000000000..bbed7a092e1 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/createActual/valueClass/common/ic.kt @@ -0,0 +1,3 @@ +// "Create actual class for module testModule_JVM (JVM)" "true" + +expect value class IC(val i: Int) diff --git a/idea/testData/multiModuleQuickFix/createActual/valueClass/common/ic.kt.after b/idea/testData/multiModuleQuickFix/createActual/valueClass/common/ic.kt.after new file mode 100644 index 00000000000..171c17f29c9 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/createActual/valueClass/common/ic.kt.after @@ -0,0 +1,3 @@ +// "Create actual class for module testModule_JVM (JVM)" "true" + +expect value class IC(val i: Int) diff --git a/idea/testData/multiModuleQuickFix/createActual/valueClass/jvm/ic.kt.after b/idea/testData/multiModuleQuickFix/createActual/valueClass/jvm/ic.kt.after new file mode 100644 index 00000000000..2431d3c62bf --- /dev/null +++ b/idea/testData/multiModuleQuickFix/createActual/valueClass/jvm/ic.kt.after @@ -0,0 +1 @@ +actual value class IC actual constructor(actual val i: Int) \ No newline at end of file diff --git a/idea/testData/quickfix/inlineClass/publicInlineClass.kt b/idea/testData/quickfix/inlineClass/publicInlineClass.kt new file mode 100644 index 00000000000..81b46ed86c8 --- /dev/null +++ b/idea/testData/quickfix/inlineClass/publicInlineClass.kt @@ -0,0 +1,4 @@ +// "Replace with '@JvmInline value'" "true" +// WITH_RUNTIME + +public inline class IC(val i: Int) \ No newline at end of file diff --git a/idea/testData/quickfix/inlineClass/publicInlineClass.kt.after b/idea/testData/quickfix/inlineClass/publicInlineClass.kt.after new file mode 100644 index 00000000000..d232dd0dfeb --- /dev/null +++ b/idea/testData/quickfix/inlineClass/publicInlineClass.kt.after @@ -0,0 +1,5 @@ +// "Replace with '@JvmInline value'" "true" +// WITH_RUNTIME + +@JvmInline +public value class IC(val i: Int) \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTestGenerated.java index b16cb0c9806..edf10cb8bbf 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTestGenerated.java @@ -491,6 +491,11 @@ public class QuickFixMultiModuleTestGenerated extends AbstractQuickFixMultiModul runTest("idea/testData/multiModuleQuickFix/createActual/sealedSubclass/"); } + @TestMetadata("valueClass") + public void testValueClass() throws Exception { + runTest("idea/testData/multiModuleQuickFix/createActual/valueClass/"); + } + @TestMetadata("withFakeJvm") public void testWithFakeJvm() throws Exception { runTest("idea/testData/multiModuleQuickFix/createActual/withFakeJvm/"); diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java index 3d727344974..bc40f126c50 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java @@ -8423,6 +8423,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public void testInlineClassDeprecated_js() throws Exception { runTest("idea/testData/quickfix/inlineClass/inlineClassDeprecated_js.kt"); } + + @TestMetadata("publicInlineClass.kt") + public void testPublicInlineClass() throws Exception { + runTest("idea/testData/quickfix/inlineClass/publicInlineClass.kt"); + } } @TestMetadata("idea/testData/quickfix/inlineClassConstructorNotValParameter")