Fix rendering of type aliases

- render 'actual' modifier if it's present
- do not render a space after type parameter list
This commit is contained in:
Alexander Udalov
2018-01-22 13:07:57 +01:00
parent e0245a9dc7
commit 71fe8c02a3
69 changed files with 165 additions and 164 deletions
@@ -104,6 +104,6 @@ public final actual annotation class Foo6 : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public typealias Foo1 = Bar1
public typealias Foo4 = Bar2
public typealias Foo7 = Bar2
public actual typealias Foo1 = Bar1
public actual typealias Foo4 = Bar2
public actual typealias Foo7 = Bar2
@@ -149,5 +149,5 @@ public open class JavaFoo {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public typealias Bar3 = JavaBar
public typealias Foo3 = JavaFoo
public actual typealias Bar3 = JavaBar
public actual typealias Foo3 = JavaFoo
@@ -36,4 +36,4 @@ public open class JavaBar {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public typealias Bar = JavaBar
public actual typealias Bar = JavaBar
@@ -65,14 +65,14 @@ public expect interface C9</*0*/ K> {
// -- Module: <m2-jvm> --
package
public typealias C1 = kotlin.String
public typealias C10</*0*/ L> = Tmp<L>
public typealias C2</*0*/ A> = kotlin.collections.List<kotlin.String>
public typealias C3</*0*/ B> = kotlin.collections.List<B>
public typealias C4</*0*/ D, /*1*/ E> = kotlin.collections.MutableMap<D, E>
public typealias C5</*0*/ F, /*1*/ G> = kotlin.collections.MutableMap<G, F>
public typealias C6</*0*/ H> = kotlin.collections.MutableList<H>
public typealias C7</*0*/ I> = kotlin.collections.MutableList<out I>
public typealias C8</*0*/ J> = kotlin.collections.MutableList<*>
public typealias C9</*0*/ K> = kotlin.collections.MutableList<in K>
public typealias Tmp</*0*/ K> = kotlin.collections.MutableList<K>
public actual typealias C1 = kotlin.String
public actual typealias C10</*0*/ L> = Tmp<L>
public actual typealias C2</*0*/ A> = kotlin.collections.List<kotlin.String>
public actual typealias C3</*0*/ B> = kotlin.collections.List<B>
public actual typealias C4</*0*/ D, /*1*/ E> = kotlin.collections.MutableMap<D, E>
public actual typealias C5</*0*/ F, /*1*/ G> = kotlin.collections.MutableMap<G, F>
public actual typealias C6</*0*/ H> = kotlin.collections.MutableList<H>
public actual typealias C7</*0*/ I> = kotlin.collections.MutableList<out I>
public actual typealias C8</*0*/ J> = kotlin.collections.MutableList<*>
public actual typealias C9</*0*/ K> = kotlin.collections.MutableList<in K>
public typealias Tmp</*0*/ K> = kotlin.collections.MutableList<K>
@@ -24,4 +24,4 @@ public open class FooImpl {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public typealias Foo = FooImpl
public actual typealias Foo = FooImpl
@@ -19,4 +19,4 @@ public open class FooImpl {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public typealias Foo = FooImpl
public actual typealias Foo = FooImpl