diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.txt
index f5a8d3fb277..d816cb89fdb 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgsOverridden.txt
@@ -13,7 +13,7 @@ public open class A {
 public final class B : A {
     public constructor B()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open tailrec override /*1*/ fun foo(/*0*/ s: kotlin.String = ...): kotlin.String
+    public open override /*1*/ tailrec fun foo(/*0*/ s: kotlin.String = ...): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.txt
index 013cb7ee7b5..dee88507fb8 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.txt
@@ -1,4 +1,4 @@
 package
 
 public fun box(): kotlin.String
-public infix tailrec fun kotlin.Int.test(/*0*/ x: kotlin.Int): kotlin.Int
+public tailrec infix fun kotlin.Int.test(/*0*/ x: kotlin.Int): kotlin.Int
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.txt
index 641a4681712..da5502c74d6 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.txt
@@ -1,4 +1,4 @@
 package
 
 public fun box(): kotlin.String
-public infix tailrec fun kotlin.Int.foo(/*0*/ x: kotlin.Int): kotlin.Unit
+public tailrec infix fun kotlin.Int.foo(/*0*/ x: kotlin.Int): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.txt b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.txt
index ccc4a790828..a17df36c4cf 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.txt
@@ -3,7 +3,7 @@ package
 public final data class A : T {
     public constructor A(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
-    public final operator override /*1*/ /*synthesized*/ fun component1(): kotlin.Int
+    public final override /*1*/ operator /*synthesized*/ fun component1(): kotlin.Int
     public final /*synthesized*/ fun copy(/*0*/ x: kotlin.Int = ...): A
     public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.txt b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.txt
index e574f259e36..c4ae28454f1 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.txt
+++ b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.txt
@@ -3,7 +3,7 @@ package
 public final data class A : T {
     public constructor A(/*0*/ x: kotlin.Int)
     public final val x: kotlin.Int
-    public final operator override /*1*/ /*synthesized*/ fun component1(): kotlin.Int
+    public final override /*1*/ operator /*synthesized*/ fun component1(): kotlin.Int
     public final /*synthesized*/ fun copy(/*0*/ x: kotlin.Int = ...): A
     public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.txt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.txt
index 3b6c1ca54b9..4ddd4907d5b 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.txt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.txt
@@ -6,9 +6,9 @@ public var b: kotlin.Int
 public var c: kotlin.String
 public val cObj: C
 public operator fun </*0*/ T> B.getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.reflect.KProperty<*>): T
-public operator inline fun </*0*/ reified T> C.getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.reflect.KProperty<*>): T
+public inline operator fun </*0*/ reified T> C.getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.reflect.KProperty<*>): T
 public operator fun </*0*/ T> B.setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.reflect.KProperty<*>, /*2*/ x: T): kotlin.Unit
-public operator inline fun </*0*/ reified T> C.setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.reflect.KProperty<*>, /*2*/ x: T): kotlin.Unit
+public inline operator fun </*0*/ reified T> C.setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.reflect.KProperty<*>, /*2*/ x: T): kotlin.Unit
 
 public final class A {
     public constructor A()
diff --git a/compiler/testData/diagnostics/tests/evaluate/infixFunOverBuiltinMemberInConst.txt b/compiler/testData/diagnostics/tests/evaluate/infixFunOverBuiltinMemberInConst.txt
index 434d8730d70..58335585cb6 100644
--- a/compiler/testData/diagnostics/tests/evaluate/infixFunOverBuiltinMemberInConst.txt
+++ b/compiler/testData/diagnostics/tests/evaluate/infixFunOverBuiltinMemberInConst.txt
@@ -4,5 +4,5 @@ public const val a1: kotlin.Int
 public const val a2: kotlin.Int = -1
 public const val b1: kotlin.Int
 public const val b2: kotlin.Int = 2
-public operator infix fun kotlin.Int.minus(/*0*/ other: kotlin.Int): kotlin.Int
+public infix operator fun kotlin.Int.minus(/*0*/ other: kotlin.Int): kotlin.Int
 public infix fun kotlin.Int.rem(/*0*/ other: kotlin.Int): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.txt b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.txt
index e0710a321c7..56e78c9328a 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.txt
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.txt
@@ -25,7 +25,7 @@ package outer {
     public fun kotlin.Int.foo(): kotlin.Int
     public operator fun </*0*/ T> T.minus(/*0*/ t: T): kotlin.Int
     public fun kotlin.Int?.optint(): kotlin.Unit
-    public operator infix fun outer.A.plus(/*0*/ a: kotlin.Any): kotlin.Unit
+    public infix operator fun outer.A.plus(/*0*/ a: kotlin.Any): kotlin.Unit
     public operator fun outer.A.plus(/*0*/ a: kotlin.Int): kotlin.Unit
 
     public final class A {
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.txt b/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.txt
index f44aa3b4104..43b2c2dcf17 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.txt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.txt
@@ -1,5 +1,5 @@
 package
 
 public fun </*0*/ A> main(/*0*/ tp: A, /*1*/ any: kotlin.Any): kotlin.Unit
-public operator inline fun </*0*/ reified T> T.invoke(): T
-public operator inline fun </*0*/ reified T> T.plus(/*0*/ p: T): T
+public inline operator fun </*0*/ reified T> T.invoke(): T
+public inline operator fun </*0*/ reified T> T.plus(/*0*/ p: T): T
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.txt b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.txt
index 3b1fbb99539..66c39128603 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.txt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.txt
@@ -1,7 +1,7 @@
 package
 
 public fun test(/*0*/ s: SelectorFor<State>): kotlin.Double
-public operator inline fun </*0*/ S, /*1*/ I> SelectorFor<S>.invoke(/*0*/ f: S.() -> I): AbstractSelector<S, I>
+public inline operator fun </*0*/ S, /*1*/ I> SelectorFor<S>.invoke(/*0*/ f: S.() -> I): AbstractSelector<S, I>
 
 public final class AbstractSelector</*0*/ S, /*1*/ I> {
     public constructor AbstractSelector</*0*/ S, /*1*/ I>()
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.txt b/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.txt
index b1321f1a2f2..a320b953909 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.txt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.txt
@@ -12,7 +12,7 @@ public final class TestClass {
         private constructor Companion()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final operator inline fun </*0*/ T> invoke(/*0*/ task: () -> T): T
+        public final inline operator fun </*0*/ T> invoke(/*0*/ task: () -> T): T
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.txt b/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.txt
index fbcd6ad806b..8f721079268 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.txt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.txt
@@ -6,6 +6,6 @@ public object TestClass {
     private constructor TestClass()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator inline fun </*0*/ T> invoke(/*0*/ task: () -> T): T
+    public final inline operator fun </*0*/ T> invoke(/*0*/ task: () -> T): T
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.txt b/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.txt
index 0baa81b1376..58703357933 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.txt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.txt
@@ -21,6 +21,6 @@ public final class TestClass {
     public constructor TestClass()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator inline fun </*0*/ T> invoke(/*0*/ task: () -> T): T
+    public final inline operator fun </*0*/ T> invoke(/*0*/ task: () -> T): T
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.txt
index ebafc28af49..da59aec34ea 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.txt
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.txt
@@ -2,6 +2,6 @@ package
 
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: U, l: V) -> W): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).get(/*0*/ index: kotlin.Int): kotlin.Unit
+public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).get(/*0*/ index: kotlin.Int): kotlin.Unit
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).get(/*0*/ index: kotlin.Int): kotlin.Unit
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).get(/*0*/ index: kotlin.Int): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.txt
index a6233a0d5a3..71cbeab6289 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.txt
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.txt
@@ -3,7 +3,7 @@ package
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U, /*1*/ ext: T.(p: U) -> V): kotlin.Unit
 public operator fun </*0*/ T, /*1*/ U> ((T) -> U).minusAssign(/*0*/ p: (T) -> U): kotlin.Unit
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).minusAssign(/*0*/ ext: T.(U) -> V): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).modAssign(/*0*/ p: (T) -> U): () -> kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).modAssign(/*0*/ ext: T.(U) -> V): () -> kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).plusAssign(/*0*/ p: (T) -> U): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).plusAssign(/*0*/ ext: T.(U) -> V): kotlin.Unit
+public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).modAssign(/*0*/ p: (T) -> U): () -> kotlin.Unit
+public inline operator fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).modAssign(/*0*/ ext: T.(U) -> V): () -> kotlin.Unit
+public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).plusAssign(/*0*/ p: (T) -> U): kotlin.Unit
+public inline operator fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).plusAssign(/*0*/ ext: T.(U) -> V): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.txt
index fbaf1c64996..35fac3bf80b 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.txt
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.txt
@@ -2,6 +2,6 @@ package
 
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: U, l: V) -> W): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).compareTo(/*0*/ p: (T) -> U): kotlin.Int
+public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).compareTo(/*0*/ p: (T) -> U): kotlin.Int
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).compareTo(/*0*/ index: (T, U) -> V): kotlin.Int
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).compareTo(/*0*/ index: T.(U, V) -> W): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.txt
index 829f98ad34d..2653146e72f 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.txt
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.txt
@@ -2,9 +2,9 @@ package
 
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: U, l: V) -> W): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).component1(): kotlin.Int
+public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).component1(): kotlin.Int
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).component1(): kotlin.Int
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).component1(): kotlin.Int
-public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).component2(): kotlin.Int
+public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).component2(): kotlin.Int
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).component2(): kotlin.Int
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).component2(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.txt
index b2a20795707..4bb8ed8c90d 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.txt
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.txt
@@ -2,6 +2,6 @@ package
 
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> U, /*1*/ ext: T.(p: U, l: U) -> V): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).contains(/*0*/ p: (T) -> U): kotlin.Boolean
+public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).contains(/*0*/ p: (T) -> U): kotlin.Boolean
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).contains(/*0*/ p: (T, U) -> V): kotlin.Boolean
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).contains(/*0*/ ext: T.(U, V) -> W): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.txt
index af9cd97a876..356cf94ea3b 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.txt
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.txt
@@ -4,7 +4,7 @@ public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U, /*1*/ ext: T.(p: U) -> V): kotlin.Unit
 public operator fun </*0*/ T, /*1*/ U> ((T) -> U).minus(/*0*/ p: (T) -> U): kotlin.Unit
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).minus(/*0*/ p: T.(p: U) -> V): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).plus(/*0*/ p: (T) -> U): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).plus(/*0*/ p: T.(p: U) -> V): kotlin.Unit
+public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).plus(/*0*/ p: (T) -> U): kotlin.Unit
+public inline operator fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).plus(/*0*/ p: T.(p: U) -> V): kotlin.Unit
 public inline fun </*0*/ T, /*1*/ U> ((T) -> U).submit(): kotlin.Unit
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).submit(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt
index 41ecc040f42..36c8fbdb744 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt
@@ -2,6 +2,6 @@ package
 
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> U, /*1*/ ext: T.(p: U, l: U) -> V): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).rangeTo(/*0*/ p: (T) -> U): kotlin.ranges.ClosedRange<kotlin.Int>
+public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).rangeTo(/*0*/ p: (T) -> U): kotlin.ranges.ClosedRange<kotlin.Int>
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).rangeTo(/*0*/ p: (T, U) -> V): kotlin.ranges.ClosedRange<kotlin.Int>
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).rangeTo(/*0*/ ext: T.(U, V) -> W): kotlin.ranges.ClosedRange<kotlin.Int>
diff --git a/compiler/testData/diagnostics/tests/inline/capture.txt b/compiler/testData/diagnostics/tests/inline/capture.txt
index d25dfed0ea4..4f729f89924 100644
--- a/compiler/testData/diagnostics/tests/inline/capture.txt
+++ b/compiler/testData/diagnostics/tests/inline/capture.txt
@@ -5,5 +5,5 @@ public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (p: kotlin.Int)
 public inline fun inlineFunWrongExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit
 public inline fun testExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit
 public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): kotlin.Unit
