From d90cc6f4cf3fbd459d204f817048c6e26f30f2ac Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Tue, 6 Jun 2017 15:55:39 +0900
Subject: [PATCH] Intention Make private and friends should respect modifier
 order #KT-17823 Fixed

---
 .../src/org/jetbrains/kotlin/psi/addRemoveModifier.kt       | 1 +
 .../changeVisibility/private/noModifierListConst.kt         | 1 +
 .../changeVisibility/private/noModifierListConst.kt.after   | 1 +
 .../kotlin/idea/intentions/IntentionTestGenerated.java      | 6 ++++++
 4 files changed, 9 insertions(+)
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListConst.kt
 create mode 100644 idea/testData/intentions/changeVisibility/private/noModifierListConst.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 037b28c1e61..c08fabf82ca 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
@@ -136,6 +136,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,
                                      OVERRIDE_KEYWORD,
+                                     CONST_KEYWORD,
                                      LATEINIT_KEYWORD,
                                      SUSPEND_KEYWORD,
                                      INNER_KEYWORD,
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListConst.kt b/idea/testData/intentions/changeVisibility/private/noModifierListConst.kt
new file mode 100644
index 00000000000..0e768b4d9d0
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListConst.kt
@@ -0,0 +1 @@
+<caret>const val a = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/changeVisibility/private/noModifierListConst.kt.after b/idea/testData/intentions/changeVisibility/private/noModifierListConst.kt.after
new file mode 100644
index 00000000000..f3c55faebe0
--- /dev/null
+++ b/idea/testData/intentions/changeVisibility/private/noModifierListConst.kt.after
@@ -0,0 +1 @@
+<caret>private const val a = 1
\ 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 b7b275debd3..2cf6e708f5d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -2938,6 +2938,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("noModifierListConst.kt")
+            public void testNoModifierListConst() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListConst.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("noModifierListFun.kt")
             public void testNoModifierListFun() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListFun.kt");