From d2592e4a2c8084fdd7611f67119676d50ad8aa87 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 1 Jun 2015 17:30:02 +0300 Subject: [PATCH] Companion objects have public visibility by default #KT-7114 Fixed --- .../kotlin/resolve/ModifiersChecker.java | 6 +-- .../invoke/onObjects/invokeOnClassObject1.txt | 2 +- .../invoke/onObjects/invokeOnClassObject2.txt | 2 +- .../invokeOnClassObjectOfNestedClass1.txt | 2 +- .../invokeOnClassObjectOfNestedClass2.txt | 2 +- .../diagnostics/tests/MultipleBounds.txt | 2 +- .../tests/annotations/annotationModifier.txt | 2 +- .../tests/annotations/bracketsDeprecation.txt | 2 +- .../annotations/kt1886annotationBody.txt | 2 +- .../function/innerConstructorFromClass.txt | 2 +- .../function/nestedConstructorFromClass.txt | 2 +- .../tests/cast/WhenWithExpression.txt | 2 +- .../ClassObjectCannotAccessClassFields.txt | 2 +- .../tests/classObjects/ClassObjects.txt | 12 +++--- .../InnerClassAccessThroughClassObject.txt | 2 +- .../classObjects/InnerClassClassObject.txt | 10 ++--- .../tests/classObjects/classObjectHeader.txt | 2 +- .../classObjects/classObjectRedeclaration.txt | 6 +-- ...companionObjectOfPrivateClassVisibility.kt | 19 +++++++++ ...ompanionObjectOfPrivateClassVisibility.txt | 35 ++++++++++++++++ .../classObjects/importClassInClassObject.txt | 2 +- .../classObjects/invisibleClassObjects.txt | 4 +- .../diagnostics/tests/classObjects/kt3866.txt | 4 +- .../multipleDissallowedDefaultObjects.txt | 12 +++--- .../nestedClassInPrivateClassObject.txt | 2 +- .../resolveFunctionInsideClassObject.txt | 2 +- .../UninitializedOrReassignedVariables.txt | 2 +- .../tests/controlFlowAnalysis/kt1185enums.txt | 2 +- .../SmartcastsForStableIdentifiers.txt | 2 +- .../illegalModifiersOnClass.txt | 8 ++-- .../tests/deprecated/nestedTypesUsage.txt | 2 +- .../tests/deprecated/objectUsage.txt | 2 +- .../functionAndProperty/classObject.txt | 2 +- .../specialNames/classObject.txt | 4 +- .../specialNames/classObjectCopiedField.txt | 2 +- .../classObjectCopiedFieldObject.txt | 6 +-- .../tests/enum/classObjectInEnum.txt | 2 +- .../tests/enum/enumEntriesAtTheEnd.txt | 2 +- .../diagnostics/tests/enum/enumMixed.txt | 2 +- .../tests/enum/enumMixedWithCommas.txt | 2 +- .../tests/enum/enumMixedWithSemicolons.txt | 2 +- .../diagnostics/tests/enum/enumModifier.txt | 2 +- .../tests/enum/inner/existingClassObject.txt | 4 +- .../tests/enum/inner/insideClassObject.txt | 2 +- .../enum/inner/redeclarationInClassObject.txt | 2 +- .../twoEnumsInClassObjectAndInnerClass.txt | 2 +- .../enum/starImportNestedClassAndEntries.txt | 2 +- .../valuesValueOfAndEntriesAccessibility.txt | 2 +- .../tests/extensions/classObject.txt | 4 +- .../extensionMemberInClassObject.txt | 2 +- .../diagnostics/tests/extensions/kt3470.txt | 2 +- .../diagnostics/tests/imports/Imports.txt | 6 +-- .../tests/imports/StarImportFromObject.txt | 2 +- .../inner/classesInClassObjectHeader.txt | 2 +- .../extensionLambdaInsideNestedClass.txt | 2 +- .../tests/inner/illegalModifier.txt | 4 +- .../inner/innerClassesInStaticParameters.txt | 2 +- .../tests/inner/innerErrorForClassObjects.txt | 4 +- ...estedClassAccessedViaInstanceReference.txt | 8 ++-- .../classObjectOfNestedClass.txt | 4 +- .../inner/resolvePackageClassInObjects.txt | 2 +- .../inner/selfAnnotationForClassObject.txt | 2 +- .../tests/j+k/accessClassObjectFromJava.txt | 2 +- .../tests/modifiers/defaultModifier.txt | 20 +++++----- .../tests/objects/invokeOnInnerObject.txt | 2 +- .../tests/objects/upperBoundViolated.txt | 2 +- .../overload/ConstructorVsFunOverload.txt | 4 +- .../tests/override/kt4785classObject.txt | 2 +- ...RedeclarationForClassesInDefaultObject.txt | 2 +- ...nForEnumEntriesAndDefaultObjectMembers.txt | 2 +- .../RedeclarationInDefaultObject.txt | 2 +- .../tests/redeclarations/kt2438.txt | 2 +- .../diagnostics/tests/regressions/kt3647.txt | 2 +- .../diagnostics/tests/regressions/kt394.txt | 2 +- .../kt526UnresolvedReferenceInnerStatic.txt | 2 +- .../diagnostics/tests/regressions/kt575.txt | 2 +- .../diagnostics/tests/regressions/kt588.txt | 2 +- .../invoke/kt3833-invokeInsideNestedClass.txt | 2 +- .../analyzeArgsInFreeExpressionPosition.txt | 2 +- .../tests/scopes/VisibilityInClassObject.txt | 2 +- .../diagnostics/tests/scopes/kt587.txt | 4 +- .../diagnostics/tests/scopes/kt900-1.txt | 4 +- .../diagnostics/tests/scopes/kt900.txt | 8 ++-- .../companionObjectScope.txt | 2 +- .../constructorInObject.txt | 2 +- .../tests/smartCasts/classObjectMember.txt | 4 +- .../diagnostics/tests/subtyping/kt2069.txt | 2 +- .../suppressWarningsOnClassObject.txt | 2 +- .../suppress/manyWarnings/onClassObject.txt | 2 +- .../suppress/oneWarning/onClassObject.txt | 2 +- .../variance/privateToThis/FunctionCall.txt | 2 +- .../tests/variance/privateToThis/GetVal.txt | 2 +- .../tests/variance/privateToThis/SetVar.txt | 2 +- .../nativeGetter/onNativeClassMembers.txt | 6 +-- .../onNestedDeclarationsInsideNativeClass.txt | 4 +- ...NestedDeclarationsInsideNonNativeClass.txt | 4 +- .../nativeGetter/onNonNativeClassMembers.txt | 4 +- .../nativeInvoke/onNativeClassMembers.txt | 2 +- .../onNestedDeclarationsInsideNativeClass.txt | 2 +- ...NestedDeclarationsInsideNonNativeClass.txt | 2 +- .../nativeInvoke/onNonNativeClassMembers.txt | 2 +- .../nativeSetter/onNativeClassMembers.txt | 4 +- .../onNestedDeclarationsInsideNativeClass.txt | 4 +- ...NestedDeclarationsInsideNonNativeClass.txt | 4 +- .../nativeSetter/onNonNativeClassMembers.txt | 4 +- .../native/optionlBody/native.txt | 4 +- .../nestedInnerClassifier.txt | 24 +++++------ .../ClassObjectAnnotatedWithItsClass.txt | 2 +- .../ClassObjectAnnotatedWithItsKClass.txt | 2 +- .../platformStatic/finalAndAbstract.txt | 2 +- .../annotations/platformStatic/functions.txt | 4 +- .../annotations/platformStatic/property.txt | 2 +- .../platformStaticInClassObject.txt | 2 +- .../testsWithStdLib/native/body.txt | 2 +- .../testsWithStdLib/native/noBody.txt | 2 +- .../testsWithStdLib/native/trait.txt | 2 +- .../classMembers/ClassObjectPropertyField.txt | 2 +- .../classes/AnnotationInClassObject.txt | 2 +- .../classes/ClassInClassObject.txt | 2 +- .../annotations/classes/ClassObject.txt | 2 +- .../ClassObjectInStaticNestedClass.txt | 2 +- .../annotations/classes/Deprecated.txt | 2 +- .../annotations/classes/EnumArgument.txt | 2 +- .../ClassObject.txt | 2 +- .../TraitClassObject.txt | 2 +- .../class/ClassMemberConflict.txt | 10 ++--- .../classObject/ClassObjectDeclaresVal.txt | 2 +- .../classObject/ClassObjectDeclaresVar.txt | 2 +- .../ClassObjectDefaultVisibility.kt | 17 ++++++++ .../ClassObjectDefaultVisibility.txt | 40 ++++++++++++++++++- .../classObject/ClassObjectExtendsTrait.txt | 2 +- .../ClassObjectExtendsTraitWithTP.txt | 2 +- .../ClassObjectPropertyInClass.txt | 2 +- .../compiledKotlin/classObject/Delegation.txt | 2 +- .../classObject/InnerClassInClassObject.txt | 2 +- .../classObject/NamedClassObject.txt | 2 +- .../classObject/SimpleClassObject.txt | 2 +- .../classObjectInClassStaticFields.txt | 2 +- .../classObjectInTraitStaticFields.txt | 2 +- .../enum/innerEnumExistingClassObject.txt | 2 +- .../fromLoadJava/ClassObject.txt | 2 +- .../fromLoadJava/classObjectAnnotation.txt | 2 +- compiler/testData/renderer/Classes.kt | 2 +- .../builtinsSerializer/annotationTargets.txt | 2 +- .../nestedClassesAndObjects.txt | 2 +- .../checkers/JetDiagnosticsTestGenerated.java | 6 +++ .../ClassWithClassObject.expected.kt | 2 +- .../decompiledText/Enum.expected.kt | 2 +- .../stubBuilder/ClassObject/ClassObject.txt | 6 +-- .../decompiler/stubBuilder/Enum/Enum.txt | 2 +- 150 files changed, 339 insertions(+), 228 deletions(-) create mode 100644 compiler/testData/diagnostics/tests/classObjects/companionObjectOfPrivateClassVisibility.kt create mode 100644 compiler/testData/diagnostics/tests/classObjects/companionObjectOfPrivateClassVisibility.txt diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java index 92895ac5ece..33e12f78fca 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java @@ -393,12 +393,10 @@ public class ModifiersChecker { @NotNull public static Visibility getDefaultClassVisibility(@NotNull ClassDescriptor descriptor) { - if (isEnumEntry(descriptor)) { + if (isEnumEntry(descriptor) || isCompanionObject(descriptor)) { + // should be be accessible where containing class is accessible by default return Visibilities.PUBLIC; } - if (isCompanionObject(descriptor)) { - return ((ClassDescriptor) descriptor.getContainingDeclaration()).getVisibility(); - } return Visibilities.INTERNAL; } diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt index a6e0700ea03..fc92edbd1f3 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt @@ -8,7 +8,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt index b22d66a85aa..03f00fff681 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt @@ -9,7 +9,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : B { + public companion object Companion : B { private constructor Companion() 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/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt index db62aff9da3..b2f609256f2 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt @@ -14,7 +14,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt index db62aff9da3..b2f609256f2 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt @@ -14,7 +14,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/MultipleBounds.txt b/compiler/testData/diagnostics/tests/MultipleBounds.txt index 5beaf807460..fc4dc24eb54 100644 --- a/compiler/testData/diagnostics/tests/MultipleBounds.txt +++ b/compiler/testData/diagnostics/tests/MultipleBounds.txt @@ -52,7 +52,7 @@ package Jet87 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : Jet87.A, Jet87.B { + public companion object Companion : Jet87.A, Jet87.B { private constructor Companion() internal open override /*1*/ /*fake_override*/ fun bar(): kotlin.Double public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt b/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt index 6add9458f6f..a576fe07507 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt @@ -10,7 +10,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/bracketsDeprecation.txt b/compiler/testData/diagnostics/tests/annotations/bracketsDeprecation.txt index 4ff1df0e9ff..71449d46718 100644 --- a/compiler/testData/diagnostics/tests/annotations/bracketsDeprecation.txt +++ b/compiler/testData/diagnostics/tests/annotations/bracketsDeprecation.txt @@ -22,7 +22,7 @@ Ann() Ann() internal final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - Ann() internal companion object O2 { + Ann() public companion object O2 { private constructor O2() 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/kt1886annotationBody.txt b/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt index 72b3b44134d..eace797f536 100644 --- a/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt +++ b/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt @@ -50,7 +50,7 @@ internal final annotation class Annotation5 : kotlin.Annotation { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/callableReference/function/innerConstructorFromClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromClass.txt index 4f9c3879f5c..18bbd707fcf 100644 --- a/compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromClass.txt +++ b/compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromClass.txt @@ -7,7 +7,7 @@ internal final class A { internal final fun main(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/callableReference/function/nestedConstructorFromClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromClass.txt index a48761c5540..5717eeccd87 100644 --- a/compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromClass.txt +++ b/compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromClass.txt @@ -7,7 +7,7 @@ internal final class A { internal final fun main(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/cast/WhenWithExpression.txt b/compiler/testData/diagnostics/tests/cast/WhenWithExpression.txt index a95d1885531..3643ca2dc6c 100644 --- a/compiler/testData/diagnostics/tests/cast/WhenWithExpression.txt +++ b/compiler/testData/diagnostics/tests/cast/WhenWithExpression.txt @@ -9,7 +9,7 @@ internal final class List { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val Nil: List public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt index 5873b35b5a2..d4c57fb79d7 100644 --- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt +++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt @@ -7,7 +7,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val y: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt index 4a62c1dcccb..099d1f7fef8 100644 --- a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt +++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt @@ -13,7 +13,7 @@ package Jet86 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val x: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -21,7 +21,7 @@ package Jet86 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val x: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -36,7 +36,7 @@ package Jet86 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object A { + public companion object A { private constructor A() internal final val x: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -44,7 +44,7 @@ package Jet86 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object AA { + public companion object AA { private constructor AA() internal final val x: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -52,7 +52,7 @@ package Jet86 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val x: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -75,7 +75,7 @@ package Jet86 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val x: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.txt index fc49dd6b7c1..05b788b94fe 100644 --- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.txt @@ -9,7 +9,7 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val c: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.txt index 4894c197add..6443ba9f34e 100644 --- a/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.txt @@ -12,7 +12,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -27,7 +27,7 @@ internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -39,7 +39,7 @@ internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -51,7 +51,7 @@ internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -75,7 +75,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 - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/classObjects/classObjectHeader.txt b/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt index 450d0bf71c1..e24dbac6096 100644 --- a/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt +++ b/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt @@ -9,7 +9,7 @@ package test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : test.ToResolve

