From 257417bc4ad1d04a659882c2a42a7ae997a8a405 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Mon, 15 Aug 2016 12:28:42 +0300
Subject: [PATCH] Minor. Lower type aliase declarations priority

There are several reasons for doing this:
- See org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberScope.computeDescriptors,
  classifiers are being deserialized in the last turn, so it's necessary to preserve consistent order
- Their priority should be close to classes
---
 .../diagnostics/tests/cast/AsTypeAlias.txt    |  6 +-
 .../redeclarations/TypeAliasCtorVsFun.txt     |  4 +-
 .../tests/redeclarations/TypeAliasVsClass.txt | 15 +++--
 .../redeclarations/TypeAliasVsProperty.txt    |  6 +-
 .../tests/typealias/aliasesOnly.txt           |  7 +--
 .../boundViolationInTypeAliasConstructor.txt  |  8 +--
 ...oundsViolationInDeepTypeAliasExpansion.txt |  4 +-
 .../boundsViolationInTypeAliasExpansion.txt   |  6 +-
 .../boundsViolationInTypeAliasRHS.txt         | 13 ++--
 .../capturingTypeParametersFromOuterClass.txt | 12 ++--
 .../tests/typealias/classReference.txt        |  2 +-
 .../typealias/conflictingProjections.txt      | 12 ++--
 .../constructorCallThroughPrivateAlias.txt    |  6 +-
 .../tests/typealias/exposedExpandedType.txt   | 59 +++++++++----------
 .../typealias/functionTypeInTypeAlias.txt     |  2 +-
 .../typealias/genericTypeAliasConstructor.txt |  2 +-
 .../typealias/genericTypeAliasObject.txt      |  4 +-
 .../diagnostics/tests/typealias/import.txt    |  4 +-
 .../tests/typealias/inSupertypesList.txt      |  3 +-
 .../typealias/inheritedNestedTypeAlias.txt    |  2 +-
 ...eritedTypeAliasQualifiedByDerivedClass.txt |  2 +-
 .../tests/typealias/isAsWithTypeAlias.txt     |  2 +-
 .../javaStaticMembersViaTypeAlias.txt         |  8 +--
 .../tests/typealias/methodReference.txt       |  2 +-
 .../diagnostics/tests/typealias/nested.txt    |  2 +-
 .../nestedCapturingTypeParameters.txt         |  4 +-
 .../tests/typealias/nestedSubstituted.txt     |  2 +-
 ...imationInTypeAliasArgumentSubstitution.txt |  4 +-
 .../tests/typealias/parameterRestrictions.txt |  2 +-
 .../tests/typealias/parameterSubstitution.txt |  2 +-
 .../projectionsInTypeAliasConstructor.txt     |  2 +-
 .../diagnostics/tests/typealias/recursive.txt |  2 +-
 ...TypeNothingShouldBeSpecifiedExplicitly.txt |  2 +-
 .../tests/typealias/simpleTypeAlias.txt       |  6 +-
 .../starProjectionInTypeAliasArgument.txt     |  2 +-
 .../tests/typealias/substitutionVariance.txt  | 24 ++++----
 .../tests/typealias/throwJLException.txt      |  2 +-
 .../typeAliasArgumentsInCompanionObject.txt   |  2 +-
 .../typeAliasArgumentsInConstructor.txt       |  2 +-
 .../tests/typealias/typeAliasAsQualifier.txt  |  4 +-
 .../tests/typealias/typeAliasConstructor.txt  |  6 +-
 .../tests/typealias/typeAliasObject.txt       |  6 +-
 .../typealias/typeAliasObjectWithInvoke.txt   |  4 +-
 .../typeAliasShouldExpandToClass.txt          | 21 ++++---
 .../tests/typealias/unsupportedTypeAlias.txt  |  6 +-
 ...umberOfArgumentsInTypeAliasConstructor.txt |  8 +--
 .../compiledKotlin/typealias/Annotations.txt  |  5 +-
 .../compiledKotlin/typealias/Basic.txt        |  6 +-
 .../compiledKotlin/typealias/Generic.txt      |  6 +-
 .../compiledKotlin/typealias/Nested.txt       |  6 +-
 .../kotlin/resolve/MemberComparator.java      | 18 +++---
 51 files changed, 170 insertions(+), 177 deletions(-)

diff --git a/compiler/testData/diagnostics/tests/cast/AsTypeAlias.txt b/compiler/testData/diagnostics/tests/cast/AsTypeAlias.txt
index 43341348ee0..e7288aac41e 100644
--- a/compiler/testData/diagnostics/tests/cast/AsTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/cast/AsTypeAlias.txt
@@ -1,8 +1,5 @@
 package
 
-public typealias IBase = Base
-public typealias IOther = Other
-public typealias MyString = kotlin.String
 public val d: Derived
 public val ib: IBase /* = Base */
 public val io: IOther /* = Other */
