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

Do not render declarations from other modules in diagnostic tests

Browse Source 
Because PackageViewDescriptor may consist of several package fragments from
different modules (see LazyPackageViewDescriptorImpl#fragments), we now filter
out fragments from irrelevant modules before rendering them into the .txt
This commit is contained in:
Alexander Udalov
2016-11-23 23:35:11 +03:00
parent a8bd82e863
commit c1eebacd55
63 changed files with 40 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public interface C</*0*/ X> : p.B<X> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: X): kotlin.Unit
@@ -50,12 +46,4 @@ package
public fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
package p {
public interface B</*0*/ T> {
// -- Module: <m3> --
}
public interface C</*0*/ X> : p.B<X> {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt
Vendored
-16
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public interface C</*0*/ X> : p.B<X> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: X?): kotlin.Unit
@@ -56,16 +52,4 @@ package
public fun test(/*0*/ b: p.B<p.Tr>?): kotlin.Unit
package p {
public interface B</*0*/ T : p.Tr?> {
// -- Module: <m3> --
}
public interface C</*0*/ X> : p.B<X> {
// -- Module: <m2> --
}
public interface Tr {
// -- Module: <m3> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B</*0*/ T, /*1*/ Z> {
// -- Module: <m1> --
}
public interface C</*0*/ X, /*1*/ Z> : p.B<X, Z> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: X?): kotlin.Unit
@@ -50,12 +46,4 @@ package
public fun </*0*/ Y, /*1*/ Z> test(/*0*/ b: p.B<Y, Z>?): kotlin.Unit
package p {
public interface B</*0*/ Z, /*1*/ T> {
// -- Module: <m3> --
}
public interface C</*0*/ X, /*1*/ Z> : p.B<X, Z> {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public interface C</*0*/ X> : p.B<X> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: X): kotlin.Unit
@@ -50,12 +46,4 @@ package
public fun </*0*/ Y> test(/*0*/ b: p.B<Y>?, /*1*/ y: Y): kotlin.Unit
package p {
public interface B</*0*/ T1> {
// -- Module: <m3> --
}
public interface C</*0*/ X> : p.B<X> {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public interface C</*0*/ X> : p.B<X> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(): X
@@ -50,12 +46,4 @@ package
public fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
package p {
public interface B</*0*/ T> {
// -- Module: <m3> --
}
public interface C</*0*/ X> : p.B<X> {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public interface C : p.B<kotlin.Any?> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ R> foo(/*0*/ a: kotlin.Any?, /*1*/ b: R): kotlin.Unit
@@ -50,12 +46,4 @@ package
public fun test(/*0*/ b: p.B?, /*1*/ c: p.C): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B<kotlin.Any?> {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun getParent(): p.B?
@@ -50,12 +46,4 @@ package
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.String): p.B?
@@ -50,12 +46,4 @@ package
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt
Vendored
-44
View File
@@ -28,14 +28,6 @@ package p {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -44,24 +36,12 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: p.G1<kotlin.Int>?, /*1*/ b: p.G2<p.B, kotlin.String>?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -76,14 +56,6 @@ package p {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -93,20 +65,4 @@ package
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.String): p.B?
@@ -50,12 +46,4 @@ package
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun getParent(): p.B?
@@ -50,12 +46,4 @@ package
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public final class C : p.B {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -51,12 +47,4 @@ package
public fun p.B.test(): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public final class C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): p.B?
@@ -51,12 +47,4 @@ public fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt
Vendored
-16
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): p.B?
@@ -56,16 +52,4 @@ package
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
public interface Tr {
// -- Module: <m3> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): p.B?
@@ -53,12 +49,4 @@ public fun test2(/*0*/ b: p.B?): kotlin.Unit
public fun test3(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): p.B?
@@ -51,12 +47,4 @@ public fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt
Vendored
-20
View File
@@ -23,20 +23,12 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): p.Foo<T>
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface Foo</*0*/ T> {
// -- Module: <m1> --
}
}
@@ -67,16 +59,4 @@ public fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
public interface Foo</*0*/ T> {
// -- Module: <m3> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ a: T): T
@@ -51,12 +47,4 @@ public fun test(/*0*/ b: p.B?): kotlin.Unit
public fun test1(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.txt
Vendored
-2
View File
@@ -20,6 +20,4 @@ package
public fun test(): kotlin.Unit
package p {
public fun f(/*0*/ s: kotlin.String, /*1*/ t: kotlin.String): kotlin.String
public fun f(/*0*/ s: kotlin.String, /*1*/ t: kotlin.String): kotlin.String
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.String): p.B?
@@ -50,12 +46,4 @@ package
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public final class C : p.B {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -51,12 +47,4 @@ package
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public final class C : p.B {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt
Vendored
-44
View File
@@ -28,14 +28,6 @@ package p {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -44,24 +36,12 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: p.G1<kotlin.Int>, /*1*/ b: p.G2<p.B, kotlin.String>): p.B?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -76,14 +56,6 @@ package p {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
@@ -93,20 +65,4 @@ package
public fun test(/*0*/ b: p.B?, /*1*/ a: p.G1<kotlin.Int>, /*2*/ b1: p.G2<p.B, kotlin.String>): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
public interface G1</*0*/ T> {
// -- Module: <m0> --
}
public interface G2</*0*/ A, /*1*/ B> {
// -- Module: <m0> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt
Vendored
-16
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B {
// -- Module: <m1> --
}
public interface C : p.B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun getParent(): p.B?
@@ -57,16 +53,4 @@ package
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B {
// -- Module: <m2> --
}
public interface D : p.B {
// -- Module: <m3> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sinceKotlin.txt
Vendored
-2
View File
@@ -21,9 +21,7 @@ public fun test1(): kotlin.Int
public fun test2(): kotlin.Int
package p1 {
@kotlin.SinceKotlin(version = "1.1") public fun foo(/*0*/ s: kotlin.Int): kotlin.String
}
package p2 {
public fun foo(/*0*/ s: kotlin.Int): kotlin.Int
}
compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt
Vendored
-12
View File
@@ -17,10 +17,6 @@ package
package p {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public interface C : p.B<kotlin.String> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: kotlin.String): kotlin.Unit
@@ -50,12 +46,4 @@ package
public fun test(/*0*/ b: p.B?): kotlin.Unit
package p {
public interface B {
// -- Module: <m3> --
}
public interface C : p.B<kotlin.String> {
// -- Module: <m2> --
}
}