From 2afe8989dfb7bce8daf0a0838b24376b09390d2f Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Tue, 13 Jun 2017 03:54:23 +0300
Subject: [PATCH] Make <modifier> intention handle sealed correctly #KT-18425
 Fixed

---
 .../src/org/jetbrains/kotlin/psi/addRemoveModifier.kt       | 2 +-
 .../changeVisibility/private/noModifierListSealed.kt        | 1 +
 .../changeVisibility/private/noModifierListSealed.kt.after  | 1 +
 .../kotlin/idea/intentions/IntentionTestGenerated.java      | 6 ++++++
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListSealed.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListSealed.kt.after

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
index 17717ee0ac3..4fb25b649d7 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
@@ -134,7 +134,7 @@ private val MODIFIERS_TO_REPLACE = mapOf(
 )
 
 private val MODIFIERS_ORDER = listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD,
-                                     FINAL_KEYWORD, OPEN_KEYWORD, ABSTRACT_KEYWORD, ANNOTATION_KEYWORD,
+                                     FINAL_KEYWORD, OPEN_KEYWORD, ABSTRACT_KEYWORD, SEALED_KEYWORD, ANNOTATION_KEYWORD,
                                      OVERRIDE_KEYWORD,
                                      CONST_KEYWORD,
                                      LATEINIT_KEYWORD,
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListSealed.kt b/idea/testData/intentions/changeVisibility/private/noModifierListSealed.kt
new file mode 100644
index 00000000000..4924e181693
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListSealed.kt
@@ -0,0 +1 @@
+<caret>sealed class Ann
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListSealed.kt.after b/idea/testData/intentions/changeVisibility/private/noModifierListSealed.kt.after
new file mode 100644
index 00000000000..0c4dc9fd945
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListSealed.kt.after
@@ -0,0 +1 @@
+<caret>private sealed class Ann
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index b9fad291c01..392be935151 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -2974,6 +2974,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("noModifierListSealed.kt")
+            public void testNoModifierListSealed() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListSealed.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("noModifierListSecondaryConstructor.kt")
             public void testNoModifierListSecondaryConstructor() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt");