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

Fix type-intersection-related test data

Browse Source 
The order of types enumeration has been changed recently:
previously it was collected at first from a child and then from
its parent, but now it's being collected in order of appearance
This commit is contained in:
Denis Zharkov
2018-07-26 12:18:34 +03:00
parent d024d2e64c
commit 375f3c0769
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/implicitIntersection.txt
Vendored
+3 -3
View File
@@ -1,7 +1,7 @@
package package
public fun bar(/*0*/ b: B): kotlin.String public fun bar(/*0*/ b: B): kotlin.String
public fun foo(/*0*/ b: B): {C & A & B}? public fun foo(/*0*/ b: B): {A & C & B}?
public fun gav(/*0*/ b: B): A? public fun gav(/*0*/ b: B): A?
public interface A { public interface A {
@@ -25,10 +25,10 @@ public interface C {
public final class My { public final class My {
public constructor My(/*0*/ b: B) public constructor My(/*0*/ b: B)
public final val x: {C & A & B}? public final val x: {A & C & B}?
public final val y: C? public final val y: C?
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(/*0*/ b: B): {C & A & B}? public final fun foo(/*0*/ b: B): {A & C & B}?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/throwsEffect.kt
Vendored
+2 -2
View File
@@ -61,5 +61,5 @@ fun testAtLeastOnceFlow(x: Any?) {
<!DEBUG_INFO_SMARTCAST!>x<!>.length <!DEBUG_INFO_SMARTCAST!>x<!>.length
} while (x != null) } while (x != null)
<!DEBUG_INFO_SMARTCAST!>x<!>.length <!DEBUG_INFO_SMARTCAST!>x<!>.<!UNREACHABLE_CODE!>length<!>
} }
idea/testData/codeInsight/expressionType/SoftSmartCastMultipleTypes.kt
Vendored
+1 -1
View File
@@ -10,4 +10,4 @@ fun fn(value: Any) {
} }
} }
// TYPE: value -> <html>A & B (smart cast from Any)</html> // TYPE: value -> <html>B & A (smart cast from Any)</html>