-public infix inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt2(/*0*/ p: kotlin.Int): kotlin.Unit
+public inline infix fun ((kotlin.Int) -> kotlin.Unit).inlineExt2(/*0*/ p: kotlin.Int): kotlin.Unit
 public infix fun ((kotlin.Int) -> kotlin.Unit).noInlineExt(/*0*/ p: kotlin.Int): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inline/defaultLambdaInlineDisable.txt b/compiler/testData/diagnostics/tests/inline/defaultLambdaInlineDisable.txt
index 0ccf9886d2e..33ce083da54 100644
--- a/compiler/testData/diagnostics/tests/inline/defaultLambdaInlineDisable.txt
+++ b/compiler/testData/diagnostics/tests/inline/defaultLambdaInlineDisable.txt
@@ -26,7 +26,7 @@ public abstract class Base {
 public final class Derived : Base {
     public constructor Derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final inline override /*1*/ fun foo(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
+    public final override /*1*/ inline fun foo(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/inline/defaultLambdaInlining.txt b/compiler/testData/diagnostics/tests/inline/defaultLambdaInlining.txt
index 0ccf9886d2e..33ce083da54 100644
--- a/compiler/testData/diagnostics/tests/inline/defaultLambdaInlining.txt
+++ b/compiler/testData/diagnostics/tests/inline/defaultLambdaInlining.txt
@@ -26,7 +26,7 @@ public abstract class Base {
 public final class Derived : Base {
     public constructor Derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final inline override /*1*/ fun foo(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
+    public final override /*1*/ inline fun foo(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/inline/extensionOnFunction.txt b/compiler/testData/diagnostics/tests/inline/extensionOnFunction.txt
index ff5d167f3a0..8155e475f36 100644
--- a/compiler/testData/diagnostics/tests/inline/extensionOnFunction.txt
+++ b/compiler/testData/diagnostics/tests/inline/extensionOnFunction.txt
@@ -4,5 +4,5 @@ public inline fun inlineFunNoInline(/*0*/ noinline s: (p: kotlin.Int) -> kotlin.
 public inline fun inlineFunWrongExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit
 public inline fun testExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit
 public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): kotlin.Unit
-public infix inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt2(/*0*/ p: kotlin.Int): kotlin.Unit
+public inline infix fun ((kotlin.Int) -> kotlin.Unit).inlineExt2(/*0*/ p: kotlin.Int): kotlin.Unit
 public infix fun ((kotlin.Int) -> kotlin.Unit).noInlineExt(/*0*/ p: kotlin.Int): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inline/messagesForUnsupportedInInline.txt b/compiler/testData/diagnostics/tests/inline/messagesForUnsupportedInInline.txt
index b4b0f8fae87..df91582ea3e 100644
--- a/compiler/testData/diagnostics/tests/inline/messagesForUnsupportedInInline.txt
+++ b/compiler/testData/diagnostics/tests/inline/messagesForUnsupportedInInline.txt
@@ -16,5 +16,5 @@ public final class Derived : Base {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public final inline override /*1*/ fun withDefault(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
+    public final override /*1*/ inline fun withDefault(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.txt
index 9c9b9bdf966..86655f7badb 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.txt
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.txt
@@ -8,6 +8,6 @@ public final class Z {
     public constructor Z()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final infix inline fun </*0*/ R> inlineFun(/*0*/ crossinline p: () -> R): kotlin.Unit
+    public final inline infix fun </*0*/ R> inlineFun(/*0*/ crossinline p: () -> R): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/inline/overrideWithInline.txt b/compiler/testData/diagnostics/tests/inline/overrideWithInline.txt
index 6998a93fa78..3e3e0eb3728 100644
--- a/compiler/testData/diagnostics/tests/inline/overrideWithInline.txt
+++ b/compiler/testData/diagnostics/tests/inline/overrideWithInline.txt
@@ -4,20 +4,20 @@ public final class CDerived : IBase {
     public constructor CDerived()
     public final val anObject: IBase
     public final fun aMethod(): kotlin.Unit
-    public open inline override /*1*/ fun bar(): kotlin.Unit
+    public open override /*1*/ inline fun bar(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final inline override /*1*/ fun foo(): kotlin.Unit
+    public final override /*1*/ inline fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final inline override /*1*/ fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
+    public final override /*1*/ inline fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     public final class CNested : IBase {
         public constructor CNested()
-        public open inline override /*1*/ fun bar(): kotlin.Unit
+        public open override /*1*/ inline fun bar(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final inline override /*1*/ fun foo(): kotlin.Unit
+        public final override /*1*/ inline fun foo(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final inline override /*1*/ fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
+        public final override /*1*/ inline fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
@@ -26,20 +26,20 @@ public open class COpen : IBase {
     public constructor COpen()
     public final val anObject: IBase
     public final fun aMethod(): kotlin.Unit
-    public open inline override /*1*/ fun bar(): kotlin.Unit
+    public open override /*1*/ inline fun bar(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final inline override /*1*/ fun foo(): kotlin.Unit
+    public final override /*1*/ inline fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final inline override /*1*/ fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
+    public final override /*1*/ inline fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     public open class COpenNested : IBase {
         public constructor COpenNested()
-        public open inline override /*1*/ fun bar(): kotlin.Unit
+        public open override /*1*/ inline fun bar(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final inline override /*1*/ fun foo(): kotlin.Unit
+        public final override /*1*/ inline fun foo(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final inline override /*1*/ fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
+        public final override /*1*/ inline fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/protectedDepecation.txt b/compiler/testData/diagnostics/tests/inline/protectedDepecation.txt
index ad8c5f09fd5..9e65e486e4a 100644
--- a/compiler/testData/diagnostics/tests/inline/protectedDepecation.txt
+++ b/compiler/testData/diagnostics/tests/inline/protectedDepecation.txt
@@ -30,10 +30,10 @@ public final class B : A {
     public constructor B()
     protected final override /*1*/ /*fake_override*/ val z: kotlin.String
     public final override /*1*/ /*fake_override*/ var zVar: kotlin.String
-    public final inline override /*1*/ /*fake_override*/ fun call(): kotlin.Unit
-    internal final inline override /*1*/ /*fake_override*/ fun callFromInternal(): kotlin.Unit
-    protected final inline override /*1*/ /*fake_override*/ fun callFromProtected(): kotlin.Unit
-    @kotlin.PublishedApi internal final inline override /*1*/ /*fake_override*/ fun callFromPublished(): kotlin.Unit
+    public final override /*1*/ inline /*fake_override*/ fun call(): kotlin.Unit
+    internal final override /*1*/ inline /*fake_override*/ fun callFromInternal(): kotlin.Unit
+    protected final override /*1*/ inline /*fake_override*/ fun callFromProtected(): kotlin.Unit
+    @kotlin.PublishedApi internal final override /*1*/ inline /*fake_override*/ fun callFromPublished(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     protected final override /*1*/ /*fake_override*/ fun test(): kotlin.Unit
@@ -71,10 +71,10 @@ private final class X {
         public constructor Z()
         protected final override /*1*/ /*fake_override*/ val z: kotlin.String
         public final override /*1*/ /*fake_override*/ var zVar: kotlin.String
-        public final inline override /*1*/ /*fake_override*/ fun call(): kotlin.Unit
-        internal final inline override /*1*/ /*fake_override*/ fun callFromInternal(): kotlin.Unit
-        protected final inline override /*1*/ /*fake_override*/ fun callFromProtected(): kotlin.Unit
-        @kotlin.PublishedApi internal final inline override /*1*/ /*fake_override*/ fun callFromPublished(): kotlin.Unit
+        public final override /*1*/ inline /*fake_override*/ fun call(): kotlin.Unit
+        internal final override /*1*/ inline /*fake_override*/ fun callFromInternal(): kotlin.Unit
+        protected final override /*1*/ inline /*fake_override*/ fun callFromProtected(): kotlin.Unit
+        @kotlin.PublishedApi internal final override /*1*/ inline /*fake_override*/ fun callFromPublished(): kotlin.Unit
         public final inline fun effictivelyNonPublic(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/inline/recursion.txt b/compiler/testData/diagnostics/tests/inline/recursion.txt
index 958e7cff68d..3348f218074 100644
--- a/compiler/testData/diagnostics/tests/inline/recursion.txt
+++ b/compiler/testData/diagnostics/tests/inline/recursion.txt
@@ -2,6 +2,6 @@ package
 
 public inline fun inlineFun(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit
 public inline fun </*0*/ T> inlineFun(/*0*/ s: T): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ V> ((T) -> V).inc(): (T) -> V
+public inline operator fun </*0*/ T, /*1*/ V> ((T) -> V).inc(): (T) -> V
 public inline fun </*0*/ T> (() -> T).inlineExt(): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ V> ((T) -> V).not(): kotlin.Boolean
+public inline operator fun </*0*/ T, /*1*/ V> ((T) -> V).not(): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.txt b/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.txt
index 185ee28a77b..946e43e9a41 100644
--- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.txt
+++ b/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.txt
@@ -3,10 +3,10 @@ package
 public inline fun </*0*/ T, /*1*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> V, /*1*/ ext: T.(p: T) -> V): kotlin.Unit
 public operator fun </*0*/ T, /*1*/ V> ((T) -> V).dec(): (T) -> V
 public operator fun </*0*/ T, /*1*/ V> (T.(T) -> V).dec(): T.(T) -> V
-public operator inline fun </*0*/ T, /*1*/ V> ((T) -> V).inc(): (T) -> V
-public operator inline fun </*0*/ T, /*1*/ V> (T.(T) -> V).inc(): T.(T) -> V
+public inline operator fun </*0*/ T, /*1*/ V> ((T) -> V).inc(): (T) -> V
+public inline operator fun </*0*/ T, /*1*/ V> (T.(T) -> V).inc(): T.(T) -> V
 public inline fun </*0*/ T, /*1*/ V> ((T) -> V).inlineFunWithInvoke(): kotlin.Unit
 public operator fun </*0*/ T, /*1*/ V> ((T) -> V).unaryMinus(): (T) -> V
 public operator fun </*0*/ T, /*1*/ V> (T.(T) -> V).unaryMinus(): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ V> ((T) -> V).unaryPlus(): (T) -> V
-public operator inline fun </*0*/ T, /*1*/ V> (T.(T) -> V).unaryPlus(): kotlin.Unit
+public inline operator fun </*0*/ T, /*1*/ V> ((T) -> V).unaryPlus(): (T) -> V
+public inline operator fun </*0*/ T, /*1*/ V> (T.(T) -> V).unaryPlus(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.txt b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.txt
index 484d5d818b4..05f40985bb8 100644
--- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.txt
+++ b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.txt
@@ -2,6 +2,6 @@ package
 
 public inline fun </*0*/ T, /*1*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> V): kotlin.Unit
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: T, l: U) -> V): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ V> ((T) -> V).not(): kotlin.Boolean
+public inline operator fun </*0*/ T, /*1*/ V> ((T) -> V).not(): kotlin.Boolean
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).not(): kotlin.Boolean
 public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).not(): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.txt b/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.txt
index 797a4e03381..ce313589a00 100644
--- a/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.txt
+++ b/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.txt
@@ -14,7 +14,7 @@ public open class Base {
 public final class Derived : Base {
     public constructor Derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final inline override /*1*/ fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
+    public final override /*1*/ inline fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/modifiers/operatorInfix/LocalFunctions.txt b/compiler/testData/diagnostics/tests/modifiers/operatorInfix/LocalFunctions.txt
index d59313d0921..3efbecd6b15 100644
--- a/compiler/testData/diagnostics/tests/modifiers/operatorInfix/LocalFunctions.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/operatorInfix/LocalFunctions.txt
@@ -4,9 +4,9 @@ public fun a(): kotlin.Unit
 public fun consumeInt(/*0*/ i: kotlin.Int): kotlin.Unit
 public fun consumeString(/*0*/ s: kotlin.String): kotlin.Unit
 public fun Example.div(/*0*/ other: Example): kotlin.Int
-public operator infix fun Example.minus(/*0*/ other: Example): kotlin.Int
+public infix operator fun Example.minus(/*0*/ other: Example): kotlin.Int
 public fun Example.plus(/*0*/ other: Example): kotlin.Int
-public operator infix fun Example.times(/*0*/ other: Example): kotlin.Int
+public infix operator fun Example.times(/*0*/ other: Example): kotlin.Int
 
 public final class Example {
     public constructor Example()
diff --git a/compiler/testData/diagnostics/tests/modifiers/operatorInfix/MemberFunctions.txt b/compiler/testData/diagnostics/tests/modifiers/operatorInfix/MemberFunctions.txt
index 0bae2ab7a53..096cc0dd377 100644
--- a/compiler/testData/diagnostics/tests/modifiers/operatorInfix/MemberFunctions.txt
+++ b/compiler/testData/diagnostics/tests/modifiers/operatorInfix/MemberFunctions.txt
@@ -4,9 +4,9 @@ public fun a(): kotlin.Unit
 public fun consumeInt(/*0*/ i: kotlin.Int): kotlin.Unit
 public fun consumeString(/*0*/ s: kotlin.String): kotlin.Unit
 public fun Example.div(/*0*/ other: Example): kotlin.String
-public operator infix fun Example.minus(/*0*/ other: Example): kotlin.String
+public infix operator fun Example.minus(/*0*/ other: Example): kotlin.String
 public fun Example.plus(/*0*/ other: Example): kotlin.String
-public operator infix fun Example.times(/*0*/ other: Example): kotlin.String
+public infix operator fun Example.times(/*0*/ other: Example): kotlin.String
 
 public final class Example {
     public constructor Example()
@@ -14,7 +14,7 @@ public final class Example {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final fun minus(/*0*/ other: Example): kotlin.Int
-    public final operator infix fun plus(/*0*/ other: Example): kotlin.Int
-    public final operator infix fun times(/*0*/ other: Example): kotlin.Int
+    public final infix operator fun plus(/*0*/ other: Example): kotlin.Int
+    public final infix operator fun times(/*0*/ other: Example): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.txt
index 291a41f6ea6..1adb731d2b7 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.txt
@@ -11,7 +11,7 @@ public final expect class Bar {
 public final expect class Baz {
     public constructor Baz(/*0*/ w: kotlin.collections.List<kotlin.String>)
     public expect final val w: kotlin.collections.List<kotlin.String>
-    public final operator expect fun component1(): kotlin.collections.List<kotlin.String>
+    public final expect operator fun component1(): kotlin.collections.List<kotlin.String>
     public open expect override /*1*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open expect override /*1*/ fun hashCode(): kotlin.Int
     public open expect override /*1*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.txt
index d7f39a9699f..e397ad4e8f0 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.txt
@@ -14,5 +14,5 @@ package
 public external actual fun external(): kotlin.Unit
 public actual inline fun inline(): kotlin.Unit
 public actual tailrec fun tailrec(): kotlin.Unit
-public infix actual fun kotlin.String.and(/*0*/ other: kotlin.String): kotlin.String
-public operator actual fun kotlin.String.unaryMinus(): kotlin.String
+public actual infix fun kotlin.String.and(/*0*/ other: kotlin.String): kotlin.String
+public actual operator fun kotlin.String.unaryMinus(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.txt
index 7af18d04f45..97afcffd2d6 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.txt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.txt
@@ -1,15 +1,15 @@
 package
 
 public fun test(/*0*/ x: kotlin.Int?, /*1*/ a: A?): kotlin.Unit
-public operator infix fun A.div(/*0*/ i: kotlin.Int): kotlin.Unit
-public operator infix fun A?.times(/*0*/ i: kotlin.Int): kotlin.Unit
+public infix operator fun A.div(/*0*/ i: kotlin.Int): kotlin.Unit
+public infix operator fun A?.times(/*0*/ i: kotlin.Int): kotlin.Unit
 
 public final class A {
     public constructor A()
-    public final operator infix fun contains(/*0*/ a: kotlin.Any?): kotlin.Boolean
+    public final infix operator fun contains(/*0*/ a: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator infix fun plus(/*0*/ i: kotlin.Int): kotlin.Unit
+    public final infix operator fun plus(/*0*/ i: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     public final operator fun unaryMinus(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/tailRecOverridden.txt b/compiler/testData/diagnostics/tests/tailRecOverridden.txt
index f1e0f302252..a45add41cea 100644
--- a/compiler/testData/diagnostics/tests/tailRecOverridden.txt
+++ b/compiler/testData/diagnostics/tests/tailRecOverridden.txt
@@ -13,8 +13,8 @@ public final class B : A {
     public constructor B()
     public final tailrec fun bar(/*0*/ y: kotlin.Double): kotlin.Double
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open tailrec override /*1*/ fun foo(/*0*/ x: kotlin.Int = ...): kotlin.Unit
-    public open tailrec override /*1*/ fun gav(/*0*/ y: kotlin.Int = ..., /*1*/ z: kotlin.Int = ...): kotlin.Unit
+    public open override /*1*/ tailrec fun foo(/*0*/ x: kotlin.Int = ...): kotlin.Unit
+    public open override /*1*/ tailrec fun gav(/*0*/ y: kotlin.Int = ..., /*1*/ z: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -23,8 +23,8 @@ public final class C : A {
     public constructor C()
     public final tailrec fun bar(/*0*/ y: kotlin.Int = ..., /*1*/ z: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open tailrec override /*1*/ fun foo(/*0*/ x: kotlin.Int = ...): kotlin.Unit
-    public open tailrec override /*1*/ fun gav(/*0*/ y: kotlin.Int = ..., /*1*/ z: kotlin.Int = ...): kotlin.Unit
+    public open override /*1*/ tailrec fun foo(/*0*/ x: kotlin.Int = ...): kotlin.Unit
+    public open override /*1*/ tailrec fun gav(/*0*/ y: kotlin.Int = ..., /*1*/ z: kotlin.Int = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/inlineExtensionToNative.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/inlineExtensionToNative.txt
index 073cd2a3056..8949ffd3f01 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/inlineExtensionToNative.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/inlineExtensionToNative.txt
@@ -1,8 +1,8 @@
 package
 
 public inline fun A.foo(/*0*/ x: kotlin.Int): kotlin.String
-public operator inline fun A.get(/*0*/ x: kotlin.Int): kotlin.String
-public operator inline fun A.B.get(/*0*/ x: kotlin.Int): kotlin.String
+public inline operator fun A.get(/*0*/ x: kotlin.Int): kotlin.String
+public inline operator fun A.B.get(/*0*/ x: kotlin.Int): kotlin.String
 
 public final external class A {
     public constructor A()
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.txt
index f28bb79059b..af473b45ec0 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/rtti/nativeInterfaceAsReifiedTypeArgument.txt
@@ -2,7 +2,7 @@ package
 
 public fun bar(): kotlin.Unit
 public inline fun </*0*/ reified T> foo(/*0*/ x: T): kotlin.Unit
-public operator inline fun </*0*/ reified T> C.plus(/*0*/ other: T): C
+public inline operator fun </*0*/ reified T> C.plus(/*0*/ other: T): C
 
 public final external class C : I {
     public constructor C()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/illegalSuspendCallsForDelegated.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/illegalSuspendCallsForDelegated.txt
index 2c482556bae..f16cbe6158c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/illegalSuspendCallsForDelegated.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/illegalSuspendCallsForDelegated.txt
@@ -5,7 +5,7 @@ public fun bar(/*0*/ d: Delegate): kotlin.String
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final operator suspend fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.Any?): kotlin.String
+    public final suspend operator fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.Any?): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/mixingSuspendability.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/mixingSuspendability.txt
index 6dcbed01116..7196a211751 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/mixingSuspendability.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/mixingSuspendability.txt
@@ -10,7 +10,7 @@ public interface AsyncVal {
 public final class MixSuspend : AsyncVal, SyncVal {
     public constructor MixSuspend()
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open suspend override /*1*/ /*fake_override*/ fun getVal(): kotlin.Int
+    public open override /*1*/ suspend /*fake_override*/ fun getVal(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt
index 6ec717121f7..9a8eed4e1da 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/restrictSuspension/allMembersAllowed.txt
@@ -10,23 +10,23 @@ public fun kotlin.String.test(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final suspend fun memberFun(): kotlin.Unit
-    public open suspend override /*1*/ /*fake_override*/ fun superFun(): kotlin.Unit
+    public open override /*1*/ suspend /*fake_override*/ fun superFun(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     public final suspend fun kotlin.String.memberExtFun(): kotlin.Unit
-    public open suspend override /*1*/ /*fake_override*/ fun kotlin.String.superExtFun(): kotlin.Unit
+    public open override /*1*/ suspend /*fake_override*/ fun kotlin.String.superExtFun(): kotlin.Unit
 }
 
 public final class SubClass : RestrictedController {
     public constructor SubClass()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final suspend override /*1*/ /*fake_override*/ fun memberFun(): kotlin.Unit
+    public final override /*1*/ suspend /*fake_override*/ fun memberFun(): kotlin.Unit
     public final suspend fun subFun(): kotlin.Unit
-    public open suspend override /*1*/ /*fake_override*/ fun superFun(): kotlin.Unit
+    public open override /*1*/ suspend /*fake_override*/ fun superFun(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public final suspend override /*1*/ /*fake_override*/ fun kotlin.String.memberExtFun(): kotlin.Unit
+    public final override /*1*/ suspend /*fake_override*/ fun kotlin.String.memberExtFun(): kotlin.Unit
     public final suspend fun kotlin.String.subExtFun(): kotlin.Unit
-    public open suspend override /*1*/ /*fake_override*/ fun kotlin.String.superExtFun(): kotlin.Unit
+    public open override /*1*/ suspend /*fake_override*/ fun kotlin.String.superExtFun(): kotlin.Unit
 }
 
 public interface SuperInterface {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt
index b32d5b9d67f..0f980ff4df0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendApplicability.txt
@@ -8,7 +8,7 @@ public final class Controller {
     public constructor Controller()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final inline suspend fun inlineFun(/*0*/ x: kotlin.Int): kotlin.Unit
+    public final suspend inline fun inlineFun(/*0*/ x: kotlin.Int): kotlin.Unit
     public final suspend fun noParameters(): kotlin.Unit
     public final suspend fun oldConvention(/*0*/ x: kotlin.coroutines.experimental.Continuation<kotlin.Int>): kotlin.Unit
     public final suspend fun oneParameter(/*0*/ q: kotlin.Any): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendConflictsWithNoSuspend.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendConflictsWithNoSuspend.txt
index e20ff4958f3..19eeacf3445 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendConflictsWithNoSuspend.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendConflictsWithNoSuspend.txt
@@ -11,7 +11,7 @@ public interface A {
 public interface B : A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ fun foo(): kotlin.Unit
-    public open suspend override /*1*/ fun foo(): kotlin.Unit
+    public open override /*1*/ suspend fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/modifierApplicability.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/modifierApplicability.txt
index d46a70a00a8..46de2e09be4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/modifierApplicability.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/modifierApplicability.txt
@@ -23,14 +23,14 @@ public interface SAM {
 public interface Supertype1 : suspend () -> kotlin.Unit {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public abstract suspend override /*1*/ /*fake_override*/ fun invoke(): kotlin.Unit
+    public abstract override /*1*/ suspend /*fake_override*/ fun invoke(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Supertype2 : suspend kotlin.String.() -> kotlin.Unit {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public abstract suspend override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: kotlin.String): kotlin.Unit
+    public abstract override /*1*/ suspend /*fake_override*/ fun invoke(/*0*/ p1: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public typealias Action = () -> kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.txt
index c3116c7b616..2e59d7b322f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendOverridability.txt
@@ -19,7 +19,7 @@ public interface B : A {
 public interface C : A {
     public open override /*1*/ fun bar(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open suspend override /*1*/ fun foo(): kotlin.Unit
+    public open override /*1*/ suspend fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -28,7 +28,7 @@ public final class D : J {
     public constructor D()
     public abstract override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open suspend override /*1*/ fun foo(): kotlin.Unit
+    public open override /*1*/ suspend fun foo(): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ y: kotlin.coroutines.experimental.Continuation<kotlin.Unit!>!): kotlin.Any!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -37,7 +37,7 @@ public final class D : J {
 public interface J : A {
     public abstract override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract suspend override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
+    public abstract override /*1*/ suspend /*fake_override*/ fun foo(): kotlin.Unit
     public abstract fun foo(/*0*/ y: kotlin.coroutines.experimental.Continuation<kotlin.Unit!>!): kotlin.Any!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/lateinit/isInitialized.txt b/compiler/testData/diagnostics/testsWithStdLib/lateinit/isInitialized.txt
index 5dac30967cc..15f0d4edddd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/lateinit/isInitialized.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/lateinit/isInitialized.txt
@@ -30,7 +30,7 @@ public open class Foo : Base {
         invisible_fake final override /*1*/ lateinit /*fake_override*/ var y: kotlin.String
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final inline override /*1*/ /*fake_override*/ fun inlineFun(): kotlin.Unit
+        public final override /*1*/ inline /*fake_override*/ fun inlineFun(): kotlin.Unit
         public final fun innerOk(): kotlin.Unit
         public final override /*1*/ /*fake_override*/ fun ok(): kotlin.Unit
         public final override /*1*/ /*fake_override*/ fun onLiteral(): kotlin.Unit
@@ -46,7 +46,7 @@ public final class FooImpl : Foo {
     invisible_fake final override /*1*/ lateinit /*fake_override*/ var y: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final inline override /*1*/ /*fake_override*/ fun inlineFun(): kotlin.Unit
+    public final override /*1*/ inline /*fake_override*/ fun inlineFun(): kotlin.Unit
     public final override /*1*/ /*fake_override*/ fun ok(): kotlin.Unit
     public final override /*1*/ /*fake_override*/ fun onLiteral(): kotlin.Unit
     public final fun onNonAccessible(): kotlin.Unit
@@ -61,7 +61,7 @@ public final class OtherFooImpl : Foo {
     invisible_fake final override /*1*/ lateinit /*fake_override*/ var y: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final inline override /*1*/ /*fake_override*/ fun inlineFun(): kotlin.Unit
+    public final override /*1*/ inline /*fake_override*/ fun inlineFun(): kotlin.Unit
     public final override /*1*/ /*fake_override*/ fun ok(): kotlin.Unit
     public final override /*1*/ /*fake_override*/ fun onLiteral(): kotlin.Unit
     public final fun onNonAccessible(): kotlin.Unit
diff --git a/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt b/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt
index 58ee488a560..c1b5cffa012 100644
--- a/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt
+++ b/compiler/testData/ir/irText/declarations/localDelegatedPropertyWithSuspendOperators.txt
@@ -22,7 +22,7 @@ FILE /localDelegatedPropertyWithSuspendOperators.kt
           SET_FIELD 'z: Int' type=kotlin.Unit origin=null
             receiver: GET_VAR 'this@A: A' type=A origin=null
             value: GET_VAR 'value-parameter <set-?>: Int' type=kotlin.Int origin=null
-    FUN public final operator suspend fun getValue(thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): kotlin.Int
+    FUN public final suspend operator fun getValue(thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>): kotlin.Int
       $this: VALUE_PARAMETER this@A: A
       VALUE_PARAMETER value-parameter thisRef: kotlin.Any?
       VALUE_PARAMETER value-parameter property: kotlin.reflect.KProperty<*>
@@ -30,7 +30,7 @@ FILE /localDelegatedPropertyWithSuspendOperators.kt
         RETURN type=kotlin.Nothing from='getValue(Any?, KProperty<*>): Int'
           CALL '<get-z>(): Int' type=kotlin.Int origin=GET_PROPERTY
             $this: GET_VAR 'this@A: A' type=A origin=null
-    FUN public final operator suspend fun setValue(thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: kotlin.Int): kotlin.Unit
+    FUN public final suspend operator fun setValue(thisRef: kotlin.Any?, property: kotlin.reflect.KProperty<*>, value: kotlin.Int): kotlin.Unit
       $this: VALUE_PARAMETER this@A: A
       VALUE_PARAMETER value-parameter thisRef: kotlin.Any?
       VALUE_PARAMETER value-parameter property: kotlin.reflect.KProperty<*>
@@ -52,7 +52,7 @@ FILE /localDelegatedPropertyWithSuspendOperators.kt
                   RETURN type=kotlin.Nothing from='<anonymous>(Continuation<Unit>): Any'
                     CALL '<get-COROUTINE_SUSPENDED>(): Any' type=kotlin.Any origin=GET_PROPERTY
               FUNCTION_REFERENCE '<anonymous>(Continuation<Unit>): Any' type=(kotlin.coroutines.experimental.Continuation<kotlin.Unit>) -> kotlin.Any origin=LAMBDA
-    FUN public final operator suspend fun provideDelegate(host: kotlin.Any?, p: kotlin.Any): A
+    FUN public final suspend operator fun provideDelegate(host: kotlin.Any?, p: kotlin.Any): A
       $this: VALUE_PARAMETER this@A: A
       VALUE_PARAMETER value-parameter host: kotlin.Any?
       VALUE_PARAMETER value-parameter p: kotlin.Any
diff --git a/compiler/testData/multiplatform/incompatibleFunctions/output.txt b/compiler/testData/multiplatform/incompatibleFunctions/output.txt
index 03f4d817165..45b06596c96 100644
--- a/compiler/testData/multiplatform/incompatibleFunctions/output.txt
+++ b/compiler/testData/multiplatform/incompatibleFunctions/output.txt
@@ -7,13 +7,13 @@ Exit code: COMPILATION_ERROR
 Output:
 compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:1:1: error: actual function 'plus' has no corresponding expected declaration
 The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (external, infix, inline, operator, tailrec):
-    public infix expect fun Int.plus(s: CharSequence): Int
+    public expect infix fun Int.plus(s: CharSequence): Int
 
 actual fun Int.plus(s: CharSequence): Int = 0
 ^
 compiler/testData/multiplatform/incompatibleFunctions/jvm.kt:3:1: error: actual function 'times' has no corresponding expected declaration
 The following declaration is incompatible because some modifiers on expected declaration are missing on the actual one (external, infix, inline, operator, tailrec):
-    public operator expect fun Double.times(x: CharArray): Unit
+    public expect operator fun Double.times(x: CharArray): Unit
 
 actual fun Double.times(x: CharArray) {}
 ^
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
index 0cd3dc02891..348b7bc1971 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
@@ -523,12 +523,11 @@ internal class DescriptorRendererImpl(
         val isInfix =
                 functionDescriptor.isInfix && (functionDescriptor.overriddenDescriptors.none { it.isInfix } || alwaysRenderModifiers)
 
-        renderModifier(builder, isOperator, "operator")
-        renderModifier(builder, isInfix, "infix")
-        renderMemberModifiers(functionDescriptor, builder)
-        renderModifier(builder, functionDescriptor.isInline, "inline")
         renderModifier(builder, functionDescriptor.isTailrec, "tailrec")
         renderModifier(builder, functionDescriptor.isSuspend, "suspend")
+        renderModifier(builder, functionDescriptor.isInline, "inline")
+        renderModifier(builder, isInfix, "infix")
+        renderModifier(builder, isOperator, "operator")
     }
 
     override fun render(declarationDescriptor: DeclarationDescriptor): String {
@@ -624,10 +623,15 @@ internal class DescriptorRendererImpl(
                 renderModalityForCallable(function, builder)
 
                 if (includeAdditionalModifiers) {
-                    renderAdditionalModifiers(function, builder)
+                    renderMemberModifiers(function, builder)
                 }
 
                 renderOverride(function, builder)
+
+                if (includeAdditionalModifiers) {
+                    renderAdditionalModifiers(function, builder)
+                }
+
                 renderMemberKind(function, builder)
 
                 if (verbose) {
diff --git a/idea/testData/codeInsight/overrideImplement/suspendFun.kt b/idea/testData/codeInsight/overrideImplement/suspendFun.kt
new file mode 100644
index 00000000000..444d2dda60d
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/suspendFun.kt
@@ -0,0 +1,7 @@
+interface I {
+    suspend fun foo()
+}
+
+class C : I {
+    <caret>
+}
diff --git a/idea/testData/codeInsight/overrideImplement/suspendFun.kt.after b/idea/testData/codeInsight/overrideImplement/suspendFun.kt.after
new file mode 100644
index 00000000000..6e1014cc167
--- /dev/null
+++ b/idea/testData/codeInsight/overrideImplement/suspendFun.kt.after
@@ -0,0 +1,9 @@
+interface I {
+    suspend fun foo()
+}
+
+class C : I {
+    override suspend fun foo() {
+        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    }
+}
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt
index 3bb8aae2ae9..f36eb1d7f43 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt
@@ -2,10 +2,10 @@
 // ACTION: Create extension function 'A.minus'
 // ACTION: Create member function 'A.minus'
 // ACTION: Replace overloaded operator with function call
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>@InlineOnly public operator inline fun BigDecimal.minus(other: BigDecimal): BigDecimal defined in kotlin<br>@InlineOnly public operator inline fun BigInteger.minus(other: BigInteger): BigInteger defined in kotlin<br>public operator fun <T> Iterable<???>.minus(elements: Array<out ???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Iterable<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Sequence<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<A>.minus(element: A): List<A> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Array<out ???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Iterable<???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Sequence<???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out A, ???>.minus(key: A): Map<A, ???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Array<out ???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Iterable<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Sequence<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<A>.minus(element: A): Set<A> defined in kotlin.collections<br>public operator fun <T> Sequence<???>.minus(elements: Array<out ???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Iterable<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Sequence<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<A>.minus(element: A): Sequence<A> defined in kotlin.sequences
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>@InlineOnly public inline operator fun BigDecimal.minus(other: BigDecimal): BigDecimal defined in kotlin<br>@InlineOnly public inline operator fun BigInteger.minus(other: BigInteger): BigInteger defined in kotlin<br>public operator fun <T> Iterable<???>.minus(elements: Array<out ???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Iterable<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Sequence<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<A>.minus(element: A): List<A> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Array<out ???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Iterable<???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Sequence<???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out A, ???>.minus(key: A): Map<A, ???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Array<out ???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Iterable<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Sequence<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<A>.minus(element: A): Set<A> defined in kotlin.collections<br>public operator fun <T> Sequence<???>.minus(elements: Array<out ???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Iterable<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Sequence<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<A>.minus(element: A): Sequence<A> defined in kotlin.sequences
 class A
 
 fun bar() {
     val a = A()
     return a <caret>- a
-}
\ No newline at end of file
+}
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt
index 72f6d45d161..5f7e8750fc0 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt
@@ -2,10 +2,10 @@
 // ACTION: Create extension function 'A.minus'
 // ACTION: Create member function 'A.minus'
 // ACTION: Replace overloaded operator with function call
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>@InlineOnly public operator inline fun BigDecimal.minus(other: BigDecimal): BigDecimal defined in kotlin<br>@InlineOnly public operator inline fun BigInteger.minus(other: BigInteger): BigInteger defined in kotlin<br>public operator fun <T> Iterable<???>.minus(elements: Array<out ???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Iterable<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Sequence<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<A>.minus(element: A): List<A> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Array<out ???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Iterable<???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Sequence<???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out A, ???>.minus(key: A): Map<A, ???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Array<out ???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Iterable<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Sequence<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<A>.minus(element: A): Set<A> defined in kotlin.collections<br>public operator fun <T> Sequence<???>.minus(elements: Array<out ???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Iterable<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Sequence<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<A>.minus(element: A): Sequence<A> defined in kotlin.sequences
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>@InlineOnly public inline operator fun BigDecimal.minus(other: BigDecimal): BigDecimal defined in kotlin<br>@InlineOnly public inline operator fun BigInteger.minus(other: BigInteger): BigInteger defined in kotlin<br>public operator fun <T> Iterable<???>.minus(elements: Array<out ???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Iterable<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Sequence<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<A>.minus(element: A): List<A> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Array<out ???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Iterable<???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out ???, ???>.minus(keys: Sequence<???>): Map<???, ???> defined in kotlin.collections<br>@SinceKotlin public operator fun <K, V> Map<out A, ???>.minus(key: A): Map<A, ???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Array<out ???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Iterable<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Sequence<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<A>.minus(element: A): Set<A> defined in kotlin.collections<br>public operator fun <T> Sequence<???>.minus(elements: Array<out ???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Iterable<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Sequence<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<A>.minus(element: A): Sequence<A> defined in kotlin.sequences
 class A
 
 fun bar() {
     val a = A()
     return a <caret>- a
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt
index ded7d17dfed..71f36fb8d76 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.kt
@@ -204,6 +204,10 @@ class OverrideImplementTest : AbstractOverrideImplementTest() {
         doOverrideFileTest()
     }
 
+    fun testSuspendFun() {
+        doOverrideFileTest()
+    }
+
     fun testDoNotOverrideFinal() {
         doMultiOverrideFileTest()
     }