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/imports/CheckVisibility.txt
Vendored
-18
View File
@@ -47,22 +47,6 @@ package k2 {
package
package k {
public final class A {
// -- Module: <m1> --
}
internal final class KInternal {
// -- Module: <m1> --
}
private final class KPrivate {
// -- Module: <m1> --
}
public final class KPublic {
// -- Module: <m1> --
}
}
package k2 {
@@ -70,5 +54,3 @@ package k2 {
package k3 {
}
compiler/testData/diagnostics/tests/imports/ClassClash.txt
Vendored
-18
View File
@@ -34,14 +34,6 @@ package
public fun test(/*0*/ b: a.B): kotlin.Unit
package a {
public final class B {
// -- Module: <m1> --
}
public final class B {
// -- Module: <m2> --
}
}
@@ -74,13 +66,3 @@ package
public fun test(/*0*/ b: B): kotlin.Unit
public fun test2(/*0*/ b: B): kotlin.Unit
public final class B {
// -- Module: <top_m1> --
}
public final class B {
// -- Module: <top_m2> --
}
compiler/testData/diagnostics/tests/imports/ClassClashStarImport.txt
Vendored
-18
View File
@@ -34,14 +34,6 @@ package
public fun test(/*0*/ b: a.B): kotlin.Unit
package a {
public final class B {
// -- Module: <m1> --
}
public final class B {
// -- Module: <m2> --
}
}
@@ -73,13 +65,3 @@ public final class B {
package
public fun test(/*0*/ b: B): kotlin.Unit
public final class B {
// -- Module: <top_m1> --
}
public final class B {
// -- Module: <top_m2> --
}
compiler/testData/diagnostics/tests/imports/PackageVsClass.txt
Vendored
-22
View File
@@ -56,20 +56,10 @@ public fun test(/*0*/ a_b: a.b): kotlin.Unit
public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
package a {
public fun a_fun(): kotlin.Unit
public fun test(/*0*/ a_b: a.b): kotlin.Unit
public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
public final class b {
// -- Module: <m2> --
}
package a.b {
public fun ab_fun(): kotlin.Unit
public final class c {
// -- Module: <m1> --
}
}
}
@@ -81,21 +71,9 @@ public fun test(/*0*/ a_b: a.b): kotlin.Unit
public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
package a {
public fun a_fun(): kotlin.Unit
public fun test(/*0*/ a_b: a.b): kotlin.Unit
public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
public final class b {
// -- Module: <m2> --
}
package a.b {
public fun ab_fun(): kotlin.Unit
public final class c {
// -- Module: <m1> --
}
}
}
compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.txt
Vendored
-12
View File
@@ -47,21 +47,9 @@ public final class a {
// -- Module: <m3> --
package
public fun _fun(): kotlin.Unit
public fun test(/*0*/ a_b: a.b): kotlin.Unit
public fun test2(/*0*/ _a: a): kotlin.Unit
public fun test3(/*0*/ _a: a): kotlin.Unit
public final class a {
// -- Module: <m2> --
}
package a {
public fun a_fun(): kotlin.Unit
public final class b {
// -- Module: <m1> --
}
}