From cbf4e4a973b3b72143969b3143fbe563882deb68 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 9 Oct 2015 21:45:33 +0300
Subject: [PATCH] Corrected order of modifier insertion

---
 .../frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt | 3 +--
 idea/testData/quickfix/migration/operatorModifier/simple.kt    | 2 +-
 .../quickfix/migration/operatorModifier/simple.kt.after        | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
index 855e653e1f5..a689a9619ee 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
@@ -112,5 +112,4 @@ 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,
-                                     INNER_KEYWORD,
-                                     ENUM_KEYWORD, COMPANION_KEYWORD)
+                                     INNER_KEYWORD, ENUM_KEYWORD, COMPANION_KEYWORD, INFIX_KEYWORD, OPERATOR_KEYWORD)
diff --git a/idea/testData/quickfix/migration/operatorModifier/simple.kt b/idea/testData/quickfix/migration/operatorModifier/simple.kt
index 05a4e3489a0..8ed4a54c3a8 100644
--- a/idea/testData/quickfix/migration/operatorModifier/simple.kt
+++ b/idea/testData/quickfix/migration/operatorModifier/simple.kt
@@ -1,4 +1,4 @@
 // "Add 'operator' modifier" "true"
 class A {
-    fun <caret>plus(other: A): A = A()
+    public fun <caret>plus(other: A): A = A()
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/migration/operatorModifier/simple.kt.after b/idea/testData/quickfix/migration/operatorModifier/simple.kt.after
index 0f22a4c9624..a777d804cfe 100644
--- a/idea/testData/quickfix/migration/operatorModifier/simple.kt.after
+++ b/idea/testData/quickfix/migration/operatorModifier/simple.kt.after
@@ -1,4 +1,4 @@
 // "Add 'operator' modifier" "true"
 class A {
-    operator fun plus(other: A): A = A()
+    public operator fun plus(other: A): A = A()
 }
\ No newline at end of file