Do not output empty non-root packages in tests with txt

Mostly to avoid listing every internal package in
kotlin-stdlib/kotlin-reflect, as in
https://github.com/JetBrains/kotlin/blob/acd5b62148d797ffd24c4811d1d663f0c1ae7885/compiler/testData/diagnostics/testsWithUnsignedTypes/conversions/conversionOfSignedToUnsigned.txt#L144

compiler/testData/diagnostics/tests/PackageInTypePosition.txt

@@ -1,6 +1,3 @@
 package
 
 @[ERROR : foo] /* annotation class not found */ public fun bar(/*0*/ p: [ERROR : foo]): [ERROR : foo]
-
-package foo {
-}

compiler/testData/diagnostics/tests/ResolveToJava.txt

@@ -2,6 +2,3 @@ package
 
 public val l: kotlin.collections.MutableList<in kotlin.Int>
 public fun test(/*0*/ l: java.util.List<kotlin.Int>): kotlin.Unit
-
-package xxx {
-}

compiler/testData/diagnostics/tests/callableReference/classVsPackage.txt

@@ -40,12 +40,6 @@ package a {
 // -- Module: <m3> --
 package
 
-package a {
-
-    package a.b {
-    }
-}
-
 package test {
     public fun test(): kotlin.reflect.KFunction1<a.b.c, kotlin.Unit>
 }

compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.txt

@@ -92,49 +92,4 @@ package kotlin {
         public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
     }
-
-    package kotlin.annotation {
-    }
-
-    package kotlin.collections {
-    }
-
-    package kotlin.internal {
-
-        package kotlin.internal.contracts {
-        }
-    }
-
-    package kotlin.ranges {
-    }
-
-    package kotlin.reflect {
-    }
-
-    package kotlin.script {
-
-        package kotlin.script.dependencies {
-        }
-
-        package kotlin.script.experimental {
-
-            package kotlin.script.experimental.dependencies {
-            }
-
-            package kotlin.script.experimental.location {
-            }
-        }
-
-        package kotlin.script.extensions {
-        }
-
-        package kotlin.script.templates {
-
-            package kotlin.script.templates.standard {
-            }
-        }
-    }
-
-    package kotlin.text {
-    }
 }

compiler/testData/diagnostics/tests/generics/PseudoRawTypes.txt

@@ -2,48 +2,6 @@ package
 
 package java {
 
-    package java.awt {
-
-        package java.awt.event {
-        }
-    }
-
-    package java.beans {
-
-        package java.beans.beancontext {
-        }
-    }
-
-    package java.io {
-    }
-
-    package java.lang {
-
-        package java.lang.annotation {
-        }
-
-        package java.lang.reflect {
-        }
-    }
-
-    package java.net {
-    }
-
-    package java.nio {
-
-        package java.nio.charset {
-        }
-    }
-
-    package java.rmi {
-    }
-
-    package java.security {
-    }
-
-    package java.sql {
-    }
-
     package java.util {
 
         public open class Collection {
@@ -53,18 +11,6 @@ package java {
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
-
-        package java.util.concurrent {
-
-            package java.util.concurrent.atomic {
-            }
-
-            package java.util.concurrent.locks {
-            }
-        }
-
-        package java.util.regex {
-        }
     }
 }
 

compiler/testData/diagnostics/tests/imports/CheckJavaVisibility.txt

@@ -47,6 +47,3 @@ package j {
         public open fun javaM(): kotlin.Unit
     }
 }
-
-package k {
-}

compiler/testData/diagnostics/tests/imports/CheckVisibility.txt

@@ -39,18 +39,7 @@ package k {
     }
 }
 
-package k2 {
-}
-
 
 // -- Module: <m2> --
 package
 
-package k {
-}
-
-package k2 {
-}
-
-package k3 {
-}

compiler/testData/diagnostics/tests/imports/ClassClash.txt

@@ -33,9 +33,6 @@ package
 
 public fun test(/*0*/ b: a.B): kotlin.Unit
 
-package a {
-}
-
 
 // -- Module: <top_m1> --
 package

compiler/testData/diagnostics/tests/imports/ClassClashStarImport.txt

@@ -33,9 +33,6 @@ package
 
 public fun test(/*0*/ b: a.B): kotlin.Unit
 
