diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.ni.txt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.ni.txt
index 3b6c1ca54b9..4ddd4907d5b 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.ni.txt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.ni.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/typealias/innerClassTypeAliasConstructor.ni.txt b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.ni.txt
index abba77acd53..d5d77e3aff9 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.ni.txt
+++ b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.ni.txt
@@ -34,6 +34,6 @@ public final class Outer {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
-public typealias GI</*0*/ T>  = Generic<T>.Inner
+public typealias GI</*0*/ T> = Generic<T>.Inner
 public typealias GIntI = Generic<kotlin.Int>.Inner
 public typealias OI = Outer.Inner
diff --git a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.ni.txt b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.ni.txt
index 43169ed78e6..1765ae73d4d 100644
--- a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.ni.txt
+++ b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.ni.txt
@@ -4,5 +4,5 @@ public fun bar1(/*0*/ a: Array2D<kotlin.Int> /* = kotlin.Array<kotlin.Array<kotl
 public fun bar2(/*0*/ m: TMap<*> /* = kotlin.collections.Map<*, *> */): kotlin.collections.Map<out kotlin.Any?, kotlin.Any?>
 public fun foo1(/*0*/ a: Array2D<out kotlin.Number> /* = kotlin.Array<kotlin.Array<out kotlin.Number>> */): Array2D<out kotlin.Number> /* = kotlin.Array<kotlin.Array<out kotlin.Number>> */
 public fun </*0*/ T> foo2(/*0*/ m: TMap<T> /* = kotlin.collections.Map<T, T> */): TMap<T> /* = kotlin.collections.Map<T, T> */
-public typealias Array2D</*0*/ T>  = kotlin.Array<kotlin.Array<T>>
-public typealias TMap</*0*/ T>  = kotlin.collections.Map<T, T>
+public typealias Array2D</*0*/ T> = kotlin.Array<kotlin.Array<T>>
+public typealias TMap</*0*/ T> = kotlin.collections.Map<T, T>
diff --git a/compiler/testData/diagnostics/tests/typealias/substitutionVariance.ni.txt b/compiler/testData/diagnostics/tests/typealias/substitutionVariance.ni.txt
index a8f13f4fdfc..108fda57f6c 100644
--- a/compiler/testData/diagnostics/tests/typealias/substitutionVariance.ni.txt
+++ b/compiler/testData/diagnostics/tests/typealias/substitutionVariance.ni.txt
@@ -58,15 +58,15 @@ public final class Out</*0*/ out T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias In1</*0*/ T>  = In<T>
-public typealias In2</*0*/ T>  = In<in T>
-public typealias In3</*0*/ T>  = In<out T>
-public typealias In4</*0*/ T>  = In<*>
-public typealias Inv1</*0*/ T>  = Inv<T>
-public typealias Inv2</*0*/ T>  = Inv<in T>
-public typealias Inv3</*0*/ T>  = Inv<out T>
-public typealias Inv4</*0*/ T>  = Inv<*>
-public typealias Out1</*0*/ T>  = Out<T>
-public typealias Out2</*0*/ T>  = Out<in T>
-public typealias Out3</*0*/ T>  = Out<out T>
-public typealias Out4</*0*/ T>  = Out<*>
+public typealias In1</*0*/ T> = In<T>
+public typealias In2</*0*/ T> = In<in T>
+public typealias In3</*0*/ T> = In<out T>
+public typealias In4</*0*/ T> = In<*>
+public typealias Inv1</*0*/ T> = Inv<T>
+public typealias Inv2</*0*/ T> = Inv<in T>
+public typealias Inv3</*0*/ T> = Inv<out T>
+public typealias Inv4</*0*/ T> = Inv<*>
+public typealias Out1</*0*/ T> = Out<T>
+public typealias Out2</*0*/ T> = Out<in T>
+public typealias Out3</*0*/ T> = Out<out T>
+public typealias Out4</*0*/ T> = Out<*>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.ni.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.ni.txt
index 3c3f23c2efd..382d0c92914 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.ni.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.ni.txt
@@ -12,6 +12,6 @@ public final class Bound</*0*/ X, /*1*/ Y : X> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias B</*0*/ X, /*1*/ Y>  = Bound<X, Y>
-public typealias BInIn</*0*/ T>  = Bound<in kotlin.collections.List<T>, in T>
-public typealias BOutIn</*0*/ T>  = Bound<out kotlin.collections.List<T>, in T>
+public typealias B</*0*/ X, /*1*/ Y> = Bound<X, Y>
+public typealias BInIn</*0*/ T> = Bound<in kotlin.collections.List<T>, in T>
+public typealias BOutIn</*0*/ T> = Bound<out kotlin.collections.List<T>, in T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.ni.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.ni.txt
index 3ca55320c25..92351251be0 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.ni.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.ni.txt
@@ -15,4 +15,4 @@ public final class C</*0*/ T> {
 public typealias CIn = C<in kotlin.Int>
 public typealias COut = C<out kotlin.Int>
 public typealias CStar = C<*>
-public typealias CT</*0*/ T>  = C<T>
+public typealias CT</*0*/ T> = C<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.ni.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.ni.txt
index c7ba8b2d91e..ee02dcb2600 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.ni.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.ni.txt
@@ -44,9 +44,9 @@ public final class Pair</*0*/ X, /*1*/ Y> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias C</*0*/ T>  = Cons<T>
-public typealias CC</*0*/ T>  = C<C<T>>
-public typealias F</*0*/ T>  = Foo<T>
-public typealias N</*0*/ T>  = Num<T>
-public typealias PL</*0*/ T>  = Pair<T, kotlin.collections.List<T>>
-public typealias PN</*0*/ T>  = Pair<T, Num<T>>
+public typealias C</*0*/ T> = Cons<T>
+public typealias CC</*0*/ T> = C<C<T>>
+public typealias F</*0*/ T> = Foo<T>
+public typealias N</*0*/ T> = Num<T>
+public typealias PL</*0*/ T> = Pair<T, kotlin.collections.List<T>>
+public typealias PN</*0*/ T> = Pair<T, Num<T>>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.ni.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.ni.txt
index a689b373ca5..c09d0cb8f26 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.ni.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.ni.txt
@@ -11,4 +11,4 @@ public final class Cons</*0*/ T : kotlin.Number> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias C</*0*/ T>  = Cons<T>
+public typealias C</*0*/ T> = Cons<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.ni.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.ni.txt
index ca051a6f373..33e3f74b864 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.ni.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.ni.txt
@@ -25,4 +25,4 @@ public interface Ref</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias LateNR</*0*/ Nt>  = LateInitNumRef<Nt>
+public typealias LateNR</*0*/ Nt> = LateInitNumRef<Nt>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.ni.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.ni.txt
index b33d567e5f0..7d89bf75441 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.ni.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.ni.txt
@@ -26,5 +26,5 @@ public final class Hr</*0*/ A, /*1*/ B, /*2*/ C, /*3*/ D> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias Bas</*0*/ T>  = Hr<T, T, Foo<T>, Bar<T>>
-public typealias Test</*0*/ A, /*1*/ B>  = Hr<A, B, Foo<A>, Bar<B>>
+public typealias Bas</*0*/ T> = Hr<T, T, Foo<T>, Bar<T>>
+public typealias Test</*0*/ A, /*1*/ B> = Hr<A, B, Foo<A>, Bar<B>>
diff --git a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.ni.txt b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.ni.txt
index 98114f6f7bd..4a4f090ea02 100644
--- a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.ni.txt
+++ b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.ni.txt
@@ -35,7 +35,7 @@ public final class Pair</*0*/ T1, /*1*/ T2> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-public typealias N</*0*/ T>  = Num<T>
-public typealias P</*0*/ T1, /*1*/ T2>  = Pair<T1, T2>
-public typealias P2</*0*/ T>  = Pair<T, T>
-public typealias PR</*0*/ T1, /*1*/ T2>  = Pair<T2, T1>
+public typealias N</*0*/ T> = Num<T>
+public typealias P</*0*/ T1, /*1*/ T2> = Pair<T1, T2>
+public typealias P2</*0*/ T> = Pair<T, T>
+public typealias PR</*0*/ T1, /*1*/ T2> = Pair<T2, T1>