@@ -30,3 +27,6 @@ public interface Other : Base {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias IBase = Base
+public typealias IOther = Other
+public typealias MyString = kotlin.String
diff --git a/compiler/testData/diagnostics/tests/redeclarations/TypeAliasCtorVsFun.txt b/compiler/testData/diagnostics/tests/redeclarations/TypeAliasCtorVsFun.txt
index 44ce22b14ef..2675edff06b 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/TypeAliasCtorVsFun.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/TypeAliasCtorVsFun.txt
@@ -1,6 +1,5 @@
 package
 
-public typealias CC = C
 public fun CC(/*0*/ x: kotlin.Int): kotlin.Int
 
 public final class C {
@@ -12,7 +11,6 @@ public final class C {
 }
 
 public final class Outer {
-    public typealias CC = Outer.C
     public constructor Outer()
     public final fun CC(/*0*/ x: kotlin.Int): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -26,4 +24,6 @@ public final class Outer {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
+    public typealias CC = Outer.C
 }
+public typealias CC = C
diff --git a/compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsClass.txt b/compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsClass.txt
index a0c21c7e85a..6eb41cd8a91 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsClass.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsClass.txt
@@ -1,14 +1,6 @@
 package
 
-public typealias SomeClass = kotlin.Any
-public typealias SomeClass = kotlin.Any
-public typealias SomeClass = kotlin.Any
-public typealias SomeClass = kotlin.Any
-
 public final class Outer {
-    public typealias Nested = kotlin.Any
-    public typealias Nested = kotlin.Any
-    public typealias Nested = kotlin.Any
     public constructor Outer()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -20,6 +12,9 @@ public final class Outer {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
+    public typealias Nested = kotlin.Any
+    public typealias Nested = kotlin.Any
+    public typealias Nested = kotlin.Any
 }
 
 public final class SomeClass {
@@ -28,3 +23,7 @@ public final class SomeClass {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias SomeClass = kotlin.Any
+public typealias SomeClass = kotlin.Any
+public typealias SomeClass = kotlin.Any
+public typealias SomeClass = kotlin.Any
diff --git a/compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsProperty.txt b/compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsProperty.txt
index 1caf40639c4..33d4fa9c310 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsProperty.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/TypeAliasVsProperty.txt
@@ -1,15 +1,15 @@
 package
 
-public typealias Test = kotlin.String
-public typealias Test2 = kotlin.String
 public val Test: kotlin.Int = 42
 public val Test2: kotlin.Int = 42
 
 public final class Outer {
-    public typealias Test = kotlin.String
     public constructor Outer()
     public final val Test: kotlin.Int = 42
     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 typealias Test = kotlin.String
 }
+public typealias Test = kotlin.String
+public typealias Test2 = kotlin.String
diff --git a/compiler/testData/diagnostics/tests/typealias/aliasesOnly.txt b/compiler/testData/diagnostics/tests/typealias/aliasesOnly.txt
index 39376966797..c122ac4cd3e 100644
--- a/compiler/testData/diagnostics/tests/typealias/aliasesOnly.txt
+++ b/compiler/testData/diagnostics/tests/typealias/aliasesOnly.txt
@@ -1,12 +1,11 @@
 package
 
-public typealias S = kotlin.String
-
 public final class C {
-    public typealias SF</*0*/ T>  = (T) -> kotlin.String
-    public typealias SS = kotlin.String
     public constructor C()
     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 typealias SF</*0*/ T>  = (T) -> kotlin.String
+    public typealias SS = kotlin.String
 }
+public typealias S = kotlin.String
diff --git a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.txt
index 8efe2a9c180..924882bc071 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.txt
@@ -1,9 +1,5 @@
 package
 
-public typealias N</*0*/ T>  = Num<T>
-public typealias N2</*0*/ T>  = N<T>
-public typealias TC</*0*/ T, /*1*/ C>  = TColl<T, C>
-public typealias TC2</*0*/ T, /*1*/ C>  = TC<T, C>
 public val x1: Num<kotlin.String>
 public val x2: Num<kotlin.String>
 public val x3: Num<kotlin.String>
@@ -25,3 +21,7 @@ public final class TColl</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> {
     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 N2</*0*/ T>  = N<T>
+public typealias TC</*0*/ T, /*1*/ C>  = TColl<T, C>
+public typealias TC2</*0*/ T, /*1*/ C>  = TC<T, C>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.txt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.txt
index 92a9728bc87..dc2b9db7d96 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.txt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.txt
@@ -1,7 +1,5 @@
 package
 
-public typealias TC</*0*/ T1, /*1*/ T2>  = TColl<T1, T2>
-public typealias TC2</*0*/ T1, /*1*/ T2>  = TC<T1, T2>
 public val test5: TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Number>>
 public val test6: TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Int>>
 public val test7: TColl<kotlin.Number, kotlin.collections.List<kotlin.Int>>
@@ -17,3 +15,5 @@ public final class TColl</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias TC</*0*/ T1, /*1*/ T2>  = TColl<T1, T2>
+public typealias TC2</*0*/ T1, /*1*/ T2>  = TC<T1, T2>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt
index d2532a87819..6c427b1aba4 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt
@@ -1,8 +1,5 @@
 package
 
-public typealias NA</*0*/ T>  = Num<T>
-public typealias NL</*0*/ T>  = NumColl<kotlin.collections.List<T>>
-public typealias TC</*0*/ T1, /*1*/ T2>  = TColl<T1, T2>
 public val test13: TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Number>>
 public val test14: TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Int>>
 public val test15: TColl<kotlin.Number, kotlin.collections.List<kotlin.Int>>
@@ -40,3 +37,6 @@ public final class TColl</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias NA</*0*/ T>  = Num<T>
+public typealias NL</*0*/ T>  = NumColl<kotlin.collections.List<T>>
+public typealias TC</*0*/ T1, /*1*/ T2>  = TColl<T1, T2>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasRHS.txt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasRHS.txt
index abde87661f8..77eeb0196fe 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasRHS.txt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasRHS.txt
@@ -1,5 +1,11 @@
 package
 
+public final class TC</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> {
+    public constructor TC</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>>()
+    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 typealias TCAlias</*0*/ T, /*1*/ C>  = TC<T, C>
 public typealias TCAliasC</*0*/ C>  = TC<kotlin.Any, C>
 public typealias TCAliasC1</*0*/ C>  = TCAlias<kotlin.Any, C>
@@ -15,10 +21,3 @@ public typealias Test6 = TCAliasC<kotlin.Any>
 public typealias Test7 = TCAliasC<kotlin.collections.Collection<kotlin.Any>>
 public typealias Test8 = TCAliasT1<kotlin.Any>
 public typealias Test9 = TCAliasC1<kotlin.Any>
-
-public final class TC</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> {
-    public constructor TC</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>>()
-    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
-}
diff --git a/compiler/testData/diagnostics/tests/typealias/capturingTypeParametersFromOuterClass.txt b/compiler/testData/diagnostics/tests/typealias/capturingTypeParametersFromOuterClass.txt
index 420c20a0f60..de6e804b5c0 100644
--- a/compiler/testData/diagnostics/tests/typealias/capturingTypeParametersFromOuterClass.txt
+++ b/compiler/testData/diagnostics/tests/typealias/capturingTypeParametersFromOuterClass.txt
@@ -3,28 +3,28 @@ package
 public fun </*0*/ TF> foo(): kotlin.Unit
 
 public final class Outer</*0*/ TO> {
-    public typealias LTO /*captured type parameters: /*0*/ TO*/ = kotlin.collections.List<TO>
     public constructor Outer</*0*/ TO>()
     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 class Nested</*0*/ TN> {
-        public typealias LTN /*captured type parameters: /*0*/ TN*/ = kotlin.collections.List<TN>
-        public typealias LTO /*captured type parameters: /*0*/ TN*/ = kotlin.collections.List<[ERROR : TO]>
         public constructor Nested</*0*/ TN>()
         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 inner class Inner</*0*/ TI> /*captured type parameters: /*1*/ TN*/ {
-            public typealias LTI /*captured type parameters: /*0*/ TI, /*1*/ TN*/ = kotlin.collections.List<TI>
-            public typealias LTN /*captured type parameters: /*0*/ TI, /*1*/ TN*/ = kotlin.collections.List<TN>
-            public typealias LTO /*captured type parameters: /*0*/ TI, /*1*/ TN*/ = kotlin.collections.List<[ERROR : TO]>
             public constructor Inner</*0*/ TI>()
             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 typealias LTI /*captured type parameters: /*0*/ TI, /*1*/ TN*/ = kotlin.collections.List<TI>
+            public typealias LTN /*captured type parameters: /*0*/ TI, /*1*/ TN*/ = kotlin.collections.List<TN>
+            public typealias LTO /*captured type parameters: /*0*/ TI, /*1*/ TN*/ = kotlin.collections.List<[ERROR : TO]>
         }
+        public typealias LTN /*captured type parameters: /*0*/ TN*/ = kotlin.collections.List<TN>
+        public typealias LTO /*captured type parameters: /*0*/ TN*/ = kotlin.collections.List<[ERROR : TO]>
     }
+    public typealias LTO /*captured type parameters: /*0*/ TO*/ = kotlin.collections.List<TO>
 }
diff --git a/compiler/testData/diagnostics/tests/typealias/classReference.txt b/compiler/testData/diagnostics/tests/typealias/classReference.txt
index 6c5c4df4a43..10abbcc9b73 100644
--- a/compiler/testData/diagnostics/tests/typealias/classReference.txt
+++ b/compiler/testData/diagnostics/tests/typealias/classReference.txt
@@ -1,4 +1,4 @@
 package
 
-public typealias S = kotlin.String
 public val s: kotlin.reflect.KClass<S /* = kotlin.String */>
+public typealias S = kotlin.String
diff --git a/compiler/testData/diagnostics/tests/typealias/conflictingProjections.txt b/compiler/testData/diagnostics/tests/typealias/conflictingProjections.txt
index 4ed25bbc357..cacfebe8857 100644
--- a/compiler/testData/diagnostics/tests/typealias/conflictingProjections.txt
+++ b/compiler/testData/diagnostics/tests/typealias/conflictingProjections.txt
@@ -1,11 +1,5 @@
 package
 
-public typealias InAlias</*0*/ T>  = In<T>
-public typealias OutAlias</*0*/ T>  = Out<T>
-public typealias TestInForOut</*0*/ T>  = Out<in T>
-public typealias TestInForOutWithinAlias</*0*/ T>  = OutAlias<in T>
-public typealias TestOutForIn</*0*/ T>  = In<out T>
-public typealias TestOutForInWithinAlias</*0*/ T>  = InAlias<out T>
 public fun </*0*/ T> testInForOutWithinResolvedType(/*0*/ x: OutAlias<in T> /* = Out<in T> */): kotlin.Unit
 public fun </*0*/ T> testOutForInWithinResolvedType(/*0*/ x: InAlias<out T> /* = In<out T> */): kotlin.Unit
 
@@ -20,3 +14,9 @@ public interface 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 InAlias</*0*/ T>  = In<T>
+public typealias OutAlias</*0*/ T>  = Out<T>
+public typealias TestInForOut</*0*/ T>  = Out<in T>
+public typealias TestInForOutWithinAlias</*0*/ T>  = OutAlias<in T>
+public typealias TestOutForIn</*0*/ T>  = In<out T>
+public typealias TestOutForInWithinAlias</*0*/ T>  = InAlias<out T>
diff --git a/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.txt b/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.txt
index d1336a7339f..fe70ea7ee1a 100644
--- a/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.txt
+++ b/compiler/testData/diagnostics/tests/typealias/constructorCallThroughPrivateAlias.txt
@@ -1,9 +1,6 @@
 package
 
 package a {
-    public typealias A1 = a.B
-    private typealias A2 = a.B
-    private typealias A3 = a.B
     public fun A3(/*0*/ x: kotlin.Any): kotlin.String
     public fun bar(): kotlin.Unit
 
@@ -13,6 +10,9 @@ package a {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
+    public typealias A1 = a.B
+    private typealias A2 = a.B
+    private typealias A3 = a.B
 }
 
 package usage {
diff --git a/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.txt b/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.txt
index 2a46588100d..2d7318a19a7 100644
--- a/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.txt
+++ b/compiler/testData/diagnostics/tests/typealias/exposedExpandedType.txt
@@ -1,17 +1,5 @@
 package
 
-public typealias L</*0*/ T>  = kotlin.collections.List<T>
-public typealias TestInternal1 = Internal
-internal typealias TestInternal2 = Internal
-private typealias TestInternal3 = Internal
-public typealias TestInternal4 = L<Internal>
-public typealias TestInternal5 = L<TestInternal1>
-public typealias TestPrivate1 = Private
-internal typealias TestPrivate2 = Private
-private typealias TestPrivate3 = Private
-public typealias TestPrivate4 = L<Private>
-public typealias TestPrivate5 = L<TestPrivate1>
-
 internal final class Internal {
     public constructor Internal()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -20,24 +8,6 @@ internal final class Internal {
 }
 
 public final class Outer {
-    public typealias TestInternal1 = Outer.Internal
-    protected typealias TestInternal2 = Outer.Internal
-    internal typealias TestInternal3 = Outer.Internal
-    private typealias TestInternal4 = Outer.Internal
-    public typealias TestInternal5 = L<Outer.Internal>
-    public typealias TestInternal6 = L<Outer.TestInternal1>
-    public typealias TestPrivate1 = Outer.Private
-    protected typealias TestPrivate2 = Outer.Private
-    internal typealias TestPrivate3 = Outer.Private
-    private typealias TestPrivate4 = Outer.Private
-    public typealias TestPrivate5 = L<Outer.Private>
-    public typealias TestPrivate6 = L<Outer.TestPrivate1>
-    public typealias TestProtected1 = Outer.Protected
-    protected typealias TestProtected2 = Outer.Protected
-    internal typealias TestProtected3 = Outer.Protected
-    private typealias TestProtected4 = Outer.Protected
-    public typealias TestProtected5 = L<Outer.Protected>
-    public typealias TestProtected6 = L<Outer.TestProtected1>
     public constructor Outer()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -63,6 +33,24 @@ public final class Outer {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
+    public typealias TestInternal1 = Outer.Internal
+    protected typealias TestInternal2 = Outer.Internal
+    internal typealias TestInternal3 = Outer.Internal
+    private typealias TestInternal4 = Outer.Internal
+    public typealias TestInternal5 = L<Outer.Internal>
+    public typealias TestInternal6 = L<Outer.TestInternal1>
+    public typealias TestPrivate1 = Outer.Private
+    protected typealias TestPrivate2 = Outer.Private
+    internal typealias TestPrivate3 = Outer.Private
+    private typealias TestPrivate4 = Outer.Private
+    public typealias TestPrivate5 = L<Outer.Private>
+    public typealias TestPrivate6 = L<Outer.TestPrivate1>
+    public typealias TestProtected1 = Outer.Protected
+    protected typealias TestProtected2 = Outer.Protected
+    internal typealias TestProtected3 = Outer.Protected
+    private typealias TestProtected4 = Outer.Protected
+    public typealias TestProtected5 = L<Outer.Protected>
+    public typealias TestProtected6 = L<Outer.TestProtected1>
 }
 
 private final class Private {
@@ -71,3 +59,14 @@ private final class Private {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias L</*0*/ T>  = kotlin.collections.List<T>
+public typealias TestInternal1 = Internal
+internal typealias TestInternal2 = Internal
+private typealias TestInternal3 = Internal
+public typealias TestInternal4 = L<Internal>
+public typealias TestInternal5 = L<TestInternal1>
+public typealias TestPrivate1 = Private
+internal typealias TestPrivate2 = Private
+private typealias TestPrivate3 = Private
+public typealias TestPrivate4 = L<Private>
+public typealias TestPrivate5 = L<TestPrivate1>
diff --git a/compiler/testData/diagnostics/tests/typealias/functionTypeInTypeAlias.txt b/compiler/testData/diagnostics/tests/typealias/functionTypeInTypeAlias.txt
index 1720e7d8855..10444f0cd68 100644
--- a/compiler/testData/diagnostics/tests/typealias/functionTypeInTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/typealias/functionTypeInTypeAlias.txt
@@ -1,4 +1,4 @@
 package
 
-public typealias F = () -> kotlin.Unit
 public val f: () -> kotlin.Unit
+public typealias F = () -> kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/typealias/genericTypeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/genericTypeAliasConstructor.txt
index 98a723012f4..0833ac32aaa 100644
--- a/compiler/testData/diagnostics/tests/typealias/genericTypeAliasConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/genericTypeAliasConstructor.txt
@@ -1,6 +1,5 @@
 package
 
-public typealias GTC</*0*/ T>  = C<T>
 public val test1: C<kotlin.String>
 public val test2: C<kotlin.String>
 public val test3: C<kotlin.String>
@@ -15,3 +14,4 @@ public final class C</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias GTC</*0*/ T>  = C<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/genericTypeAliasObject.txt b/compiler/testData/diagnostics/tests/typealias/genericTypeAliasObject.txt
index 7f103c47e00..81c49beea6e 100644
--- a/compiler/testData/diagnostics/tests/typealias/genericTypeAliasObject.txt
+++ b/compiler/testData/diagnostics/tests/typealias/genericTypeAliasObject.txt
@@ -1,7 +1,5 @@
 package
 
-public typealias GenericTestObject</*0*/ T>  = AnObject
-public typealias TestGCWC</*0*/ T>  = GenericClassWithCompanion<T>
 public val test11: AnObject
 public val test12: GenericTestObject<*> /* = AnObject */
 public val test13: kotlin.String = "OK"
@@ -35,3 +33,5 @@ public final class GenericClassWithCompanion</*0*/ T> {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+public typealias GenericTestObject</*0*/ T>  = AnObject
+public typealias TestGCWC</*0*/ T>  = GenericClassWithCompanion<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/import.txt b/compiler/testData/diagnostics/tests/typealias/import.txt
index acb072c19a4..34ecc3b549f 100644
--- a/compiler/testData/diagnostics/tests/typealias/import.txt
+++ b/compiler/testData/diagnostics/tests/typealias/import.txt
@@ -5,15 +5,15 @@ package package1 {
 }
 
 package package2 {
-    public typealias I = kotlin.Int
 
     public final class Outer {
-        public typealias A = kotlin.Any
         public constructor Outer()
         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 typealias A = kotlin.Any
     }
+    public typealias I = kotlin.Int
 }
 
 package package3 {
diff --git a/compiler/testData/diagnostics/tests/typealias/inSupertypesList.txt b/compiler/testData/diagnostics/tests/typealias/inSupertypesList.txt
index 245f7fbfc92..a863eb2dcb0 100644
--- a/compiler/testData/diagnostics/tests/typealias/inSupertypesList.txt
+++ b/compiler/testData/diagnostics/tests/typealias/inSupertypesList.txt
@@ -1,7 +1,5 @@
 package
 
-public typealias B = IBase
-
 public interface IBase {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -21,3 +19,4 @@ public final class Test2 : IBase, B /* = IBase */ {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias B = IBase
diff --git a/compiler/testData/diagnostics/tests/typealias/inheritedNestedTypeAlias.txt b/compiler/testData/diagnostics/tests/typealias/inheritedNestedTypeAlias.txt
index d155d1d2dec..045d9d58f65 100644
--- a/compiler/testData/diagnostics/tests/typealias/inheritedNestedTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/typealias/inheritedNestedTypeAlias.txt
@@ -1,7 +1,6 @@
 package
 
 public open class Base</*0*/ T> {
-    public typealias CT /*captured type parameters: /*0*/ T*/ = Cell<T>
     public constructor Base</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -14,6 +13,7 @@ public open class Base</*0*/ T> {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
+    public typealias CT /*captured type parameters: /*0*/ T*/ = Cell<T>
 }
 
 public final class Cell</*0*/ T> : ICell<T> {
diff --git a/compiler/testData/diagnostics/tests/typealias/inhreritedTypeAliasQualifiedByDerivedClass.txt b/compiler/testData/diagnostics/tests/typealias/inhreritedTypeAliasQualifiedByDerivedClass.txt
index f7c12a9d6cc..f359b5d90ed 100644
--- a/compiler/testData/diagnostics/tests/typealias/inhreritedTypeAliasQualifiedByDerivedClass.txt
+++ b/compiler/testData/diagnostics/tests/typealias/inhreritedTypeAliasQualifiedByDerivedClass.txt
@@ -4,11 +4,11 @@ public fun test(/*0*/ x: [ERROR : Derived.Nested]): [ERROR : Derived.Nested]
 public fun Base.testWithImplicitReceiver(/*0*/ x: [ERROR : Nested]): kotlin.Unit
 
 public open class Base {
-    public typealias Nested = kotlin.String
     public constructor 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 typealias Nested = kotlin.String
 }
 
 public final class Derived : Base {
diff --git a/compiler/testData/diagnostics/tests/typealias/isAsWithTypeAlias.txt b/compiler/testData/diagnostics/tests/typealias/isAsWithTypeAlias.txt
index 3c2e33cd6c7..7629025904d 100644
--- a/compiler/testData/diagnostics/tests/typealias/isAsWithTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/typealias/isAsWithTypeAlias.txt
@@ -1,6 +1,6 @@
 package
 
-public typealias S = kotlin.String
 public fun test1(/*0*/ x: kotlin.Any): kotlin.Boolean
 public fun test2(/*0*/ x: kotlin.Any): S /* = kotlin.String */
 public fun test3(/*0*/ x: kotlin.Any): S? /* = kotlin.String? */
+public typealias S = kotlin.String
diff --git a/compiler/testData/diagnostics/tests/typealias/javaStaticMembersViaTypeAlias.txt b/compiler/testData/diagnostics/tests/typealias/javaStaticMembersViaTypeAlias.txt
index 014fa62a5f1..29d44ddbc84 100644
--- a/compiler/testData/diagnostics/tests/typealias/javaStaticMembersViaTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/typealias/javaStaticMembersViaTypeAlias.txt
@@ -1,9 +1,5 @@
 package
 
-public typealias IT = ITest
-public typealias JD = JDerived
-public typealias JT = JTest
-public typealias KT = KTest
 public val seeAlsoDerivedFoo: kotlin.String
 public val seeAlsoFoo: kotlin.String
 public val testDerivedFoo: kotlin.String
@@ -79,3 +75,7 @@ public final class KTest {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+public typealias IT = ITest
+public typealias JD = JDerived
+public typealias JT = JTest
+public typealias KT = KTest
diff --git a/compiler/testData/diagnostics/tests/typealias/methodReference.txt b/compiler/testData/diagnostics/tests/typealias/methodReference.txt
index 636b490c290..a09d909495d 100644
--- a/compiler/testData/diagnostics/tests/typealias/methodReference.txt
+++ b/compiler/testData/diagnostics/tests/typealias/methodReference.txt
@@ -1,6 +1,5 @@
 package
 
-public typealias CA = C
 public val cf: kotlin.reflect.KFunction1<CA /* = C */, kotlin.Unit>
 
 public final class C {
@@ -10,3 +9,4 @@ public final class C {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias CA = C
diff --git a/compiler/testData/diagnostics/tests/typealias/nested.txt b/compiler/testData/diagnostics/tests/typealias/nested.txt
index ca38892dcd4..eff054f6cab 100644
--- a/compiler/testData/diagnostics/tests/typealias/nested.txt
+++ b/compiler/testData/diagnostics/tests/typealias/nested.txt
@@ -7,7 +7,6 @@ public fun C.testExtFun1(/*0*/ x: C.P2 /* = Pair<kotlin.Int, kotlin.Int> */): C.
 public fun C.testExtFun2(): C.P2 /* = Pair<kotlin.Int, kotlin.Int> */
 
 public final class C {
-    public typealias P2 = Pair<kotlin.Int, kotlin.Int>
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun first(/*0*/ p: C.P2 /* = Pair<kotlin.Int, kotlin.Int> */): kotlin.Int
@@ -15,6 +14,7 @@ public final class C {
     public final fun p(): Pair<kotlin.Int, kotlin.Int>
     public final fun second(/*0*/ p: C.P2 /* = Pair<kotlin.Int, kotlin.Int> */): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    public typealias P2 = Pair<kotlin.Int, kotlin.Int>
 }
 
 public final class Pair</*0*/ T1, /*1*/ T2> {
diff --git a/compiler/testData/diagnostics/tests/typealias/nestedCapturingTypeParameters.txt b/compiler/testData/diagnostics/tests/typealias/nestedCapturingTypeParameters.txt
index 0d1da4efc02..89e94bd767f 100644
--- a/compiler/testData/diagnostics/tests/typealias/nestedCapturingTypeParameters.txt
+++ b/compiler/testData/diagnostics/tests/typealias/nestedCapturingTypeParameters.txt
@@ -8,8 +8,6 @@ public val test3: kotlin.Int
 public val test4: kotlin.String
 
 public final class C</*0*/ T> {
-    public typealias P2 /*captured type parameters: /*0*/ T*/ = Pair<T, T>
-    public typealias PT2</*0*/ T2>  /*captured type parameters: /*1*/ T*/ = Pair<T, T2>
     public constructor C</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun first(/*0*/ p: C<T>.P2 /* = Pair<T, T> */): T
@@ -18,6 +16,8 @@ public final class C</*0*/ T> {
     public final fun second(/*0*/ p: C<T>.P2 /* = Pair<T, T> */): T
     public final fun </*0*/ T2> second2(/*0*/ p: C<T>.PT2<T2> /* = Pair<T, T2> */): T2
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    public typealias P2 /*captured type parameters: /*0*/ T*/ = Pair<T, T>
+    public typealias PT2</*0*/ T2>  /*captured type parameters: /*1*/ T*/ = Pair<T, T2>
 }
 
 public final class Pair</*0*/ T1, /*1*/ T2> {
diff --git a/compiler/testData/diagnostics/tests/typealias/nestedSubstituted.txt b/compiler/testData/diagnostics/tests/typealias/nestedSubstituted.txt
index 15e3db50cfa..dbf69d80b2d 100644
--- a/compiler/testData/diagnostics/tests/typealias/nestedSubstituted.txt
+++ b/compiler/testData/diagnostics/tests/typealias/nestedSubstituted.txt
@@ -3,11 +3,11 @@ package
 public val p1: C<kotlin.String>.P2 /* = Pair<kotlin.String, kotlin.Int> */
 
 public final class C</*0*/ T> {
-    public typealias P2 /*captured type parameters: /*0*/ T*/ = Pair<T, kotlin.Int>
     public constructor C</*0*/ T>()
     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 typealias P2 /*captured type parameters: /*0*/ T*/ = Pair<T, kotlin.Int>
 }
 
 public final class Pair</*0*/ T1, /*1*/ T2> {
diff --git a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.txt b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.txt
index 55ccabfb05f..939591cc9b5 100644
--- a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.txt
+++ b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.txt
@@ -1,8 +1,8 @@
 package
 
-public typealias Array2D</*0*/ T>  = kotlin.Array<kotlin.Array<T>>
-public typealias TMap</*0*/ T>  = kotlin.collections.Map<T, T>
 public fun bar1(/*0*/ a: Array2D<kotlin.Int> /* = kotlin.Array<kotlin.Array<kotlin.Int>> */): Array2D<out kotlin.Number> /* = kotlin.Array<kotlin.Array<out kotlin.Number>> */
 public fun bar2(/*0*/ m: TMap<*> /* = kotlin.collections.Map<*, *> */): [ERROR : Error function type]
 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, out T> */): TMap<T> /* = kotlin.collections.Map<T, out 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/parameterRestrictions.txt b/compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt
index 45bdc321dab..a9fe458bc1b 100644
--- a/compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt
+++ b/compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt
@@ -1,7 +1,7 @@
 package
 
+public val x: WithVariance<kotlin.Int, kotlin.Int> /* = kotlin.Int */ = 0
 public typealias WithBounds1</*0*/ T : [ERROR : Cyclic upper bounds]>  = kotlin.Int
 public typealias WithBounds2</*0*/ X : [ERROR : Cyclic upper bounds], /*1*/ Y : [ERROR : Cyclic upper bounds]>  = kotlin.Int
 public typealias WithBounds3</*0*/ X>  = kotlin.Int
 public typealias WithVariance</*0*/ in X, /*1*/ out Y>  = kotlin.Int
-public val x: WithVariance<kotlin.Int, kotlin.Int> /* = kotlin.Int */ = 0
diff --git a/compiler/testData/diagnostics/tests/typealias/parameterSubstitution.txt b/compiler/testData/diagnostics/tests/typealias/parameterSubstitution.txt
index c4f82e5a0bd..14f96b3cb65 100644
--- a/compiler/testData/diagnostics/tests/typealias/parameterSubstitution.txt
+++ b/compiler/testData/diagnostics/tests/typealias/parameterSubstitution.txt
@@ -1,6 +1,5 @@
 package
 
-public typealias CA</*0*/ T>  = C<T>
 public val ca1: CA<kotlin.Int> /* = C<kotlin.Int> */
 public val ca2: CA<CA<kotlin.Int> /* = C<kotlin.Int> */> /* = C<CA<kotlin.Int> /* = C<kotlin.Int> */> */
 public val ca3: CA<C<kotlin.Int>> /* = C<C<kotlin.Int>> */
@@ -12,3 +11,4 @@ public final class C</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias CA</*0*/ T>  = C<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/projectionsInTypeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/projectionsInTypeAliasConstructor.txt
index f0648e2a09b..61114518597 100644
--- a/compiler/testData/diagnostics/tests/typealias/projectionsInTypeAliasConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/projectionsInTypeAliasConstructor.txt
@@ -1,6 +1,5 @@
 package
 
-public typealias InAlias</*0*/ T>  = In<T>
 public val test1: In<kotlin.String>
 public val test2: In<kotlin.String>
 
@@ -11,3 +10,4 @@ public final class In</*0*/ in T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias InAlias</*0*/ T>  = In<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/recursive.txt b/compiler/testData/diagnostics/tests/typealias/recursive.txt
index 61c8e999fc0..f7eda2c0410 100644
--- a/compiler/testData/diagnostics/tests/typealias/recursive.txt
+++ b/compiler/testData/diagnostics/tests/typealias/recursive.txt
@@ -1,9 +1,9 @@
 package
 
+public val x: [ERROR : Recursive type alias: A]
 public typealias A = B
 public typealias B = A
 public typealias F1 = (kotlin.Int) -> F2
 public typealias F2 = (F1) -> kotlin.Int
 public typealias L = kotlin.collections.List<L>
 public typealias R = R
-public val x: [ERROR : Recursive type alias: A]
diff --git a/compiler/testData/diagnostics/tests/typealias/returnTypeNothingShouldBeSpecifiedExplicitly.txt b/compiler/testData/diagnostics/tests/typealias/returnTypeNothingShouldBeSpecifiedExplicitly.txt
index f9156cfa7ff..a7016d85523 100644
--- a/compiler/testData/diagnostics/tests/typealias/returnTypeNothingShouldBeSpecifiedExplicitly.txt
+++ b/compiler/testData/diagnostics/tests/typealias/returnTypeNothingShouldBeSpecifiedExplicitly.txt
@@ -1,6 +1,6 @@
 package
 
-public typealias N = kotlin.Nothing
 public val testVal: N /* = kotlin.Nothing */
 public val testValWithGetter: N /* = kotlin.Nothing */
 public fun testFun(): N /* = kotlin.Nothing */
+public typealias N = kotlin.Nothing
diff --git a/compiler/testData/diagnostics/tests/typealias/simpleTypeAlias.txt b/compiler/testData/diagnostics/tests/typealias/simpleTypeAlias.txt
index 9f907c8b249..6acb6ccf99c 100644
--- a/compiler/testData/diagnostics/tests/typealias/simpleTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/typealias/simpleTypeAlias.txt
@@ -1,9 +1,9 @@
 package
 
-public typealias S = kotlin.String
-public typealias SS = S
-public typealias SSS = SS
 public val s1: SSS /* = kotlin.String */ = ""
 public val s2: SSS? /* = kotlin.String? */ = null
 public val s3: kotlin.collections.List<SSS /* = kotlin.String */>? = null
 public val s4: kotlin.collections.List<kotlin.collections.List<SSS /* = kotlin.String */>?>? = null
+public typealias S = kotlin.String
+public typealias SS = S
+public typealias SSS = SS
diff --git a/compiler/testData/diagnostics/tests/typealias/starProjectionInTypeAliasArgument.txt b/compiler/testData/diagnostics/tests/typealias/starProjectionInTypeAliasArgument.txt
index 3346924858b..d04ef498688 100644
--- a/compiler/testData/diagnostics/tests/typealias/starProjectionInTypeAliasArgument.txt
+++ b/compiler/testData/diagnostics/tests/typealias/starProjectionInTypeAliasArgument.txt
@@ -1,6 +1,5 @@
 package
 
-public typealias Test</*0*/ X, /*1*/ Y>  = NumCharSeq<X, Y>
 public fun getM(/*0*/ t: Test<*, *> /* = NumCharSeq<*, *> */): kotlin.CharSequence
 public fun getN(/*0*/ t: Test<*, *> /* = NumCharSeq<*, *> */): kotlin.Number
 
@@ -12,3 +11,4 @@ public final class NumCharSeq</*0*/ N : kotlin.Number, /*1*/ M : kotlin.CharSequ
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias Test</*0*/ X, /*1*/ Y>  = NumCharSeq<X, Y>
diff --git a/compiler/testData/diagnostics/tests/typealias/substitutionVariance.txt b/compiler/testData/diagnostics/tests/typealias/substitutionVariance.txt
index 07e90caed0f..df29a342767 100644
--- a/compiler/testData/diagnostics/tests/typealias/substitutionVariance.txt
+++ b/compiler/testData/diagnostics/tests/typealias/substitutionVariance.txt
@@ -1,17 +1,5 @@
 package
 
-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 val inv1: Inv1<kotlin.Int> /* = Inv<kotlin.Int> */
 
 public final class In</*0*/ in T> {
@@ -34,3 +22,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<*>
diff --git a/compiler/testData/diagnostics/tests/typealias/throwJLException.txt b/compiler/testData/diagnostics/tests/typealias/throwJLException.txt
index e21513a1ff2..260c2d07821 100644
--- a/compiler/testData/diagnostics/tests/typealias/throwJLException.txt
+++ b/compiler/testData/diagnostics/tests/typealias/throwJLException.txt
@@ -1,4 +1,4 @@
 package
 
-public typealias Exn = java.lang.Exception
 public fun test(): kotlin.Unit
+public typealias Exn = java.lang.Exception
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInCompanionObject.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInCompanionObject.txt
index 5f03c7f6530..63478a2e346 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInCompanionObject.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInCompanionObject.txt
@@ -1,6 +1,5 @@
 package
 
-public typealias C2</*0*/ T>  = C<T, T>
 public val test1: kotlin.String
 public val test2: kotlin.String = "OK"
 
@@ -18,3 +17,4 @@ public final class C</*0*/ T1, /*1*/ T2> {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+public typealias C2</*0*/ T>  = C<T, T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInConstructor.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInConstructor.txt
index 8a3f8912797..2370e60130e 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInConstructor.txt
@@ -1,6 +1,5 @@
 package
 
-public typealias P2</*0*/ T>  = Pair<T, T>
 public val test1: Pair<kotlin.String, kotlin.String>
 public val test1x1: kotlin.String
 public val test1x2: kotlin.String
@@ -16,3 +15,4 @@ 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 P2</*0*/ T>  = Pair<T, T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.txt
index 9de824b3606..bcc2798d9f6 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.txt
@@ -8,14 +8,12 @@ public val ok: kotlin.String = "OK"
 public val x: [ERROR : Type for C.Self.X]
 
 public final class C {
-    public typealias Self = C
     public constructor C()
     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 class Nested {
-        public typealias Root = C
         public constructor Nested()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -27,6 +25,7 @@ public final class C {
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
+        public typealias Root = C
     }
 
     public companion object X {
@@ -43,4 +42,5 @@ public final class C {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
+    public typealias Self = C
 }
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.txt
index a7487719d70..e1de949947e 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.txt
@@ -1,8 +1,5 @@
 package
 
-public typealias TC = C
-public typealias TI = Interface
-public typealias TO = AnObject
 public val test1: C
 public val test2: TC /* = C */
 public val test3: C
@@ -34,3 +31,6 @@ public interface Interface {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias TC = C
+public typealias TI = Interface
+public typealias TO = AnObject
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasObject.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasObject.txt
index 83f14b92a8d..127e289f194 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasObject.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasObject.txt
@@ -1,8 +1,5 @@
 package
 
-public typealias TestCWC = ClassWithCompanion
-public typealias TestObject = AnObject
-public typealias TestObject2 = TestObject
 public val test11: AnObject
 public val test12: TestObject /* = AnObject */
 public val test13: kotlin.String = "OK"
@@ -40,3 +37,6 @@ public final class ClassWithCompanion {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+public typealias TestCWC = ClassWithCompanion
+public typealias TestObject = AnObject
+public typealias TestObject2 = TestObject
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasObjectWithInvoke.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasObjectWithInvoke.txt
index 58ccc1dcebf..c159234cddc 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasObjectWithInvoke.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasObjectWithInvoke.txt
@@ -1,7 +1,5 @@
 package
 
-public typealias CWI = ClassWithCompanionObjectWithInvoke
-public typealias WI = ObjectWithInvoke
 public val test1: ObjectWithInvoke
 public val test2: ObjectWithInvoke
 public val test3: ClassWithCompanionObjectWithInvoke
@@ -31,3 +29,5 @@ public object ObjectWithInvoke {
     public final operator fun invoke(): ObjectWithInvoke
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias CWI = ClassWithCompanionObjectWithInvoke
+public typealias WI = ObjectWithInvoke
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt
index 51c73fefa46..7993158b21f 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt
@@ -1,19 +1,18 @@
 package
 
+public final class Outer {
+    public constructor Outer()
+    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 typealias ToTypeParam1</*0*/ T>  = T
+    public typealias ToTypeParam2</*0*/ T>  = Outer.ToTypeParam1<T>
+    public typealias ToTypeParam3</*0*/ T1, /*1*/ T2>  = Outer.ToTypeParam2<T1>
+    public typealias ToTypeParam4 = Outer.ToTypeParam1<kotlin.Any>
+}
 public typealias ToFun1 = () -> kotlin.Unit
 public typealias ToFun2</*0*/ T>  = (T) -> kotlin.Unit
 public typealias ToTypeParam1</*0*/ T>  = T
 public typealias ToTypeParam2</*0*/ T>  = ToTypeParam1<T>
 public typealias ToTypeParam3</*0*/ T1, /*1*/ T2>  = ToTypeParam2<T1>
 public typealias ToTypeParam4 = ToTypeParam1<kotlin.Any>
-
-public final class Outer {
-    public typealias ToTypeParam1</*0*/ T>  = T
-    public typealias ToTypeParam2</*0*/ T>  = Outer.ToTypeParam1<T>
-    public typealias ToTypeParam3</*0*/ T1, /*1*/ T2>  = Outer.ToTypeParam2<T1>
-    public typealias ToTypeParam4 = Outer.ToTypeParam1<kotlin.Any>
-    public constructor Outer()
-    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
-}
diff --git a/compiler/testData/diagnostics/tests/typealias/unsupportedTypeAlias.txt b/compiler/testData/diagnostics/tests/typealias/unsupportedTypeAlias.txt
index 64b3719b497..cf3988b0ef6 100644
--- a/compiler/testData/diagnostics/tests/typealias/unsupportedTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/typealias/unsupportedTypeAlias.txt
@@ -1,8 +1,5 @@
 package
 
-public typealias CA = [ERROR : CA]
-public typealias L</*0*/ T>  = [ERROR : L]
-public typealias S = [ERROR : S]
 public val test1: [ERROR : S]
 public fun test2(/*0*/ x: [ERROR : L]<[ERROR : S]>): [ERROR : L]<[ERROR : S]>
 
@@ -19,3 +16,6 @@ public final class Test3 {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+public typealias CA = [ERROR : CA]
+public typealias L</*0*/ T>  = [ERROR : L]
+public typealias S = [ERROR : S]
diff --git a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.txt
index d250dc708f8..eca2cf7af29 100644
--- a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.txt
+++ b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.txt
@@ -1,9 +1,5 @@
 package
 
-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 val test0: Pair<kotlin.Int, kotlin.Int>
 public val test0p2: Pair<kotlin.Int, kotlin.Int>
 public val test0p2a: Pair<kotlin.Any, kotlin.Any>
@@ -39,3 +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>
diff --git a/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.txt
index 6c5524ac0d3..e39d2972542 100644
--- a/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.txt
+++ b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.txt
@@ -1,10 +1,9 @@
 package test
 
-@test.Ann() public typealias A1 = kotlin.String
-@test.Ann(value = "OK") public typealias A2 = kotlin.String
-
 public final annotation class Ann : kotlin.Annotation {
     /*primary*/ public constructor Ann(/*0*/ value: kotlin.String = ...)
     public final val value: kotlin.String
         public final fun <get-value>(): kotlin.String
 }
+@test.Ann() public typealias A1 = kotlin.String
+@test.Ann(value = "OK") public typealias A2 = kotlin.String
diff --git a/compiler/testData/loadJava/compiledKotlin/typealias/Basic.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Basic.txt
index a2f1b3b6cf8..979d66fcc28 100644
--- a/compiler/testData/loadJava/compiledKotlin/typealias/Basic.txt
+++ b/compiler/testData/loadJava/compiledKotlin/typealias/Basic.txt
@@ -1,8 +1,5 @@
 package test
 
-public typealias S = kotlin.String
-public typealias SS = test.S
-public typealias SSS = test.SS
 public val x1: test.S /* = kotlin.String */ = ""
     public fun <get-x1>(): test.S /* = kotlin.String */
 public val x2: test.SS /* = kotlin.String */ = ""
@@ -15,3 +12,6 @@ public val x5: test.SS? /* = kotlin.String? */ = ""
     public fun <get-x5>(): test.SS? /* = kotlin.String? */
 public val x6: test.SSS? /* = kotlin.String? */ = ""
     public fun <get-x6>(): test.SSS? /* = kotlin.String? */
+public typealias S = kotlin.String
+public typealias SS = test.S
+public typealias SSS = test.SS
diff --git a/compiler/testData/loadJava/compiledKotlin/typealias/Generic.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Generic.txt
index 0729f70a1b3..f4562542f26 100644
--- a/compiler/testData/loadJava/compiledKotlin/typealias/Generic.txt
+++ b/compiler/testData/loadJava/compiledKotlin/typealias/Generic.txt
@@ -1,11 +1,11 @@
 package test
 
-public typealias L</*0*/ T>  = kotlin.collections.List<T>
-public typealias LL</*0*/ T>  = test.L<T>
-public typealias LLL</*0*/ T>  = test.LL<T>
 public fun test1(/*0*/ x: test.L<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */): kotlin.Unit
 public fun test2(/*0*/ x: test.LL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */): kotlin.Unit
 public fun test3(/*0*/ x: test.LLL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */): kotlin.Unit
 public fun test4(/*0*/ x: test.L<test.L<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> /* = kotlin.collections.List<out test.L<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> */): kotlin.Unit
 public fun test5(/*0*/ x: test.LL<test.LL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> /* = kotlin.collections.List<out test.LL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> */): kotlin.Unit
 public fun test6(/*0*/ x: test.LLL<test.LLL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> /* = kotlin.collections.List<out test.LLL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> */): kotlin.Unit
+public typealias L</*0*/ T>  = kotlin.collections.List<T>
+public typealias LL</*0*/ T>  = test.L<T>
+public typealias LLL</*0*/ T>  = test.LL<T>
diff --git a/compiler/testData/loadJava/compiledKotlin/typealias/Nested.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Nested.txt
index 4d70fd2fa35..a8908a84e3b 100644
--- a/compiler/testData/loadJava/compiledKotlin/typealias/Nested.txt
+++ b/compiler/testData/loadJava/compiledKotlin/typealias/Nested.txt
@@ -1,12 +1,11 @@
 package test
 
 public final class Outer</*0*/ X> {
-    public typealias Test1</*0*/ A>  /*captured type parameters: /*1*/ X*/ = test.Pair<X, A>
     /*primary*/ public constructor Outer</*0*/ X>()
 
     public final inner class Inner</*0*/ Z> /*captured type parameters: /*1*/ X*/ {
-        public typealias Test3</*0*/ C>  /*captured type parameters: /*1*/ Z, /*2*/ X*/ = test.Triple<X, Z, C>
         /*primary*/ public constructor Inner</*0*/ Z>()
+        public typealias Test3</*0*/ C>  /*captured type parameters: /*1*/ Z, /*2*/ X*/ = test.Triple<X, Z, C>
     }
 
     public final inner class InnerTest1</*0*/ A> /*captured type parameters: /*1*/ X*/ : test.Pair<X, A> {
@@ -14,9 +13,10 @@ public final class Outer</*0*/ X> {
     }
 
     public final class Nested</*0*/ Y> {
-        public typealias Test2</*0*/ B>  /*captured type parameters: /*1*/ Y*/ = test.Pair<Y, B>
         /*primary*/ public constructor Nested</*0*/ Y>()
+        public typealias Test2</*0*/ B>  /*captured type parameters: /*1*/ Y*/ = test.Pair<Y, B>
     }
+    public typealias Test1</*0*/ A>  /*captured type parameters: /*1*/ X*/ = test.Pair<X, A>
 }
 
 public open class Pair</*0*/ T1, /*1*/ T2> {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java
index bd68b271a14..f5ddb9bb130 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java
@@ -48,32 +48,32 @@ public class MemberComparator implements Comparator<DeclarationDescriptor> {
     }
 
     private static int getDeclarationPriority(DeclarationDescriptor descriptor) {
-        if (descriptor instanceof TypeAliasDescriptor) {
+        if (isEnumEntry(descriptor)) {
             return 8;
         }
-        else if (isEnumEntry(descriptor)) {
-            return 7;
-        }
         else if (descriptor instanceof ConstructorDescriptor) {
-            return 6;
+            return 7;
         }
         else if (descriptor instanceof PropertyDescriptor) {
             if (((PropertyDescriptor)descriptor).getExtensionReceiverParameter() == null) {
-                return 5;
+                return 6;
             }
             else {
-                return 4;
+                return 5;
             }
         }
         else if (descriptor instanceof FunctionDescriptor) {
             if (((FunctionDescriptor)descriptor).getExtensionReceiverParameter() == null) {
-                return 3;
+                return 4;
             }
             else {
-                return 2;
+                return 3;
             }
         }
         else if (descriptor instanceof ClassDescriptor) {
+            return 2;
+        }
+        else if (descriptor instanceof TypeAliasDescriptor) {
             return 1;
         }
         return 0;