{ + public companion object Companion : test.ToResolve

{ private constructor Companion() 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/classObjects/classObjectRedeclaration.txt b/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.txt index bf8bdb4b687..8b5cc8bd7f5 100644 --- a/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.txt +++ b/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.txt @@ -15,7 +15,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -36,7 +36,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Named { + public companion object Named { private constructor Named() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -57,7 +57,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Named { + public companion object Named { private constructor Named() 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/classObjects/companionObjectOfPrivateClassVisibility.kt b/compiler/testData/diagnostics/tests/classObjects/companionObjectOfPrivateClassVisibility.kt new file mode 100644 index 00000000000..86fa31da339 --- /dev/null +++ b/compiler/testData/diagnostics/tests/classObjects/companionObjectOfPrivateClassVisibility.kt @@ -0,0 +1,19 @@ +package test + +fun use() { + Default.create() + + Explicit.create() +} + +private class Default { + companion object { + fun create() = Default() + } +} + +private class Explicit { + private companion object { + fun create() = Explicit() + } +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/classObjects/companionObjectOfPrivateClassVisibility.txt b/compiler/testData/diagnostics/tests/classObjects/companionObjectOfPrivateClassVisibility.txt new file mode 100644 index 00000000000..cb25d78fbcb --- /dev/null +++ b/compiler/testData/diagnostics/tests/classObjects/companionObjectOfPrivateClassVisibility.txt @@ -0,0 +1,35 @@ +package + +package test { + internal fun use(): kotlin.Unit + + private final class Default { + public constructor Default() + 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 + + public companion object Companion { + private constructor Companion() + internal final fun create(): test.Default + 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 + } + } + + private final class Explicit { + public constructor Explicit() + 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 + + private companion object Companion { + private constructor Companion() + internal final fun create(): test.Explicit + 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/classObjects/importClassInClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.txt index bb42bfbd4e4..c82597bc2f7 100644 --- a/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.txt @@ -9,7 +9,7 @@ package f { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/classObjects/invisibleClassObjects.txt b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.txt index d7d63a939a4..c8143d501d0 100644 --- a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.txt +++ b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.txt @@ -8,7 +8,7 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(): kotlin.Unit @@ -23,7 +23,7 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - private companion object Companion { + public companion object Companion { private constructor Companion() internal final fun bar(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/classObjects/kt3866.txt b/compiler/testData/diagnostics/tests/classObjects/kt3866.txt index c99e4379f37..35974e586fe 100644 --- a/compiler/testData/diagnostics/tests/classObjects/kt3866.txt +++ b/compiler/testData/diagnostics/tests/classObjects/kt3866.txt @@ -16,7 +16,7 @@ internal open class X { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : C { + public companion object Companion : C { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -30,7 +30,7 @@ internal open class Y { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : C { + public companion object Companion : C { private constructor Companion() 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/classObjects/multipleDissallowedDefaultObjects.txt b/compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.txt index a9c1723bb4f..dcdb041c2a8 100644 --- a/compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.txt +++ b/compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.txt @@ -12,21 +12,21 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object A { + public companion object A { private constructor A() 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 companion object B { + public companion object B { private constructor B() 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 companion object C { + public companion object C { private constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -41,21 +41,21 @@ internal object O { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object A { + public companion object A { private constructor A() 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 companion object B { + public companion object B { private constructor B() 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 companion object C { + public companion object C { private constructor C() 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/classObjects/nestedClassInPrivateClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.txt index 8b90236669d..c2c7608b866 100644 --- a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.txt @@ -27,7 +27,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt index 6e8772eef9f..0ac6f708f80 100644 --- a/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt @@ -9,7 +9,7 @@ package test { internal final fun test(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val a: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt index d497cbb3128..44cc4af6a2b 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt @@ -49,7 +49,7 @@ package uninitialized_reassigned_variables { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt index d3f0757387a..c906986d130 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt @@ -12,7 +12,7 @@ package kt1185 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.txt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.txt index b0b8ed0a4f5..fd1950ee7dc 100644 --- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.txt +++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.txt @@ -11,7 +11,7 @@ package example { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val y: kotlin.Any? = 2 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt index 6ea75415478..45b31383fca 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt +++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt @@ -6,28 +6,28 @@ internal open class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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 companion object Companion { + public companion object Companion { private constructor Companion() 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 companion object Companion { + public companion object Companion { private constructor Companion() 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 companion object Companion { + public companion object Companion { private constructor Companion() 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/deprecated/nestedTypesUsage.txt b/compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.txt index 931136ddaa2..556574b85a8 100644 --- a/compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.txt +++ b/compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.txt @@ -14,7 +14,7 @@ internal final class TopLevel { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/deprecated/objectUsage.txt b/compiler/testData/diagnostics/tests/deprecated/objectUsage.txt index b519a08f6a5..1029207baab 100644 --- a/compiler/testData/diagnostics/tests/deprecated/objectUsage.txt +++ b/compiler/testData/diagnostics/tests/deprecated/objectUsage.txt @@ -10,7 +10,7 @@ internal final class Another { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - kotlin.deprecated(value = "Object": kotlin.String) internal companion object Companion { + kotlin.deprecated(value = "Object": kotlin.String) public companion object Companion { private constructor Companion() 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/duplicateJvmSignature/functionAndProperty/classObject.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt index 02966baf381..489d7a0119a 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.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 - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val x: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt index 137e6e30c68..4fac25c9706 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt @@ -7,7 +7,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 - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -22,7 +22,7 @@ internal final class D { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/duplicateJvmSignature/specialNames/classObjectCopiedField.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt index 69a7fd892ec..d8db753f41e 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt @@ -7,7 +7,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 - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val X: kotlin.Int = 1 internal final val `X$1`: kotlin.Int = 1 diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt index f238d17009b..353977e4cb0 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt @@ -7,7 +7,7 @@ internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object A { + public companion object A { private constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -21,7 +21,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 - internal companion object A { + public companion object A { private constructor A() internal final val A: C.A public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -37,7 +37,7 @@ internal final class D { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val `OBJECT$`: D.Companion public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt index c623bd6b74e..3d8f8b57f1b 100644 --- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt @@ -21,7 +21,7 @@ internal final enum class E : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final fun entry(): E public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/enum/enumEntriesAtTheEnd.txt b/compiler/testData/diagnostics/tests/enum/enumEntriesAtTheEnd.txt index 64f6142c482..18a20d60eb9 100644 --- a/compiler/testData/diagnostics/tests/enum/enumEntriesAtTheEnd.txt +++ b/compiler/testData/diagnostics/tests/enum/enumEntriesAtTheEnd.txt @@ -43,7 +43,7 @@ internal final enum class MixedEnum : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val first: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/enum/enumMixed.txt b/compiler/testData/diagnostics/tests/enum/enumMixed.txt index 64f6142c482..18a20d60eb9 100644 --- a/compiler/testData/diagnostics/tests/enum/enumMixed.txt +++ b/compiler/testData/diagnostics/tests/enum/enumMixed.txt @@ -43,7 +43,7 @@ internal final enum class MixedEnum : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val first: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/enum/enumMixedWithCommas.txt b/compiler/testData/diagnostics/tests/enum/enumMixedWithCommas.txt index 64f6142c482..18a20d60eb9 100644 --- a/compiler/testData/diagnostics/tests/enum/enumMixedWithCommas.txt +++ b/compiler/testData/diagnostics/tests/enum/enumMixedWithCommas.txt @@ -43,7 +43,7 @@ internal final enum class MixedEnum : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val first: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/enum/enumMixedWithSemicolons.txt b/compiler/testData/diagnostics/tests/enum/enumMixedWithSemicolons.txt index 64f6142c482..18a20d60eb9 100644 --- a/compiler/testData/diagnostics/tests/enum/enumMixedWithSemicolons.txt +++ b/compiler/testData/diagnostics/tests/enum/enumMixedWithSemicolons.txt @@ -43,7 +43,7 @@ internal final enum class MixedEnum : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val first: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/enum/enumModifier.txt b/compiler/testData/diagnostics/tests/enum/enumModifier.txt index 1c2fcc36de6..891ff431398 100644 --- a/compiler/testData/diagnostics/tests/enum/enumModifier.txt +++ b/compiler/testData/diagnostics/tests/enum/enumModifier.txt @@ -10,7 +10,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/enum/inner/existingClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt index 8dcbe3d4c70..7173b3b74a8 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt @@ -6,7 +6,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -44,7 +44,7 @@ internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/enum/inner/insideClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt index 17e31be20fb..6791b21ddf0 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt @@ -6,7 +6,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/enum/inner/redeclarationInClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt index db6cdc88759..9ea0a82ec61 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt @@ -6,7 +6,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/enum/inner/twoEnumsInClassObjectAndInnerClass.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt index e6bdad7eff0..20ed2028e7c 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt @@ -37,7 +37,7 @@ internal final class A { } } - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/enum/starImportNestedClassAndEntries.txt b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt index 413fa058df1..ebf875d6169 100644 --- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt +++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt @@ -45,7 +45,7 @@ package foo { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt index 9a5fd651d4e..2b91114035f 100644 --- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt +++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt @@ -29,7 +29,7 @@ internal final enum class E : kotlin.Enum { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String internal final fun zab(): E - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val valuez: kotlin.Array internal final fun bar(): kotlin.Array diff --git a/compiler/testData/diagnostics/tests/extensions/classObject.txt b/compiler/testData/diagnostics/tests/extensions/classObject.txt index 3caff4d465c..bc801040132 100644 --- a/compiler/testData/diagnostics/tests/extensions/classObject.txt +++ b/compiler/testData/diagnostics/tests/extensions/classObject.txt @@ -13,7 +13,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -27,7 +27,7 @@ internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : Tr { + public companion object Companion : Tr { private constructor Companion() 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/extensions/extensionMemberInClassObject.txt b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt index fe122ab61a4..c2b710ece9b 100644 --- a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt +++ b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt @@ -9,7 +9,7 @@ internal final class Foo { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : JPAEntityClass { + public companion object Companion : JPAEntityClass { private constructor Companion() 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/extensions/kt3470.txt b/compiler/testData/diagnostics/tests/extensions/kt3470.txt index bab8a01bb5e..4fa42d7bb3c 100644 --- a/compiler/testData/diagnostics/tests/extensions/kt3470.txt +++ b/compiler/testData/diagnostics/tests/extensions/kt3470.txt @@ -8,7 +8,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/imports/Imports.txt b/compiler/testData/diagnostics/tests/imports/Imports.txt index f034ddc20c3..934d6741e96 100644 --- a/compiler/testData/diagnostics/tests/imports/Imports.txt +++ b/compiler/testData/diagnostics/tests/imports/Imports.txt @@ -24,7 +24,7 @@ package b { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val cValue: kotlin.Int = 1 internal final fun bar(): kotlin.Unit @@ -49,7 +49,7 @@ package b { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val f: b.F public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -90,7 +90,7 @@ package d { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/imports/StarImportFromObject.txt b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt index 6a3bfbd4875..70bd732847e 100644 --- a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt +++ b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt @@ -22,7 +22,7 @@ package a { } } - internal companion object CO { + public companion object CO { private constructor CO() 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/inner/classesInClassObjectHeader.txt b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt index 384be552dc7..3da9ff2e581 100644 --- a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt +++ b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt @@ -6,7 +6,7 @@ internal final class Test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - Test.InnerAnnotation() Test.InnerAnnotation() internal companion object Companion : Test.StaticClass, Test.InnerClass { + Test.InnerAnnotation() Test.InnerAnnotation() public companion object Companion : Test.StaticClass, Test.InnerClass { private constructor Companion() public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt index 45dc1bd165e..97833cf1b77 100644 --- a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt +++ b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt @@ -45,7 +45,7 @@ package f { } } - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/inner/illegalModifier.txt b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt index 6a8d6fa6f75..ddfca693e0c 100644 --- a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt +++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt @@ -30,7 +30,7 @@ internal final class D { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -150,7 +150,7 @@ internal final class P { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/inner/innerClassesInStaticParameters.txt b/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.txt index d060d06e2ab..4d8ec3fa7c9 100644 --- a/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.txt +++ b/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.txt @@ -6,7 +6,7 @@ internal final class Test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/inner/innerErrorForClassObjects.txt b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt index 4eaab369371..ccd6f8cbc37 100644 --- a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt +++ b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt @@ -15,7 +15,7 @@ internal final class Test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : Test.InnerClass { + public companion object Companion : Test.InnerClass { private constructor Companion() internal final val a: Test.InnerClass public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -38,7 +38,7 @@ internal final class TestSome { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : SomeClass

{ + public companion object Companion : SomeClass

{ private constructor Companion() 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/inner/nestedClassAccessedViaInstanceReference.txt b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt index bae523fcc0c..0fbca295424 100644 --- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt +++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt @@ -61,7 +61,7 @@ internal object Obj { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : N { + public companion object Companion : N { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int @@ -77,7 +77,7 @@ internal final class WithClassObject { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -130,7 +130,7 @@ internal final class WithClassObject { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : N { + public companion object Companion : N { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int @@ -192,7 +192,7 @@ internal final class WithoutClassObject { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : N { + public companion object Companion : N { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.txt index 4ed342756fe..fe502dd7f1e 100644 --- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.txt +++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.txt @@ -9,7 +9,7 @@ internal final class Outer { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final fun bar(): kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -23,7 +23,7 @@ internal final class Outer { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.txt b/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.txt index f48d81e912f..7091adb1451 100644 --- a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.txt +++ b/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.txt @@ -6,7 +6,7 @@ internal final class MoreTest { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : PackageTest { + public companion object Companion : PackageTest { private constructor Companion() 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/inner/selfAnnotationForClassObject.txt b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt index 0f532d1c5a4..0ade0d0df69 100644 --- a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt +++ b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt @@ -6,7 +6,7 @@ internal final class Test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - Test.Companion.ClassObjectAnnotation() Test.NestedAnnotation() internal companion object Companion { + Test.Companion.ClassObjectAnnotation() Test.NestedAnnotation() public companion object Companion { private constructor Companion() 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/j+k/accessClassObjectFromJava.txt b/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt index b916a671d55..ad0e736d44e 100644 --- a/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt +++ b/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt @@ -6,7 +6,7 @@ internal final class Foo { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val bar: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt index a5cc2596851..b73c04cb5ed 100644 --- a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt +++ b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt @@ -9,7 +9,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -24,7 +24,7 @@ internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -38,7 +38,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 - internal companion object A { + public companion object A { private constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -52,13 +52,13 @@ internal final class D { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object A { + public companion object A { private constructor A() 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 companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -96,7 +96,7 @@ internal final enum class Enum : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -114,7 +114,7 @@ internal object G { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -127,7 +127,7 @@ internal interface H { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -141,13 +141,13 @@ internal final class J { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object C { + public companion object C { private constructor C() 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 companion object Companion { + public companion object Companion { private constructor Companion() 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/objects/invokeOnInnerObject.txt b/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.txt index 00d457b024d..c56cdc3bb6c 100644 --- a/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.txt +++ b/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.txt @@ -8,7 +8,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/objects/upperBoundViolated.txt b/compiler/testData/diagnostics/tests/objects/upperBoundViolated.txt index 73fbc66bd2f..ee112b847c8 100644 --- a/compiler/testData/diagnostics/tests/objects/upperBoundViolated.txt +++ b/compiler/testData/diagnostics/tests/objects/upperBoundViolated.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 - internal companion object Companion : Trait { + public companion object Companion : Trait { private constructor Companion() 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/overload/ConstructorVsFunOverload.txt b/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.txt index 72d377e6ae9..3c9fa6f5d03 100644 --- a/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.txt +++ b/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.txt @@ -10,7 +10,7 @@ package constructorVsFun { internal final fun ololo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -46,7 +46,7 @@ package constructorVsFun { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun fghj(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/override/kt4785classObject.txt b/compiler/testData/diagnostics/tests/override/kt4785classObject.txt index f5866ccb276..adf481e9eb0 100644 --- a/compiler/testData/diagnostics/tests/override/kt4785classObject.txt +++ b/compiler/testData/diagnostics/tests/override/kt4785classObject.txt @@ -20,7 +20,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 - internal companion object Companion : A, B { + public companion object Companion : A, B { private constructor Companion() internal final fun bar(): kotlin.Nothing? public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.txt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.txt index dcefdb1e758..b0705971afb 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.txt @@ -8,7 +8,7 @@ package kt2247 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt index 9232d2a4170..ac34dbfcbd6 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt @@ -29,7 +29,7 @@ internal final enum class E : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val SECOND: E.Companion public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.txt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.txt index d46148e983d..ccb4ed247e2 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.txt @@ -6,7 +6,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object B { + public companion object B { private constructor B() internal final val G: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2438.txt b/compiler/testData/diagnostics/tests/redeclarations/kt2438.txt index 416dd3dff8b..795fb72a78e 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/kt2438.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/kt2438.txt @@ -22,7 +22,7 @@ package kt2438 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/regressions/kt3647.txt b/compiler/testData/diagnostics/tests/regressions/kt3647.txt index a204d9b0474..4456f636624 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt3647.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt3647.txt @@ -7,7 +7,7 @@ internal final class Test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final fun create(/*0*/ init: () -> kotlin.Int): Test public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/regressions/kt394.txt b/compiler/testData/diagnostics/tests/regressions/kt394.txt index 504ecc7c733..3eca6b0e973 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt394.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt394.txt @@ -7,7 +7,7 @@ internal final class X { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/regressions/kt526UnresolvedReferenceInnerStatic.txt b/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.txt index d271c081925..08e66ce1674 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.txt @@ -8,7 +8,7 @@ package demo { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/regressions/kt575.txt b/compiler/testData/diagnostics/tests/regressions/kt575.txt index 508acebe0b1..25fe5caa78b 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt575.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt575.txt @@ -24,7 +24,7 @@ package kt575 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final var numCreated: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/regressions/kt588.txt b/compiler/testData/diagnostics/tests/regressions/kt588.txt index dd0e95541e9..2147ae14b7a 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt588.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt588.txt @@ -71,7 +71,7 @@ internal final class Test : java.lang.Thread { invisible_fake open override /*1*/ /*fake_override*/ fun suspend0(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String! - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/resolve/invoke/kt3833-invokeInsideNestedClass.txt b/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.txt index a033f313ed1..4aba3fbf2ee 100644 --- a/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.txt +++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.txt @@ -8,7 +8,7 @@ package m { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun f(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt index 208ebaee71e..ddac4de04a4 100644 --- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt +++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt @@ -9,7 +9,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/scopes/VisibilityInClassObject.txt b/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.txt index 94ac4035096..6690bb6a130 100644 --- a/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.txt +++ b/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.txt @@ -10,7 +10,7 @@ internal open class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val internal_val: kotlin.Int = 1 private final val private_val: kotlin.Int = 3 diff --git a/compiler/testData/diagnostics/tests/scopes/kt587.txt b/compiler/testData/diagnostics/tests/scopes/kt587.txt index d369b097404..e4aeb682f67 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt587.txt +++ b/compiler/testData/diagnostics/tests/scopes/kt587.txt @@ -6,7 +6,7 @@ internal final class Main { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -18,7 +18,7 @@ internal final class Main { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public final val N: Main.Companion.States public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/scopes/kt900-1.txt b/compiler/testData/diagnostics/tests/scopes/kt900-1.txt index 9cea85b39ea..4f244347f8f 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt900-1.txt +++ b/compiler/testData/diagnostics/tests/scopes/kt900-1.txt @@ -9,7 +9,7 @@ package c { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -21,7 +21,7 @@ package c { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/scopes/kt900.txt b/compiler/testData/diagnostics/tests/scopes/kt900.txt index 2204ed98f3a..8c858d8d0fb 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt900.txt +++ b/compiler/testData/diagnostics/tests/scopes/kt900.txt @@ -9,7 +9,7 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -21,7 +21,7 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(): kotlin.Unit @@ -65,7 +65,7 @@ package b { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -77,7 +77,7 @@ package b { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean internal final fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.txt index ce9dc54bddc..a55b8a34c49 100644 --- a/compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.txt +++ b/compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.txt @@ -23,7 +23,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val C: kotlin.Int = 3 internal final val prop: kotlin.Int = 2 diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt index f0684aa7a78..34a0f9c665a 100644 --- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt +++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt @@ -41,7 +41,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 - internal companion object Companion { + public companion object Companion { private constructor Companion() private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.txt b/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.txt index 4f1ae8c514b..36eb096f699 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.txt +++ b/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.txt @@ -9,7 +9,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : T { + public companion object Companion : T { private constructor Companion() internal final override /*1*/ /*fake_override*/ val x: kotlin.Int? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -24,7 +24,7 @@ internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion : T { + public companion object Companion : T { private constructor Companion() internal final override /*1*/ /*fake_override*/ val x: kotlin.Int? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/subtyping/kt2069.txt b/compiler/testData/diagnostics/tests/subtyping/kt2069.txt index 2b862980475..d56bb0b9da6 100644 --- a/compiler/testData/diagnostics/tests/subtyping/kt2069.txt +++ b/compiler/testData/diagnostics/tests/subtyping/kt2069.txt @@ -10,7 +10,7 @@ package kt2069 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/suppress/allWarnings/suppressWarningsOnClassObject.txt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.txt index ea69719d7df..4dc4885e370 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 companion object Companion { + kotlin.suppress(names = {"warnings"}: kotlin.Array) public companion object Companion { private constructor Companion() internal final val foo: kotlin.String? = null public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.txt b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.txt index b3c52081a6b..bcee0c2d38b 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 companion object Companion { + kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) public companion object Companion { private constructor Companion() 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/onClassObject.txt b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.txt index 78fa887a55d..2022b7bfcb0 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 companion object Companion { + kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) public companion object Companion { private constructor Companion() internal final val foo: kotlin.String? = null public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.txt b/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.txt index 3e4c1fff9d4..06a7b575f69 100644 --- a/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.txt +++ b/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.txt @@ -14,7 +14,7 @@ internal final class Test { internal final fun test(/*0*/ t: Test): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/variance/privateToThis/GetVal.txt b/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.txt index fcefe2bb028..8ff0cc22481 100644 --- a/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.txt +++ b/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.txt @@ -14,7 +14,7 @@ internal final class Test { internal final fun test(/*0*/ t: Test): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/variance/privateToThis/SetVar.txt b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.txt index 7d70cd713f4..00e569e4825 100644 --- a/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.txt +++ b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.txt @@ -14,7 +14,7 @@ internal final class Test { internal final fun test(/*0*/ t: Test): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt index 570b82d35e6..1dd5d7949d8 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt @@ -9,7 +9,7 @@ kotlin.js.native() internal final class A { kotlin.js.nativeGetter() internal final fun take(/*0*/ a: kotlin.Number): kotlin.String? public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.js.nativeGetter() internal final fun foo(/*0*/ a: kotlin.Double): kotlin.String? @@ -27,7 +27,7 @@ kotlin.js.native() internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.js.nativeGetter() internal final val foo: kotlin.Int = 0 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -64,7 +64,7 @@ kotlin.js.native() internal final class C { kotlin.js.nativeGetter() internal final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String? kotlin.js.nativeGetter() internal final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String? - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt index 544a20ab761..e08a8da1185 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt @@ -22,7 +22,7 @@ kotlin.js.native() internal final class A { kotlin.js.nativeGetter() internal final fun take(/*0*/ a: kotlin.Number): kotlin.String? public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.js.nativeGetter() internal final fun foo(/*0*/ a: kotlin.Double): kotlin.String? @@ -40,7 +40,7 @@ kotlin.js.native() internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.js.nativeGetter() internal final val foo: kotlin.Int = 0 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt index eb2ad831a63..bf69fcc83c3 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt @@ -22,7 +22,7 @@ internal final class A { kotlin.js.nativeGetter() internal final fun take(/*0*/ a: kotlin.Number): kotlin.String? public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.js.nativeGetter() internal final fun foo(/*0*/ a: kotlin.Double): kotlin.String? @@ -43,7 +43,7 @@ internal final class A { kotlin.js.nativeGetter() internal final fun kotlin.Int.get2(/*0*/ a: kotlin.Number): kotlin.String? kotlin.js.nativeGetter() internal final fun kotlin.Int.get3(/*0*/ a: kotlin.Int): kotlin.String? - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.js.nativeGetter() internal final val foo: kotlin.Int = 0 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt index f487b191fca..bacde03592d 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt @@ -9,7 +9,7 @@ internal final class A { kotlin.js.nativeGetter() internal final fun take(/*0*/ a: kotlin.Number): kotlin.String? public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.js.nativeGetter() internal final fun foo(/*0*/ a: kotlin.Double): kotlin.String? @@ -27,7 +27,7 @@ internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.js.nativeGetter() internal final val foo: kotlin.Int = 0 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt index 78f50a102b4..98fa6fa1cb6 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt @@ -11,7 +11,7 @@ kotlin.js.native() internal final class A { kotlin.js.nativeInvoke() internal final fun kotlin.Int.ext(): kotlin.Int kotlin.js.nativeInvoke() internal final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.js.nativeInvoke() internal final val foo: kotlin.Int = 0 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt index e23fcc7a9b3..e3de7bfacd2 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt @@ -24,7 +24,7 @@ kotlin.js.native() internal final class A { kotlin.js.nativeInvoke() internal final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.js.nativeInvoke() internal final fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt index 809da4004d4..174702a3a8f 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt @@ -24,7 +24,7 @@ internal final class A { kotlin.js.nativeInvoke() internal final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.js.nativeInvoke() internal final fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt index b73fecfbb66..0b184e84f87 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt @@ -11,7 +11,7 @@ internal final class A { kotlin.js.nativeInvoke() internal final fun kotlin.Int.ext(): kotlin.Int kotlin.js.nativeInvoke() internal final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.js.nativeInvoke() internal final fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt index 4cd8dc9b1cd..788a32520f4 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt @@ -11,7 +11,7 @@ kotlin.js.native() internal final class A { kotlin.js.nativeSetter() internal final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.js.nativeSetter() internal final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit @@ -31,7 +31,7 @@ kotlin.js.native() internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.js.nativeSetter() internal final val foo: kotlin.Int = 0 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt index 22f7161f708..ebe2308d205 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt @@ -24,7 +24,7 @@ kotlin.js.native() internal final class A { kotlin.js.nativeSetter() internal final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.js.nativeSetter() internal final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit @@ -44,7 +44,7 @@ kotlin.js.native() internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.js.nativeSetter() internal final val foo: kotlin.Int = 0 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt index 5bd2f53d23f..466acc7660e 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt @@ -24,7 +24,7 @@ internal final class A { kotlin.js.nativeSetter() internal final fun set5(/*0*/ a: kotlin.Double, /*1*/ v: kotlin.String): kotlin.CharSequence public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.js.nativeSetter() internal final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit @@ -42,7 +42,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.js.nativeSetter() internal final val foo: kotlin.Int = 0 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt index efcf38715ed..6d4a4aa13fb 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt @@ -9,7 +9,7 @@ internal final class A { kotlin.js.nativeSetter() internal final fun set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Any?): kotlin.Any? public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.js.nativeSetter() internal final fun foo(/*0*/ a: kotlin.Int, /*1*/ v: kotlin.String): kotlin.Unit @@ -27,7 +27,7 @@ internal final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.js.nativeSetter() internal final val foo: kotlin.Int = 0 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt index a280b551dd0..a69eabedc67 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt @@ -19,7 +19,7 @@ kotlin.js.native() internal final class C { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val baz: kotlin.Int internal final val boo: kotlin.Int @@ -50,7 +50,7 @@ kotlin.js.native() internal interface T { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val baz: kotlin.Int internal final val boo: kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt b/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt index 2de5f46e3a8..82b1df832b2 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.txt @@ -19,7 +19,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -53,7 +53,7 @@ internal final class A { } } - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -89,7 +89,7 @@ internal final class A { public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -126,7 +126,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -177,7 +177,7 @@ internal final enum class E : kotlin.Enum { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -211,7 +211,7 @@ internal final enum class E : kotlin.Enum { } } - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -247,7 +247,7 @@ internal final enum class E : kotlin.Enum { public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -284,7 +284,7 @@ internal final enum class E : kotlin.Enum { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -315,7 +315,7 @@ internal interface T { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -349,7 +349,7 @@ internal interface T { } } - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -385,7 +385,7 @@ internal interface T { public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -415,7 +415,7 @@ internal interface T { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() 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/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt index 81c781e62f2..49367796294 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt @@ -16,7 +16,7 @@ package test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - test.AnnClass(a = javaClass(): java.lang.Class) internal companion object Companion { + test.AnnClass(a = javaClass(): java.lang.Class) public companion object Companion { private constructor Companion() 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/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.txt index 582d8098cf0..d6d7c8da0e3 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.txt @@ -16,7 +16,7 @@ package test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - test.AnnClass(a = test.MyClass::class: kotlin.reflect.KClass) internal companion object Companion { + test.AnnClass(a = test.MyClass::class: kotlin.reflect.KClass) public companion object Companion { private constructor Companion() 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/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt index 86954fd365f..f6dd5cbabe1 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt @@ -27,7 +27,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 - internal companion object Companion : A { + public companion object Companion : A { private constructor Companion() kotlin.platform.platformStatic() internal open override /*1*/ fun a(): kotlin.Unit kotlin.platform.platformStatic() internal open override /*1*/ fun b(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt index 30a9c51cf88..faa2d759255 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt @@ -16,7 +16,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.platform.platformStatic() internal final fun a1(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -40,7 +40,7 @@ internal interface B { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.platform.platformStatic() internal final fun a1(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt index 309dfb892db..bde8c1d25cf 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt @@ -20,7 +20,7 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal companion object Companion : B { + public companion object Companion : B { private constructor Companion() kotlin.platform.platformStatic() public open override /*1*/ val base1: kotlin.Int = 0 public open override /*1*/ val base2: kotlin.Int = 0 diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt index 5e591856bca..8d348b3bd01 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt @@ -15,7 +15,7 @@ internal final class Derived : Base { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.platform.platformStatic() internal final fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/body.txt b/compiler/testData/diagnostics/testsWithStdLib/native/body.txt index 1fbbb013f0f..bc2c9b2c7bd 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/native/body.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/native/body.txt @@ -10,7 +10,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 - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.jvm.native() internal final fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/noBody.txt b/compiler/testData/diagnostics/testsWithStdLib/native/noBody.txt index 1fbbb013f0f..bc2c9b2c7bd 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/native/noBody.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/native/noBody.txt @@ -10,7 +10,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 - internal companion object Companion { + public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean kotlin.jvm.native() internal final fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/trait.txt b/compiler/testData/diagnostics/testsWithStdLib/native/trait.txt index bec001b6a7c..c8d6f7fffc3 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/native/trait.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/native/trait.txt @@ -7,7 +7,7 @@ internal interface Tr { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal companion object Companion { + public companion object Companion { private constructor Companion() kotlin.jvm.native() internal final fun bar(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt index e2156acd967..c253b8d5a4d 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt @@ -7,7 +7,7 @@ internal final annotation class Anno : kotlin.Annotation { internal final class Class { /*primary*/ public constructor Class() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() test.Anno() internal final var property: kotlin.Int internal final fun (): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt index 1feb38a4e09..29a6baac275 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt @@ -3,7 +3,7 @@ package test internal final class A { /*primary*/ public constructor A() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() internal final annotation class Anno1 : kotlin.Annotation { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt index 8ee4f1000d0..ca4816dab10 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt @@ -7,7 +7,7 @@ internal final annotation class Anno : kotlin.Annotation { internal final class Class { /*primary*/ public constructor Class() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() test.Anno() internal final class Nested { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt index 4d86be1c00d..ea76204d029 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt @@ -7,7 +7,7 @@ internal final annotation class Anno : kotlin.Annotation { internal final class Class { /*primary*/ public constructor Class() - test.Anno() internal companion object Companion { + test.Anno() public companion object Companion { /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt index d6e4080d184..0d4157960e8 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt @@ -6,7 +6,7 @@ internal final class A { internal final class B { /*primary*/ public constructor B() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() internal final val TEST: kotlin.Int = 1 internal final fun (): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt index bcf4276b7d8..75981febbc1 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt @@ -3,7 +3,7 @@ package test kotlin.deprecated(value = "Class": kotlin.String) internal final class Class { /*primary*/ public constructor Class() - kotlin.deprecated(value = "companion object": kotlin.String) internal companion object Companion { + kotlin.deprecated(value = "companion object": kotlin.String) public companion object Companion { /*primary*/ private constructor Companion() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt index e2ac333aaa8..20a1353c449 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt @@ -9,7 +9,7 @@ internal final annotation class Anno : kotlin.Annotation { test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal final class Class { /*primary*/ public constructor Class() - test.Anno(t = ElementType.ANNOTATION_TYPE: java.lang.annotation.ElementType) internal companion object Companion { + test.Anno(t = ElementType.ANNOTATION_TYPE: java.lang.annotation.ElementType) public companion object Companion { /*primary*/ private constructor Companion() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt index da941ca4922..5b093257651 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt @@ -7,7 +7,7 @@ internal final annotation class Anno : kotlin.Annotation { internal final class Class { /*primary*/ public constructor Class() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() test.Anno() internal final val property: kotlin.Int internal final fun (): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt index 349e452ba0a..02901516852 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt @@ -6,7 +6,7 @@ internal final annotation class Anno : kotlin.Annotation { internal interface Trait { - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() test.Anno() internal final val property: kotlin.Int internal final fun (): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt index 8cd5ac7a868..e353c89486d 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt @@ -5,7 +5,7 @@ internal final class ConstructorTypeParamClassObjectConflict { internal final val some: kotlin.Int = 12 internal final fun (): kotlin.Int - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() internal final val test: kotlin.Int = 12 internal final fun (): kotlin.Int @@ -17,7 +17,7 @@ internal final class ConstructorTypeParamClassObjectTypeConflict { internal final val some: test? internal final fun (): test? - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() internal interface test { @@ -32,7 +32,7 @@ internal final class TestClassObjectAndClassConflict { internal final val some: kotlin.String = "More" internal final fun (): kotlin.String - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() internal final val bla: kotlin.Int = 12 internal final fun (): kotlin.Int @@ -44,7 +44,7 @@ internal final class TestConstructorParamClassObjectConflict { internal final val some: kotlin.String internal final fun (): kotlin.String - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() internal final val test: kotlin.Int = 12 internal final fun (): kotlin.Int @@ -58,7 +58,7 @@ internal final class TestConstructorValClassObjectConflict { internal final val test: kotlin.String internal final fun (): kotlin.String - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() internal final val test: kotlin.Int = 12 internal final fun (): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt index a83697fe438..f50dbe3ec18 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt @@ -3,7 +3,7 @@ package test internal final class ClassObjectDeclaresProperty { /*primary*/ public constructor ClassObjectDeclaresProperty() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() internal final val i: kotlin.Int = 1 internal final fun (): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt index f0d9c749f0b..b642c2719d7 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt @@ -3,7 +3,7 @@ package test internal final class ClassObjectDeclaresProperty { /*primary*/ public constructor ClassObjectDeclaresProperty() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() internal final var s: kotlin.String internal final fun (): kotlin.String diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt index 94c6dfbae08..a62bc518449 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt @@ -12,3 +12,20 @@ class Int { companion object {} } +public class Outer { + public class Pub { + companion object {} + } + + private class Pri { + companion object {} + } + + class Int { + companion object {} + } + + protected class Pro { + companion object {} + } +} \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.txt index 96ecec3c116..033728dbe7e 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.txt @@ -3,15 +3,51 @@ package test internal final class Int { /*primary*/ public constructor Int() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() } } +public final class Outer { + /*primary*/ public constructor Outer() + + internal final class Int { + /*primary*/ public constructor Int() + + public companion object Companion { + /*primary*/ private constructor Companion() + } + } + + private final class Pri { + /*primary*/ public constructor Pri() + + public companion object Companion { + /*primary*/ private constructor Companion() + } + } + + protected final class Pro { + /*primary*/ public constructor Pro() + + public companion object Companion { + /*primary*/ private constructor Companion() + } + } + + public final class Pub { + /*primary*/ public constructor Pub() + + public companion object Companion { + /*primary*/ private constructor Companion() + } + } +} + private final class Pri { /*primary*/ public constructor Pri() - private companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.txt index e6197420caa..b18e8d160bf 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.txt @@ -6,7 +6,7 @@ internal interface Bbb { internal final class ClassObjectextendsTrait { /*primary*/ public constructor ClassObjectextendsTrait() - internal companion object Companion : test.Bbb { + public companion object Companion : test.Bbb { /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt index adcd3fe6117..3abd1689472 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt @@ -6,7 +6,7 @@ internal interface Bbb { internal final class ClassObjectExtendsTraitWithTP { /*primary*/ public constructor ClassObjectExtendsTraitWithTP() - internal companion object Companion : test.Bbb { + public companion object Companion : test.Bbb { /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt index e15bec6dae7..c7474a03f35 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt @@ -5,7 +5,7 @@ internal final class A { internal final val other: kotlin.Int = 1 internal final fun (): kotlin.Int - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() internal final val some: kotlin.Int = 1 internal final fun (): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt b/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt index ea52cf19683..480282cbf17 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt @@ -4,7 +4,7 @@ internal final class A : test.T { /*primary*/ public constructor A() internal open override /*1*/ fun foo(): kotlin.Int - internal companion object Companion : test.T { + public companion object Companion : test.T { /*primary*/ private constructor Companion() internal open override /*1*/ /*delegation*/ fun foo(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt index 117ed5991d4..9400e915c85 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt @@ -3,7 +3,7 @@ package test internal final class TestFirst { /*primary*/ public constructor TestFirst() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() internal final fun testing(/*0*/ a: test.TestFirst.InnerClass): kotlin.Int internal final fun testing(/*0*/ a: test.TestFirst.NotInnerClass): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.txt b/compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.txt index 897ec8914cf..c6d5a1f0cb8 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.txt @@ -3,7 +3,7 @@ package test internal final class NamedClassObject { /*primary*/ public constructor NamedClassObject() - internal companion object Named { + public companion object Named { /*primary*/ private constructor Named() internal final fun f(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.txt b/compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.txt index 967bd3e5a56..b76ff929346 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.txt @@ -3,7 +3,7 @@ package test internal final class SimpleClassObject { /*primary*/ public constructor SimpleClassObject() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt index ce10dbf8cc5..811122e138e 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt @@ -3,7 +3,7 @@ package test internal final class Test { /*primary*/ public constructor Test() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() public final val prop1: kotlin.Int = 10 public final fun (): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt index 03539dfcede..bf1241f25f1 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt @@ -2,7 +2,7 @@ package test internal interface Test { - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() public final val prop1: kotlin.Int = 10 public final fun (): kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt index 57d8ab835bd..7b9cb8ce13f 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt @@ -3,7 +3,7 @@ package test internal final class A { /*primary*/ public constructor A() - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.txt index 65ef329e1af..7669771f824 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.txt @@ -2,7 +2,7 @@ package test internal interface TheTrait { - internal companion object Companion { + public companion object Companion { /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt index fa60e4307c8..a9f8f7f5278 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt @@ -3,7 +3,7 @@ package test internal final class Some { /*primary*/ public constructor Some() - test.Some.Companion.TestAnnotation() internal companion object Companion { + test.Some.Companion.TestAnnotation() public companion object Companion { /*primary*/ private constructor Companion() internal final annotation class TestAnnotation : kotlin.Annotation { diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt index 88025ee9481..2454a506dc8 100644 --- a/compiler/testData/renderer/Classes.kt +++ b/compiler/testData/renderer/Classes.kt @@ -58,7 +58,7 @@ public interface TwoUpperBounds where T : Number, T : Any //public constructor InternalClass() defined in rendererTest.InternalClass //internal interface TheTrait defined in rendererTest //internal abstract fun abstractFun(): kotlin.Unit defined in rendererTest.TheTrait -//internal companion object : rendererTest.TheClass defined in rendererTest.TheTrait +//public companion object : rendererTest.TheClass defined in rendererTest.TheTrait //private constructor Companion() defined in rendererTest.TheTrait.Companion //internal final fun classObjectFunction(): kotlin.Int defined in rendererTest.TheTrait.Companion //public final class WithReified defined in rendererTest diff --git a/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt b/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt index 38ac00117c5..580b7ba7fd8 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt +++ b/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt @@ -16,7 +16,7 @@ test.anno(x = "top level class": kotlin.String) internal final class C1 { public constructor C2() } - test.anno(x = "companion object": kotlin.String) internal companion object Companion { + test.anno(x = "companion object": kotlin.String) public companion object Companion { private constructor Companion() } } diff --git a/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.txt b/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.txt index 462a0e828c8..117f686dcb8 100644 --- a/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.txt +++ b/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.txt @@ -3,7 +3,7 @@ package test internal final class ClassA { public constructor ClassA() - internal companion object Companion { + public companion object Companion { private constructor Companion() internal final val stat: kotlin.Int diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java index 6bc2bb70aa9..4b1eebf4834 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java @@ -1998,6 +1998,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { doTest(fileName); } + @TestMetadata("companionObjectOfPrivateClassVisibility.kt") + public void testCompanionObjectOfPrivateClassVisibility() throws Exception { + String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/companionObjectOfPrivateClassVisibility.kt"); + doTest(fileName); + } + @TestMetadata("importClassInClassObject.kt") public void testImportClassInClassObject() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt"); diff --git a/idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt b/idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt index 1d0af36bab5..9e9ac92bbe9 100644 --- a/idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt +++ b/idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt @@ -4,7 +4,7 @@ package test internal final class ClassWithClassObject public constructor() { - internal companion object { + public companion object { internal final val a: test.A /* compiled code */ public final var b: test.B /* compiled code */ diff --git a/idea/testData/decompiler/decompiledText/Enum.expected.kt b/idea/testData/decompiler/decompiledText/Enum.expected.kt index 1b8ff0389d5..79e9661256c 100644 --- a/idea/testData/decompiler/decompiledText/Enum.expected.kt +++ b/idea/testData/decompiler/decompiledText/Enum.expected.kt @@ -16,7 +16,7 @@ internal final enum class Enum private constructor() : kotlin.Enum { F - internal companion object { + public companion object { internal final val c: kotlin.Int /* compiled code */ } diff --git a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt index 40a4b2370b1..843502aabfa 100644 --- a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt +++ b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt @@ -76,7 +76,7 @@ PsiJetFileStubImpl[package=test.class_object] VALUE_PARAMETER_LIST: CLASS_BODY: OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] - MODIFIER_LIST:[internal companion] + MODIFIER_LIST:[public companion] CLASS_BODY: CLASS:[fqName=test.class_object.ClassObject.B.Companion.C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] MODIFIER_LIST:[internal final] @@ -85,7 +85,7 @@ PsiJetFileStubImpl[package=test.class_object] VALUE_PARAMETER_LIST: CLASS_BODY: OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Companion.C.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] - MODIFIER_LIST:[internal companion] + MODIFIER_LIST:[public companion] CLASS_BODY: CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] MODIFIER_LIST:[internal final] @@ -94,7 +94,7 @@ PsiJetFileStubImpl[package=test.class_object] VALUE_PARAMETER_LIST: CLASS_BODY: OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] - MODIFIER_LIST:[internal companion] + MODIFIER_LIST:[public companion] CLASS_BODY: PROPERTY:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=i] MODIFIER_LIST:[internal final] diff --git a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt index a3c72017040..c0ef3039a33 100644 --- a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt +++ b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt @@ -44,7 +44,7 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.E, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E, superNames=[]] ENUM_ENTRY:[fqName=a.b.c.test.enum.Enum.F, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=F, superNames=[]] OBJECT_DECLARATION:[fqName=a.b.c.test.enum.Enum.Companion, isCompanion=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] - MODIFIER_LIST:[internal companion] + MODIFIER_LIST:[public companion] CLASS_BODY: PROPERTY:[fqName=a.b.c.test.enum.Enum.Companion.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=c] MODIFIER_LIST:[internal final]