From 7a5124215a8dda2d6d70970e97af3dd7a1a1ed53 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Tue, 9 Dec 2014 14:11:54 +0300 Subject: [PATCH] Updated test data for Array vararg type --- .../basic/IfWithUninitialized.values | 24 +++++++++---------- .../basic/UsageInFunctionLiteral.values | 22 ++++++++--------- .../bugs/varInitializationInIfInCycle.values | 4 ++-- .../diagnostics/tests/IllegalModifiers.txt | 4 ++-- .../diagnostics/tests/VarargTypes.txt | 2 +- .../testData/diagnostics/tests/Varargs.txt | 2 +- .../AnnotatedConstructorParams.txt | 8 +++---- .../JavaAnnotationConstructors.txt | 2 +- .../UnresolvedAnnotationOnObject.txt | 2 +- .../WrongAnnotationArgsOnObject.txt | 2 +- .../strings.txt | 4 ++-- .../invalidTypesInAnnotationConstructor.txt | 10 ++++---- .../tests/checkArguments/SpreadVarargs.txt | 8 +++---- .../tests/classObjects/classObjectHeader.txt | 2 +- .../resolveFunctionInsideClassObject.txt | 2 +- .../varInitializationInIfInCycle.txt | 2 +- .../MultiDeclarationErrors.txt | 2 +- .../checkDeparenthesizedType.txt | 2 +- .../tests/duplicateJvmSignature/vararg.txt | 2 +- .../tpAsReified/InlineableReified.txt | 2 +- .../tests/generics/tpAsReified/LocalFun.txt | 2 +- .../tpAsReified/NotInlineableReified.txt | 2 +- .../generics/tpAsReified/ReifiedClass.txt | 2 +- ...tionWithAllUnderImportAfterNamedImport.txt | 2 +- .../completeInferenceIfManyFailed.txt | 2 +- .../tests/inference/dependantOnVariance.txt | 2 +- .../tests/inference/listConstructor.txt | 2 +- .../tests/inference/mapFunction.txt | 2 +- .../nestedCalls/binaryExpressions.txt | 2 +- .../tests/inference/nestedCalls/kt3395.txt | 2 +- .../tests/inference/regressions/compareBy.txt | 2 +- .../tests/inference/regressions/kt1718.txt | 2 +- .../tests/inference/regressions/kt2179.txt | 2 +- .../tests/inference/regressions/kt2200.txt | 2 +- .../tests/inference/regressions/kt2294.txt | 2 +- .../tests/inference/regressions/kt2324.txt | 2 +- .../tests/inference/regressions/kt2407.txt | 2 +- .../tests/inference/regressions/kt2459.txt | 2 +- .../tests/inference/regressions/kt2741.txt | 2 +- .../tests/inference/regressions/kt3038.txt | 2 +- .../tests/inference/regressions/kt3301.txt | 2 +- .../subtypeForInvariantWithErrorGenerics.txt | 2 +- .../typeInferenceExpectedTypeMismatch.txt | 2 +- .../upperBounds/intersectUpperBounds.txt | 2 +- .../useBoundsToInferTypeParamsSimple.txt | 2 +- .../nonLocalReturns/anonymousObjects.txt | 2 +- .../anonymousObjectsNested.txt | 2 +- .../inline/nonLocalReturns/fromOnlyLocal.txt | 2 +- .../inline/nonLocalReturns/inlineLambda.txt | 2 +- ...bdaWithGlobalReturnsInsideOnlyLocalOne.txt | 2 +- .../tests/inline/nonLocalReturns/localFun.txt | 2 +- .../inline/nonLocalReturns/noInlineLambda.txt | 2 +- .../nonLocalReturns/nonInlinedClass.txt | 2 +- .../nonLocalReturns/onlyLocalReturnLambda.txt | 2 +- .../onlyLocalReturnLambdaBinaryExpr.txt | 2 +- .../inline/nonLocalReturns/toOnlyLocal.txt | 2 +- .../diagnostics/tests/inline/vararg.txt | 4 ++-- .../tests/inner/InnerClassNameClash.txt | 2 +- .../diagnostics/tests/j+k/OverrideVararg.txt | 2 +- .../tests/j+k/javaStaticImport.txt | 2 +- compiler/testData/diagnostics/tests/kt310.txt | 2 +- .../diagnostics/tests/library/Collections.txt | 2 +- .../numbers/numbersInSimpleConstraints.txt | 2 +- .../tests/operatorsOverloading/kt3450.txt | 2 +- .../tests/override/OverrideWithErrors.txt | 2 +- .../diagnostics/tests/regressions/kt580.txt | 2 +- .../analyzeArgsInFreeExpressionPosition.txt | 2 +- .../inference/intersectionTypes.txt | 4 ++-- .../tests/smartCasts/inference/kt1355.txt | 2 +- .../allWarnings/suppressWarningsOnClass.txt | 2 +- .../suppressWarningsOnClassObject.txt | 2 +- .../suppressWarningsOnFunction.txt | 2 +- .../allWarnings/suppressWarningsOnObject.txt | 2 +- .../suppressWarningsOnParameter.txt | 2 +- .../suppressWarningsOnProperty.txt | 2 +- .../tests/suppress/manyWarnings/mixed.txt | 4 ++-- .../tests/suppress/manyWarnings/onClass.txt | 2 +- .../suppress/manyWarnings/onClassObject.txt | 2 +- .../suppress/manyWarnings/onFunction.txt | 2 +- .../tests/suppress/manyWarnings/onObject.txt | 2 +- .../suppress/manyWarnings/onParameter.txt | 2 +- .../suppress/manyWarnings/onProperty.txt | 2 +- .../tests/suppress/oneWarning/onClass.txt | 2 +- .../suppress/oneWarning/onClassObject.txt | 2 +- .../tests/suppress/oneWarning/onFunction.txt | 2 +- .../tests/suppress/oneWarning/onObject.txt | 2 +- .../tests/suppress/oneWarning/onParameter.txt | 2 +- .../tests/suppress/oneWarning/onProperty.txt | 2 +- .../tests/varargs/AmbiguousVararg.txt | 2 +- .../MoreSpecificVarargsOfEqualLength.txt | 4 ++-- .../diagnostics/tests/varargs/kt422.txt | 4 ++-- .../tests/varargs/varargIterator.txt | 4 ++-- .../tests/varargs/varargsAndPair.txt | 2 +- .../diagnostics/tests/variance/Class.txt | 2 +- .../diagnostics/tests/variance/InPosition.txt | 2 +- .../tests/variance/OutPosition.txt | 2 +- .../diagnostics/tests/variance/Visibility.txt | 2 +- .../dynamicTypes/varargs.txt | 2 +- .../vararg.txt | 10 ++++---- 99 files changed, 143 insertions(+), 143 deletions(-) diff --git a/compiler/testData/cfg-variables/basic/IfWithUninitialized.values b/compiler/testData/cfg-variables/basic/IfWithUninitialized.values index 3b520035ad9..56802f4f203 100644 --- a/compiler/testData/cfg-variables/basic/IfWithUninitialized.values +++ b/compiler/testData/cfg-variables/basic/IfWithUninitialized.values @@ -9,21 +9,21 @@ fun foo() { } } --------------------- -1 : {<: Comparable} NEW: r(1) -> -2 : Int NEW: r(2) -> -1 < 2 : Boolean NEW: call(1 < 2, compareTo|, ) -> -b : * NEW: r(b) -> -use(b) : * NEW: call(use(b), use|) -> -{ use(b) } : * COPY -true : Boolean NEW: r(true) -> -b = true !: * -{ b = true } !: * COPY +1 : {<: Comparable} NEW: r(1) -> +2 : Int NEW: r(2) -> +1 < 2 : Boolean NEW: call(1 < 2, compareTo|, ) -> +b : * NEW: r(b) -> +use(b) : * NEW: call(use(b), use|) -> +{ use(b) } : * COPY +true : Boolean NEW: r(true) -> +b = true !: * +{ b = true } !: * COPY if (1 < 2) { use(b) } else { b = true } : * NEW: merge(if (1 < 2) { use(b) } else { b = true }|, !) -> -{ val b: Boolean if (1 < 2) { use(b) } else { b = true } } : * COPY +{ val b: Boolean if (1 < 2) { use(b) } else { b = true } } : * COPY ===================== == use == fun use(vararg a: Any?) = a --------------------- - : {<: Array} NEW: magic[FAKE_INITIALIZER](vararg a: Any?) -> -a : {<: Array} NEW: r(a) -> + : {<: Array} NEW: magic[FAKE_INITIALIZER](vararg a: Any?) -> +a : {<: Array} NEW: r(a) -> ===================== diff --git a/compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values b/compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values index 8c892930432..02a26ef3b5b 100644 --- a/compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values +++ b/compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values @@ -7,8 +7,8 @@ fun foo() { } } --------------------- -1 : Int NEW: r(1) -> -{ (x: Int) -> val y = x + a use(a) } : {<: (Int) -> Array} NEW: r({ (x: Int) -> val y = x + a use(a) }) -> +1 : Int NEW: r(1) -> +{ (x: Int) -> val y = x + a use(a) } : {<: (Int) -> Array} NEW: r({ (x: Int) -> val y = x + a use(a) }) -> ===================== == anonymous_0 == { (x: Int) -> @@ -16,17 +16,17 @@ fun foo() { use(a) } --------------------- - : Int NEW: magic[FAKE_INITIALIZER](x: Int) -> -x : Int NEW: r(x) -> -a : Int NEW: r(a) -> -x + a : Int NEW: call(x + a, plus|, ) -> -a : * NEW: r(a) -> -use(a) : {<: Array} NEW: call(use(a), use|) -> -val y = x + a use(a) : {<: Array} COPY + : Int NEW: magic[FAKE_INITIALIZER](x: Int) -> +x : Int NEW: r(x) -> +a : Int NEW: r(a) -> +x + a : Int NEW: call(x + a, plus|, ) -> +a : * NEW: r(a) -> +use(a) : {<: Array} NEW: call(use(a), use|) -> +val y = x + a use(a) : {<: Array} COPY ===================== == use == fun use(vararg a: Any?) = a --------------------- - : {<: Array} NEW: magic[FAKE_INITIALIZER](vararg a: Any?) -> -a : {<: Array} NEW: r(a) -> + : {<: Array} NEW: magic[FAKE_INITIALIZER](vararg a: Any?) -> +a : {<: Array} NEW: r(a) -> ===================== diff --git a/compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.values b/compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.values index 2133ae845e2..05d6e38dbed 100644 --- a/compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.values +++ b/compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.values @@ -36,6 +36,6 @@ for (i in numbers) { val b: Boolean if (1 < 2) { b = false } else { b = true } u == use == fun use(vararg a: Any?) = a --------------------- - : {<: Array} NEW: magic[FAKE_INITIALIZER](vararg a: Any?) -> -a : {<: Array} NEW: r(a) -> + : {<: Array} NEW: magic[FAKE_INITIALIZER](vararg a: Any?) -> +a : {<: Array} NEW: r(a) -> ===================== diff --git a/compiler/testData/diagnostics/tests/IllegalModifiers.txt b/compiler/testData/diagnostics/tests/IllegalModifiers.txt index 79f11c5e3b8..2c08c7af14f 100644 --- a/compiler/testData/diagnostics/tests/IllegalModifiers.txt +++ b/compiler/testData/diagnostics/tests/IllegalModifiers.txt @@ -75,10 +75,10 @@ package illegal_modifiers { internal abstract class IllegalModifiers5 { public constructor IllegalModifiers5() - internal abstract fun bar(/*0*/ a: kotlin.Int, /*1*/ vararg v: kotlin.String /*kotlin.Array*/): kotlin.Unit + internal abstract fun bar(/*0*/ a: kotlin.Int, /*1*/ vararg v: kotlin.String /*kotlin.Array*/): kotlin.Unit internal abstract fun baz(/*0*/ illegal_modifiers.annotated(text = "a text": kotlin.String) a: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - internal abstract fun foo(/*0*/ a: kotlin.Int, /*1*/ vararg v: kotlin.String /*kotlin.Array*/): kotlin.Unit + internal abstract fun foo(/*0*/ a: kotlin.Int, /*1*/ vararg v: kotlin.String /*kotlin.Array*/): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int private final fun qux(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/VarargTypes.txt b/compiler/testData/diagnostics/tests/VarargTypes.txt index 0b4108fd494..809eea7c13a 100644 --- a/compiler/testData/diagnostics/tests/VarargTypes.txt +++ b/compiler/testData/diagnostics/tests/VarargTypes.txt @@ -7,6 +7,6 @@ internal fun food(/*0*/ vararg a: kotlin.Double /*kotlin.DoubleArray*/): kotlin. internal fun foof(/*0*/ vararg a: kotlin.Float /*kotlin.FloatArray*/): kotlin.FloatArray internal fun fooi(/*0*/ vararg a: kotlin.Int /*kotlin.IntArray*/): kotlin.IntArray internal fun fool(/*0*/ vararg a: kotlin.Long /*kotlin.LongArray*/): kotlin.LongArray -internal fun foos(/*0*/ vararg a: kotlin.String /*kotlin.Array*/): kotlin.Array +internal fun foos(/*0*/ vararg a: kotlin.String /*kotlin.Array*/): kotlin.Array internal fun foos(/*0*/ vararg a: kotlin.Short /*kotlin.ShortArray*/): kotlin.ShortArray internal fun test(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/Varargs.txt b/compiler/testData/diagnostics/tests/Varargs.txt index 4c10aa06912..4595e673039 100644 --- a/compiler/testData/diagnostics/tests/Varargs.txt +++ b/compiler/testData/diagnostics/tests/Varargs.txt @@ -2,4 +2,4 @@ package internal fun test(): kotlin.Unit internal fun v(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String, /*2*/ vararg f: kotlin.Long /*kotlin.LongArray*/): kotlin.Unit -internal fun v1(/*0*/ vararg f: (kotlin.Int) -> kotlin.Unit /*kotlin.Array<(kotlin.Int) -> kotlin.Unit>*/): kotlin.Unit +internal fun v1(/*0*/ vararg f: (kotlin.Int) -> kotlin.Unit /*kotlin.Array kotlin.Unit>*/): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt index ecd55e4f728..b3c47576322 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.txt @@ -1,13 +1,13 @@ package package a { - java.lang.Deprecated() java.lang.SuppressWarnings(value = {}: kotlin.Array) internal val s: kotlin.String = "" - java.lang.Deprecated() java.lang.SuppressWarnings(value = {}: kotlin.Array) internal fun main(/*0*/ args: kotlin.Array): kotlin.Unit + java.lang.Deprecated() java.lang.SuppressWarnings(value = {}: kotlin.Array) internal val s: kotlin.String = "" + java.lang.Deprecated() java.lang.SuppressWarnings(value = {}: kotlin.Array) internal fun main(/*0*/ args: kotlin.Array): kotlin.Unit internal final class Test { - public constructor Test(/*0*/ java.lang.Deprecated() s: kotlin.String, /*1*/ java.lang.SuppressWarnings(value = {}: kotlin.Array) x: kotlin.Int) + public constructor Test(/*0*/ java.lang.Deprecated() s: kotlin.String, /*1*/ java.lang.SuppressWarnings(value = {}: kotlin.Array) x: kotlin.Int) java.lang.Deprecated() internal final val s: kotlin.String - java.lang.SuppressWarnings(value = {}: kotlin.Array) internal final val x: kotlin.Int + java.lang.SuppressWarnings(value = {}: kotlin.Array) internal final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt b/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt index 40bd48035d3..d89aa20b438 100644 --- a/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt +++ b/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt @@ -7,7 +7,7 @@ java.lang.annotation.Retention(value = RetentionPolicy.CLASS: java.lang.annotati public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) java.lang.annotation.Target(value = {ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR}: kotlin.Array) internal final annotation class my1 : kotlin.Annotation { +java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) java.lang.annotation.Target(value = {ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR}: kotlin.Array) internal final annotation class my1 : kotlin.Annotation { public constructor my1() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt b/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt index 9f3ec0643f7..662c2eb1ad0 100644 --- a/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt +++ b/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt @@ -1,4 +1,4 @@ -package +package package test { internal val some: test.SomeObject diff --git a/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt b/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt index f09544b082e..5718c8e41f1 100644 --- a/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt +++ b/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.txt @@ -1,4 +1,4 @@ -package +package package test { internal val some: test.SomeObject diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt index 08dfe8346a9..65763ee3097 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.txt @@ -4,8 +4,8 @@ internal val topLevel: kotlin.String = "topLevel" internal fun foo(): kotlin.Unit internal final annotation class Ann : kotlin.Annotation { - public constructor Ann(/*0*/ vararg i: kotlin.String /*kotlin.Array*/) - internal final val i: kotlin.Array + public constructor Ann(/*0*/ vararg i: kotlin.String /*kotlin.Array*/) + internal final val i: kotlin.Array public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt index 54dce29ca26..e04881c9ff3 100644 --- a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt +++ b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt @@ -84,11 +84,11 @@ package test { } internal final annotation class Ann9 : kotlin.Annotation { - public constructor Ann9(/*0*/ vararg p1: kotlin.String /*kotlin.Array*/, /*1*/ vararg p2: java.lang.Class /*kotlin.Array>*/, /*2*/ vararg p3: test.MyEnum /*kotlin.Array*/, /*3*/ vararg p4: test.Ann1 /*kotlin.Array*/, /*4*/ vararg p5: kotlin.Int /*kotlin.IntArray*/) - internal final val p1: kotlin.Array - internal final val p2: kotlin.Array> - internal final val p3: kotlin.Array - internal final val p4: kotlin.Array + public constructor Ann9(/*0*/ vararg p1: kotlin.String /*kotlin.Array*/, /*1*/ vararg p2: java.lang.Class /*kotlin.Array>*/, /*2*/ vararg p3: test.MyEnum /*kotlin.Array*/, /*3*/ vararg p4: test.Ann1 /*kotlin.Array*/, /*4*/ vararg p5: kotlin.Int /*kotlin.IntArray*/) + internal final val p1: kotlin.Array + internal final val p2: kotlin.Array> + internal final val p3: kotlin.Array + internal final val p4: kotlin.Array internal final val p5: kotlin.IntArray public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.txt b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.txt index 62c6873341d..077c73cb818 100644 --- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.txt +++ b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.txt @@ -1,7 +1,7 @@ package -internal fun array1(/*0*/ vararg a: T /*kotlin.Array*/): kotlin.Array -internal fun join(/*0*/ x: kotlin.Int, /*1*/ vararg a: kotlin.String /*kotlin.Array*/): kotlin.String -internal fun joinG(/*0*/ x: kotlin.Int, /*1*/ vararg a: T /*kotlin.Array*/): kotlin.String -internal fun joinT(/*0*/ x: kotlin.Int, /*1*/ vararg a: T /*kotlin.Array*/): T? +internal fun array1(/*0*/ vararg a: T /*kotlin.Array*/): kotlin.Array +internal fun join(/*0*/ x: kotlin.Int, /*1*/ vararg a: kotlin.String /*kotlin.Array*/): kotlin.String +internal fun joinG(/*0*/ x: kotlin.Int, /*1*/ vararg a: T /*kotlin.Array*/): kotlin.String +internal fun joinT(/*0*/ x: kotlin.Int, /*1*/ vararg a: T /*kotlin.Array*/): T? internal fun main(/*0*/ args: kotlin.Array): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt b/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt index 4c99fc4711e..2f22e0e10eb 100644 --- a/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt +++ b/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt @@ -1,4 +1,4 @@ -package +package package test { internal fun testFun(/*0*/ a: kotlin.Int): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt index fc2d3a9e327..002ee16cab6 100644 --- a/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt @@ -1,4 +1,4 @@ -package +package package test { diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.txt index aac7c6742fe..63efd057013 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.txt @@ -1,4 +1,4 @@ package internal fun foo(/*0*/ numbers: kotlin.Collection): kotlin.Unit -internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array +internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array diff --git a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.txt b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.txt index d5924920c51..69b3ac032e6 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.txt +++ b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.txt @@ -2,7 +2,7 @@ package package a { internal fun test(/*0*/ mc1: a.MyClass, /*1*/ mc2: a.MyClass2): kotlin.Unit - internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array + internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array internal fun a.MyClass2.component1(): kotlin.Double internal fun a.MyClass2.component1(): kotlin.Double diff --git a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.txt b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.txt index 7e9caa71619..2850e0068dd 100644 --- a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.txt +++ b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.txt @@ -3,5 +3,5 @@ package package m { internal fun foo(/*0*/ i: kotlin.Int): kotlin.Int internal fun test(/*0*/ i: kotlin.Int?): kotlin.Unit - internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array + internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array } diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.txt index 851ac8eb595..40c4e0ff61a 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.txt @@ -1,6 +1,6 @@ package internal fun foo(/*0*/ x: kotlin.Array): kotlin.Unit -internal fun foo(/*0*/ vararg x: kotlin.Int? /*kotlin.Array*/): kotlin.Unit +internal fun foo(/*0*/ vararg x: kotlin.Int? /*kotlin.Array*/): kotlin.Unit internal fun foo(/*0*/ vararg x: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit internal fun foo(/*0*/ x: kotlin.IntArray): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.txt b/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.txt index 43cf27f68b0..8702638c465 100644 --- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.txt +++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.txt @@ -2,4 +2,4 @@ package kotlin.inline() internal fun bar(/*0*/ x: T1, /*1*/ y: T2): T2 internal fun box(): kotlin.Unit -kotlin.inline() internal fun foo(/*0*/ z: R): R \ No newline at end of file +kotlin.inline() internal fun foo(/*0*/ z: R): R diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.txt b/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.txt index 06ea686575f..8ce1b398c22 100644 --- a/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.txt +++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.txt @@ -1,3 +1,3 @@ package -kotlin.inline() internal fun foo(/*0*/ x: T): kotlin.Unit \ No newline at end of file +kotlin.inline() internal fun foo(/*0*/ x: T): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/NotInlineableReified.txt b/compiler/testData/diagnostics/tests/generics/tpAsReified/NotInlineableReified.txt index 5ab5fda4f11..24d30332ae4 100644 --- a/compiler/testData/diagnostics/tests/generics/tpAsReified/NotInlineableReified.txt +++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/NotInlineableReified.txt @@ -1,3 +1,3 @@ package -internal fun foo(): kotlin.Unit \ No newline at end of file +internal fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.txt b/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.txt index c89b8583492..f805f279cbf 100644 --- a/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.txt +++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.txt @@ -6,4 +6,4 @@ internal final class A { internal final fun foo(): T2 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/imports/importFunctionWithAllUnderImportAfterNamedImport.txt b/compiler/testData/diagnostics/tests/imports/importFunctionWithAllUnderImportAfterNamedImport.txt index bedd9fddc6f..07c5bef23a3 100644 --- a/compiler/testData/diagnostics/tests/imports/importFunctionWithAllUnderImportAfterNamedImport.txt +++ b/compiler/testData/diagnostics/tests/imports/importFunctionWithAllUnderImportAfterNamedImport.txt @@ -1,4 +1,4 @@ -package +package package test { internal val a: [ERROR : Type for TestFun()] diff --git a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.txt b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.txt index af3b11914c4..3c4c8086991 100644 --- a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.txt +++ b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.txt @@ -2,6 +2,6 @@ package package d { internal fun joinT(/*0*/ x: kotlin.Any, /*1*/ y: T): T? - internal fun joinT(/*0*/ x: kotlin.Int, /*1*/ vararg a: T /*kotlin.Array*/): T? + internal fun joinT(/*0*/ x: kotlin.Int, /*1*/ vararg a: T /*kotlin.Array*/): T? internal fun test(): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.txt b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.txt index 861caeb7160..0007e5e057d 100644 --- a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.txt +++ b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.txt @@ -6,7 +6,7 @@ package a { internal fun getMyListToWriteTo(/*0*/ t: T): a.MyList internal fun readFromMyList(/*0*/ l: a.MyList, /*1*/ t: T): kotlin.Unit internal fun test1(/*0*/ int: kotlin.Int, /*1*/ any: kotlin.Any): kotlin.Unit - internal fun use(/*0*/ vararg a: kotlin.Any /*kotlin.Array*/): kotlin.Array + internal fun use(/*0*/ vararg a: kotlin.Any /*kotlin.Array*/): kotlin.Array internal fun useMyList(/*0*/ l: a.MyList, /*1*/ t: T): kotlin.Unit internal fun writeToMyList(/*0*/ l: a.MyList, /*1*/ t: T): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inference/listConstructor.txt b/compiler/testData/diagnostics/tests/inference/listConstructor.txt index b33189b314b..76cc056cfe3 100644 --- a/compiler/testData/diagnostics/tests/inference/listConstructor.txt +++ b/compiler/testData/diagnostics/tests/inference/listConstructor.txt @@ -1,7 +1,7 @@ package package a { - internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList + internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList internal fun cons(/*0*/ x: A, /*1*/ xs: kotlin.List): kotlin.List internal fun nil(): kotlin.List internal fun test(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inference/mapFunction.txt b/compiler/testData/diagnostics/tests/inference/mapFunction.txt index fe116fcb285..2268ddbdbd1 100644 --- a/compiler/testData/diagnostics/tests/inference/mapFunction.txt +++ b/compiler/testData/diagnostics/tests/inference/mapFunction.txt @@ -1,7 +1,7 @@ package package a { - internal fun array(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array + internal fun array(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array internal fun foo(): kotlin.Unit internal fun kotlin.Array.map(/*0*/ transform: (T) -> R): kotlin.List internal fun kotlin.Iterable.map(/*0*/ transform: (T) -> R): kotlin.List diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.txt b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.txt index 3c0b09ee2f6..688cb0a2b15 100644 --- a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.txt +++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.txt @@ -10,7 +10,7 @@ package h { internal fun test4(/*0*/ collection: kotlin.Collection>): kotlin.Unit internal fun test5(): kotlin.Unit internal fun toBeOrNot(): kotlin.Boolean - internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array + internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array internal fun h.Z.compareTo(/*0*/ a: h.A): kotlin.Int internal fun h.Z.equals(/*0*/ any: kotlin.Any): kotlin.Int internal fun h.Z.foo(/*0*/ a: h.A): h.A diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.txt b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.txt index 313da06a7f5..f67510866b7 100644 --- a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.txt +++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.txt @@ -2,7 +2,7 @@ package package b { internal fun foo(/*0*/ t: T): T - internal fun mapOf(/*0*/ vararg values: b.Pair /*kotlin.Array>*/): kotlin.Map + internal fun mapOf(/*0*/ vararg values: b.Pair /*kotlin.Array>*/): kotlin.Map internal fun println(/*0*/ message: kotlin.Any?): kotlin.Unit public fun query(/*0*/ t: T, /*1*/ args: kotlin.Map): kotlin.List internal fun test(/*0*/ pair: b.Pair): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inference/regressions/compareBy.txt b/compiler/testData/diagnostics/tests/inference/regressions/compareBy.txt index 5160f81ed32..e3e04589def 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/compareBy.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/compareBy.txt @@ -1,6 +1,6 @@ package -internal fun compareBy(/*0*/ a: T?, /*1*/ b: T?, /*2*/ vararg functions: T.() -> kotlin.Comparable? /*kotlin.Array kotlin.Comparable?>*/): kotlin.Int +internal fun compareBy(/*0*/ a: T?, /*1*/ b: T?, /*2*/ vararg functions: T.() -> kotlin.Comparable? /*kotlin.Array kotlin.Comparable?>*/): kotlin.Int internal final class Item : kotlin.Comparable { public constructor Item(/*0*/ name: kotlin.String, /*1*/ rating: kotlin.Int) diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.txt index 0d5893e45a0..ac456b4b349 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.txt @@ -1,7 +1,7 @@ package package n { - internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList + internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList internal fun test(): kotlin.Unit internal fun kotlin.Iterable.plus(/*0*/ elements: kotlin.Iterable): kotlin.List } diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.txt index aa0228f37c0..d8656016264 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.txt @@ -2,7 +2,7 @@ package package i { internal val kotlin.Collection.size: kotlin.Int - internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList + internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList internal fun test(): kotlin.Unit internal fun kotlin.Collection.map(/*0*/ transform: (T) -> R): kotlin.List internal fun > kotlin.Collection.mapTo(/*0*/ result: C, /*1*/ transform: (T) -> R): C diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.txt index 78bbcf60836..d937d49e320 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.txt @@ -1,6 +1,6 @@ package package n { - internal fun array(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array + internal fun array(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array internal fun main(/*0*/ args: kotlin.Array): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2294.txt index e305fb658d8..07ae225c6c5 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2294.txt @@ -1,7 +1,7 @@ package package a { - internal fun array(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array + internal fun array(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array public fun foo(/*0*/ array: kotlin.Array): kotlin.Array public fun test(): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.txt index 69dd86bdada..00313c7dd69 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.txt @@ -1,7 +1,7 @@ package package i { - internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList + internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList internal fun assertEquals(/*0*/ expected: kotlin.Any?, /*1*/ actual: kotlin.Any?, /*2*/ message: kotlin.String = ...): kotlin.Unit internal fun someFunction(/*0*/ list: kotlin.List, /*1*/ transform: (T) -> K): kotlin.List internal fun testSomeFunction(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.txt index dbbfd731b82..8c3ea8d8d88 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.txt @@ -1,7 +1,7 @@ package package n { - internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList + internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList internal fun test(): kotlin.Unit internal fun kotlin.Iterable.fold(/*0*/ initial: T, /*1*/ operation: (T, T) -> T): T internal fun kotlin.Collection.map(/*0*/ transform: (T) -> R): kotlin.List diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2459.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2459.txt index e7484427a8f..f8e914e6a0f 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt2459.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2459.txt @@ -1,7 +1,7 @@ package package b { - internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList + internal fun arrayList(/*0*/ vararg values: T /*kotlin.Array*/): java.util.ArrayList internal fun f(/*0*/ x: T): b.B internal final class B { diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.txt index a198edc2cf9..d5ee5d1432a 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.txt @@ -1,7 +1,7 @@ package package a { - internal fun _arrayList(/*0*/ vararg values: T /*kotlin.Array*/): kotlin.List + internal fun _arrayList(/*0*/ vararg values: T /*kotlin.Array*/): kotlin.List internal fun test(): kotlin.Unit internal fun > kotlin.Iterable._sortBy(/*0*/ f: (T) -> R): kotlin.List diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt index 4940cc7cba2..4c61c5ed89a 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.txt @@ -3,7 +3,7 @@ package package a { internal fun hello(): kotlin.Unit internal fun inferenceTest(/*0*/ a: T): T - internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array + internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array internal final enum class TestEnum : kotlin.Enum { public enum entry FIRST : a.TestEnum { diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3301.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3301.txt index b3ebd19e20c..66afdc37f33 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt3301.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3301.txt @@ -1,7 +1,7 @@ package package arrays { - internal fun array(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array + internal fun array(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array internal fun m(/*0*/ args: kotlin.Array): kotlin.Unit internal fun test122(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.txt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.txt index 02c39b23417..4e53648ed1b 100644 --- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.txt +++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.txt @@ -1,7 +1,7 @@ package package a { - internal fun arrayListOf(/*0*/ vararg values: T /*kotlin.Array*/): kotlin.MutableList + internal fun arrayListOf(/*0*/ vararg values: T /*kotlin.Array*/): kotlin.MutableList internal fun bar(/*0*/ r: kotlin.MutableList, /*1*/ f: () -> R): kotlin.Boolean internal fun foo(/*0*/ f: () -> R, /*1*/ r: kotlin.MutableList): kotlin.Boolean internal fun test(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.txt b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.txt index 4d8c708e98f..1f7f61ace34 100644 --- a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.txt +++ b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.txt @@ -7,7 +7,7 @@ package typeInferenceExpectedTypeMismatch { internal fun test(): kotlin.Unit internal fun test1(/*0*/ outA: typeInferenceExpectedTypeMismatch.Out, /*1*/ inB: typeInferenceExpectedTypeMismatch.In): kotlin.Unit internal fun test2(/*0*/ outA: typeInferenceExpectedTypeMismatch.Out, /*1*/ inC: typeInferenceExpectedTypeMismatch.In): kotlin.Unit - internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array + internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array internal trait A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.txt b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.txt index 075df7ba68e..19196a5c3ea 100644 --- a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.txt +++ b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.txt @@ -5,7 +5,7 @@ package s { internal fun foo(/*0*/ in1: s.In, /*1*/ in2: s.In): T internal fun test(/*0*/ inA: s.In): kotlin.Unit internal fun test(/*0*/ inA: s.In, /*1*/ inB: s.In, /*2*/ inC: s.In): kotlin.Unit - internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array + internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array internal trait A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.txt b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.txt index 8b8bd5c126b..f79b1437bff 100644 --- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.txt +++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.txt @@ -1,7 +1,7 @@ package package a { - internal fun arrayListOf(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.MutableList + internal fun arrayListOf(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.MutableList internal fun bar(/*0*/ v: V, /*1*/ u: U): U internal fun baz(/*0*/ v: V, /*1*/ u: kotlin.MutableSet): kotlin.MutableSet internal fun checkItIsExactlyAny(/*0*/ t: T, /*1*/ l: kotlin.MutableList): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.txt index dc0e45e33d7..5819ec11199 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.txt @@ -1,4 +1,4 @@ package kotlin.inline() internal fun inlineFun(/*0*/ p: () -> R): kotlin.Unit -kotlin.inline() internal fun inlineFunOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit +kotlin.inline() internal fun inlineFunOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.txt index 1b3c7fce071..96e62984331 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.txt @@ -2,4 +2,4 @@ package kotlin.inline() internal fun doCall(/*0*/ p: () -> R): kotlin.Unit kotlin.inline() internal fun inlineFun(/*0*/ p: () -> R): kotlin.Unit -kotlin.inline() internal fun inlineFunOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit +kotlin.inline() internal fun inlineFunOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.txt index 8f84a150f0e..ac811c189b9 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.txt @@ -1,4 +1,4 @@ package kotlin.inline() internal fun inlineAll(/*0*/ p: () -> R): kotlin.Unit -kotlin.inline() internal fun onlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit +kotlin.inline() internal fun onlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.txt index 85bc16a54ad..2426c69366a 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.txt @@ -2,4 +2,4 @@ package kotlin.inline() internal fun inlineFun(/*0*/ p: () -> R): kotlin.Unit kotlin.inline() internal fun inlineFun2(/*0*/ p: () -> R): kotlin.Unit -kotlin.inline() internal fun inlineFunWithAnnotation(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit +kotlin.inline() internal fun inlineFunWithAnnotation(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.txt index bd7dd5b5897..4b789b27f12 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.txt @@ -1,4 +1,4 @@ package -kotlin.inline() internal fun doWork(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) job: () -> R): R +kotlin.inline() internal fun doWork(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) job: () -> R): R kotlin.inline() internal fun testSameCaptured(/*0*/ lambdaWithResultCaptured: () -> kotlin.Unit): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.txt index dc0e45e33d7..5819ec11199 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.txt @@ -1,4 +1,4 @@ package kotlin.inline() internal fun inlineFun(/*0*/ p: () -> R): kotlin.Unit -kotlin.inline() internal fun inlineFunOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit +kotlin.inline() internal fun inlineFunOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.txt index dc0e45e33d7..5819ec11199 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.txt @@ -1,4 +1,4 @@ package kotlin.inline() internal fun inlineFun(/*0*/ p: () -> R): kotlin.Unit -kotlin.inline() internal fun inlineFunOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit +kotlin.inline() internal fun inlineFunOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.txt index dc0e45e33d7..5819ec11199 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.txt @@ -1,4 +1,4 @@ package kotlin.inline() internal fun inlineFun(/*0*/ p: () -> R): kotlin.Unit -kotlin.inline() internal fun inlineFunOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit +kotlin.inline() internal fun inlineFunOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.txt index c19c066522a..7d39c20eb2c 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.txt @@ -6,4 +6,4 @@ internal fun fun3(/*0*/ p: () -> R): kotlin.Unit internal fun fun3ValueArgument(/*0*/ p: () -> R): kotlin.Unit internal fun fun4(/*0*/ p: () -> R): kotlin.Unit internal fun fun4ValueArgument(/*0*/ p: () -> R): kotlin.Unit -kotlin.inline() internal fun inlineFun(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit +kotlin.inline() internal fun inlineFun(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.txt index 16cd7efc290..43298e0c4b5 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.txt @@ -8,6 +8,6 @@ internal final class Z { public constructor Z() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - kotlin.inline() internal final fun inlineFun(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit + kotlin.inline() internal final fun inlineFun(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.txt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.txt index 5b2423fee1b..3caf1f16bb4 100644 --- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.txt +++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.txt @@ -1,4 +1,4 @@ package kotlin.inline() internal fun inlineAll(/*0*/ p: () -> R): kotlin.Unit -kotlin.inline() internal fun toOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit +kotlin.inline() internal fun toOnlyLocal(/*0*/ kotlin.inlineOptions(value = {InlineOption.ONLY_LOCAL_RETURN}: kotlin.Array) p: () -> R): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inline/vararg.txt b/compiler/testData/diagnostics/tests/inline/vararg.txt index 365572f0256..0ca0470ac5e 100644 --- a/compiler/testData/diagnostics/tests/inline/vararg.txt +++ b/compiler/testData/diagnostics/tests/inline/vararg.txt @@ -1,6 +1,6 @@ package kotlin.inline() internal fun inlineFun(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ kotlin.noinline() b: (kotlin.Int) -> kotlin.Unit): kotlin.Unit -kotlin.inline() internal fun subInline(/*0*/ vararg s: (kotlin.Int) -> kotlin.Unit /*kotlin.Array<(kotlin.Int) -> kotlin.Unit>*/): kotlin.Unit -internal fun subNoInline(/*0*/ vararg s: (kotlin.Int) -> kotlin.Unit /*kotlin.Array<(kotlin.Int) -> kotlin.Unit>*/): kotlin.Unit +kotlin.inline() internal fun subInline(/*0*/ vararg s: (kotlin.Int) -> kotlin.Unit /*kotlin.Array kotlin.Unit>*/): kotlin.Unit +internal fun subNoInline(/*0*/ vararg s: (kotlin.Int) -> kotlin.Unit /*kotlin.Array kotlin.Unit>*/): kotlin.Unit kotlin.inline() internal fun ((kotlin.Int) -> kotlin.Unit).inlineExt(/*0*/ s: (kotlin.Int) -> kotlin.Unit, /*1*/ kotlin.noinline() b: (kotlin.Int) -> kotlin.Unit): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inner/InnerClassNameClash.txt b/compiler/testData/diagnostics/tests/inner/InnerClassNameClash.txt index 9db4ad3a169..ec86557a8cb 100644 --- a/compiler/testData/diagnostics/tests/inner/InnerClassNameClash.txt +++ b/compiler/testData/diagnostics/tests/inner/InnerClassNameClash.txt @@ -1,4 +1,4 @@ -package +package package test { diff --git a/compiler/testData/diagnostics/tests/j+k/OverrideVararg.txt b/compiler/testData/diagnostics/tests/j+k/OverrideVararg.txt index d353d1add08..c329ec59f5c 100644 --- a/compiler/testData/diagnostics/tests/j+k/OverrideVararg.txt +++ b/compiler/testData/diagnostics/tests/j+k/OverrideVararg.txt @@ -11,7 +11,7 @@ public abstract class Aaa { internal final class Bbb : Aaa { public constructor Bbb() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ fun foo(/*0*/ vararg args: kotlin.String? /*kotlin.Array*/): kotlin.Unit + public open override /*1*/ fun foo(/*0*/ vararg args: kotlin.String? /*kotlin.Array*/): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt b/compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt index 6da21649582..d50a5a4e3c7 100644 --- a/compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt +++ b/compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt @@ -40,4 +40,4 @@ package frontend { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } } -} \ No newline at end of file +} diff --git a/compiler/testData/diagnostics/tests/kt310.txt b/compiler/testData/diagnostics/tests/kt310.txt index 9949eda0fbe..7992db9ea3a 100644 --- a/compiler/testData/diagnostics/tests/kt310.txt +++ b/compiler/testData/diagnostics/tests/kt310.txt @@ -1,3 +1,3 @@ -package +package internal fun f(/*0*/ c: kotlin.LongRange): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/library/Collections.txt b/compiler/testData/diagnostics/tests/library/Collections.txt index 0d8f0247b73..62a46ea25ca 100644 --- a/compiler/testData/diagnostics/tests/library/Collections.txt +++ b/compiler/testData/diagnostics/tests/library/Collections.txt @@ -1,7 +1,7 @@ package package collections { - internal fun array(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array + internal fun array(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array internal fun testCollection(/*0*/ c: kotlin.Collection, /*1*/ t: T): kotlin.Unit internal fun testList(/*0*/ l: kotlin.List, /*1*/ t: T): kotlin.Unit internal fun testMap(/*0*/ m: kotlin.Map): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.txt b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.txt index 1a4e51b4570..aede32f04e4 100644 --- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.txt +++ b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.txt @@ -12,7 +12,7 @@ package a { internal fun testLowerBound(/*0*/ cov: a.Cov, /*1*/ covN: a.Cov): kotlin.Unit internal fun testUpperBound(/*0*/ contrS: a.Contr, /*1*/ contrB: a.Contr, /*2*/ contrN: a.Contr): kotlin.Unit internal fun upperBound(/*0*/ t: T, /*1*/ l: a.Contr): T - internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array + internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array internal trait Contr { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.txt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.txt index b665579382a..637a0e6dc1d 100644 --- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.txt +++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.txt @@ -9,7 +9,7 @@ internal fun A.to(/*0*/ that: B): Pair public final class A { public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun get(/*0*/ vararg attrs: Pair /*kotlin.Array>*/): A + public final fun get(/*0*/ vararg attrs: Pair /*kotlin.Array>*/): A public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/override/OverrideWithErrors.txt b/compiler/testData/diagnostics/tests/override/OverrideWithErrors.txt index 5607dfcb1f9..20420acaa82 100644 --- a/compiler/testData/diagnostics/tests/override/OverrideWithErrors.txt +++ b/compiler/testData/diagnostics/tests/override/OverrideWithErrors.txt @@ -1,4 +1,4 @@ -package +package package test { diff --git a/compiler/testData/diagnostics/tests/regressions/kt580.txt b/compiler/testData/diagnostics/tests/regressions/kt580.txt index 4c1f52de1ac..d7dba7da5a6 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt580.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt580.txt @@ -7,7 +7,7 @@ package whats { package whats.the.difference { internal val kotlin.Array.indices: kotlin.IntRange internal val kotlin.Array.lastIndex: kotlin.Int - internal fun iarray(/*0*/ vararg a: kotlin.String /*kotlin.Array*/): kotlin.Array + internal fun iarray(/*0*/ vararg a: kotlin.String /*kotlin.Array*/): kotlin.Array internal fun main(): kotlin.Unit internal fun kotlin.Array.lastIndex(): kotlin.Int } diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt index b94773a5a70..70152b3b7ad 100644 --- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt +++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt @@ -1,7 +1,7 @@ package internal fun test(): kotlin.Unit -internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array +internal fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array*/): kotlin.Array internal final class A { public constructor A() diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.txt b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.txt index 3d337552c69..2ec397fa3e1 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.txt +++ b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.txt @@ -1,7 +1,7 @@ package package a { - internal fun arrayListOf(/*0*/ vararg values: T /*kotlin.Array*/): kotlin.MutableList + internal fun arrayListOf(/*0*/ vararg values: T /*kotlin.Array*/): kotlin.MutableList internal fun foo(/*0*/ t: T, /*1*/ l: kotlin.MutableList): T internal fun id(/*0*/ t: T): T internal fun rr(/*0*/ s: kotlin.String?): kotlin.Unit @@ -9,7 +9,7 @@ package a { internal fun testErrorMessages(/*0*/ a: a.A, /*1*/ ml: kotlin.MutableList): kotlin.Unit internal fun three(/*0*/ a: T, /*1*/ b: T, /*2*/ c: T): T internal fun two(/*0*/ u: T, /*1*/ v: T): T - internal fun use(/*0*/ vararg a: kotlin.Any /*kotlin.Array*/): kotlin.Array + internal fun use(/*0*/ vararg a: kotlin.Any /*kotlin.Array*/): kotlin.Array internal trait A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt index d357f4f95e6..dae6adf88f7 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt +++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt @@ -1,7 +1,7 @@ package package a { - internal fun arrayListOf(/*0*/ vararg values: T /*kotlin.Array*/): kotlin.MutableList + internal fun arrayListOf(/*0*/ vararg values: T /*kotlin.Array*/): kotlin.MutableList internal fun foo(/*0*/ map: kotlin.MutableMap, /*1*/ value: kotlin.String?): kotlin.Unit internal fun kotlin.MutableMap.set(/*0*/ key: K, /*1*/ value: V): V? diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.txt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.txt index 15b4838524f..32609ed1a4e 100644 --- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.txt +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.txt @@ -1,6 +1,6 @@ package -kotlin.suppress(names = {"warnings"}: kotlin.Array) internal final class C { +kotlin.suppress(names = {"warnings"}: kotlin.Array) internal final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(/*0*/ p: kotlin.String?): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.txt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.txt index aafe966f697..c4331fa8caf 100644 --- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.txt +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.txt @@ -6,7 +6,7 @@ internal final class C { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - kotlin.suppress(names = {"warnings"}: kotlin.Array) internal class object { + kotlin.suppress(names = {"warnings"}: kotlin.Array) internal class object { private constructor () internal final val foo: kotlin.String? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.txt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.txt index 117d6dec350..ef079d3c01d 100644 --- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.txt +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.txt @@ -3,7 +3,7 @@ package internal final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.suppress(names = {"warnings"}: kotlin.Array) internal final fun foo(/*0*/ p: kotlin.String?): kotlin.Unit + kotlin.suppress(names = {"warnings"}: kotlin.Array) internal final fun foo(/*0*/ p: kotlin.String?): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.txt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.txt index 70851890d97..4845fa8dacc 100644 --- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.txt +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.txt @@ -1,6 +1,6 @@ package -kotlin.suppress(names = {"warnings"}: kotlin.Array) internal object C { +kotlin.suppress(names = {"warnings"}: kotlin.Array) internal object C { private constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(/*0*/ p: kotlin.String?): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.txt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.txt index 537d3b302a2..0846b889e4b 100644 --- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.txt +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.txt @@ -3,7 +3,7 @@ package internal final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - internal final fun foo(/*0*/ kotlin.suppress(names = {"warnings"}: kotlin.Array) p: kotlin.String? = ...): kotlin.Unit + internal final fun foo(/*0*/ kotlin.suppress(names = {"warnings"}: kotlin.Array) p: kotlin.String? = ...): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.txt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.txt index 8a0cdbeae39..5993eaceed0 100644 --- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.txt +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.txt @@ -2,7 +2,7 @@ package internal final class C { public constructor C() - kotlin.suppress(names = {"warnings"}: kotlin.Array) internal final val foo: kotlin.String? + kotlin.suppress(names = {"warnings"}: kotlin.Array) internal final val foo: kotlin.String? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.txt b/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.txt index bf29504cab9..4b11629ff4a 100644 --- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.txt +++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.txt @@ -1,9 +1,9 @@ package -kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal final class C { +kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.suppress(names = {"UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal final fun foo(): kotlin.String? + kotlin.suppress(names = {"UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal final fun foo(): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.txt b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.txt index 7568558d0f4..3c7ab031280 100644 --- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.txt +++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.txt @@ -1,6 +1,6 @@ package -kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal final class C { +kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(): kotlin.String? diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.txt b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.txt index d50a6e330b5..23af91c28c9 100644 --- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.txt +++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.txt @@ -6,7 +6,7 @@ internal final class C { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal class object { + kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal class object { private constructor () internal final val foo: kotlin.String? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.txt b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.txt index 008954c9076..d52fa1405ff 100644 --- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.txt +++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.txt @@ -3,7 +3,7 @@ package internal final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal final fun foo(): kotlin.String? + kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal final fun foo(): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.txt b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.txt index bea4208645f..3bdcd9cc0ad 100644 --- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.txt +++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.txt @@ -1,6 +1,6 @@ package -kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal object C { +kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal object C { private constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(): kotlin.String? diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.txt b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.txt index c2f16510342..62062f20944 100644 --- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.txt +++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.txt @@ -3,7 +3,7 @@ package internal final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - internal final fun foo(/*0*/ kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) p: kotlin.String? = ...): kotlin.String? + internal final fun foo(/*0*/ kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) p: kotlin.String? = ...): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.txt b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.txt index c20d32c5b2c..16d4baa8761 100644 --- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.txt +++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.txt @@ -2,7 +2,7 @@ package internal final class C { public constructor C() - kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal final val foo: kotlin.String? + kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal final val foo: kotlin.String? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.txt b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.txt index d30fb6da480..dd3782ccc2d 100644 --- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.txt +++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.txt @@ -1,6 +1,6 @@ package -kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal final class C { +kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(): kotlin.String? diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.txt b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.txt index 28c4ffd478d..bbea15827ce 100644 --- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.txt +++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.txt @@ -6,7 +6,7 @@ internal final class C { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal class object { + kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal class object { private constructor () internal final val foo: kotlin.String? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.txt b/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.txt index eb43f9d5a8e..1c92466e71d 100644 --- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.txt +++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.txt @@ -3,7 +3,7 @@ package internal final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal final fun foo(): kotlin.String? + kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal final fun foo(): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.txt b/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.txt index 0631711435a..e4b904e54f1 100644 --- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.txt +++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.txt @@ -1,6 +1,6 @@ package -kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal object C { +kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal object C { private constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(): kotlin.String? diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.txt b/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.txt index ac81889e164..53ad9bc5a82 100644 --- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.txt +++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.txt @@ -3,7 +3,7 @@ package internal final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - internal final fun foo(/*0*/ kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) p: kotlin.String? = ...): kotlin.String? + internal final fun foo(/*0*/ kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) p: kotlin.String? = ...): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.txt b/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.txt index 425d429ab72..340763ed2ef 100644 --- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.txt +++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.txt @@ -2,7 +2,7 @@ package internal final class C { public constructor C() - kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal final val foo: kotlin.String? + kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal final val foo: kotlin.String? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.txt b/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.txt index 920f98ab611..e081df7786b 100644 --- a/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.txt +++ b/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.txt @@ -1,5 +1,5 @@ package -internal fun foo(/*0*/ vararg t: kotlin.String /*kotlin.Array*/): kotlin.String +internal fun foo(/*0*/ vararg t: kotlin.String /*kotlin.Array*/): kotlin.String internal fun foo(/*0*/ vararg t: kotlin.Int /*kotlin.IntArray*/): kotlin.String internal fun test(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.txt b/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.txt index ae4d8e356e3..6b3f165a12e 100644 --- a/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.txt +++ b/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.txt @@ -5,8 +5,8 @@ internal fun main(/*0*/ d: D): kotlin.Unit internal final class D { public constructor D() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - internal final fun from(/*0*/ vararg a: kotlin.Any /*kotlin.Array*/): kotlin.Unit - internal final fun from(/*0*/ vararg a: kotlin.String /*kotlin.Array*/): kotlin.Unit + internal final fun from(/*0*/ vararg a: kotlin.Any /*kotlin.Array*/): kotlin.Unit + internal final fun from(/*0*/ vararg a: kotlin.String /*kotlin.Array*/): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/varargs/kt422.txt b/compiler/testData/diagnostics/tests/varargs/kt422.txt index a44fe8309fd..231c93069e4 100644 --- a/compiler/testData/diagnostics/tests/varargs/kt422.txt +++ b/compiler/testData/diagnostics/tests/varargs/kt422.txt @@ -1,8 +1,8 @@ package -internal fun array(/*0*/ vararg elements: T /*kotlin.Array*/): kotlin.Array +internal fun array(/*0*/ vararg elements: T /*kotlin.Array*/): kotlin.Array internal fun array(/*0*/ vararg elements: kotlin.Int /*kotlin.IntArray*/): kotlin.IntArray -internal fun foo(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array +internal fun foo(/*0*/ vararg t: T /*kotlin.Array*/): kotlin.Array internal fun foo(/*0*/ vararg a: kotlin.Int /*kotlin.IntArray*/): kotlin.IntArray internal fun foo(/*0*/ vararg a: kotlin.Long /*kotlin.LongArray*/): kotlin.LongArray internal fun test(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/varargs/varargIterator.txt b/compiler/testData/diagnostics/tests/varargs/varargIterator.txt index 94e926dd2e7..ad2dbb6c7c7 100644 --- a/compiler/testData/diagnostics/tests/varargs/varargIterator.txt +++ b/compiler/testData/diagnostics/tests/varargs/varargIterator.txt @@ -1,9 +1,9 @@ -package +package package test { internal final class CompositeIterator { - public constructor CompositeIterator(/*0*/ vararg iterators: java.util.Iterator /*kotlin.Array>*/) + public constructor CompositeIterator(/*0*/ vararg iterators: java.util.Iterator /*kotlin.Array>*/) internal final val iteratorsIter: kotlin.Iterator> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/varargs/varargsAndPair.txt b/compiler/testData/diagnostics/tests/varargs/varargsAndPair.txt index 0b519c6d036..d2720150d8d 100644 --- a/compiler/testData/diagnostics/tests/varargs/varargsAndPair.txt +++ b/compiler/testData/diagnostics/tests/varargs/varargsAndPair.txt @@ -1,6 +1,6 @@ package -internal fun foo(/*0*/ vararg ts: T /*kotlin.Array*/): T? +internal fun foo(/*0*/ vararg ts: T /*kotlin.Array*/): T? internal fun test(): kotlin.Unit internal final class Pair { diff --git a/compiler/testData/diagnostics/tests/variance/Class.txt b/compiler/testData/diagnostics/tests/variance/Class.txt index a0c42d657fe..554bd02b7ed 100644 --- a/compiler/testData/diagnostics/tests/variance/Class.txt +++ b/compiler/testData/diagnostics/tests/variance/Class.txt @@ -1,4 +1,4 @@ -package +package internal trait In { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/variance/InPosition.txt b/compiler/testData/diagnostics/tests/variance/InPosition.txt index b4eeeafd87f..da4ab828be8 100644 --- a/compiler/testData/diagnostics/tests/variance/InPosition.txt +++ b/compiler/testData/diagnostics/tests/variance/InPosition.txt @@ -1,4 +1,4 @@ -package +package internal trait In { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/variance/OutPosition.txt b/compiler/testData/diagnostics/tests/variance/OutPosition.txt index edbf17fe02e..b1db67127f4 100644 --- a/compiler/testData/diagnostics/tests/variance/OutPosition.txt +++ b/compiler/testData/diagnostics/tests/variance/OutPosition.txt @@ -1,4 +1,4 @@ -package +package internal trait In { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/variance/Visibility.txt b/compiler/testData/diagnostics/tests/variance/Visibility.txt index b8b35c8f86f..8e04b04e237 100644 --- a/compiler/testData/diagnostics/tests/variance/Visibility.txt +++ b/compiler/testData/diagnostics/tests/variance/Visibility.txt @@ -1,4 +1,4 @@ -package +package internal trait Test { internal abstract var interlan_private_set: O diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.txt index d5238f236c1..9cc4acaf07a 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.txt @@ -1,4 +1,4 @@ package internal fun test(): kotlin.Unit -internal fun v(/*0*/ vararg d: dynamic /*kotlin.Array*/): kotlin.Unit +internal fun v(/*0*/ vararg d: dynamic /*kotlin.Array*/): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt index 33c7c994a9e..b64e7978488 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.txt @@ -16,16 +16,16 @@ internal final annotation class Ann : kotlin.Annotation { } internal final annotation class AnnAnn : kotlin.Annotation { - public constructor AnnAnn(/*0*/ vararg i: Ann /*kotlin.Array*/) - internal final val i: kotlin.Array + public constructor AnnAnn(/*0*/ vararg i: Ann /*kotlin.Array*/) + internal final val i: kotlin.Array public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } internal final annotation class AnnJC : kotlin.Annotation { - public constructor AnnJC(/*0*/ vararg i: java.lang.Class /*kotlin.Array>*/) - internal final val i: kotlin.Array> + public constructor AnnJC(/*0*/ vararg i: java.lang.Class /*kotlin.Array>*/) + internal final val i: kotlin.Array> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -45,7 +45,7 @@ AnnAnn(i = {Ann(i = {IntegerValueType(1)}: kotlin.IntArray)}: kotlin.Array) public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -AnnJC(i = {Test.class}: kotlin.Array>) AnnJC(i = {}: kotlin.Array>) internal final class TestJC { +AnnJC(i = {Test.class}: kotlin.Array>) AnnJC(i = {}: kotlin.Array>) internal final class TestJC { public constructor TestJC() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int