-package a {
-}
-
 
 // -- Module: <top_m1> --
 package

compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.txt

@@ -1,8 +1,5 @@
 package
 
-package a {
-}
-
 package b {
 
     public object O {

compiler/testData/diagnostics/tests/imports/ImportsConflicting.txt

@@ -1,8 +1,5 @@
 package
 
-package a {
-}
-
 package b {
     public fun foo(): kotlin.Int
 }

compiler/testData/diagnostics/tests/imports/MalformedImports.txt

@@ -1,4 +1,2 @@
 package
 
-package test {
-}

compiler/testData/diagnostics/tests/imports/PackageVsClass.txt

@@ -58,9 +58,6 @@ public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 package a {
     public fun test(/*0*/ a_b: a.b): kotlin.Unit
     public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
-
-    package a.b {
-    }
 }
 
 
@@ -73,7 +70,4 @@ public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 package a {
     public fun test(/*0*/ a_b: a.b): kotlin.Unit
     public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
-
-    package a.b {
-    }
 }

compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.txt

@@ -50,6 +50,3 @@ package
 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
-
-package a {
-}

compiler/testData/diagnostics/tests/imports/WrongImport.txt

@@ -44,7 +44,4 @@ package a {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
-
-    package a.b {
-    }
 }

compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.txt

@@ -39,6 +39,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.txt

@@ -39,6 +39,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.txt

@@ -40,6 +40,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt

@@ -149,6 +149,3 @@ package p {
 package
 
 public fun test(/*0*/ m1: p.M1): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt

@@ -39,6 +39,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt

@@ -70,6 +70,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.txt

@@ -48,6 +48,3 @@ package p {
 package
 
 public fun test(/*0*/ a: p.A): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.txt

@@ -31,6 +31,3 @@ public final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.txt

@@ -39,6 +39,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt

@@ -50,6 +50,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B<p.Tr>?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun </*0*/ Y, /*1*/ Z> test(/*0*/ b: p.B<Y, Z>?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun </*0*/ Y> test(/*0*/ b: p.B<Y>?, /*1*/ y: Y): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?, /*1*/ c: p.C): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt

@@ -63,6 +63,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt

@@ -45,6 +45,3 @@ package p {
 package
 
 public fun p.B.test(): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt

@@ -45,6 +45,3 @@ package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt

@@ -50,6 +50,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt

@@ -47,6 +47,3 @@ public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
 public fun test2(/*0*/ b: p.B?): kotlin.Unit
 public fun test3(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt

@@ -45,6 +45,3 @@ package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt

@@ -57,6 +57,3 @@ package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt

@@ -45,6 +45,3 @@ package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.txt

@@ -18,6 +18,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt

@@ -45,6 +45,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt

@@ -63,6 +63,3 @@ package p {
 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 {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt

@@ -51,6 +51,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sinceKotlin.txt

@@ -19,9 +19,3 @@ package
 
 public fun test1(): kotlin.Int
 public fun test2(): kotlin.Int
-
-package p1 {
-}
-
-package p2 {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt

@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.txt

@@ -57,6 +57,3 @@ public final class Foo : p.C, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt

@@ -50,6 +50,3 @@ public final class Foo : p.A, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt

@@ -51,6 +51,3 @@ public final class Foo : p.A, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt

@@ -50,6 +50,3 @@ public final class Foo : p.A<kotlin.String>, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenImportPriority.txt

@@ -33,9 +33,3 @@ package
 
 public fun test(/*0*/ a: p1.A): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
-
-package p1 {
-}
-
-package p2 {
-}

compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt

@@ -48,12 +48,3 @@ package
 
 public fun test(/*0*/ a: [ERROR : A]): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
-
-package p1 {
-}
-
-package p2 {
-}
-
-package p3 {
-}

compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinImportPriority.txt

@@ -33,9 +33,3 @@ package
 
 public fun test(/*0*/ a: p1.A): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
-
-package p1 {
-}
-
-package p2 {
-}

compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt

@@ -48,12 +48,3 @@ package
 
 public fun test(/*0*/ a: [ERROR : A]): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
-
-package p1 {
-}
-
-package p2 {
-}
-
-package p3 {
-}

compiler/testData/diagnostics/tests/multimodule/internal.txt

@@ -36,6 +36,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.txt

@@ -37,6 +37,3 @@ package
 
 public fun test(): kotlin.Unit
 public inline fun testInline(): kotlin.Unit
-
-package p {
-}

compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt

@@ -47,6 +47,3 @@ package other {
     public fun baz(/*0*/ b: kotlin.Boolean?): kotlin.Int
     public fun foo(/*0*/ e: test.E): kotlin.Int
 }
-
-package test {
-}

compiler/testData/diagnostics/tests/multimodule/varargConflict.txt

@@ -22,6 +22,3 @@ package
 package m {
     public fun main(): kotlin.Unit
 }
-
-package p {
-}

compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.txt

@@ -9,9 +9,6 @@ package common {
 // -- Module: <m2-jvm> --
 package
 
-package common {
-}
-
 package jvm {
     public actual fun foo(): kotlin.Unit
 }
@@ -20,9 +17,6 @@ package jvm {
 // -- Module: <m3-js> --
 package
 
-package common {
-}
-
 package js {
     public actual fun foo(): kotlin.Unit
 }

compiler/testData/diagnostics/tests/qualifiedExpression/GenericClassVsPackage.txt

@@ -44,12 +44,6 @@ package
 public fun test(/*0*/ ab_c: a.b.c): kotlin.Unit
 public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 
-package a {
-
-    package a.b {
-    }
-}
-
 
 // -- Module: <top_m1> --
 package
@@ -91,6 +85,3 @@ package
 
 public fun test(/*0*/ a_b: a.b): kotlin.Unit
 public fun test2(/*0*/ _ab: a.b): kotlin.Unit
-
-package a {
-}

compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass.txt

@@ -55,12 +55,6 @@ package
 public fun test(/*0*/ a_b: a.b): kotlin.Unit
 public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 
-package a {
-
-    package a.b {
-    }
-}
-
 
 // -- Module: <m1> --
 package
@@ -109,9 +103,3 @@ package
 
 public fun test(/*0*/ a_b: a.b): kotlin.Unit
 public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
-
-package a {
-
-    package a.b {
-    }
-}

compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt

@@ -30,9 +30,6 @@ package a {
 // -- Module: <m2> --
 package
 
-package a {
-}
-
 package test {
     public val x: [ERROR : Type for a.b()]
 
@@ -48,9 +45,6 @@ package test {
 // -- Module: <m3> --
 package
 
-package a {
-}
-
 package test {
     public fun foo(/*0*/ i: a.a): kotlin.Unit
 }

compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt

@@ -38,9 +38,6 @@ package some {
 // -- Module: <m3> --
 package
 
-package a {
-}
-
 package other {
     public fun test(/*0*/ a_: [ERROR : a.b]): kotlin.Unit
 

compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.txt

@@ -8,7 +8,4 @@ package a {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
-
-    package a.b {
-    }
 }

compiler/testData/diagnostics/tests/regressions/kt26-1.txt

@@ -1,7 +1,2 @@
 package
 
-package bar {
-}
-
-package foo {
-}

compiler/testData/diagnostics/tests/regressions/kt691.txt

@@ -1,10 +1,2 @@
 package
 
-package foo {
-
-    package foo.bar {
-
-        package foo.bar.buz {
-        }
-    }
-}

compiler/testData/diagnostics/tests/resolve/implicitReceiverProperty.txt

@@ -20,12 +20,6 @@ package a {
     }
 }
 
-package b {
-}
-
-package c {
-}
-
 package test {
     public val x1: kotlin.Int
     public val x3: kotlin.Int

compiler/testData/diagnostics/tests/scopes/kt1579.txt

@@ -14,6 +14,3 @@ package lib {
         }
     }
 }
-
-package user {
-}

compiler/testData/diagnostics/tests/scopes/kt1642.txt

@@ -1,7 +1,2 @@
 package
 
-package a {
-
-    package a.java {
-    }
-}

compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesOnImport.txt

@@ -11,6 +11,3 @@ package a {
     @kotlin.SinceKotlin(version = "1.1") public typealias Alias_1_1 = kotlin.String
     public typealias Since_1_1_Alias = a.Since_1_1
 }
-
-package b {
-}