azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Render unabbreviated part of type wrapped in common comments

Browse Source 
It's necessary for preserving DescriptorRenderer invariant, namely
only valid code should be generated
This commit is contained in:
Denis Zharkov
2016-06-27 14:44:36 +03:00
parent 249be0a142
commit d39d36b94c
30 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.txt
Vendored
+4 -4
View File
@@ -6,10 +6,10 @@ public val test5: TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Numb
public val test6: TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Int>>
public val test7: TColl<kotlin.Number, kotlin.collections.List<kotlin.Int>>
public val test8: TColl<kotlin.Number, kotlin.collections.List<kotlin.Any>>
public fun test1(/*0*/ x: TC2<kotlin.Number, kotlin.collections.Collection<kotlin.Number>> [= TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Number>>]): kotlin.Unit
public fun test2(/*0*/ x: TC2<kotlin.Number, kotlin.collections.Collection<kotlin.Int>> [= TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Int>>]): kotlin.Unit
public fun test3(/*0*/ x: TC2<kotlin.Number, kotlin.collections.List<kotlin.Int>> [= TColl<kotlin.Number, kotlin.collections.List<kotlin.Int>>]): kotlin.Unit
public fun test4(/*0*/ x: TC2<kotlin.Number, kotlin.collections.List<kotlin.Any>> [= TColl<kotlin.Number, kotlin.collections.List<kotlin.Any>>]): kotlin.Unit
public fun test1(/*0*/ x: TC2<kotlin.Number, kotlin.collections.Collection<kotlin.Number>> /* = TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Number>> */): kotlin.Unit
public fun test2(/*0*/ x: TC2<kotlin.Number, kotlin.collections.Collection<kotlin.Int>> /* = TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Int>> */): kotlin.Unit
public fun test3(/*0*/ x: TC2<kotlin.Number, kotlin.collections.List<kotlin.Int>> /* = TColl<kotlin.Number, kotlin.collections.List<kotlin.Int>> */): kotlin.Unit
public fun test4(/*0*/ x: TC2<kotlin.Number, kotlin.collections.List<kotlin.Any>> /* = TColl<kotlin.Number, kotlin.collections.List<kotlin.Any>> */): kotlin.Unit
public final class TColl</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> {
public constructor TColl</*0*/ T, /*1*/ C : kotlin.collections.Collection<T>>()
compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.txt
Vendored
+8 -8
View File
@@ -11,14 +11,14 @@ public val test5: Num<kotlin.Int>
public val test6: Num<kotlin.Any>
public val test7: NumColl<kotlin.collections.List<kotlin.Int>>
public val test8: NumColl<kotlin.collections.List<kotlin.Any>>
public fun test1(/*0*/ x: NA<kotlin.Int> [= Num<kotlin.Int>]): kotlin.Unit
public fun test10(/*0*/ x: TC<kotlin.Number, kotlin.collections.Collection<kotlin.Int>> [= TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Int>>]): kotlin.Unit
public fun test11(/*0*/ x: TC<kotlin.Number, kotlin.collections.List<kotlin.Int>> [= TColl<kotlin.Number, kotlin.collections.List<kotlin.Int>>]): kotlin.Unit
public fun test12(/*0*/ x: TC<kotlin.Number, kotlin.collections.List<kotlin.Any>> [= TColl<kotlin.Number, kotlin.collections.List<kotlin.Any>>]): kotlin.Unit
public fun test2(/*0*/ x: NA<kotlin.Any> [= Num<kotlin.Any>]): kotlin.Unit
public fun test3(/*0*/ x: NL<kotlin.Int> [= NumColl<kotlin.collections.List<out kotlin.Int>>]): kotlin.Unit
public fun test4(/*0*/ x: NL<kotlin.Any> [= NumColl<kotlin.collections.List<out kotlin.Any>>]): kotlin.Unit
public fun test9(/*0*/ x: TC<kotlin.Number, kotlin.collections.Collection<kotlin.Number>> [= TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Number>>]): kotlin.Unit
public fun test1(/*0*/ x: NA<kotlin.Int> /* = Num<kotlin.Int> */): kotlin.Unit
public fun test10(/*0*/ x: TC<kotlin.Number, kotlin.collections.Collection<kotlin.Int>> /* = TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Int>> */): kotlin.Unit
public fun test11(/*0*/ x: TC<kotlin.Number, kotlin.collections.List<kotlin.Int>> /* = TColl<kotlin.Number, kotlin.collections.List<kotlin.Int>> */): kotlin.Unit
public fun test12(/*0*/ x: TC<kotlin.Number, kotlin.collections.List<kotlin.Any>> /* = TColl<kotlin.Number, kotlin.collections.List<kotlin.Any>> */): kotlin.Unit
public fun test2(/*0*/ x: NA<kotlin.Any> /* = Num<kotlin.Any> */): kotlin.Unit
public fun test3(/*0*/ x: NL<kotlin.Int> /* = NumColl<kotlin.collections.List<out kotlin.Int>> */): kotlin.Unit
public fun test4(/*0*/ x: NL<kotlin.Any> /* = NumColl<kotlin.collections.List<out kotlin.Any>> */): kotlin.Unit
public fun test9(/*0*/ x: TC<kotlin.Number, kotlin.collections.Collection<kotlin.Number>> /* = TColl<kotlin.Number, kotlin.collections.Collection<kotlin.Number>> */): kotlin.Unit
public final class Num</*0*/ T : kotlin.Number> {
public constructor Num</*0*/ T : kotlin.Number>()
compiler/testData/diagnostics/tests/typealias/conflictingProjections.txt
Vendored
+2 -2
View File
@@ -6,8 +6,8 @@ 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
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
public interface In</*0*/ in T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/typealias/genericTypeAliasObject.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ 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 test12: GenericTestObject<*> /* = AnObject */
public val test13: kotlin.String = "OK"
public val test14: kotlin.String
public val test25: GenericClassWithCompanion.Companion
compiler/testData/diagnostics/tests/typealias/import.txt
Vendored
+3 -3
View File
@@ -17,7 +17,7 @@ package package2 {
}
package package3 {
public val testA: package2.Outer.A [= kotlin.Any]
public val testI: package2.I [= kotlin.Int] = 42
public val testS: package1.S [= kotlin.String] = ""
public val testA: package2.Outer.A /* = kotlin.Any */
public val testI: package2.I /* = kotlin.Int */ = 42
public val testS: package1.S /* = kotlin.String */ = ""
}
compiler/testData/diagnostics/tests/typealias/inSupertypesList.txt
Vendored
+2 -2
View File
@@ -8,14 +8,14 @@ public interface IBase {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class Test1 : B [= IBase] {
public final class Test1 : B /* = IBase */ {
public constructor Test1()
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 Test2 : IBase, B [= IBase] {
public final class Test2 : IBase, B /* = IBase */ {
public constructor Test2()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/typealias/inheritedNestedTypeAlias.kt
Vendored
+1 -1
View File
@@ -17,4 +17,4 @@ class Derived : Base<Int>() {
val test1: <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>CT<!> = Cell(42)
val test2: Base<Int>.CT = Cell(42)
}
}
compiler/testData/diagnostics/tests/typealias/inheritedNestedTypeAlias.txt
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ public final class Cell</*0*/ T> : ICell<T> {
public final class Derived : Base<kotlin.Int> {
public constructor Derived()
public final val test1: [ERROR : CT]
public final val test2: Base<kotlin.Int>.CT [= Cell<kotlin.Int>]
public final val test2: Base<kotlin.Int>.CT /* = Cell<kotlin.Int> */
public final val x1: [ERROR : InnerCell]
public final val x2: Base<kotlin.Int>.InnerCell
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/typealias/isAsWithTypeAlias.txt
Vendored
+2 -2
View File
@@ -2,5 +2,5 @@ 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 fun test2(/*0*/ x: kotlin.Any): S /* = kotlin.String */
public fun test3(/*0*/ x: kotlin.Any): S? /* = kotlin.String? */
compiler/testData/diagnostics/tests/typealias/nested.txt
Vendored
+4 -4
View File
@@ -3,17 +3,17 @@ package
public val p1: Pair<kotlin.Int, kotlin.Int>
public val test1: kotlin.Int
public val test2: kotlin.Int
public fun C.testExtFun1(/*0*/ x: C.P2 [= Pair<kotlin.Int, kotlin.Int>]): C.P2 [= Pair<kotlin.Int, kotlin.Int>]
public fun C.testExtFun2(): C.P2 [= Pair<kotlin.Int, kotlin.Int>]
public fun C.testExtFun1(/*0*/ x: C.P2 /* = Pair<kotlin.Int, kotlin.Int> */): C.P2 /* = Pair<kotlin.Int, kotlin.Int> */
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
public final fun first(/*0*/ p: C.P2 /* = Pair<kotlin.Int, kotlin.Int> */): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
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 final fun second(/*0*/ p: C.P2 /* = Pair<kotlin.Int, kotlin.Int> */): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/typealias/nestedCapturingTypeParameters.txt
Vendored
+4 -4
View File
@@ -12,11 +12,11 @@ public final class C</*0*/ 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
public final fun </*0*/ T2> first2(/*0*/ p: C<T>.PT2<T2> [= Pair<T, T2>]): T
public final fun first(/*0*/ p: C<T>.P2 /* = Pair<T, T> */): T
public final fun </*0*/ T2> first2(/*0*/ p: C<T>.PT2<T2> /* = Pair<T, T2> */): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
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 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
}
compiler/testData/diagnostics/tests/typealias/nestedSubstituted.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
public val p1: C<kotlin.String>.P2 [= Pair<kotlin.String, kotlin.Int>]
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>
compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ typealias Array2D<T> = Array<Array<T>>
fun foo1(a: Array2D<out Number>) = a
fun bar1(a: Array2D<Int>) =
foo1(<!TYPE_MISMATCH(Array2D<out Number> [= Array<Array<out Number>>]; Array2D<Int> [= Array<Array<Int>>])!>a<!>)
foo1(<!TYPE_MISMATCH(Array2D<out Number> /* = Array<Array<out Number>> */; Array2D<Int> /* = Array<Array<Int>> */)!>a<!>)
typealias TMap<T> = Map<T, T>
compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.txt
Vendored
+4 -4
View File
@@ -2,7 +2,7 @@ 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 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> */
compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@ public typealias WithBounds1</*0*/ T : [ERROR : Cyclic upper bounds]> = kotlin.
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
public val x: WithVariance<kotlin.Int, kotlin.Int> /* = kotlin.Int */ = 0
compiler/testData/diagnostics/tests/typealias/parameterSubstitution.kt
Vendored
+1 -1
View File
@@ -5,4 +5,4 @@ typealias CA<T> = C<T>
val ca1: CA<Int> = C<Int>()
val ca2: CA<CA<Int>> = C<C<Int>>()
val ca3: CA<C<Int>> = C<C<Int>>()
val ca4: CA<Int?> = C<Int?>()
val ca4: CA<Int?> = C<Int?>()
compiler/testData/diagnostics/tests/typealias/parameterSubstitution.txt
Vendored
+4 -4
View File
@@ -1,10 +1,10 @@
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>>]
public val ca4: CA<kotlin.Int?> [= C<kotlin.Int?>]
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>> */
public val ca4: CA<kotlin.Int?> /* = C<kotlin.Int?> */
public final class C</*0*/ T> {
public constructor C</*0*/ T>()
compiler/testData/diagnostics/tests/typealias/returnTypeNothingShouldBeSpecifiedExplicitly.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ typealias N = Nothing
fun <!ABBREVIATED_NOTHING_RETURN_TYPE!>testFun<!>(): N = null!!
val <!ABBREVIATED_NOTHING_PROPERTY_TYPE!>testVal<!>: N = null!!
val <!ABBREVIATED_NOTHING_PROPERTY_TYPE!>testValWithGetter<!>: N get() = null!!
val <!ABBREVIATED_NOTHING_PROPERTY_TYPE!>testValWithGetter<!>: N get() = null!!
compiler/testData/diagnostics/tests/typealias/returnTypeNothingShouldBeSpecifiedExplicitly.txt
Vendored
+3 -3
View File
@@ -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 val testVal: N /* = kotlin.Nothing */
public val testValWithGetter: N /* = kotlin.Nothing */
public fun testFun(): N /* = kotlin.Nothing */
compiler/testData/diagnostics/tests/typealias/simpleTypeAlias.kt
Vendored
+1 -1
View File
@@ -5,4 +5,4 @@ typealias SSS = SS
val s1: SSS = ""
val s2: SSS? = null
val s3: List<SSS>? = null
val s4: List<List<SSS>?>? = null
val s4: List<List<SSS>?>? = null
compiler/testData/diagnostics/tests/typealias/simpleTypeAlias.txt
Vendored
+4 -4
View File
@@ -3,7 +3,7 @@ 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 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
compiler/testData/diagnostics/tests/typealias/starProjectionInTypeAliasArgument.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
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
public fun getM(/*0*/ t: Test<*, *> /* = NumCharSeq<*, *> */): kotlin.CharSequence
public fun getN(/*0*/ t: Test<*, *> /* = NumCharSeq<*, *> */): kotlin.Number
public final class NumCharSeq</*0*/ N : kotlin.Number, /*1*/ M : kotlin.CharSequence> {
public constructor NumCharSeq</*0*/ N : kotlin.Number, /*1*/ M : kotlin.CharSequence>(/*0*/ n: N, /*1*/ m: M)
compiler/testData/diagnostics/tests/typealias/substitutionVariance.kt
Vendored
+1 -1
View File
@@ -17,4 +17,4 @@ typealias Inv2<T> = Inv<in T>
typealias Inv3<T> = Inv<out T>
typealias Inv4<<!UNUSED_TYPEALIAS_PARAMETER!>T<!>> = Inv<*>
val inv1: Inv1<Int> = Inv<Int>()
val inv1: Inv1<Int> = Inv<Int>()
compiler/testData/diagnostics/tests/typealias/substitutionVariance.txt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ 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 val inv1: Inv1<kotlin.Int> /* = Inv<kotlin.Int> */
public final class In</*0*/ in T> {
public constructor In</*0*/ in T>()
compiler/testData/diagnostics/tests/typealias/typeAliasArgumentsInConstructor.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ 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
public val test2: P2<kotlin.String> [= Pair<kotlin.String, kotlin.String>]
public val test2: P2<kotlin.String> /* = Pair<kotlin.String, kotlin.String> */
public val test2x1: kotlin.String
public val test2x2: kotlin.String
compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.txt
Vendored
+2 -2
View File
@@ -4,9 +4,9 @@ public typealias TC = C
public typealias TI = Interface
public typealias TO = AnObject
public val test1: C
public val test2: TC [= C]
public val test2: TC /* = C */
public val test3: C
public val test4: TC [= C]
public val test4: TC /* = C */
public val test5: [ERROR : Type for TC("", "")]
public val test6: [ERROR : Type for TI()]
public val test6a: [ERROR : Type for Interface()]
compiler/testData/diagnostics/tests/typealias/typeAliasObject.txt
Vendored
+2 -2
View File
@@ -4,11 +4,11 @@ public typealias TestCWC = ClassWithCompanion
public typealias TestObject = AnObject
public typealias TestObject2 = TestObject
public val test11: AnObject
public val test12: TestObject [= AnObject]
public val test12: TestObject /* = AnObject */
public val test13: kotlin.String = "OK"
public val test14: kotlin.String
public val test21: AnObject
public val test22: TestObject2 [= AnObject]
public val test22: TestObject2 /* = AnObject */
public val test23: kotlin.String = "OK"
public val test24: kotlin.String
public val test35: ClassWithCompanion.Companion
compiler/testData/loadJava/compiledKotlin/typealias/Basic.txt
Vendored
+12 -12
View File
@@ -3,15 +3,15 @@ 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] = ""
public fun <get-x2>(): test.SS [= kotlin.String]
public val x3: test.SSS [= kotlin.String] = ""
public fun <get-x3>(): test.SSS [= kotlin.String]
public val x4: test.S? [= kotlin.String?] = ""
public fun <get-x4>(): test.S? [= kotlin.String?]
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 val x1: test.S /* = kotlin.String */ = ""
public fun <get-x1>(): test.S /* = kotlin.String */
public val x2: test.SS /* = kotlin.String */ = ""
public fun <get-x2>(): test.SS /* = kotlin.String */
public val x3: test.SSS /* = kotlin.String */ = ""
public fun <get-x3>(): test.SSS /* = kotlin.String */
public val x4: test.S? /* = kotlin.String? */ = ""
public fun <get-x4>(): test.S? /* = kotlin.String? */
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? */
compiler/testData/loadJava/compiledKotlin/typealias/Generic.txt
Vendored
+6 -6
View File
@@ -3,9 +3,9 @@ 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 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
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+1 -1
View File
@@ -129,7 +129,7 @@ internal class DescriptorRendererImpl(
// TODO nullability is lost for abbreviated type?
val abbreviatedRendered = renderNormalizedTypeAsIs(abbreviated.abbreviation)
val unabbreviatedRendered = renderNormalizedTypeAsIs(abbreviated.expandedType)
return "$abbreviatedRendered [= $unabbreviatedRendered]"
return "$abbreviatedRendered /* = $unabbreviatedRendered */"
}
return renderNormalizedTypeAsIs(type)