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/duplicateClass/differentGenericArguments.txt
Vendored
-13
View File
@@ -41,17 +41,4 @@ package
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: p.A<kotlin.Int>): kotlin.Unit
public final class A {
// -- Module: <m1> --
}
public final class A</*0*/ T> {
// -- Module: <m2> --
}
public final class M1 {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.txt
Vendored
-13
View File
@@ -41,17 +41,4 @@ package
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: p.A): kotlin.Unit
public final class A {
// -- Module: <m2> --
}
public final class A</*0*/ T> {
// -- Module: <m1> --
}
public final class M1 {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.txt
Vendored
-13
View File
@@ -42,17 +42,4 @@ package
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: p.A): kotlin.Unit
public final class A {
// -- Module: <m1> --
}
public final class A {
// -- Module: <m2> --
}
public final class B {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt
Vendored
-19
View File
@@ -151,23 +151,4 @@ package
public fun test(/*0*/ m1: p.M1): kotlin.Unit
package p {
public fun a(/*0*/ p: p.A): kotlin.Unit
public fun b(/*0*/ p: p.A.B): kotlin.Unit
public fun c(/*0*/ p: p.A.C): kotlin.Unit
public fun d(/*0*/ p: p.A.Companion.D): kotlin.Unit
public fun e(/*0*/ p: p.A.Companion.D.E): kotlin.Unit
public fun f(/*0*/ p: p.A.F): kotlin.Unit
public fun g(/*0*/ p: p.A.G): kotlin.Unit
public final class A {
// -- Module: <m1> --
}
public final class A {
// -- Module: <m2> --
}
public final class M1 {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt
Vendored
-17
View File
@@ -46,21 +46,4 @@ package
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: p.A): kotlin.Unit
public interface A {
// -- Module: <m1> --
}
public interface A {
// -- Module: <m2> --
}
public final class B : p.A {
// -- Module: <m1> --
}
public final class M1 {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt
Vendored
-13
View File
@@ -41,17 +41,4 @@ package
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: [ERROR : A]<kotlin.Int>): kotlin.Unit
public final class A</*0*/ X, /*1*/ Y> {
// -- Module: <m1> --
}
public final class A</*0*/ X, /*1*/ Y> {
// -- Module: <m2> --
}
public final class M1 {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt
Vendored
-35
View File
@@ -72,39 +72,4 @@ package
public fun test(): kotlin.Unit
package p {
public fun a(/*0*/ a: p.A): kotlin.Unit
public fun c(/*0*/ c: p.C<kotlin.Int>): kotlin.Unit
public fun d(/*0*/ d: p.D<kotlin.Int>): kotlin.Unit
public interface A {
// -- Module: <m2> --
}
public interface A</*0*/ T> {
// -- Module: <m1> --
}
public final class B : p.A<kotlin.Int>, p.C, p.D<kotlin.Int> {
// -- Module: <m1> --
}
public interface C {
// -- Module: <m1> --
}
public interface C</*0*/ T> {
// -- Module: <m2> --
}
public interface D</*0*/ T> {
// -- Module: <m1> --
}
public interface D</*0*/ T> {
// -- Module: <m2> --
}
public final class M1 {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.txt
Vendored
-8
View File
@@ -26,10 +26,6 @@ package
package p {
public fun test(): kotlin.Unit
public final class A {
// -- Module: <m1> --
}
public final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -37,8 +33,4 @@ package p {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class B {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.txt
Vendored
-8
View File
@@ -26,10 +26,6 @@ package
package p {
public fun test(): kotlin.Unit
public final class A {
// -- Module: <m1> --
}
public final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -37,8 +33,4 @@ package p {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class B {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.txt
Vendored
-16
View File
@@ -50,20 +50,4 @@ package
public fun test(/*0*/ a: p.A): kotlin.Unit
package p {
public final class A {
// -- Module: <m1> --
}
public final class A {
// -- Module: <m2> --
}
public final class M1 {
// -- Module: <m1> --
}
public final class M2 {
// -- Module: <m2> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.txt
Vendored
-8
View File
@@ -33,12 +33,4 @@ public final class A {
}
package p {
public final class A {
// -- Module: <m1> --
}
public final class B {
// -- Module: <m1> --
}
}
compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.txt
Vendored
-13
View File
@@ -41,17 +41,4 @@ package
public fun test(): kotlin.Unit
package p {
public fun foo(/*0*/ a: p.A<kotlin.Int>): kotlin.Unit
public final class A</*0*/ T> {
// -- Module: <m1> --
}
public final class A</*0*/ T> {
// -- Module: <m2> --
}
public final class M1 {
// -- Module: <m1> --
}
}