diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/builtins/DefaultObjectMapping.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/builtins/DefaultObjectMapping.kt index 18830f60367..2cec9a55ef6 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/builtins/DefaultObjectMapping.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/builtins/DefaultObjectMapping.kt @@ -20,9 +20,9 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.resolve.DescriptorUtils -public abstract class DefaultObjectMapping { +public abstract class CompanionObjectMapping { public fun hasMappingToObject(classDescriptor: ClassDescriptor): Boolean { - if (!DescriptorUtils.isDefaultObject(classDescriptor)) return false + if (!DescriptorUtils.isCompanionObject(classDescriptor)) return false val containingDeclaration = classDescriptor.getContainingDeclaration() if (containingDeclaration !is ClassDescriptor) return false diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index 53b9f45ef10..d47bb18d967 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -195,8 +195,8 @@ public class AsmUtil { } } - if (AnnotationsPackage.isPlatformStaticInDefaultObject(functionDescriptor)) { - // Native method will be a member of the class, the default object method will be delegated to it + if (AnnotationsPackage.isPlatformStaticInCompanionObject(functionDescriptor)) { + // Native method will be a member of the class, the companion object method will be delegated to it flags &= ~Opcodes.ACC_NATIVE; } @@ -344,7 +344,7 @@ public class AsmUtil { } // the following code is only for PRIVATE visibility of member if (memberDescriptor instanceof ConstructorDescriptor) { - if (isNonDefaultObject(containingDeclaration) || isEnumEntry(containingDeclaration)) { + if (isNonCompanionObject(containingDeclaration) || isEnumEntry(containingDeclaration)) { return NO_FLAG_PACKAGE_PRIVATE; } if (isEnumClass(containingDeclaration)) { @@ -727,12 +727,12 @@ public class AsmUtil { return false; } - return isNonDefaultObject(propertyDescriptor.getContainingDeclaration()) || isPropertyWithBackingFieldInOuterClass(propertyDescriptor); + return isNonCompanionObject(propertyDescriptor.getContainingDeclaration()) || isPropertyWithBackingFieldInOuterClass(propertyDescriptor); } public static boolean isPropertyWithBackingFieldInOuterClass(@NotNull PropertyDescriptor propertyDescriptor) { return propertyDescriptor.getKind() != CallableMemberDescriptor.Kind.FAKE_OVERRIDE && - isDefaultObjectWithBackingFieldsInOuter(propertyDescriptor.getContainingDeclaration()); + isCompanionObjectWithBackingFieldsInOuter(propertyDescriptor.getContainingDeclaration()); } public static int getVisibilityForSpecialPropertyBackingField(@NotNull PropertyDescriptor propertyDescriptor, boolean isDelegate) { @@ -761,14 +761,14 @@ public class AsmUtil { DeclarationDescriptor propertyContainer = propertyDescriptor.getContainingDeclaration(); return !propertyDescriptor.isVar() && !isExtensionProperty - && isDefaultObject(propertyContainer) && isTrait(propertyContainer.getContainingDeclaration()) + && isCompanionObject(propertyContainer) && isTrait(propertyContainer.getContainingDeclaration()) && areBothAccessorDefault(propertyDescriptor) && getVisibilityForSpecialPropertyBackingField(propertyDescriptor, false) == ACC_PUBLIC; } - public static boolean isDefaultObjectWithBackingFieldsInOuter(@NotNull DeclarationDescriptor defaultObject) { - DeclarationDescriptor containingClass = defaultObject.getContainingDeclaration(); - return isDefaultObject(defaultObject) && (isClass(containingClass) || isEnumClass(containingClass)); + public static boolean isCompanionObjectWithBackingFieldsInOuter(@NotNull DeclarationDescriptor companionObject) { + DeclarationDescriptor containingClass = companionObject.getContainingDeclaration(); + return isCompanionObject(companionObject) && (isClass(containingClass) || isEnumClass(containingClass)); } private static boolean areBothAccessorDefault(@NotNull PropertyDescriptor propertyDescriptor) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 834c3b10910..60f6587d2a1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -1946,9 +1946,9 @@ public class ExpressionCodegen extends JetVisitor implem Type type = typeMapper.mapType((ClassDescriptor) enumClass); return StackValue.field(type, type, descriptor.getName().asString(), true, StackValue.none()); } - ClassDescriptor defaultObjectDescriptor = classDescriptor.getDefaultObjectDescriptor(); - if (defaultObjectDescriptor != null) { - return StackValue.singleton(defaultObjectDescriptor, typeMapper); + ClassDescriptor companionObjectDescriptor = classDescriptor.getCompanionObjectDescriptor(); + if (companionObjectDescriptor != null) { + return StackValue.singleton(companionObjectDescriptor, typeMapper); } return StackValue.none(); } @@ -2439,7 +2439,7 @@ public class ExpressionCodegen extends JetVisitor implem public StackValue generateReceiverValue(@NotNull ReceiverValue receiverValue) { if (receiverValue instanceof ClassReceiver) { ClassDescriptor receiverDescriptor = ((ClassReceiver) receiverValue).getDeclarationDescriptor(); - if (DescriptorUtils.isDefaultObject(receiverDescriptor)) { + if (DescriptorUtils.isCompanionObject(receiverDescriptor)) { CallableMemberDescriptor contextDescriptor = context.getContextDescriptor(); if (contextDescriptor instanceof FunctionDescriptor && receiverDescriptor == contextDescriptor.getContainingDeclaration()) { return StackValue.LOCAL_0; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java index 0072e6aaade..f968f3662e7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.org.objectweb.asm.Type; -import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonDefaultObject; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonCompanionObject; public class FieldInfo { @NotNull @@ -34,7 +34,7 @@ public class FieldInfo { throw new UnsupportedOperationException("Can't create singleton field for class: " + classDescriptor); } - if (isNonDefaultObject(classDescriptor) || IntrinsicObjects.INSTANCE$.hasMappingToObject(classDescriptor)) { + if (isNonCompanionObject(classDescriptor) || IntrinsicObjects.INSTANCE$.hasMappingToObject(classDescriptor)) { Type type = typeMapper.mapType(classDescriptor); return new FieldInfo(type, type, JvmAbi.INSTANCE_FIELD, true); } @@ -48,12 +48,12 @@ public class FieldInfo { @SuppressWarnings("deprecation") @NotNull - public static FieldInfo deprecatedFieldForDefaultObject(@NotNull ClassDescriptor defaultObject, @NotNull JetTypeMapper typeMapper) { - assert DescriptorUtils.isDefaultObject(defaultObject) : "Not a default object: " + defaultObject; + public static FieldInfo deprecatedFieldForCompanionObject(@NotNull ClassDescriptor companionObject, @NotNull JetTypeMapper typeMapper) { + assert DescriptorUtils.isCompanionObject(companionObject) : "Not a companion object: " + companionObject; return new FieldInfo( - typeMapper.mapType((ClassifierDescriptor) defaultObject.getContainingDeclaration()), - typeMapper.mapType(defaultObject), - JvmAbi.DEPRECATED_DEFAULT_OBJECT_FIELD, + typeMapper.mapType((ClassifierDescriptor) companionObject.getContainingDeclaration()), + typeMapper.mapType(companionObject), + JvmAbi.DEPRECATED_COMPANION_OBJECT_FIELD, true ); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index e135cf9d505..a4ae796a485 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -166,8 +166,8 @@ public class FunctionCodegen { generateBridges(functionDescriptor); - boolean staticInDefaultObject = AnnotationsPackage.isPlatformStaticInDefaultObject(functionDescriptor); - if (staticInDefaultObject) { + boolean staticInCompanionObject = AnnotationsPackage.isPlatformStaticInCompanionObject(functionDescriptor); + if (staticInCompanionObject) { ImplementationBodyCodegen parentBodyCodegen = (ImplementationBodyCodegen) memberCodegen.getParentCodegen(); parentBodyCodegen.addAdditionalTask(new PlatformStaticGenerator(functionDescriptor, origin, state)); } @@ -190,8 +190,8 @@ public class FunctionCodegen { if (!isNative) { generateMethodBody(mv, functionDescriptor, methodContext, jvmSignature, strategy, memberCodegen); } - else if (staticInDefaultObject) { - // native platformStatic foo() in default object should delegate to the static native function moved to the outer class + else if (staticInCompanionObject) { + // native platformStatic foo() in companion object should delegate to the static native function moved to the outer class mv.visitCode(); FunctionDescriptor staticFunctionDescriptor = PlatformStaticGenerator.createStaticFunctionDescriptor(functionDescriptor); JvmMethodSignature jvmMethodSignature = diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index d508b5bc3a3..f7c8d2392dc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -92,7 +92,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { private JetType superClassType; private final Type classAsmType; - private List defaultObjectPropertiesToCopy; + private List companionObjectPropertiesToCopy; private final List> additionalTasks = new ArrayList>(); @@ -152,7 +152,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { isStatic = !jetClass.isInner(); } else { - isStatic = myClass instanceof JetObjectDeclaration && ((JetObjectDeclaration) myClass).isDefault() ; + isStatic = myClass instanceof JetObjectDeclaration && ((JetObjectDeclaration) myClass).isCompanion() ; isFinal = true; } @@ -352,7 +352,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { generateFieldForSingleton(); - generateDefaultObjectBackingFieldCopies(); + generateCompanionObjectBackingFieldCopies(); DelegationFieldsInfo delegationFieldsInfo = getDelegationFieldsInfo(myClass.getDelegationSpecifiers()); try { @@ -872,7 +872,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { @Override public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) { boolean forceField = AsmUtil.isPropertyWithBackingFieldInOuterClass(original) && - !isDefaultObject(bridge.getContainingDeclaration()); + !isCompanionObject(bridge.getContainingDeclaration()); StackValue property = codegen.intermediateValueForProperty(original, forceField, null, MethodKind.SYNTHETIC_ACCESSOR, StackValue.none()); @@ -962,9 +962,9 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } private void generateFieldForSingleton() { - if (isEnumEntry(descriptor) || isDefaultObject(descriptor)) return; + if (isEnumEntry(descriptor) || isCompanionObject(descriptor)) return; - if (isNonDefaultObject(descriptor)) { + if (isNonCompanionObject(descriptor)) { StackValue.Field field = StackValue.singleton(descriptor, typeMapper); v.newField(OtherOrigin(myClass), ACC_PUBLIC | ACC_STATIC | ACC_FINAL, field.name, field.type.getDescriptor(), null, null); @@ -977,34 +977,34 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { return; } - ClassDescriptor defaultObjectDescriptor = descriptor.getDefaultObjectDescriptor(); - if (defaultObjectDescriptor == null) { + ClassDescriptor companionObjectDescriptor = descriptor.getCompanionObjectDescriptor(); + if (companionObjectDescriptor == null) { return; } - JetObjectDeclaration defaultObject = firstOrNull(((JetClass) myClass).getDefaultObjects()); - assert defaultObject != null : "Default object not found: " + myClass.getText(); + JetObjectDeclaration companionObject = firstOrNull(((JetClass) myClass).getCompanionObjects()); + assert companionObject != null : "Companion object not found: " + myClass.getText(); - StackValue.Field field = StackValue.singleton(defaultObjectDescriptor, typeMapper); - v.newField(OtherOrigin(defaultObject), ACC_PUBLIC | ACC_STATIC | ACC_FINAL, field.name, field.type.getDescriptor(), null, null); + StackValue.Field field = StackValue.singleton(companionObjectDescriptor, typeMapper); + v.newField(OtherOrigin(companionObject), ACC_PUBLIC | ACC_STATIC | ACC_FINAL, field.name, field.type.getDescriptor(), null, null); - StackValue.Field deprecatedField = StackValue.deprecatedDefaultObjectAccessor(defaultObjectDescriptor, typeMapper); - FieldVisitor fv = v.newField(OtherOrigin(defaultObject), ACC_PUBLIC | ACC_STATIC | ACC_FINAL | ACC_DEPRECATED, + StackValue.Field deprecatedField = StackValue.deprecatedCompanionObjectAccessor(companionObjectDescriptor, typeMapper); + FieldVisitor fv = v.newField(OtherOrigin(companionObject), ACC_PUBLIC | ACC_STATIC | ACC_FINAL | ACC_DEPRECATED, deprecatedField.name, deprecatedField.type.getDescriptor(), null, null); fv.visitAnnotation(asmDescByFqNameWithoutInnerClasses(new FqName("java.lang.Deprecated")), true).visitEnd(); if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return; - if (!isDefaultObjectWithBackingFieldsInOuter(defaultObjectDescriptor)) { - generateDefaultObjectInitializer(defaultObjectDescriptor); + if (!isCompanionObjectWithBackingFieldsInOuter(companionObjectDescriptor)) { + generateCompanionObjectInitializer(companionObjectDescriptor); } } - private void generateDefaultObjectBackingFieldCopies() { - if (defaultObjectPropertiesToCopy == null) return; + private void generateCompanionObjectBackingFieldCopies() { + if (companionObjectPropertiesToCopy == null) return; - for (PropertyAndDefaultValue info : defaultObjectPropertiesToCopy) { + for (PropertyAndDefaultValue info : companionObjectPropertiesToCopy) { PropertyDescriptor property = info.descriptor; Type type = typeMapper.mapType(property); @@ -1020,40 +1020,40 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { // TODO: test this code if (state.getClassBuilderMode() == ClassBuilderMode.FULL && info.defaultValue == null) { ExpressionCodegen codegen = createOrGetClInitCodegen(); - int defaultObjectIndex = putDefaultObjectInLocalVar(codegen); - StackValue.local(defaultObjectIndex, OBJECT_TYPE).put(OBJECT_TYPE, codegen.v); - copyFieldFromDefaultObject(property); + int companionObjectIndex = putCompanionObjectInLocalVar(codegen); + StackValue.local(companionObjectIndex, OBJECT_TYPE).put(OBJECT_TYPE, codegen.v); + copyFieldFromCompanionObject(property); } } } - private int putDefaultObjectInLocalVar(ExpressionCodegen codegen) { + private int putCompanionObjectInLocalVar(ExpressionCodegen codegen) { FrameMap frameMap = codegen.myFrameMap; - ClassDescriptor defaultObjectDescriptor = descriptor.getDefaultObjectDescriptor(); - int defaultObjectIndex = frameMap.getIndex(defaultObjectDescriptor); - if (defaultObjectIndex == -1) { - defaultObjectIndex = frameMap.enter(defaultObjectDescriptor, OBJECT_TYPE); - StackValue defaultObject = StackValue.singleton(defaultObjectDescriptor, typeMapper); - StackValue.local(defaultObjectIndex, defaultObject.type).store(defaultObject, codegen.v); + ClassDescriptor companionObjectDescriptor = descriptor.getCompanionObjectDescriptor(); + int companionObjectIndex = frameMap.getIndex(companionObjectDescriptor); + if (companionObjectIndex == -1) { + companionObjectIndex = frameMap.enter(companionObjectDescriptor, OBJECT_TYPE); + StackValue companionObject = StackValue.singleton(companionObjectDescriptor, typeMapper); + StackValue.local(companionObjectIndex, companionObject.type).store(companionObject, codegen.v); } - return defaultObjectIndex; + return companionObjectIndex; } - private void copyFieldFromDefaultObject(PropertyDescriptor propertyDescriptor) { + private void copyFieldFromCompanionObject(PropertyDescriptor propertyDescriptor) { ExpressionCodegen codegen = createOrGetClInitCodegen(); StackValue property = codegen.intermediateValueForProperty(propertyDescriptor, false, null, StackValue.none()); StackValue.Field field = StackValue.field(property.type, classAsmType, propertyDescriptor.getName().asString(), true, StackValue.none()); field.store(property, codegen.v); } - private void generateDefaultObjectInitializer(@NotNull ClassDescriptor defaultObject) { + private void generateCompanionObjectInitializer(@NotNull ClassDescriptor companionObject) { ExpressionCodegen codegen = createOrGetClInitCodegen(); - FunctionDescriptor constructor = codegen.accessibleFunctionDescriptor(KotlinPackage.single(defaultObject.getConstructors())); + FunctionDescriptor constructor = codegen.accessibleFunctionDescriptor(KotlinPackage.single(companionObject.getConstructors())); generateMethodCallTo(constructor, codegen.v); codegen.v.dup(); - StackValue instance = StackValue.onStack(typeMapper.mapClass(defaultObject)); - StackValue.singleton(defaultObject, typeMapper).store(instance, codegen.v, true); - StackValue.deprecatedDefaultObjectAccessor(defaultObject, typeMapper).store(instance, codegen.v, true); + StackValue instance = StackValue.onStack(typeMapper.mapClass(companionObject)); + StackValue.singleton(companionObject, typeMapper).store(instance, codegen.v, true); + StackValue.deprecatedCompanionObjectAccessor(companionObject, typeMapper).store(instance, codegen.v, true); } private void generatePrimaryConstructor(final DelegationFieldsInfo delegationFieldsInfo) { @@ -1079,7 +1079,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { CallableMethod callableMethod = typeMapper.mapToCallableMethod(constructorDescriptor); FunctionCodegen.generateConstructorWithoutParametersIfNeeded(state, callableMethod, constructorDescriptor, v, myClass); - if (isDefaultObject(descriptor)) { + if (isCompanionObject(descriptor)) { context.recordSyntheticAccessorIfNeeded(constructorDescriptor, bindingContext); } } @@ -1112,7 +1112,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { generateDelegatorToConstructorCall(iv, codegen, constructorDescriptor, getDelegationConstructorCall(bindingContext, constructorDescriptor)); - if (isNonDefaultObject(descriptor)) { + if (isNonCompanionObject(descriptor)) { StackValue.singleton(descriptor, typeMapper).store(StackValue.LOCAL_0, iv); } @@ -1137,9 +1137,9 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { curParam++; } - if (isDefaultObjectWithBackingFieldsInOuter(descriptor)) { + if (isCompanionObjectWithBackingFieldsInOuter(descriptor)) { final ImplementationBodyCodegen parentCodegen = (ImplementationBodyCodegen) getParentCodegen(); - parentCodegen.generateDefaultObjectInitializer(descriptor); + parentCodegen.generateCompanionObjectInitializer(descriptor); generateInitializers(new Function0() { @Override public ExpressionCodegen invoke() { @@ -1740,11 +1740,11 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } } - public void addDefaultObjectPropertyToCopy(@NotNull PropertyDescriptor descriptor, Object defaultValue) { - if (defaultObjectPropertiesToCopy == null) { - defaultObjectPropertiesToCopy = new ArrayList(); + public void addCompanionObjectPropertyToCopy(@NotNull PropertyDescriptor descriptor, Object defaultValue) { + if (companionObjectPropertiesToCopy == null) { + companionObjectPropertiesToCopy = new ArrayList(); } - defaultObjectPropertiesToCopy.add(new PropertyAndDefaultValue(descriptor, defaultValue)); + companionObjectPropertiesToCopy.add(new PropertyAndDefaultValue(descriptor, defaultValue)); } @Override diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index 8ea8dd8116b..552d1441648 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -180,8 +180,8 @@ public class JvmCodegenUtil { // Delegated and extension properties have no backing fields if (isDelegated || property.getExtensionReceiverParameter() != null) return false; - // Default object properties cannot be accessed directly because their backing fields are stored in the containing class - if (DescriptorUtils.isDefaultObject(property.getContainingDeclaration())) return false; + // Companion object properties cannot be accessed directly because their backing fields are stored in the containing class + if (DescriptorUtils.isCompanionObject(property.getContainingDeclaration())) return false; PropertyAccessorDescriptor accessor = forGetter ? property.getGetter() : property.getSetter(); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index fc07ab30938..dd895d32f49 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -48,7 +48,7 @@ import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isInterface; import static org.jetbrains.kotlin.codegen.JvmSerializationBindings.*; -import static org.jetbrains.kotlin.resolve.DescriptorUtils.isDefaultObject; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isCompanionObject; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isTrait; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.PROPERTY_METADATA_TYPE; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; @@ -144,8 +144,8 @@ public class PropertyCodegen { // Delegated or extension properties can only be referenced via accessors if (declaration.hasDelegate() || declaration.getReceiverTypeReference() != null) return true; - // Default object properties always should have accessors, because their backing fields are moved/copied to the outer class - if (isDefaultObject(descriptor.getContainingDeclaration())) return true; + // Companion object properties always should have accessors, because their backing fields are moved/copied to the outer class + if (isCompanionObject(descriptor.getContainingDeclaration())) return true; // Private class properties have accessors only in cases when those accessors are non-trivial if (kind == OwnerKind.IMPLEMENTATION && Visibilities.isPrivate(descriptor.getVisibility())) { @@ -265,7 +265,7 @@ public class PropertyCodegen { if (AsmUtil.isPropertyWithBackingFieldCopyInOuterClass(propertyDescriptor)) { ImplementationBodyCodegen parentBodyCodegen = (ImplementationBodyCodegen) memberCodegen.getParentCodegen(); - parentBodyCodegen.addDefaultObjectPropertyToCopy(propertyDescriptor, defaultValue); + parentBodyCodegen.addCompanionObjectPropertyToCopy(propertyDescriptor, defaultValue); } String name = backingFieldContext.getFieldName(propertyDescriptor, isDelegate); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java index 2efe5689908..a8380e585d0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java @@ -513,8 +513,8 @@ public abstract class StackValue { return field(FieldInfo.createForSingleton(classDescriptor, typeMapper)); } - public static Field deprecatedDefaultObjectAccessor(ClassDescriptor classDescriptor, JetTypeMapper typeMapper) { - return field(FieldInfo.deprecatedFieldForDefaultObject(classDescriptor, typeMapper)); + public static Field deprecatedCompanionObjectAccessor(ClassDescriptor classDescriptor, JetTypeMapper typeMapper) { + return field(FieldInfo.deprecatedFieldForCompanionObject(classDescriptor, typeMapper)); } public static StackValue operation(Type type, Function1 lambda) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java index 320f9d14953..a5ab72e5dbd 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java @@ -51,7 +51,7 @@ public final class PsiCodegenPredictor { */ @Nullable public static String getPredefinedJvmInternalName(@NotNull JetDeclaration declaration) { - // TODO: Method won't work for declarations inside default objects + // TODO: Method won't work for declarations inside companion objects // TODO: Method won't give correct class name for traits implementations JetDeclaration parentDeclaration = JetStubbedPsiUtil.getContainingDeclaration(declaration); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java index c8b2b3e116f..d430d43f188 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java @@ -61,9 +61,9 @@ public class ClassContext extends FieldOwnerContext { } @Nullable - public CodegenContext getDefaultObjectContext() { - if (getContextDescriptor().getDefaultObjectDescriptor() != null) { - return findChildContext(getContextDescriptor().getDefaultObjectDescriptor()); + public CodegenContext getCompanionObjectContext() { + if (getContextDescriptor().getCompanionObjectDescriptor() != null) { + return findChildContext(getContextDescriptor().getCompanionObjectDescriptor()); } return null; } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java index 52a0711c275..5430b876ef8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java @@ -361,7 +361,7 @@ public abstract class CodegenContext { CodegenContext descriptorContext = null; if (!fromOutsideContext || getClassOrPackageParentContext().getContextDescriptor() != descriptor.getContainingDeclaration()) { DeclarationDescriptor enclosed = descriptor.getContainingDeclaration(); - boolean isDefaultObjectMember = DescriptorUtils.isDefaultObject(enclosed); + boolean isCompanionObjectMember = DescriptorUtils.isCompanionObject(enclosed); //go upper if (hasThisDescriptor() && (enclosed != getThisDescriptor() || !fromOutsideContext)) { CodegenContext currentContext = this; @@ -371,12 +371,12 @@ public abstract class CodegenContext { break; } - //accessors for private members in default object for call from class - if (isDefaultObjectMember && currentContext instanceof ClassContext) { + //accessors for private members in companion object for call from class + if (isCompanionObjectMember && currentContext instanceof ClassContext) { ClassContext classContext = (ClassContext) currentContext; - CodegenContext defaultObjectContext = classContext.getDefaultObjectContext(); - if (defaultObjectContext != null && defaultObjectContext.getContextDescriptor() == enclosed) { - descriptorContext = defaultObjectContext; + CodegenContext companionObjectContext = classContext.getCompanionObjectContext(); + if (companionObjectContext != null && companionObjectContext.getContextDescriptor() == enclosed) { + descriptorContext = companionObjectContext; break; } } @@ -417,7 +417,7 @@ public abstract class CodegenContext { } protected boolean shouldAddChild(@NotNull CodegenContext child) { - return DescriptorUtils.isDefaultObject(child.contextDescriptor); + return DescriptorUtils.isCompanionObject(child.contextDescriptor); } @Nullable diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicObjects.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicObjects.kt index 24d7338f5be..160a2315061 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicObjects.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicObjects.kt @@ -16,17 +16,17 @@ package org.jetbrains.kotlin.codegen.intrinsics -import org.jetbrains.kotlin.backend.common.builtins.DefaultObjectMapping +import org.jetbrains.kotlin.backend.common.builtins.CompanionObjectMapping import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -public object IntrinsicObjects : DefaultObjectMapping() { +public object IntrinsicObjects : CompanionObjectMapping() { public fun mapType(classDescriptor: ClassDescriptor): FqName? { if (!hasMappingToObject(classDescriptor)) return null val containingDeclaration = classDescriptor.getContainingDeclaration() - val name = Name.identifier(containingDeclaration.getName().asString() + "DefaultObject") + val name = Name.identifier(containingDeclaration.getName().asString() + "CompanionObject") return FqName("kotlin.jvm.internal").child(name) } } \ No newline at end of file diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java index 9bca0bb5cd1..4a6b2e28ca2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -300,9 +300,9 @@ public class JetTypeMapper { } if (descriptor instanceof ClassDescriptor) { - FqName defaultObjectMappedFqName = IntrinsicObjects.INSTANCE$.mapType((ClassDescriptor) descriptor); - if (defaultObjectMappedFqName != null) { - Type asmType = AsmUtil.asmTypeByFqNameWithoutInnerClasses(defaultObjectMappedFqName); + FqName companionObjectMappedFqName = IntrinsicObjects.INSTANCE$.mapType((ClassDescriptor) descriptor); + if (companionObjectMappedFqName != null) { + Type asmType = AsmUtil.asmTypeByFqNameWithoutInnerClasses(companionObjectMappedFqName); if (signatureVisitor != null) { signatureVisitor.writeAsmType(asmType); } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java index b988c25ba85..50d992661be 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java @@ -81,7 +81,7 @@ public abstract class FileBasedKotlinClass implements KotlinJvmBinaryClass { @NotNull protected abstract byte[] getFileContents(); - // TODO public to be accessible in default object of subclass, workaround for KT-3974 + // TODO public to be accessible in companion object of subclass, workaround for KT-3974 @Nullable public static T create( @NotNull byte[] fileContents, diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt index 836beb30498..68ac956575a 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt @@ -96,12 +96,12 @@ public class PlatformStaticAnnotationChecker : AnnotationChecker { diagnosticHolder: DiagnosticSink ) { val container = descriptor.getContainingDeclaration() - val insideObject = container != null && DescriptorUtils.isNonDefaultObject(container) - val insideDefaultObjectInClass = - container != null && DescriptorUtils.isDefaultObject(container) && DescriptorUtils.isClass(container.getContainingDeclaration()) - container != null && DescriptorUtils.isDefaultObject(container) && DescriptorUtils.isClass(container.getContainingDeclaration()) + val insideObject = container != null && DescriptorUtils.isNonCompanionObject(container) + val insideCompanionObjectInClass = + container != null && DescriptorUtils.isCompanionObject(container) && DescriptorUtils.isClass(container.getContainingDeclaration()) + container != null && DescriptorUtils.isCompanionObject(container) && DescriptorUtils.isClass(container.getContainingDeclaration()) - if (!insideObject && !insideDefaultObjectInClass) { + if (!insideObject && !insideCompanionObjectInClass) { diagnosticHolder.report(ErrorsJvm.PLATFORM_STATIC_NOT_IN_OBJECT.on(declaration)); } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/calls/checkers/NeedSyntheticChecker.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/calls/checkers/NeedSyntheticChecker.java index 686c10c3cb7..1b11b8e5dbf 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/calls/checkers/NeedSyntheticChecker.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/calls/checkers/NeedSyntheticChecker.java @@ -42,7 +42,7 @@ public class NeedSyntheticChecker implements CallChecker { //Necessary synthetic accessors in outer classes generated via old logic: CodegenContext.getAccessor //Generation of accessors in nested classes (to invoke from outer, - // e.g.: from class to default object) controlled via NEED_SYNTHETIC_ACCESSOR slice + // e.g.: from class to companion object) controlled via NEED_SYNTHETIC_ACCESSOR slice private boolean needSyntheticAccessor(JetScope invokationScope, CallableDescriptor targetDescriptor) { return targetDescriptor instanceof CallableMemberDescriptor && Visibilities.isPrivate(targetDescriptor.getVisibility()) && diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java index 1ab3590b857..ea5b71669b7 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java @@ -45,7 +45,7 @@ public class DefaultErrorMessagesJvm implements DefaultErrorMessages.Extension { static { MAP.put(ErrorsJvm.CONFLICTING_JVM_DECLARATIONS, "Platform declaration clash: {0}", CONFLICTING_JVM_DECLARATIONS_DATA); MAP.put(ErrorsJvm.ACCIDENTAL_OVERRIDE, "Accidental override: {0}", CONFLICTING_JVM_DECLARATIONS_DATA); - MAP.put(ErrorsJvm.PLATFORM_STATIC_NOT_IN_OBJECT, "Only functions in named objects and default objects of classes can be annotated with 'platformStatic'"); + MAP.put(ErrorsJvm.PLATFORM_STATIC_NOT_IN_OBJECT, "Only functions in named objects and companion objects of classes can be annotated with 'platformStatic'"); MAP.put(ErrorsJvm.OVERRIDE_CANNOT_BE_STATIC, "Override member cannot be 'platformStatic' in object"); MAP.put(ErrorsJvm.PLATFORM_STATIC_ILLEGAL_USAGE, "This declaration does not support ''platformStatic''", DescriptorRenderer.SHORT_NAMES_IN_TYPES); MAP.put(ErrorsJvm.NATIVE_DECLARATION_CANNOT_BE_ABSTRACT, "Native declaration can not be abstract"); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java index a4f54e8e520..270d2ebe7f7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java @@ -1379,7 +1379,7 @@ public class JetControlFlowProcessor { @Override public void visitTypeProjection(@NotNull JetTypeProjection typeProjection) { - // TODO : Support Type Arguments. Default object may be initialized at this point"); + // TODO : Support Type Arguments. Companion object may be initialized at this point"); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java index 2ba293eb48b..dfda79e9e52 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java @@ -41,7 +41,7 @@ public interface ClassDescriptorWithResolutionScopes extends ClassDescriptor { @Nullable @Override - ClassDescriptorWithResolutionScopes getDefaultObjectDescriptor(); + ClassDescriptorWithResolutionScopes getCompanionObjectDescriptor(); @NotNull @ReadOnly diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java index 3bc6a626a7a..b10718e1c54 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java @@ -44,7 +44,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class private List typeParameters; private Collection supertypes = new ArrayList(); - private MutableClassDescriptor defaultObjectDescriptor; + private MutableClassDescriptor companionObjectDescriptor; private final Set constructors = Sets.newLinkedHashSet(); private ConstructorDescriptor primaryConstructor; @@ -71,7 +71,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class @NotNull SourceElement source ) { super(LockBasedStorageManager.NO_LOCKS, containingDeclaration, name, source); - assert kind != ClassKind.OBJECT : "Fix isDefaultObject()"; + assert kind != ClassKind.OBJECT : "Fix isCompanionObject()"; this.kind = kind; this.isInner = isInner; @@ -98,13 +98,13 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class @Nullable @Override - public MutableClassDescriptor getDefaultObjectDescriptor() { - return defaultObjectDescriptor; + public MutableClassDescriptor getCompanionObjectDescriptor() { + return companionObjectDescriptor; } - public void setDefaultObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor) { - assert this.defaultObjectDescriptor == null : "classObjectDescriptor already assigned in " + this; - this.defaultObjectDescriptor = classObjectDescriptor; + public void setCompanionObjectDescriptor(@NotNull MutableClassDescriptor classObjectDescriptor) { + assert this.companionObjectDescriptor == null : "classObjectDescriptor already assigned in " + this; + this.companionObjectDescriptor = classObjectDescriptor; } @NotNull @@ -155,7 +155,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class } @Override - public boolean isDefaultObject() { + public boolean isCompanionObject() { //TODO: return false; } @@ -329,8 +329,8 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class public void lockScopes() { getScopeForMemberLookupAsWritableScope().changeLockLevel(WritableScope.LockLevel.READING); - if (defaultObjectDescriptor != null) { - defaultObjectDescriptor.lockScopes(); + if (companionObjectDescriptor != null) { + companionObjectDescriptor.lockScopes(); } scopeForSupertypeResolution.changeLockLevel(WritableScope.LockLevel.READING); scopeForMemberResolution.changeLockLevel(WritableScope.LockLevel.READING); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java index 440f830cd13..53b196c7a3a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java @@ -203,10 +203,10 @@ public interface Errors { DiagnosticFactory1 ENUM_ENTRY_ILLEGAL_TYPE = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 LOCAL_ENUM_NOT_ALLOWED = DiagnosticFactory1.create(ERROR, DECLARATION_NAME); - // Default objects + // Companion objects - DiagnosticFactory0 MANY_DEFAULT_OBJECTS = DiagnosticFactory0.create(ERROR, DEFAULT_OBJECT); - DiagnosticFactory0 DEFAULT_OBJECT_NOT_ALLOWED = DiagnosticFactory0.create(ERROR, DEFAULT_OBJECT); + DiagnosticFactory0 MANY_COMPANION_OBJECTS = DiagnosticFactory0.create(ERROR, COMPANION_OBJECT); + DiagnosticFactory0 COMPANION_OBJECT_NOT_ALLOWED = DiagnosticFactory0.create(ERROR, COMPANION_OBJECT); DiagnosticFactory0 DEPRECATED_CLASS_OBJECT_SYNTAX = DiagnosticFactory0.create(WARNING); @@ -217,12 +217,12 @@ public interface Errors { // Type parameter declarations DiagnosticFactory1 FINAL_UPPER_BOUND = DiagnosticFactory1.create(WARNING); - DiagnosticFactory1 FINAL_DEFAULT_OBJECT_UPPER_BOUND = DiagnosticFactory1.create(ERROR); + DiagnosticFactory1 FINAL_COMPANION_OBJECT_UPPER_BOUND = DiagnosticFactory1.create(ERROR); DiagnosticFactory0 DYNAMIC_UPPER_BOUND = DiagnosticFactory0.create(ERROR); DiagnosticFactory1 CONFLICTING_UPPER_BOUNDS = DiagnosticFactory1.create(ERROR, DECLARATION_NAME); - DiagnosticFactory1 CONFLICTING_DEFAULT_OBJECT_UPPER_BOUNDS + DiagnosticFactory1 CONFLICTING_COMPANION_OBJECT_UPPER_BOUNDS = DiagnosticFactory1.create(ERROR, DECLARATION_NAME); DiagnosticFactory2 NAME_IN_CONSTRAINT_IS_NOT_A_TYPE_PARAMETER = @@ -636,7 +636,7 @@ public interface Errors { DiagnosticFactory0 NO_THIS = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 PACKAGE_IS_NOT_AN_EXPRESSION = DiagnosticFactory0.create(ERROR); - DiagnosticFactory1 NO_DEFAULT_OBJECT = DiagnosticFactory1.create(ERROR); + DiagnosticFactory1 NO_COMPANION_OBJECT = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 TYPE_PARAMETER_IS_NOT_AN_EXPRESSION = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 TYPE_PARAMETER_ON_LHS_OF_DOT = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 NESTED_CLASS_ACCESSED_VIA_INSTANCE_REFERENCE = DiagnosticFactory1.create(ERROR); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt index ea419f13417..551bdd054d4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt @@ -391,10 +391,10 @@ public object PositioningStrategies { } } - public val DEFAULT_OBJECT: PositioningStrategy = object : PositioningStrategy() { + public val COMPANION_OBJECT: PositioningStrategy = object : PositioningStrategy() { override fun mark(element: JetObjectDeclaration): List { - if (element.hasModifier(JetTokens.DEFAULT_KEYWORD)) { - return modifierSetPosition(JetTokens.DEFAULT_KEYWORD).mark(element) + if (element.hasModifier(JetTokens.COMPANION_KEYWORD)) { + return modifierSetPosition(JetTokens.COMPANION_KEYWORD).mark(element) } return DEFAULT.mark(element) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index 40f152dd823..bb4d38762fd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -273,10 +273,10 @@ public class DefaultErrorMessages { MAP.put(UNREACHABLE_CODE, "Unreachable code", TO_STRING); - MAP.put(MANY_DEFAULT_OBJECTS, "Only one default object is allowed per class"); - MAP.put(DEFAULT_OBJECT_NOT_ALLOWED, "A default object is not allowed here"); + MAP.put(MANY_COMPANION_OBJECTS, "Only one companion object is allowed per class"); + MAP.put(COMPANION_OBJECT_NOT_ALLOWED, "A companion object is not allowed here"); - MAP.put(DEPRECATED_CLASS_OBJECT_SYNTAX, "'class object' syntax for default objects was deprecated. Use 'default' modifier instead"); + MAP.put(DEPRECATED_CLASS_OBJECT_SYNTAX, "'class object' syntax for companion objects was deprecated. Use 'default' modifier instead"); MAP.put(LOCAL_OBJECT_NOT_ALLOWED, "Named object ''{0}'' is a singleton and cannot be local. Try to use anonymous object instead", NAME); MAP.put(LOCAL_ENUM_NOT_ALLOWED, "Enum class ''{0}'' cannot be local", NAME); @@ -321,9 +321,9 @@ public class DefaultErrorMessages { MAP.put(USELESS_NULLABLE_CHECK, "Non-null type is checked for instance of nullable type"); MAP.put(WRONG_SETTER_PARAMETER_TYPE, "Setter parameter type must be equal to the type of the property, i.e. ''{0}''", RENDER_TYPE, RENDER_TYPE); MAP.put(WRONG_GETTER_RETURN_TYPE, "Getter return type must be equal to the type of the property, i.e. ''{0}''", RENDER_TYPE, RENDER_TYPE); - MAP.put(NO_DEFAULT_OBJECT, "Please specify constructor invocation; classifier ''{0}'' does not have a default object", NAME); + MAP.put(NO_COMPANION_OBJECT, "Please specify constructor invocation; classifier ''{0}'' does not have a companion object", NAME); MAP.put(TYPE_PARAMETER_IS_NOT_AN_EXPRESSION, "Type parameter ''{0}'' is not an expression", NAME); - MAP.put(TYPE_PARAMETER_ON_LHS_OF_DOT, "Type parameter ''{0}'' cannot have or inherit a default object, so it cannot be on the left hand side of dot", NAME); + MAP.put(TYPE_PARAMETER_ON_LHS_OF_DOT, "Type parameter ''{0}'' cannot have or inherit a companion object, so it cannot be on the left hand side of dot", NAME); MAP.put(NO_GENERICS_IN_SUPERTYPE_SPECIFIER, "Generic arguments of the base type must be specified"); MAP.put(NESTED_CLASS_ACCESSED_VIA_INSTANCE_REFERENCE, "Nested {0} accessed via instance reference", RENDER_CLASS_OR_OBJECT_NAME); MAP.put(NESTED_CLASS_SHOULD_BE_QUALIFIED, "Nested {0} should be qualified as ''{1}''", RENDER_CLASS_OR_OBJECT_NAME, TO_STRING); @@ -381,12 +381,12 @@ public class DefaultErrorMessages { }); MAP.put(UPPER_BOUND_VIOLATED, "Type argument is not within its bounds: should be subtype of ''{0}''", RENDER_TYPE, RENDER_TYPE); - MAP.put(FINAL_DEFAULT_OBJECT_UPPER_BOUND, "''{0}'' is a final type, and thus a default object cannot extend it", RENDER_TYPE); + MAP.put(FINAL_COMPANION_OBJECT_UPPER_BOUND, "''{0}'' is a final type, and thus a companion object cannot extend it", RENDER_TYPE); MAP.put(FINAL_UPPER_BOUND, "''{0}'' is a final type, and thus a value of the type parameter is predetermined", RENDER_TYPE); MAP.put(DYNAMIC_UPPER_BOUND, "Dynamic type can not be used as an upper bound"); MAP.put(USELESS_ELVIS, "Elvis operator (?:) always returns the left operand of non-nullable type {0}", RENDER_TYPE); MAP.put(CONFLICTING_UPPER_BOUNDS, "Upper bounds of {0} have empty intersection", NAME); - MAP.put(CONFLICTING_DEFAULT_OBJECT_UPPER_BOUNDS, "Default object upper bounds of {0} have empty intersection", NAME); + MAP.put(CONFLICTING_COMPANION_OBJECT_UPPER_BOUNDS, "Companion object upper bounds of {0} have empty intersection", NAME); MAP.put(TOO_MANY_ARGUMENTS, "Too many arguments for {0}", FQ_NAMES_IN_TYPES); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java b/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java index 8dda77860f8..fa996a7c9ea 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetTokens.java @@ -155,7 +155,7 @@ public interface JetTokens { JetModifierKeywordToken VARARG_KEYWORD = JetModifierKeywordToken.softKeywordModifier("vararg"); JetModifierKeywordToken REIFIED_KEYWORD = JetModifierKeywordToken.softKeywordModifier("reified"); JetModifierKeywordToken DYNAMIC_KEYWORD = JetModifierKeywordToken.softKeywordModifier("dynamic"); - JetModifierKeywordToken DEFAULT_KEYWORD = JetModifierKeywordToken.softKeywordModifier("default"); + JetModifierKeywordToken COMPANION_KEYWORD = JetModifierKeywordToken.softKeywordModifier("companion"); JetKeywordToken FINALLY_KEYWORD = JetKeywordToken.softKeyword("finally"); JetModifierKeywordToken FINAL_KEYWORD = JetModifierKeywordToken.softKeywordModifier("final"); @@ -173,7 +173,7 @@ public interface JetTokens { SET_KEYWORD, ABSTRACT_KEYWORD, ENUM_KEYWORD, OPEN_KEYWORD, INNER_KEYWORD, ANNOTATION_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, PROTECTED_KEYWORD, CATCH_KEYWORD, FINALLY_KEYWORD, OUT_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, REIFIED_KEYWORD, - DYNAMIC_KEYWORD, DEFAULT_KEYWORD, CONSTRUCTOR_KEYWORD, INIT_KEYWORD + DYNAMIC_KEYWORD, COMPANION_KEYWORD, CONSTRUCTOR_KEYWORD, INIT_KEYWORD ); /* @@ -185,7 +185,7 @@ public interface JetTokens { new JetModifierKeywordToken[] { ABSTRACT_KEYWORD, ENUM_KEYWORD, OPEN_KEYWORD, INNER_KEYWORD, ANNOTATION_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, PROTECTED_KEYWORD, OUT_KEYWORD, IN_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, - REIFIED_KEYWORD, DEFAULT_KEYWORD + REIFIED_KEYWORD, COMPANION_KEYWORD }; TokenSet MODIFIER_KEYWORDS = TokenSet.create(MODIFIER_KEYWORDS_ARRAY); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java index ac36f3ddad0..aab730d8f5f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java @@ -785,7 +785,7 @@ public class JetParsing extends AbstractJetParsing { * ; * * memberDeclaration' - * : defaultObject + * : companionObject * : secondaryConstructor * : function * : property @@ -957,7 +957,7 @@ public class JetParsing extends AbstractJetParsing { } /* - * defaultObject + * companionObject * : modifiers "class" object * ; */ @@ -2083,7 +2083,7 @@ public class JetParsing extends AbstractJetParsing { if (item == JetTokens.ENUM_KEYWORD) { enumDetected = true; } - else if (item == JetTokens.DEFAULT_KEYWORD) { + else if (item == JetTokens.COMPANION_KEYWORD) { defaultDetected = true; } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java index 213b7880ce1..149c218e682 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java @@ -220,12 +220,12 @@ public class JetClass extends JetTypeParameterListOwnerStub imp } @NotNull - public List getDefaultObjects() { + public List getCompanionObjects() { JetClassBody body = getBody(); if (body == null) { return Collections.emptyList(); } - return body.getAllDefaultObjects(); + return body.getAllCompanionObjects(); } public boolean hasPrimaryConstructor() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java index 5b9a95b3c13..8d0333fab0d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java @@ -72,10 +72,10 @@ public class JetClassBody extends JetElementImplStub getAllDefaultObjects() { + public List getAllCompanionObjects() { List result = Lists.newArrayList(); for (JetObjectDeclaration declaration : getStubOrPsiChildrenAsList(JetStubElementTypes.OBJECT_DECLARATION)) { - if (declaration.isDefault()) { + if (declaration.isCompanion()) { result.add(declaration); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java index 72a73344aa9..0840765871b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java @@ -95,10 +95,10 @@ abstract class JetNamedDeclarationStub extends J if (hasModifier(JetTokens.PRIVATE_KEYWORD)) { JetElement containingClass = PsiTreeUtil.getParentOfType(this, JetClassOrObject.class); - if (containingClass instanceof JetObjectDeclaration && ((JetObjectDeclaration) containingClass).isDefault()) { - JetElement defaultObjectClass = PsiTreeUtil.getParentOfType(containingClass, JetClassOrObject.class); - if (defaultObjectClass != null) { - containingClass = defaultObjectClass; + if (containingClass instanceof JetObjectDeclaration && ((JetObjectDeclaration) containingClass).isCompanion()) { + JetElement companionObjectClass = PsiTreeUtil.getParentOfType(containingClass, JetClassOrObject.class); + if (companionObjectClass != null) { + containingClass = companionObjectClass; } } if (containingClass != null) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java index c824cc2507b..48b29a9e0f2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java @@ -51,9 +51,9 @@ public class JetObjectDeclaration extends JetNamedDeclarationStub { } public trait KotlinTypeConstraintStub : StubElement { - public fun isDefaultObjectConstraint(): Boolean + public fun isCompanionObjectConstraint(): Boolean } public trait KotlinTypeParameterStub : KotlinStubWithFqName { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java index f088e54ff8d..575ad0f8108 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java @@ -45,7 +45,7 @@ public class JetObjectElementType extends JetStubElementType superNames = PsiUtilPackage.getSuperNames(psi); return new KotlinObjectStubImpl(parentStub, StringRef.fromString(name), fqName, Utils.INSTANCE$.wrapStrings(superNames), - psi.isTopLevel(), psi.isDefault(), psi.isLocal(), psi.isObjectLiteral()); + psi.isTopLevel(), psi.isCompanion(), psi.isLocal(), psi.isObjectLiteral()); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeConstraintElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeConstraintElementType.java index 6fa0844d744..a1683593d29 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeConstraintElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeConstraintElementType.java @@ -34,18 +34,18 @@ public class JetTypeConstraintElementType extends JetStubElementType?, - private val isDefaultObjectConstraint: Boolean + private val isCompanionObjectConstraint: Boolean ) : KotlinStubBaseImpl(parent, JetStubElementTypes.TYPE_CONSTRAINT), KotlinTypeConstraintStub { - override fun isDefaultObjectConstraint() = isDefaultObjectConstraint + override fun isCompanionObjectConstraint() = isCompanionObjectConstraint } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt index 20ce0c2cb67..c889eef15f8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt @@ -36,10 +36,10 @@ public fun DeclarationDescriptor.hasIntrinsicAnnotation(): Boolean { } public fun CallableDescriptor.isPlatformStaticInObjectOrClass(): Boolean = - isPlatformStaticIn { DescriptorUtils.isNonDefaultObject(it) || DescriptorUtils.isClass(it) } + isPlatformStaticIn { DescriptorUtils.isNonCompanionObject(it) || DescriptorUtils.isClass(it) } -public fun CallableDescriptor.isPlatformStaticInDefaultObject(): Boolean = - isPlatformStaticIn { DescriptorUtils.isDefaultObject(it) } +public fun CallableDescriptor.isPlatformStaticInCompanionObject(): Boolean = + isPlatformStaticIn { DescriptorUtils.isCompanionObject(it) } private fun CallableDescriptor.isPlatformStaticIn(predicate: (DeclarationDescriptor) -> Boolean): Boolean = when (this) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java index 880baf4beb2..26044c6e63d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java @@ -96,8 +96,8 @@ public interface BindingContext { WritableSlice REFERENCE_TARGET = new BasicWritableSlice(DO_NOTHING); - // if 'A' really means 'A.Default' then this slice stores class descriptor for A, REFERENCE_TARGET stores descriptor Default in this case - WritableSlice SHORT_REFERENCE_TO_DEFAULT_OBJECT = + // if 'A' really means 'A.Companion' then this slice stores class descriptor for A, REFERENCE_TARGET stores descriptor Companion in this case + WritableSlice SHORT_REFERENCE_TO_COMPANION_OBJECT = new BasicWritableSlice(DO_NOTHING); @KotlinSignature("val RESOLVED_CALL: WritableSlice>") diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java index 1d1d5c6b3a9..1d13abe148b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java @@ -151,7 +151,7 @@ public class DeclarationsChecker { for (JetTypeConstraint constraint : jetClass.getTypeConstraints()) { checkBoundsForTypeInClassHeader(constraint.getBoundTypeReference()); - checkFinalUpperBounds(constraint.getBoundTypeReference(), constraint.isDefaultObjectConstraint()); + checkFinalUpperBounds(constraint.getBoundTypeReference(), constraint.isCompanionObjectConstraint()); } } @@ -164,11 +164,11 @@ public class DeclarationsChecker { } } - private void checkFinalUpperBounds(@Nullable JetTypeReference typeReference, boolean isDefaultObjectConstraint) { + private void checkFinalUpperBounds(@Nullable JetTypeReference typeReference, boolean isCompanionObjectConstraint) { if (typeReference != null) { JetType type = trace.getBindingContext().get(TYPE, typeReference); if (type != null) { - DescriptorResolver.checkUpperBoundType(typeReference, type, isDefaultObjectConstraint, trace); + DescriptorResolver.checkUpperBoundType(typeReference, type, isCompanionObjectConstraint, trace); } } } @@ -258,7 +258,7 @@ public class DeclarationsChecker { private void checkObject(JetObjectDeclaration declaration, ClassDescriptor classDescriptor) { checkDeprecatedClassObjectSyntax(declaration); reportErrorIfHasIllegalModifier(declaration); - if (declaration.isLocal() && !declaration.isDefault() && !declaration.isObjectLiteral()) { + if (declaration.isLocal() && !declaration.isCompanion() && !declaration.isObjectLiteral()) { trace.report(LOCAL_OBJECT_NOT_ALLOWED.on(declaration, classDescriptor)); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 3aabf9c466f..3484817a1a2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -455,12 +455,12 @@ public class DescriptorResolver { static final class UpperBoundCheckerTask { JetTypeReference upperBound; JetType upperBoundType; - boolean isDefaultObjectConstraint; + boolean isCompanionObjectConstraint; - private UpperBoundCheckerTask(JetTypeReference upperBound, JetType upperBoundType, boolean defaultObjectConstraint) { + private UpperBoundCheckerTask(JetTypeReference upperBound, JetType upperBoundType, boolean companionObjectConstraint) { this.upperBound = upperBound; this.upperBoundType = upperBoundType; - isDefaultObjectConstraint = defaultObjectConstraint; + isCompanionObjectConstraint = companionObjectConstraint; } } @@ -489,7 +489,7 @@ public class DescriptorResolver { } } for (JetTypeConstraint constraint : declaration.getTypeConstraints()) { - reportUnsupportedDefaultObjectConstraint(trace, constraint); + reportUnsupportedCompanionObjectConstraint(trace, constraint); JetSimpleNameExpression subjectTypeParameterName = constraint.getSubjectTypeParameterName(); if (subjectTypeParameterName == null) { @@ -502,14 +502,14 @@ public class DescriptorResolver { if (boundTypeReference != null) { bound = typeResolver.resolveType(scope, boundTypeReference, trace, false); deferredUpperBoundCheckerTasks - .add(new UpperBoundCheckerTask(boundTypeReference, bound, constraint.isDefaultObjectConstraint())); + .add(new UpperBoundCheckerTask(boundTypeReference, bound, constraint.isCompanionObjectConstraint())); } if (typeParameterDescriptor != null) { trace.record(BindingContext.REFERENCE_TARGET, subjectTypeParameterName, typeParameterDescriptor); if (bound != null) { - if (constraint.isDefaultObjectConstraint()) { - // Default object bounds are not supported + if (constraint.isCompanionObjectConstraint()) { + // Companion object bounds are not supported } else { typeParameterDescriptor.addUpperBound(bound); @@ -528,7 +528,7 @@ public class DescriptorResolver { if (!(declaration instanceof JetClass)) { for (UpperBoundCheckerTask checkerTask : deferredUpperBoundCheckerTasks) { - checkUpperBoundType(checkerTask.upperBound, checkerTask.upperBoundType, checkerTask.isDefaultObjectConstraint, trace); + checkUpperBoundType(checkerTask.upperBound, checkerTask.upperBoundType, checkerTask.isCompanionObjectConstraint, trace); } checkNamesInConstraints(declaration, descriptor, scope, trace); @@ -546,7 +546,7 @@ public class DescriptorResolver { JetType classObjectType = parameter.getClassObjectType(); if (classObjectType != null && KotlinBuiltIns.isNothing(classObjectType)) { - trace.report(CONFLICTING_DEFAULT_OBJECT_UPPER_BOUNDS.on(typeParameter, parameter)); + trace.report(CONFLICTING_COMPANION_OBJECT_UPPER_BOUNDS.on(typeParameter, parameter)); } } @@ -581,21 +581,21 @@ public class DescriptorResolver { } } - public static void reportUnsupportedDefaultObjectConstraint(BindingTrace trace, JetTypeConstraint constraint) { - if (constraint.isDefaultObjectConstraint()) { - trace.report(UNSUPPORTED.on(constraint, "Default objects constraints are not supported yet")); + public static void reportUnsupportedCompanionObjectConstraint(BindingTrace trace, JetTypeConstraint constraint) { + if (constraint.isCompanionObjectConstraint()) { + trace.report(UNSUPPORTED.on(constraint, "Companion objects constraints are not supported yet")); } } public static void checkUpperBoundType( JetTypeReference upperBound, @NotNull JetType upperBoundType, - boolean isDefaultObjectConstraint, + boolean isCompanionObjectConstraint, BindingTrace trace ) { if (!TypeUtils.canHaveSubtypes(JetTypeChecker.DEFAULT, upperBoundType)) { - if (isDefaultObjectConstraint) { - trace.report(FINAL_DEFAULT_OBJECT_UPPER_BOUND.on(upperBound, upperBoundType)); + if (isCompanionObjectConstraint) { + trace.report(FINAL_COMPANION_OBJECT_UPPER_BOUND.on(upperBound, upperBoundType)); } else { trace.report(FINAL_UPPER_BOUND.on(upperBound, upperBoundType)); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java index 1d86469862e..e50fd874135 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java @@ -192,13 +192,13 @@ public class LazyTopDownAnalyzer { } private void checkClassOrObjectDeclarations(JetClassOrObject classOrObject, ClassDescriptor classDescriptor) { - boolean defaultObjectAlreadyFound = false; + boolean companionObjectAlreadyFound = false; for (JetDeclaration jetDeclaration : classOrObject.getDeclarations()) { - if (jetDeclaration instanceof JetObjectDeclaration && ((JetObjectDeclaration) jetDeclaration).isDefault()) { - if (defaultObjectAlreadyFound) { - trace.report(MANY_DEFAULT_OBJECTS.on((JetObjectDeclaration) jetDeclaration)); + if (jetDeclaration instanceof JetObjectDeclaration && ((JetObjectDeclaration) jetDeclaration).isCompanion()) { + if (companionObjectAlreadyFound) { + trace.report(MANY_COMPANION_OBJECTS.on((JetObjectDeclaration) jetDeclaration)); } - defaultObjectAlreadyFound = true; + companionObjectAlreadyFound = true; } else if (jetDeclaration instanceof JetSecondaryConstructor) { if (DescriptorUtils.isSingletonOrAnonymousObject(classDescriptor)) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java index a2adb757e3b..cc6e5acf7a2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java @@ -40,7 +40,7 @@ import java.util.*; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.lexer.JetTokens.*; import static org.jetbrains.kotlin.psi.JetStubbedPsiUtil.getContainingDeclaration; -import static org.jetbrains.kotlin.resolve.DescriptorUtils.isDefaultObject; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isCompanionObject; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry; public class ModifiersChecker { @@ -235,13 +235,13 @@ public class ModifiersChecker { } private void checkDefaultModifier(@NotNull JetDeclaration declaration) { - if (declaration.hasModifier(DEFAULT_KEYWORD) && !isDefaultModifierAllowed(declaration)) { - reportIllegalModifiers(declaration, Collections.singletonList(DEFAULT_KEYWORD)); + if (declaration.hasModifier(COMPANION_KEYWORD) && !isDefaultModifierAllowed(declaration)) { + reportIllegalModifiers(declaration, Collections.singletonList(COMPANION_KEYWORD)); } } - // NOTE: just checks if this is legal context for default modifier (Default object descriptor can be created) - // DEFAULT_OBJECT_NOT_ALLOWED can be reported later + // NOTE: just checks if this is legal context for companion modifier (Companion object descriptor can be created) + // COMPANION_OBJECT_NOT_ALLOWED can be reported later public static boolean isDefaultModifierAllowed(@NotNull JetDeclaration declaration) { if (declaration instanceof JetObjectDeclaration) { JetDeclaration containingDeclaration = getContainingDeclaration(declaration); @@ -388,7 +388,7 @@ public class ModifiersChecker { if (isEnumEntry(descriptor)) { return Visibilities.PUBLIC; } - if (isDefaultObject(descriptor)) { + if (isCompanionObject(descriptor)) { return ((ClassDescriptor) descriptor.getContainingDeclaration()).getVisibility(); } return Visibilities.INTERNAL; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java index 57caee25245..ff78e08525a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java @@ -121,9 +121,9 @@ public class OverloadResolver { return name; } if (jetClass instanceof JetObjectDeclaration) { - // must be default object + // must be companion object name = classDescriptor.getContainingDeclaration().getName().asString(); - return "default object " + name; + return "companion object " + name; } // safe return ""; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt index f463d73a93c..1787710f697 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt @@ -92,8 +92,8 @@ public class TaskPrioritizer(private val storageManager: StorageManager) { val classifierDescriptor = qualifierReceiver.classifier doComputeTasks(classObjectReceiver, taskPrioritizerContext.filterCollectors { when { - classifierDescriptor is ClassDescriptor && classifierDescriptor.getDefaultObjectDescriptor() != null -> { - // nested classes and objects should not be accessible via short reference to default object + classifierDescriptor is ClassDescriptor && classifierDescriptor.getCompanionObjectDescriptor() != null -> { + // nested classes and objects should not be accessible via short reference to companion object it !is ConstructorDescriptor && it !is FakeCallableDescriptorForObject } classifierDescriptor != null && DescriptorUtils.isEnumEntry(classifierDescriptor) -> { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyImpl.java index 7dc05129cc9..623ec5232c5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyImpl.java @@ -60,8 +60,8 @@ public class TracingStrategyImpl extends AbstractTracingStrategy { if (descriptor instanceof FakeCallableDescriptorForObject) { FakeCallableDescriptorForObject fakeCallableDescriptorForObject = (FakeCallableDescriptorForObject) descriptor; descriptor = fakeCallableDescriptorForObject.getReferencedDescriptor(); - if (fakeCallableDescriptorForObject.getClassDescriptor().getDefaultObjectDescriptor() != null) { - trace.record(SHORT_REFERENCE_TO_DEFAULT_OBJECT, reference, fakeCallableDescriptorForObject.getClassDescriptor()); + if (fakeCallableDescriptorForObject.getClassDescriptor().getCompanionObjectDescriptor() != null) { + trace.record(SHORT_REFERENCE_TO_COMPANION_OBJECT, reference, fakeCallableDescriptorForObject.getClassDescriptor()); } } DeclarationDescriptor storedReference = trace.get(REFERENCE_TARGET, reference); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt index 0d305ab1c24..88bdd23d12f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt @@ -35,7 +35,7 @@ public class FakeCallableDescriptorForObject( { assert(classDescriptor.getClassObjectType() != null) { - "FakeCallableDescriptorForObject can be created only for objects, classes with default object or enum entries: $classDescriptor" + "FakeCallableDescriptorForObject can be created only for objects, classes with companion object or enum entries: $classDescriptor" } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassLikeInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassLikeInfo.java index c4318cf4ca3..06cc731d08a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassLikeInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassLikeInfo.java @@ -35,7 +35,7 @@ public interface JetClassLikeInfo extends JetDeclarationContainer { @NotNull @ReadOnly - List getDefaultObjects(); + List getCompanionObjects(); // This element is used to identify resolution scope for the class @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassOrObjectInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassOrObjectInfo.java index 8aa6e0fd7ce..10cdb2dda33 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassOrObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassOrObjectInfo.java @@ -58,12 +58,12 @@ public abstract class JetClassOrObjectInfo implement @NotNull @Override - public List getDefaultObjects() { + public List getCompanionObjects() { JetClassBody body = element.getBody(); if (body == null) { return Collections.emptyList(); } - return body.getAllDefaultObjects(); + return body.getAllCompanionObjects(); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java index 84ddced4d74..389b5133d59 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java @@ -54,7 +54,7 @@ public class JetObjectInfo extends JetClassOrObjectInfo { return kind; } - public boolean isDefaultObject() { - return element.isDefault() && ModifiersChecker.isDefaultModifierAllowed(element); + public boolean isCompanionObject() { + return element.isCompanion() && ModifiersChecker.isDefaultModifierAllowed(element); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt index b52e89ded8a..1fcf4b47370 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt @@ -27,7 +27,7 @@ public class JetScriptInfo( public val fqName: FqName = ScriptNameUtil.classNameForScript(script) override fun getContainingPackageFqName() = fqName.parent() override fun getModifierList() = null - override fun getDefaultObjects() = listOf() + override fun getCompanionObjects() = listOf() override fun getScopeAnchor() = script override fun getCorrespondingClassOrObject() = null override fun getTypeParameterList() = null diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java index d8ef06acf1d..051caf4b5a1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -83,8 +83,8 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes private final Annotations annotations; private final Annotations danglingAnnotations; - private final NullableLazyValue defaultObjectDescriptor; - private final MemoizedFunctionToNotNull extraDefaultObjectDescriptors; + private final NullableLazyValue companionObjectDescriptor; + private final MemoizedFunctionToNotNull extraCompanionObjectDescriptors; private final LazyClassMemberScope unsubstitutedMemberScope; private final JetScope staticScope = new StaticScopeForKotlinClass(this); @@ -95,7 +95,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes private final NotNullLazyValue scopeForSecondaryConstructorHeaderResolution; private final NullableLazyValue forceResolveAllContents; - private final boolean isDefaultObject; + private final boolean isCompanionObject; public LazyClassDescriptor( @NotNull LazyClassContext c, @@ -122,7 +122,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes this.typeConstructor = new LazyClassTypeConstructor(); this.kind = classLikeInfo.getClassKind(); - this.isDefaultObject = classLikeInfo instanceof JetObjectInfo && ((JetObjectInfo) classLikeInfo).isDefaultObject(); + this.isCompanionObject = classLikeInfo instanceof JetObjectInfo && ((JetObjectInfo) classLikeInfo).isCompanionObject(); JetModifierList modifierList = classLikeInfo.getModifierList(); if (kind.isSingleton()) { @@ -182,16 +182,16 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes ); } - this.defaultObjectDescriptor = storageManager.createNullableLazyValue(new Function0() { + this.companionObjectDescriptor = storageManager.createNullableLazyValue(new Function0() { @Override public LazyClassDescriptor invoke() { - return computeDefaultObjectDescriptor(getDefaultObjectIfAllowed()); + return computeCompanionObjectDescriptor(getCompanionObjectIfAllowed()); } }); - this.extraDefaultObjectDescriptors = storageManager.createMemoizedFunction(new Function1() { + this.extraCompanionObjectDescriptors = storageManager.createMemoizedFunction(new Function1() { @Override - public ClassDescriptor invoke(JetObjectDeclaration defaultObject) { - return computeDefaultObjectDescriptor(defaultObject); + public ClassDescriptor invoke(JetObjectDeclaration companionObject) { + return computeCompanionObjectDescriptor(companionObject); } }); this.scopeForClassHeaderResolution = storageManager.createLazyValue(new Function0() { @@ -277,8 +277,8 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes thisScope.setImplicitReceiver(this.getThisAsReceiverParameter()); thisScope.changeLockLevel(WritableScope.LockLevel.READING); - ClassDescriptor defaultObjectDescriptor = getDefaultObjectDescriptor(); - JetScope defaultObjectAdapterScope = (defaultObjectDescriptor != null) ? new DefaultObjectMixinScope(defaultObjectDescriptor) : JetScope.Empty.INSTANCE$; + ClassDescriptor companionObjectDescriptor = getCompanionObjectDescriptor(); + JetScope companionObjectAdapterScope = (companionObjectDescriptor != null) ? new CompanionObjectMixinScope(companionObjectDescriptor) : JetScope.Empty.INSTANCE$; return new ChainedScope( this, @@ -286,7 +286,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes thisScope, getScopeForMemberLookup(), getScopeForClassHeaderResolution(), - defaultObjectAdapterScope, + companionObjectAdapterScope, getStaticScope() ); } @@ -374,47 +374,47 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes } @Override - public LazyClassDescriptor getDefaultObjectDescriptor() { - return defaultObjectDescriptor.invoke(); + public LazyClassDescriptor getCompanionObjectDescriptor() { + return companionObjectDescriptor.invoke(); } @NotNull @ReadOnly - public List getDescriptorsForExtraDefaultObjects() { - final JetObjectDeclaration allowedDefaultObject = getDefaultObjectIfAllowed(); + public List getDescriptorsForExtraCompanionObjects() { + final JetObjectDeclaration allowedCompanionObject = getCompanionObjectIfAllowed(); return KotlinPackage.map( KotlinPackage.filter( - declarationProvider.getOwnerInfo().getDefaultObjects(), + declarationProvider.getOwnerInfo().getCompanionObjects(), new Function1() { @Override - public Boolean invoke(JetObjectDeclaration defaultObject) { - return defaultObject != allowedDefaultObject; + public Boolean invoke(JetObjectDeclaration companionObject) { + return companionObject != allowedCompanionObject; } } ), new Function1() { @Override - public ClassDescriptor invoke(JetObjectDeclaration defaultObject) { - return extraDefaultObjectDescriptors.invoke(defaultObject); + public ClassDescriptor invoke(JetObjectDeclaration companionObject) { + return extraCompanionObjectDescriptors.invoke(companionObject); } } ); } @Nullable - private LazyClassDescriptor computeDefaultObjectDescriptor(@Nullable JetObjectDeclaration defaultObject) { - JetClassLikeInfo defaultObjectInfo = getDefaultObjectInfo(defaultObject); - if (!(defaultObjectInfo instanceof JetClassOrObjectInfo)) { + private LazyClassDescriptor computeCompanionObjectDescriptor(@Nullable JetObjectDeclaration companionObject) { + JetClassLikeInfo companionObjectInfo = getCompanionObjectInfo(companionObject); + if (!(companionObjectInfo instanceof JetClassOrObjectInfo)) { return null; } - Name name = ((JetClassOrObjectInfo) defaultObjectInfo).getName(); + Name name = ((JetClassOrObjectInfo) companionObjectInfo).getName(); assert name != null; getScopeForMemberLookup().getClassifier(name); - ClassDescriptor defaultObjectDescriptor = c.getTrace().get(BindingContext.CLASS, defaultObject); - if (defaultObjectDescriptor instanceof LazyClassDescriptor) { - assert DescriptorUtils.isDefaultObject(defaultObjectDescriptor) : "Not a default object: " + defaultObjectDescriptor; - return (LazyClassDescriptor) defaultObjectDescriptor; + ClassDescriptor companionObjectDescriptor = c.getTrace().get(BindingContext.CLASS, companionObject); + if (companionObjectDescriptor instanceof LazyClassDescriptor) { + assert DescriptorUtils.isCompanionObject(companionObjectDescriptor) : "Not a companion object: " + companionObjectDescriptor; + return (LazyClassDescriptor) companionObjectDescriptor; } else { return null; @@ -422,25 +422,25 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes } @Nullable - private JetClassLikeInfo getDefaultObjectInfo(@Nullable JetObjectDeclaration defaultObject) { - if (defaultObject != null) { - if (!isDefaultObjectAllowed()) { - c.getTrace().report(DEFAULT_OBJECT_NOT_ALLOWED.on(defaultObject)); + private JetClassLikeInfo getCompanionObjectInfo(@Nullable JetObjectDeclaration companionObject) { + if (companionObject != null) { + if (!isCompanionObjectAllowed()) { + c.getTrace().report(COMPANION_OBJECT_NOT_ALLOWED.on(companionObject)); } - return JetClassInfoUtil.createClassLikeInfo(defaultObject); + return JetClassInfoUtil.createClassLikeInfo(companionObject); } return null; } @Nullable - private JetObjectDeclaration getDefaultObjectIfAllowed() { - JetObjectDeclaration defaultObject = firstOrNull(declarationProvider.getOwnerInfo().getDefaultObjects()); - return (defaultObject != null && isDefaultObjectAllowed()) ? defaultObject : null; + private JetObjectDeclaration getCompanionObjectIfAllowed() { + JetObjectDeclaration companionObject = firstOrNull(declarationProvider.getOwnerInfo().getCompanionObjects()); + return (companionObject != null && isCompanionObjectAllowed()) ? companionObject : null; } - private boolean isDefaultObjectAllowed() { + private boolean isCompanionObjectAllowed() { return !(getKind().isSingleton() || isInner() || DescriptorUtils.isLocal(this)); } @@ -468,8 +468,8 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes } @Override - public boolean isDefaultObject() { - return isDefaultObject; + public boolean isCompanionObject() { + return isCompanionObject; } @NotNull @@ -496,13 +496,13 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes private void doForceResolveAllContents() { resolveMemberHeaders(); - ClassDescriptor defaultObjectDescriptor = getDefaultObjectDescriptor(); - if (defaultObjectDescriptor != null) { - ForceResolveUtil.forceResolveAllContents(defaultObjectDescriptor); + ClassDescriptor companionObjectDescriptor = getCompanionObjectDescriptor(); + if (companionObjectDescriptor != null) { + ForceResolveUtil.forceResolveAllContents(companionObjectDescriptor); } ForceResolveUtil.forceResolveAllContents(getConstructors()); - ForceResolveUtil.forceResolveAllContents(getDescriptorsForExtraDefaultObjects()); + ForceResolveUtil.forceResolveAllContents(getDescriptorsForExtraCompanionObjects()); ForceResolveUtil.forceResolveAllContents(getScopeForMemberLookup()); ForceResolveUtil.forceResolveAllContents(getTypeConstructor()); } @@ -512,9 +512,9 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes ForceResolveUtil.forceResolveAllContents(getAnnotations()); ForceResolveUtil.forceResolveAllContents(getDanglingAnnotations()); - getDefaultObjectDescriptor(); + getCompanionObjectDescriptor(); - getDescriptorsForExtraDefaultObjects(); + getDescriptorsForExtraCompanionObjects(); getClassObjectType(); getConstructors(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt index e694ff0e0f4..4d886a951fe 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -230,7 +230,7 @@ public open class LazyClassMemberScope( private fun generateDelegatingDescriptors(name: Name, extractor: MemberExtractor, existingDescriptors: Collection): Collection { val classOrObject = declarationProvider.getOwnerInfo().getCorrespondingClassOrObject() - ?: return setOf() // Enum default objects do not have delegated members + ?: return setOf() val lazyTypeResolver = DelegationResolver.TypeResolver { reference -> c.typeResolver.resolveType(thisDescriptor.getScopeForClassHeaderResolution(), reference, trace, false) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java index 3e570a50912..ea586fc64d1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java @@ -83,7 +83,7 @@ public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescri if (classOrObject instanceof JetClass) { JetClass jetClass = (JetClass) classOrObject; for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstraints()) { - DescriptorResolver.reportUnsupportedDefaultObjectConstraint(c.getTrace(), jetTypeConstraint); + DescriptorResolver.reportUnsupportedCompanionObjectConstraint(c.getTrace(), jetTypeConstraint); JetSimpleNameExpression constrainedParameterName = jetTypeConstraint.getSubjectTypeParameterName(); if (constrainedParameterName != null) { @@ -93,7 +93,7 @@ public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescri JetTypeReference boundTypeReference = jetTypeConstraint.getBoundTypeReference(); if (boundTypeReference != null) { JetType boundType = resolveBoundType(boundTypeReference); - if (!jetTypeConstraint.isDefaultObjectConstraint()) { + if (!jetTypeConstraint.isCompanionObjectConstraint()) { upperBounds.add(boundType); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/DefaultObjectMixinScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/DefaultObjectMixinScope.kt index c357388641a..63503b9af2b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/DefaultObjectMixinScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/DefaultObjectMixinScope.kt @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.resolve.scopes import org.jetbrains.kotlin.descriptors.ClassDescriptor /** - * Members of the default object are accessible from the class. - * Scope lazily delegates requests to default object scope. + * Members of the companion object are accessible from the class. + * Scope lazily delegates requests to companion object scope. */ -public class DefaultObjectMixinScope(private val defaultObjectDescriptor: ClassDescriptor) : AbstractScopeAdapter() { +public class CompanionObjectMixinScope(private val companionObjectDescriptor: ClassDescriptor) : AbstractScopeAdapter() { override val workerScope: JetScope - get() = defaultObjectDescriptor.getDefaultType().getMemberScope() + get() = companionObjectDescriptor.getDefaultType().getMemberScope() - override fun getImplicitReceiversHierarchy() = listOf(defaultObjectDescriptor.getThisAsReceiverParameter()) + override fun getImplicitReceiversHierarchy() = listOf(companionObjectDescriptor.getThisAsReceiverParameter()) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeWithImports.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeWithImports.kt index b5c42069a2f..11a1f4e94bb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeWithImports.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeWithImports.kt @@ -91,8 +91,8 @@ public abstract class WritableScopeWithImports(override val workerScope: JetScop protected open fun computeImplicitReceiversHierarchy(): List { val implicitReceiverHierarchy = Lists.newArrayList() // Imported scopes come with their receivers - // Example: class member resolution scope imports a scope of it's default object - // members of the default object must be able to find it as an implicit receiver + // Example: class member resolution scope imports a scope of it's companion object + // members of the companion object must be able to find it as an implicit receiver for (scope in getImports()) { implicitReceiverHierarchy.addAll(scope.getImplicitReceiversHierarchy()) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt index e1bb4ea35d7..469a5d5245f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt @@ -129,7 +129,7 @@ private fun QualifierReceiver.resolveAsStandaloneExpression(context: ExpressionT context.trace.report(TYPE_PARAMETER_IS_NOT_AN_EXPRESSION.on(referenceExpression, classifier)) } else if (classifier is ClassDescriptor && classifier.getClassObjectType() == null) { - context.trace.report(NO_DEFAULT_OBJECT.on(referenceExpression, classifier)) + context.trace.report(NO_COMPANION_OBJECT.on(referenceExpression, classifier)) } else if (packageView != null) { context.trace.report(EXPRESSION_EXPECTED_PACKAGE_FOUND.on(referenceExpression)) @@ -174,8 +174,8 @@ private fun QualifierReceiver.resolveReferenceTarget( (selector.getDispatchReceiverParameter() != null || selector.getExtensionReceiverParameter() != null) if (classifier is ClassDescriptor && classifier.classObjectDescriptor != null && isCallableWithReceiver) { - if (classifier.getDefaultObjectDescriptor() != null) { - context.trace.record(SHORT_REFERENCE_TO_DEFAULT_OBJECT, referenceExpression, classifier) + if (classifier.getCompanionObjectDescriptor() != null) { + context.trace.record(SHORT_REFERENCE_TO_COMPANION_OBJECT, referenceExpression, classifier) } return classifier.getClassObjectReferenceTarget() } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt index ceb0bbea82d..f020996e74d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt @@ -180,7 +180,7 @@ class DeclarationScopeProviderForLocalClassifierAnalyzer( } override fun getOuterDataFlowInfoForDeclaration(elementOfDeclaration: PsiElement): DataFlowInfo { - // nested (non-inner) classes and default objects are forbidden in local classes, so it's enough to be simply inside the class + // nested (non-inner) classes and companion objects are forbidden in local classes, so it's enough to be simply inside the class if (localClassDescriptorManager.insideMyClass(elementOfDeclaration)) { return localClassDescriptorManager.expressionTypingContext.dataFlowInfo } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java index 1e18e293285..565cb898abf 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java @@ -150,12 +150,12 @@ public class LightClassUtil { } @Nullable - public static PsiField getLightFieldForDefaultObject(@NotNull JetClassOrObject defaultObject) { - PsiClass outerPsiClass = getWrappingClass(defaultObject); + public static PsiField getLightFieldForCompanionObject(@NotNull JetClassOrObject companionObject) { + PsiClass outerPsiClass = getWrappingClass(companionObject); if (outerPsiClass != null) { for (PsiField fieldOfParent : outerPsiClass.getFields()) { - if (((KotlinLightElement) fieldOfParent).getOrigin() == defaultObject && - fieldOfParent.getName().equals(defaultObject.getName())) { // TODO this check is relevant while light class has deprecated OBJECT$ field + if (((KotlinLightElement) fieldOfParent).getOrigin() == companionObject && + fieldOfParent.getName().equals(companionObject.getName())) { // TODO this check is relevant while light class has deprecated OBJECT$ field return fieldOfParent; } } diff --git a/compiler/testData/asJava/lightClassStructure/ClassObject.kt b/compiler/testData/asJava/lightClassStructure/ClassObject.kt index ac10c17608e..c6d84bfc22a 100644 --- a/compiler/testData/asJava/lightClassStructure/ClassObject.kt +++ b/compiler/testData/asJava/lightClassStructure/ClassObject.kt @@ -1,6 +1,6 @@ package test class WithClassObject { - default object { + companion object { } } \ No newline at end of file diff --git a/compiler/testData/asJava/lightClassStructure/PlatformStaticMethodsGenerics.kt b/compiler/testData/asJava/lightClassStructure/PlatformStaticMethodsGenerics.kt index 2e138c8f31d..e10300b9ff4 100644 --- a/compiler/testData/asJava/lightClassStructure/PlatformStaticMethodsGenerics.kt +++ b/compiler/testData/asJava/lightClassStructure/PlatformStaticMethodsGenerics.kt @@ -3,7 +3,7 @@ package test import kotlin.platform.platformStatic class PlatformStaticClass { - default object { + companion object { platformStatic fun inClassObject() {} } diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java index a6970f8533b..216eca84c56 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java @@ -2,21 +2,21 @@ public final class ClassObjectField { @org.jetbrains.annotations.Nullable public static final java.lang.String x = ""; private static final java.lang.String y = ""; - public static final ClassObjectField.Default Default; + public static final ClassObjectField.Companion Companion; /** * @deprecated */ @java.lang.Deprecated - public static final ClassObjectField.Default OBJECT$; + public static final ClassObjectField.Companion OBJECT$; public ClassObjectField() { /* compiled code */ } - public static final class Default { + public static final class Companion { @org.jetbrains.annotations.Nullable public final java.lang.String getX() { /* compiled code */ } private final java.lang.String getY() { /* compiled code */ } - private Default() { /* compiled code */ } + private Companion() { /* compiled code */ } } } \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt index 20f8c240fbc..7fc70fcf897 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt @@ -1,7 +1,7 @@ // ClassObjectField class ClassObjectField { - default object { + companion object { val x: String? = "" private val y: String? = "" } diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java index 84aa2ddbaa3..27b9d09742c 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java @@ -1,14 +1,14 @@ public interface TraitClassObjectField { - TraitClassObjectField.Default Default; + TraitClassObjectField.Companion Companion; /** * @deprecated */ @java.lang.Deprecated - TraitClassObjectField.Default OBJECT$; + TraitClassObjectField.Companion OBJECT$; @org.jetbrains.annotations.Nullable java.lang.String x = ""; - static final class Default { + static final class Companion { @org.jetbrains.annotations.Nullable private final java.lang.String x = ""; private final java.lang.String y = ""; @@ -18,6 +18,6 @@ public interface TraitClassObjectField { private final java.lang.String getY() { /* compiled code */ } - private Default() { /* compiled code */ } + private Companion() { /* compiled code */ } } } \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt index e720f181b55..73598d0f805 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt @@ -1,7 +1,7 @@ // TraitClassObjectField trait TraitClassObjectField { - default object { + companion object { val x: String? = "" private val y: String? = "" } diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index 2cbbd9823b7..ea60f107a1a 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -109,8 +109,8 @@ public final class Byte : kotlin.Number, kotlin.Comparable { public open override /*1*/ fun toLong(): kotlin.Long public open override /*1*/ fun toShort(): kotlin.Short - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() } } @@ -171,8 +171,8 @@ public final class ByteRange : kotlin.Range, kotlin.Progression(): kotlin.ByteRange } @@ -231,8 +231,8 @@ public final class Char : kotlin.Comparable { public open fun toLong(): kotlin.Long public open fun toShort(): kotlin.Short - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() } } @@ -293,8 +293,8 @@ public final class CharRange : kotlin.Range, kotlin.Progression(): kotlin.CharRange } @@ -385,8 +385,8 @@ public final class Double : kotlin.Number, kotlin.Comparable { public open override /*1*/ fun toLong(): kotlin.Long public open override /*1*/ fun toShort(): kotlin.Short - public default object Default : kotlin.FloatingPointConstants { - /*primary*/ private constructor Default() + public companion object Companion : kotlin.FloatingPointConstants { + /*primary*/ private constructor Companion() public abstract override /*1*/ /*fake_override*/ val NEGATIVE_INFINITY: kotlin.Double public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Double public abstract override /*1*/ /*fake_override*/ val NaN: kotlin.Double @@ -450,8 +450,8 @@ public final class DoubleRange : kotlin.Range, kotlin.Progression public open override /*1*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ fun iterator(): kotlin.DoubleIterator - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() public final val EMPTY: kotlin.DoubleRange public final fun (): kotlin.DoubleRange } @@ -463,8 +463,8 @@ public abstract class Enum> : kotlin.Comparable { public final fun name(): kotlin.String public final fun ordinal(): kotlin.Int - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() } } @@ -623,8 +623,8 @@ public final class Float : kotlin.Number, kotlin.Comparable { public open override /*1*/ fun toLong(): kotlin.Long public open override /*1*/ fun toShort(): kotlin.Short - public default object Default : kotlin.FloatingPointConstants { - /*primary*/ private constructor Default() + public companion object Companion : kotlin.FloatingPointConstants { + /*primary*/ private constructor Companion() public abstract override /*1*/ /*fake_override*/ val NEGATIVE_INFINITY: kotlin.Float public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Float public abstract override /*1*/ /*fake_override*/ val NaN: kotlin.Float @@ -688,8 +688,8 @@ public final class FloatRange : kotlin.Range, kotlin.Progression(): kotlin.FloatRange } @@ -916,8 +916,8 @@ public final class Int : kotlin.Number, kotlin.Comparable { public final fun ushr(/*0*/ bits: kotlin.Int): kotlin.Int public final fun xor(/*0*/ other: kotlin.Int): kotlin.Int - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() } } @@ -978,8 +978,8 @@ public final class IntRange : kotlin.Range, kotlin.Progression(): kotlin.IntRange } @@ -1087,8 +1087,8 @@ public final class Long : kotlin.Number, kotlin.Comparable { public final fun ushr(/*0*/ bits: kotlin.Int): kotlin.Long public final fun xor(/*0*/ other: kotlin.Long): kotlin.Long - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() } } @@ -1149,8 +1149,8 @@ public final class LongRange : kotlin.Range, kotlin.Progression(): kotlin.LongRange } @@ -1383,8 +1383,8 @@ public final class Short : kotlin.Number, kotlin.Comparable { public open override /*1*/ fun toLong(): kotlin.Long public open override /*1*/ fun toShort(): kotlin.Short - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() } } @@ -1445,8 +1445,8 @@ public final class ShortRange : kotlin.Range, kotlin.Progression(): kotlin.ShortRange } @@ -1461,8 +1461,8 @@ public final class String : kotlin.Comparable, kotlin.CharSequenc public final fun plus(/*0*/ other: kotlin.Any?): kotlin.String public open override /*1*/ fun subSequence(/*0*/ start: kotlin.Int, /*1*/ end: kotlin.Int): kotlin.CharSequence - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/cfg/declarations/local/LocalDeclarations.instructions b/compiler/testData/cfg/declarations/local/LocalDeclarations.instructions index 9aec4bc9825..55533707c0c 100644 --- a/compiler/testData/cfg/declarations/local/LocalDeclarations.instructions +++ b/compiler/testData/cfg/declarations/local/LocalDeclarations.instructions @@ -2,7 +2,7 @@ class C() { val a: Int = 1 - default object { + companion object { val x : Int { diff --git a/compiler/testData/cfg/declarations/local/LocalDeclarations.kt b/compiler/testData/cfg/declarations/local/LocalDeclarations.kt index c4940740684..9dd36f3687d 100644 --- a/compiler/testData/cfg/declarations/local/LocalDeclarations.kt +++ b/compiler/testData/cfg/declarations/local/LocalDeclarations.kt @@ -1,7 +1,7 @@ class C() { val a: Int = 1 - default object { + companion object { val x : Int { diff --git a/compiler/testData/cfg/declarations/local/LocalDeclarations.values b/compiler/testData/cfg/declarations/local/LocalDeclarations.values index 14441d36413..56bc3874f8f 100644 --- a/compiler/testData/cfg/declarations/local/LocalDeclarations.values +++ b/compiler/testData/cfg/declarations/local/LocalDeclarations.values @@ -2,7 +2,7 @@ class C() { val a: Int = 1 - default object { + companion object { val x : Int { diff --git a/compiler/testData/codegen/box/classes/boxPrimitiveTypeInClinitOfClassObject.kt b/compiler/testData/codegen/box/classes/boxPrimitiveTypeInClinitOfClassObject.kt index 2b5b8c04bdc..497167d4be6 100644 --- a/compiler/testData/codegen/box/classes/boxPrimitiveTypeInClinitOfClassObject.kt +++ b/compiler/testData/codegen/box/classes/boxPrimitiveTypeInClinitOfClassObject.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { var xi = 0 var xin : Int? = 0 var xinn : Int? = null diff --git a/compiler/testData/codegen/box/classes/classObject.kt b/compiler/testData/codegen/box/classes/classObject.kt index 9d24ef7c256..c8da87c8a7f 100644 --- a/compiler/testData/codegen/box/classes/classObject.kt +++ b/compiler/testData/codegen/box/classes/classObject.kt @@ -1,5 +1,5 @@ class C() { - default object { + companion object { fun create() = C() } } diff --git a/compiler/testData/codegen/box/classes/classObjectAsExtensionReceiver.kt b/compiler/testData/codegen/box/classes/classObjectAsExtensionReceiver.kt index fa6250c6c5d..886dbdf8364 100644 --- a/compiler/testData/codegen/box/classes/classObjectAsExtensionReceiver.kt +++ b/compiler/testData/codegen/box/classes/classObjectAsExtensionReceiver.kt @@ -1,7 +1,7 @@ fun Any.foo() = 1 class A { - default object + companion object } fun box() = if (A.foo() == 1) "OK" else "fail" diff --git a/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt b/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt index 0bbd5593beb..5b19fef6a5f 100644 --- a/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt +++ b/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt @@ -1,7 +1,7 @@ var global = 0; class C { - default object { + companion object { { global = 1; } diff --git a/compiler/testData/codegen/box/classes/classObjectField.kt b/compiler/testData/codegen/box/classes/classObjectField.kt index 06b7819b949..f23073c6e89 100644 --- a/compiler/testData/codegen/box/classes/classObjectField.kt +++ b/compiler/testData/codegen/box/classes/classObjectField.kt @@ -1,5 +1,5 @@ class A() { - default object { + companion object { val value = 10 } } diff --git a/compiler/testData/codegen/box/classes/classObjectInTrait.kt b/compiler/testData/codegen/box/classes/classObjectInTrait.kt index b9df87f1a2c..cff3e374654 100644 --- a/compiler/testData/codegen/box/classes/classObjectInTrait.kt +++ b/compiler/testData/codegen/box/classes/classObjectInTrait.kt @@ -1,7 +1,7 @@ // EA-38323 - Illegal field modifiers in class: classObject field in C must be static and final trait C { - default object { + companion object { public val FOO: String = "OK" } } diff --git a/compiler/testData/codegen/box/classes/classObjectNotOfEnum.kt b/compiler/testData/codegen/box/classes/classObjectNotOfEnum.kt index cb1bca3439d..e2a775320cd 100644 --- a/compiler/testData/codegen/box/classes/classObjectNotOfEnum.kt +++ b/compiler/testData/codegen/box/classes/classObjectNotOfEnum.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { fun values() = "O" fun valueOf() = "K" } diff --git a/compiler/testData/codegen/box/classes/classObjectToString.kt b/compiler/testData/codegen/box/classes/classObjectToString.kt index 55251983524..a1b66901895 100644 --- a/compiler/testData/codegen/box/classes/classObjectToString.kt +++ b/compiler/testData/codegen/box/classes/classObjectToString.kt @@ -1,7 +1,7 @@ -class SomeClass { default object } +class SomeClass { companion object } fun box() = - if ((SomeClass.toString() as java.lang.String).matches("SomeClass\\\$Default@[0-9a-fA-F]+")) + if ((SomeClass.toString() as java.lang.String).matches("SomeClass\\\$Companion@[0-9a-fA-F]+")) "OK" else "Fail: $SomeClass" diff --git a/compiler/testData/codegen/box/classes/classObjectWithPrivateGenericMember.kt b/compiler/testData/codegen/box/classes/classObjectWithPrivateGenericMember.kt index bacea1f1133..bb7b150238f 100644 --- a/compiler/testData/codegen/box/classes/classObjectWithPrivateGenericMember.kt +++ b/compiler/testData/codegen/box/classes/classObjectWithPrivateGenericMember.kt @@ -1,5 +1,5 @@ class C() { - default object { + companion object { private fun create() = C() } diff --git a/compiler/testData/codegen/box/classes/classObjectsWithParentClasses.kt b/compiler/testData/codegen/box/classes/classObjectsWithParentClasses.kt index dc16dec98fd..668619e3032 100644 --- a/compiler/testData/codegen/box/classes/classObjectsWithParentClasses.kt +++ b/compiler/testData/codegen/box/classes/classObjectsWithParentClasses.kt @@ -1,5 +1,5 @@ open class Test { - default object { + companion object { fun testStatic(ic: InnerClass): NotInnerClass = NotInnerClass(ic.value) } diff --git a/compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt b/compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt index 1f8dfdcfd4e..8332b83ef41 100644 --- a/compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt +++ b/compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt @@ -2,7 +2,7 @@ class A { private val p: Int get() = 4 - default object B { + companion object B { val p: Int get() = 6 } diff --git a/compiler/testData/codegen/box/classes/extensionOnNamedClassObject.kt b/compiler/testData/codegen/box/classes/extensionOnNamedClassObject.kt index 6bdea4b2fc6..dd3efea880b 100644 --- a/compiler/testData/codegen/box/classes/extensionOnNamedClassObject.kt +++ b/compiler/testData/codegen/box/classes/extensionOnNamedClassObject.kt @@ -1,5 +1,5 @@ class C() { - default object Foo + companion object Foo } fun C.Foo.create() = 3 diff --git a/compiler/testData/codegen/box/classes/kt1018.kt b/compiler/testData/codegen/box/classes/kt1018.kt index 602062efff6..a4b6f375edc 100644 --- a/compiler/testData/codegen/box/classes/kt1018.kt +++ b/compiler/testData/codegen/box/classes/kt1018.kt @@ -4,7 +4,7 @@ public class StockMarketTableModel() { return COLUMN_TITLES?.size()!! } - default object { + companion object { private val COLUMN_TITLES : Array = arrayOfNulls(10) } } diff --git a/compiler/testData/codegen/box/classes/kt2384.kt b/compiler/testData/codegen/box/classes/kt2384.kt index 545d5c2e166..67b1df3973e 100644 --- a/compiler/testData/codegen/box/classes/kt2384.kt +++ b/compiler/testData/codegen/box/classes/kt2384.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { val b = 0 val c = b diff --git a/compiler/testData/codegen/box/classes/kt249.kt b/compiler/testData/codegen/box/classes/kt249.kt index fd5282fc6df..afd8fa0a0a7 100644 --- a/compiler/testData/codegen/box/classes/kt249.kt +++ b/compiler/testData/codegen/box/classes/kt249.kt @@ -1,13 +1,13 @@ package x class Outer() { - default object { + companion object { class Inner() { } } } fun box (): String { - val inner = Outer.Default.Inner() + val inner = Outer.Companion.Inner() return "OK" } diff --git a/compiler/testData/codegen/box/classes/kt2784.kt b/compiler/testData/codegen/box/classes/kt2784.kt index db5ee7eb0c4..fc7c5dfccbe 100644 --- a/compiler/testData/codegen/box/classes/kt2784.kt +++ b/compiler/testData/codegen/box/classes/kt2784.kt @@ -1,7 +1,7 @@ open class Factory(p: Int) class A { - default object : Factory(1) + companion object : Factory(1) } fun box() : String { diff --git a/compiler/testData/codegen/box/classes/kt508.kt b/compiler/testData/codegen/box/classes/kt508.kt index d6517f532a9..ce2a4ba643e 100644 --- a/compiler/testData/codegen/box/classes/kt508.kt +++ b/compiler/testData/codegen/box/classes/kt508.kt @@ -2,7 +2,7 @@ package mult_constructors_3_bug public open class Identifier() { private var myNullable : Boolean = true - default object { + companion object { open public fun init(isNullable : Boolean) : Identifier { val __ = Identifier() __.myNullable = isNullable diff --git a/compiler/testData/codegen/box/classes/namedClassObject.kt b/compiler/testData/codegen/box/classes/namedClassObject.kt index cf660ac7aac..2ff7587752d 100644 --- a/compiler/testData/codegen/box/classes/namedClassObject.kt +++ b/compiler/testData/codegen/box/classes/namedClassObject.kt @@ -1,5 +1,5 @@ class C() { - default object Foo { + companion object Foo { fun create() = 3 } } diff --git a/compiler/testData/codegen/box/defaultArguments/constructor/kt3060.kt b/compiler/testData/codegen/box/defaultArguments/constructor/kt3060.kt index ae335592654..f41e711b1dc 100644 --- a/compiler/testData/codegen/box/defaultArguments/constructor/kt3060.kt +++ b/compiler/testData/codegen/box/defaultArguments/constructor/kt3060.kt @@ -1,5 +1,5 @@ class Foo private(val param: String = "OK") { - default object { + companion object { val s = Foo() } } diff --git a/compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInClassObject.kt b/compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInClassObject.kt index 99367454ea7..876be1766c2 100644 --- a/compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInClassObject.kt +++ b/compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInClassObject.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { fun Int.foo(a: Int = 1): Int { return a } diff --git a/compiler/testData/codegen/box/defaultArguments/function/mixingNamedAndPositioned.kt b/compiler/testData/codegen/box/defaultArguments/function/mixingNamedAndPositioned.kt index cb206b8d271..7b3aebeec18 100644 --- a/compiler/testData/codegen/box/defaultArguments/function/mixingNamedAndPositioned.kt +++ b/compiler/testData/codegen/box/defaultArguments/function/mixingNamedAndPositioned.kt @@ -1,4 +1,4 @@ -fun foo(a: String = "Default", b: Int = 1, c: Long = 2): String { +fun foo(a: String = "Companion", b: Int = 1, c: Long = 2): String { return "$a $b $c" } diff --git a/compiler/testData/codegen/box/delegatedProperty/kt4138.kt b/compiler/testData/codegen/box/delegatedProperty/kt4138.kt index 29026c5f0e9..d4e52b824b5 100644 --- a/compiler/testData/codegen/box/delegatedProperty/kt4138.kt +++ b/compiler/testData/codegen/box/delegatedProperty/kt4138.kt @@ -5,14 +5,14 @@ class Delegate(var inner: T) { class Foo (val f: Int) { - default object { + companion object { val A: Foo by Delegate(Foo(11)) var B: Foo by Delegate(Foo(11)) } } trait FooTrait { - default object { + companion object { val A: Foo by Delegate(Foo(11)) var B: Foo by Delegate(Foo(11)) } diff --git a/compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt b/compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt index 8435fa0e066..08234dd1373 100644 --- a/compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt +++ b/compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt @@ -3,7 +3,7 @@ import java.util.IdentityHashMap class A { var foo: Int by IntHandler - default object { + companion object { var bar: Any? by AnyHandler } } diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt index cadddbe73c9..060c5e8b467 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { fun invoke(i: Int) = i } } 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 265a9bf36cd..a6e0700ea03 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.txt @@ -8,8 +8,8 @@ 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 default object Default { - private constructor Default() + internal 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 internal final fun invoke(/*0*/ i: kotlin.Int): kotlin.Int diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt index fb74564a48d..74cb9e4c24e 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt @@ -3,7 +3,7 @@ trait B fun B.invoke(i: Int) = i class A { - default object: B { + companion object: B { } } 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 543021380ff..47d84eff5e8 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.txt @@ -9,8 +9,8 @@ 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 default object Default : B { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt index bb8be09c4e5..27a700dd08a 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt @@ -1,6 +1,6 @@ class A { class Nested { - default object { + companion object { fun invoke(i: Int) = i } } 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 dac62217eb2..db62aff9da3 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.txt @@ -14,8 +14,8 @@ 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 default object Default { - private constructor Default() + internal 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 internal final fun invoke(/*0*/ i: kotlin.Int): kotlin.Int diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt index 86dee8aa2af..82f96ee54a5 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt @@ -2,7 +2,7 @@ import A.Nested class A { class Nested { - default object { + companion object { fun invoke(i: Int) = i } } 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 dac62217eb2..db62aff9da3 100644 --- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt +++ b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.txt @@ -14,8 +14,8 @@ 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 default object Default { - private constructor Default() + internal 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 internal final fun invoke(/*0*/ i: kotlin.Int): kotlin.Int diff --git a/compiler/testData/codegen/box/enum/classObjectInEnum.kt b/compiler/testData/codegen/box/enum/classObjectInEnum.kt index 47521761566..4d7e1df4a19 100644 --- a/compiler/testData/codegen/box/enum/classObjectInEnum.kt +++ b/compiler/testData/codegen/box/enum/classObjectInEnum.kt @@ -3,7 +3,7 @@ enum class Game { PAPER SCISSORS - default object { + companion object { fun foo() = ROCK val bar = PAPER } diff --git a/compiler/testData/codegen/box/enum/inclassobj.kt b/compiler/testData/codegen/box/enum/inclassobj.kt index 1c0d612273b..f949bf91581 100644 --- a/compiler/testData/codegen/box/enum/inclassobj.kt +++ b/compiler/testData/codegen/box/enum/inclassobj.kt @@ -1,8 +1,8 @@ -fun box() = if(Context.operatingSystemType == Context.Default.OsType.OTHER) "OK" else "fail" +fun box() = if(Context.operatingSystemType == Context.Companion.OsType.OTHER) "OK" else "fail" public class Context { - default object + companion object { public enum class OsType { LINUX; diff --git a/compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt b/compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt index b7242eeaef8..139345cc14a 100644 --- a/compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt +++ b/compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt @@ -1,5 +1,5 @@ class A { - default object {} + companion object {} enum class E { OK } diff --git a/compiler/testData/codegen/box/extensionFunctions/kt4228.kt b/compiler/testData/codegen/box/extensionFunctions/kt4228.kt index 98ff1d63918..9906d20305f 100644 --- a/compiler/testData/codegen/box/extensionFunctions/kt4228.kt +++ b/compiler/testData/codegen/box/extensionFunctions/kt4228.kt @@ -1,5 +1,5 @@ class A { - default object + companion object } val foo: Any.() -> Unit = {} diff --git a/compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt b/compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt index 68da5e80fc1..7bf67aa45a1 100644 --- a/compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt +++ b/compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt @@ -1,6 +1,6 @@ class Test(val prop: String) { - default object { + companion object { public val prop : String = "CO"; } diff --git a/compiler/testData/codegen/box/functions/kt2716.kt b/compiler/testData/codegen/box/functions/kt2716.kt index 4900ab6017b..3a1220b0593 100644 --- a/compiler/testData/codegen/box/functions/kt2716.kt +++ b/compiler/testData/codegen/box/functions/kt2716.kt @@ -1,7 +1,7 @@ package someTest public class Some private(val v: String) { - default object { + companion object { public fun init(v: String): Some { return Some(v) } diff --git a/compiler/testData/codegen/box/innerNested/nestedClassObject.kt b/compiler/testData/codegen/box/innerNested/nestedClassObject.kt index ee7907bbd7d..8e470a4e58e 100644 --- a/compiler/testData/codegen/box/innerNested/nestedClassObject.kt +++ b/compiler/testData/codegen/box/innerNested/nestedClassObject.kt @@ -1,6 +1,6 @@ class Outer { class Nested { - default object { + companion object { val O = "O" val K = "K" } diff --git a/compiler/testData/codegen/box/objectIntrinsics/objects.kt b/compiler/testData/codegen/box/objectIntrinsics/objects.kt index f86868ec2f3..7941e8d4860 100644 --- a/compiler/testData/codegen/box/objectIntrinsics/objects.kt +++ b/compiler/testData/codegen/box/objectIntrinsics/objects.kt @@ -2,7 +2,7 @@ package foo fun box(): String { try { - testDefaultObjectAccess() + testCompanionObjectAccess() testInCall() testDoubleConstants() testFloatConstants() @@ -18,7 +18,7 @@ fun box(): String { return "OK" } -fun testDefaultObjectAccess() { +fun testCompanionObjectAccess() { val i = Int val d = Double val f = Float @@ -73,7 +73,7 @@ fun testCallInterface() { } fun testLocalFun() { - fun Int.Default.LocalFun() : String = "LocalFun" + fun Int.Companion.LocalFun() : String = "LocalFun" myAssertEquals("LocalFun", Int.LocalFun()) } @@ -94,11 +94,11 @@ fun testVarTopField() { fun test(a: Any) {} var _field: Int = 0 -var Int.Default.TopField : Int +var Int.Companion.TopField : Int get() = _field set(value) { _field = value }; -fun Int.Default.TopFun() : String = "TopFun" +fun Int.Companion.TopFun() : String = "TopFun" fun myAssertEquals(a: T, b: T) { if (a != b) throw Exception("$a != $b") diff --git a/compiler/testData/codegen/box/objects/flist.kt b/compiler/testData/codegen/box/objects/flist.kt index 3499c26bba7..92e4006ba95 100644 --- a/compiler/testData/codegen/box/objects/flist.kt +++ b/compiler/testData/codegen/box/objects/flist.kt @@ -3,7 +3,7 @@ public abstract class FList() { public abstract val tail: FList public abstract val empty: Boolean - default object { + companion object { val emptyFList = object: FList() { public override val head: Any get() = throw UnsupportedOperationException(); diff --git a/compiler/testData/codegen/box/objects/kt1047.kt b/compiler/testData/codegen/box/objects/kt1047.kt index ffa0cb2950a..291977e2950 100644 --- a/compiler/testData/codegen/box/objects/kt1047.kt +++ b/compiler/testData/codegen/box/objects/kt1047.kt @@ -2,7 +2,7 @@ public open class Test() { open public fun test() : Unit { System.out?.println(hello) } - default object { + companion object { private val hello : String? = "Hello" } } diff --git a/compiler/testData/codegen/box/objects/kt2719.kt b/compiler/testData/codegen/box/objects/kt2719.kt index 3eb8d1e4573..908dbb3a1be 100644 --- a/compiler/testData/codegen/box/objects/kt2719.kt +++ b/compiler/testData/codegen/box/objects/kt2719.kt @@ -1,5 +1,5 @@ class Clazz { - default object { + companion object { val a = object { fun run(x: String) = x } diff --git a/compiler/testData/codegen/box/objects/kt535.kt b/compiler/testData/codegen/box/objects/kt535.kt index eed70c894a3..97a18485384 100644 --- a/compiler/testData/codegen/box/objects/kt535.kt +++ b/compiler/testData/codegen/box/objects/kt535.kt @@ -3,7 +3,7 @@ class Identifier(t : T?, myHasDollar : Boolean) { public fun getName() : T? { return myT } - default object { + companion object { open public fun init(name : T?) : Identifier { val __ = Identifier(name, false) return __ diff --git a/compiler/testData/codegen/box/objects/kt560.kt b/compiler/testData/codegen/box/objects/kt560.kt index e246dac3802..678533de9a2 100644 --- a/compiler/testData/codegen/box/objects/kt560.kt +++ b/compiler/testData/codegen/box/objects/kt560.kt @@ -4,7 +4,7 @@ import java.io.* open class AllEvenNum() { - default object { + companion object { open public fun main(args : Array?) : Unit { var i : Int = 1 while ((i <= 100)) { diff --git a/compiler/testData/codegen/box/objects/kt640.kt b/compiler/testData/codegen/box/objects/kt640.kt index 9e61927242c..dba2c75f913 100644 --- a/compiler/testData/codegen/box/objects/kt640.kt +++ b/compiler/testData/codegen/box/objects/kt640.kt @@ -14,7 +14,7 @@ public open class Identifier(myName : T?, myHasDollar : Boolean) { return myName } - default object { + companion object { open public fun init(name : T?) : Identifier { val __ = Identifier(name, false) return __ diff --git a/compiler/testData/codegen/box/properties/classObjectProperties.kt b/compiler/testData/codegen/box/properties/classObjectProperties.kt index 10d88854908..1f0c5ec7592 100644 --- a/compiler/testData/codegen/box/properties/classObjectProperties.kt +++ b/compiler/testData/codegen/box/properties/classObjectProperties.kt @@ -1,6 +1,6 @@ class Test { - default object { + companion object { public val prop1 : Int = 10 diff --git a/compiler/testData/codegen/box/properties/kt1482_2279.kt b/compiler/testData/codegen/box/properties/kt1482_2279.kt index 1221224bb79..7d09fe957df 100644 --- a/compiler/testData/codegen/box/properties/kt1482_2279.kt +++ b/compiler/testData/codegen/box/properties/kt1482_2279.kt @@ -1,7 +1,7 @@ abstract class ClassValAbstract { abstract var a: Int - default object { + companion object { val methods = (this as java.lang.Object).getClass()?.getClassLoader()?.loadClass("ClassValAbstract")?.getMethods()!! } } diff --git a/compiler/testData/codegen/box/properties/kt3551.kt b/compiler/testData/codegen/box/properties/kt3551.kt index eda42cb8186..ba6696e1417 100644 --- a/compiler/testData/codegen/box/properties/kt3551.kt +++ b/compiler/testData/codegen/box/properties/kt3551.kt @@ -8,7 +8,7 @@ class Identifier() { return myNullable } - default object { + companion object { fun init(isNullable : Boolean) : Identifier { val id = Identifier() id.myNullable = isNullable diff --git a/compiler/testData/codegen/box/properties/kt4140.kt b/compiler/testData/codegen/box/properties/kt4140.kt index 7b35305d299..7345dd26c5a 100644 --- a/compiler/testData/codegen/box/properties/kt4140.kt +++ b/compiler/testData/codegen/box/properties/kt4140.kt @@ -1,6 +1,6 @@ class TestObject() { - default object { + companion object { var prop: Int = 1 get() = $prop++ } diff --git a/compiler/testData/codegen/box/properties/kt4252.kt b/compiler/testData/codegen/box/properties/kt4252.kt index d90163bd232..2df15e1e331 100644 --- a/compiler/testData/codegen/box/properties/kt4252.kt +++ b/compiler/testData/codegen/box/properties/kt4252.kt @@ -2,7 +2,7 @@ class CallbackBlock {} public class Foo { - default object { + companion object { private var bar = 0 } diff --git a/compiler/testData/codegen/box/properties/kt4252_2.kt b/compiler/testData/codegen/box/properties/kt4252_2.kt index 89d24a9a367..f6271ec39d9 100644 --- a/compiler/testData/codegen/box/properties/kt4252_2.kt +++ b/compiler/testData/codegen/box/properties/kt4252_2.kt @@ -1,5 +1,5 @@ class Foo() { - default object { + companion object { val bar = "OK"; var boo = "FAIL"; } diff --git a/compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt b/compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt index a9d1cb7cd00..38fd75f040f 100644 --- a/compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt +++ b/compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt @@ -1,5 +1,5 @@ class Foo { - default object { + companion object { val bar: String { diff --git a/compiler/testData/codegen/box/staticFields/incInClassObject.kt b/compiler/testData/codegen/box/staticFields/incInClassObject.kt index 8a8481a56c5..4053e9a631d 100644 --- a/compiler/testData/codegen/box/staticFields/incInClassObject.kt +++ b/compiler/testData/codegen/box/staticFields/incInClassObject.kt @@ -1,6 +1,6 @@ class A { - default object { + companion object { private var r: Int = 1; fun test(): Int { diff --git a/compiler/testData/codegen/box/staticFields/inheritedPropertyInClassObject.kt b/compiler/testData/codegen/box/staticFields/inheritedPropertyInClassObject.kt index b015febd970..2ab591a3f58 100644 --- a/compiler/testData/codegen/box/staticFields/inheritedPropertyInClassObject.kt +++ b/compiler/testData/codegen/box/staticFields/inheritedPropertyInClassObject.kt @@ -1,6 +1,6 @@ open class Bar(val prop: String) class Foo { - default object : Bar("OK") { + companion object : Bar("OK") { val p = Foo.prop val p2 = prop val p3 = this.prop diff --git a/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt index 3d392c75608..2e48215123d 100644 --- a/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt +++ b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt @@ -1,5 +1,5 @@ class A { - default object: funClassObject() { + companion object: funClassObject() { fun test(): String { return funClassObject.protectedFun()!! } diff --git a/compiler/testData/codegen/boxInline/simple/classObject.2.kt b/compiler/testData/codegen/boxInline/simple/classObject.2.kt index e2c941bc521..db338ff7687 100644 --- a/compiler/testData/codegen/boxInline/simple/classObject.2.kt +++ b/compiler/testData/codegen/boxInline/simple/classObject.2.kt @@ -10,7 +10,7 @@ class InlineAll { return s() } - default object { + companion object { inline fun inline(s: () -> String): String { return s() } diff --git a/compiler/testData/codegen/boxInline/trait/trait.2.kt b/compiler/testData/codegen/boxInline/trait/trait.2.kt index b5219e7c7ca..d7a9b4e33c1 100644 --- a/compiler/testData/codegen/boxInline/trait/trait.2.kt +++ b/compiler/testData/codegen/boxInline/trait/trait.2.kt @@ -6,7 +6,7 @@ trait InlineTrait { return s() } - default object { + companion object { inline final fun finalInline(s: () -> String): String { return s() } diff --git a/compiler/testData/codegen/boxWithJava/classObjectAccessor/J.java b/compiler/testData/codegen/boxWithJava/classObjectAccessor/J.java index aeb26ab7d13..308c328b2b8 100644 --- a/compiler/testData/codegen/boxWithJava/classObjectAccessor/J.java +++ b/compiler/testData/codegen/boxWithJava/classObjectAccessor/J.java @@ -1,5 +1,5 @@ public class J { public static int f() { - return A.Default.getI1() + A.OBJECT$.getI2() + B.Named.getI1() + B.OBJECT$.getI2(); + return A.Companion.getI1() + A.OBJECT$.getI2() + B.Named.getI1() + B.OBJECT$.getI2(); } } diff --git a/compiler/testData/codegen/boxWithJava/classObjectAccessor/classObject.kt b/compiler/testData/codegen/boxWithJava/classObjectAccessor/classObject.kt index 7b3b1e9aa93..d8d1b09b117 100644 --- a/compiler/testData/codegen/boxWithJava/classObjectAccessor/classObject.kt +++ b/compiler/testData/codegen/boxWithJava/classObjectAccessor/classObject.kt @@ -1,12 +1,12 @@ class A { - default object { + companion object { val i1 = 1 val i2 = 2 } } class B { - default object Named { + companion object Named { val i1 = 3 val i2 = 4 } diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt b/compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt index ea68d8e4894..a57849fb795 100644 --- a/compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt +++ b/compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt @@ -7,7 +7,7 @@ annotation class testAnnotation class A { - default object { + companion object { val b: String = "OK" platformStatic testAnnotation fun test1() = b diff --git a/compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt b/compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt index 5445a3c9e89..dac282c72ed 100644 --- a/compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt +++ b/compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt @@ -2,7 +2,7 @@ import kotlin.platform.platformStatic class A { - default object { + companion object { val b: String = "OK" platformStatic val c: String = "OK" diff --git a/compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt b/compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt index e77f9342e4c..00c287d105d 100644 --- a/compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt +++ b/compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt @@ -1,17 +1,17 @@ class Klass { - default object { + companion object { val NAME = "Klass" } } trait Trait { - default object { + companion object { val NAME = "Trait" } } enum class Enoom { - default object { + companion object { val NAME = "Enoom" } } diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt b/compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt index 2c569ba8ab3..ec16c008089 100644 --- a/compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt +++ b/compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt @@ -32,7 +32,7 @@ annotation class Ann( ) class Foo { - default object { + companion object { val i: Int = 2 val s: Short = 2 val f: Float = 2.0.toFloat() diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt b/compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt index 6b2c2c3f756..48a935e5c2f 100644 --- a/compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt +++ b/compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt @@ -15,7 +15,7 @@ annotation class Ann(val i: Int) class A { class B { - default object { + companion object { val i = 1 } } diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/classObjectVar.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/property/classObjectVar.kt index e8cf75aa2a4..d263bcd7b18 100644 --- a/compiler/testData/codegen/boxWithStdlib/callableReference/property/classObjectVar.kt +++ b/compiler/testData/codegen/boxWithStdlib/callableReference/property/classObjectVar.kt @@ -1,5 +1,5 @@ class A { - default object B { + companion object B { var state: String = "12345" } } diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt index fdec8486202..db87afa64e7 100644 --- a/compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt +++ b/compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt @@ -1,7 +1,7 @@ import kotlin.reflect.KMemberProperty class A { - default object { + companion object { val ref: KMemberProperty = A::foo } diff --git a/compiler/testData/codegen/boxWithStdlib/intrinsics/defaultObjectMapping.kt b/compiler/testData/codegen/boxWithStdlib/intrinsics/defaultObjectMapping.kt index c7c58eaad18..b133b653db0 100644 --- a/compiler/testData/codegen/boxWithStdlib/intrinsics/defaultObjectMapping.kt +++ b/compiler/testData/codegen/boxWithStdlib/intrinsics/defaultObjectMapping.kt @@ -4,12 +4,12 @@ fun box(): String { assertEquals(java.lang.Integer.MIN_VALUE, Int.MIN_VALUE) assertEquals(java.lang.Byte.MAX_VALUE, Byte.MAX_VALUE) - assertEquals("MIN_VALUE", (Int.Default::MIN_VALUE).name) - assertEquals("MAX_VALUE", (Double.Default::MAX_VALUE).name) - assertEquals("MIN_VALUE", (Float.Default::MIN_VALUE).name) - assertEquals("MAX_VALUE", (Long.Default::MAX_VALUE).name) - assertEquals("MIN_VALUE", (Short.Default::MIN_VALUE).name) - assertEquals("MAX_VALUE", (Byte.Default::MAX_VALUE).name) + assertEquals("MIN_VALUE", (Int.Companion::MIN_VALUE).name) + assertEquals("MAX_VALUE", (Double.Companion::MAX_VALUE).name) + assertEquals("MIN_VALUE", (Float.Companion::MIN_VALUE).name) + assertEquals("MAX_VALUE", (Long.Companion::MAX_VALUE).name) + assertEquals("MIN_VALUE", (Short.Companion::MIN_VALUE).name) + assertEquals("MAX_VALUE", (Byte.Companion::MAX_VALUE).name) return "OK" } diff --git a/compiler/testData/codegen/boxWithStdlib/native/nativePropertyAccessors.kt b/compiler/testData/codegen/boxWithStdlib/native/nativePropertyAccessors.kt index 1d2836285a8..1f247513c2e 100644 --- a/compiler/testData/codegen/boxWithStdlib/native/nativePropertyAccessors.kt +++ b/compiler/testData/codegen/boxWithStdlib/native/nativePropertyAccessors.kt @@ -1,5 +1,5 @@ class C { - default object { + companion object { val defaultGetter: Int = 1 [native] get @@ -39,8 +39,8 @@ fun box(): String { return check({defaultGetter}, "_DefaultPackage.getDefaultGetter()I") ?: check({defaultSetter = 1}, "_DefaultPackage.setDefaultSetter(I)V") - ?: check({C.defaultGetter}, "C\$Default.getDefaultGetter()I") - ?: check({C.defaultSetter = 1}, "C\$Default.setDefaultSetter(I)V") + ?: check({C.defaultGetter}, "C\$Companion.getDefaultGetter()I") + ?: check({C.defaultSetter = 1}, "C\$Companion.setDefaultSetter(I)V") ?: check({C().defaultGetter}, "C.getDefaultGetter()I") ?: check({C().defaultSetter = 1}, "C.setDefaultSetter(I)V") diff --git a/compiler/testData/codegen/boxWithStdlib/native/privateStatic.kt b/compiler/testData/codegen/boxWithStdlib/native/privateStatic.kt index 7be128bf10a..d3b119824e5 100644 --- a/compiler/testData/codegen/boxWithStdlib/native/privateStatic.kt +++ b/compiler/testData/codegen/boxWithStdlib/native/privateStatic.kt @@ -2,7 +2,7 @@ import kotlin.jvm.* import kotlin.platform.* class C { - default object { + companion object { private platformStatic native fun foo() } diff --git a/compiler/testData/codegen/boxWithStdlib/native/staticNative.kt b/compiler/testData/codegen/boxWithStdlib/native/staticNative.kt index ee31da43788..e013f14db60 100644 --- a/compiler/testData/codegen/boxWithStdlib/native/staticNative.kt +++ b/compiler/testData/codegen/boxWithStdlib/native/staticNative.kt @@ -4,7 +4,7 @@ import kotlin.jvm.* import kotlin.platform.* class WithNative { - default object { + companion object { platformStatic native fun bar(l: Long, s: String): Double } } diff --git a/compiler/testData/codegen/boxWithStdlib/platformStatic/syntheticAccessor.kt b/compiler/testData/codegen/boxWithStdlib/platformStatic/syntheticAccessor.kt index f56724fb1e6..d54d503f2ad 100644 --- a/compiler/testData/codegen/boxWithStdlib/platformStatic/syntheticAccessor.kt +++ b/compiler/testData/codegen/boxWithStdlib/platformStatic/syntheticAccessor.kt @@ -1,7 +1,7 @@ import kotlin.platform.* class C { - default object { + companion object { private platformStatic fun foo(): String { return "OK" } diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/builtinClassLiterals.kt b/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/builtinClassLiterals.kt index 9813359f5b3..20be0b1183d 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/builtinClassLiterals.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/builtinClassLiterals.kt @@ -8,8 +8,8 @@ fun box(): String { assertEquals("Int", Int::class.simpleName) assertEquals("Long", Long::class.simpleName) - assertEquals("Default", Int.Default::class.simpleName) - assertEquals("Default", Double.Default::class.simpleName) + assertEquals("Companion", Int.Companion::class.simpleName) + assertEquals("Companion", Double.Companion::class.simpleName) assertEquals("IntRange", IntRange::class.simpleName) diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInClassObject.kt b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInClassObject.kt index 5b9d8181177..cf83208b3e1 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInClassObject.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInClassObject.kt @@ -1,5 +1,5 @@ class O { - default object { + companion object { // Currently we consider in class O as the enclosing method of this lambda, // so we write outer class = O and enclosing method = null val f = {} diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt b/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt index bc293db61b6..4be92ec9f51 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt @@ -5,13 +5,13 @@ class G(val s: T) { } public trait ErrorsJvmTrait { - default object { + companion object { public val param : G = G("STRING") } } public class ErrorsJvmClass { - default object { + companion object { public val param : G = G("STRING") } } diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt b/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt index 143d250560c..157b4f4227d 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt @@ -6,7 +6,7 @@ open class B class A { - default object { + companion object { [platformStatic] fun a(s: T) : T { return s diff --git a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt index 440cf9f0aab..574190a829f 100644 --- a/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt +++ b/compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt @@ -1,7 +1,7 @@ import kotlin.test.assertEquals class A { - default object { + companion object { enum class Season { WINTER SPRING @@ -11,19 +11,19 @@ class A { } } -fun foo(x : A.Default.Season) : String { +fun foo(x : A.Companion.Season) : String { return when (x) { - A.Default.Season.WINTER -> "winter" - A.Default.Season.SPRING -> "spring" - A.Default.Season.SUMMER -> "summer" + A.Companion.Season.WINTER -> "winter" + A.Companion.Season.SPRING -> "spring" + A.Companion.Season.SUMMER -> "summer" else -> "other" } } fun box() : String { - assertEquals("winter", foo(A.Default.Season.WINTER)) - assertEquals("spring", foo(A.Default.Season.SPRING)) - assertEquals("summer", foo(A.Default.Season.SUMMER)) - assertEquals("other", foo(A.Default.Season.AUTUMN)) + assertEquals("winter", foo(A.Companion.Season.WINTER)) + assertEquals("spring", foo(A.Companion.Season.SPRING)) + assertEquals("summer", foo(A.Companion.Season.SUMMER)) + assertEquals("other", foo(A.Companion.Season.AUTUMN)) return "OK" } diff --git a/compiler/testData/codegen/bytecodeText/staticFields/classObject.kt b/compiler/testData/codegen/bytecodeText/staticFields/classObject.kt index 2486b8e659c..34977448c45 100644 --- a/compiler/testData/codegen/bytecodeText/staticFields/classObject.kt +++ b/compiler/testData/codegen/bytecodeText/staticFields/classObject.kt @@ -1,7 +1,7 @@ class A { - default object { + companion object { val r: Int = 1; } } -// A and default object constructor call +// A and companion object constructor call // 2 ALOAD 0 \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/staticFields/classObjectSyntheticAccessor.kt b/compiler/testData/codegen/bytecodeText/staticFields/classObjectSyntheticAccessor.kt index 1169178d381..7496744e3b2 100644 --- a/compiler/testData/codegen/bytecodeText/staticFields/classObjectSyntheticAccessor.kt +++ b/compiler/testData/codegen/bytecodeText/staticFields/classObjectSyntheticAccessor.kt @@ -1,8 +1,8 @@ class A { - default object { + companion object { private var r: Int = 1; } } -// A and default object constructor call +// A and companion object constructor call // 2 ALOAD 0 // 1 synthetic access\$getR diff --git a/compiler/testData/codegen/classes/classObjectInterface.kt b/compiler/testData/codegen/classes/classObjectInterface.kt index dcd660fda83..76b5614275c 100644 --- a/compiler/testData/codegen/classes/classObjectInterface.kt +++ b/compiler/testData/codegen/classes/classObjectInterface.kt @@ -1,7 +1,7 @@ class C() { fun getInstance(): Runnable = C - default object: Runnable { + companion object: Runnable { override fun run(): Unit { } } } diff --git a/compiler/testData/codegen/classes/classObjectIsInnerClass.kt b/compiler/testData/codegen/classes/classObjectIsInnerClass.kt index 6638d9feeae..3ce218107d0 100644 --- a/compiler/testData/codegen/classes/classObjectIsInnerClass.kt +++ b/compiler/testData/codegen/classes/classObjectIsInnerClass.kt @@ -1,3 +1,3 @@ class A { - default object + companion object } diff --git a/compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt b/compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt index 9e3a95f0699..991dffb89a1 100644 --- a/compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt +++ b/compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt @@ -1,8 +1,8 @@ class A { - default object { + companion object { class Foo(val a: Int = 1) {} } } -// CLASS: A$Default$Foo +// CLASS: A$Companion$Foo // HAS_DEFAULT_CONSTRUCTOR: true diff --git a/compiler/testData/codegen/innerClassInfo/innerClassInfo.kt b/compiler/testData/codegen/innerClassInfo/innerClassInfo.kt index 990a2e249a9..2b5af6d519f 100644 --- a/compiler/testData/codegen/innerClassInfo/innerClassInfo.kt +++ b/compiler/testData/codegen/innerClassInfo/innerClassInfo.kt @@ -3,5 +3,5 @@ class A { inner class C } - default object + companion object } diff --git a/compiler/testData/codegen/notNullAssertions/noAssertionsForKotlin.kt b/compiler/testData/codegen/notNullAssertions/noAssertionsForKotlin.kt index 2788a23ecbe..b906676ddba 100644 --- a/compiler/testData/codegen/notNullAssertions/noAssertionsForKotlin.kt +++ b/compiler/testData/codegen/notNullAssertions/noAssertionsForKotlin.kt @@ -3,7 +3,7 @@ class A { fun foo(): String = "" - default object { + companion object { val y: Any? = 239 fun bar(): String = "" diff --git a/compiler/testData/codegen/outerClassInfo/outerClassInfo.java b/compiler/testData/codegen/outerClassInfo/outerClassInfo.java index 97a3dc84f9b..142385a0033 100644 --- a/compiler/testData/codegen/outerClassInfo/outerClassInfo.java +++ b/compiler/testData/codegen/outerClassInfo/outerClassInfo.java @@ -4,7 +4,7 @@ import java.lang.Object; class Foo { - class Default { } + class Companion { } class InnerClass { } diff --git a/compiler/testData/codegen/outerClassInfo/outerClassInfo.kt b/compiler/testData/codegen/outerClassInfo/outerClassInfo.kt index d7d9a6124d9..5bffa10b23d 100644 --- a/compiler/testData/codegen/outerClassInfo/outerClassInfo.kt +++ b/compiler/testData/codegen/outerClassInfo/outerClassInfo.kt @@ -2,7 +2,7 @@ package foo class Foo { - default object { + companion object { fun objectFoo() { } } diff --git a/compiler/testData/codegen/properties/privateClassPropertyAccessors.kt b/compiler/testData/codegen/properties/privateClassPropertyAccessors.kt index 80cb1c0bc10..2924da71399 100644 --- a/compiler/testData/codegen/properties/privateClassPropertyAccessors.kt +++ b/compiler/testData/codegen/properties/privateClassPropertyAccessors.kt @@ -13,7 +13,7 @@ class C { get() = this set(value) {} - default object { + companion object { private val classObjectVal: Long get() = 1L } diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt index 1b07fc6edcd..87d09913465 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt +++ b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt @@ -1,7 +1,7 @@ package test class WithClassObject { - default object { + companion object { fun foo() {} val value: Int = 0 diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt b/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt index 9924e3e3678..9fe14bcf0ea 100644 --- a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt +++ b/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt @@ -4,7 +4,7 @@ import kotlin.platform.platformStatic class A { - default object { + companion object { val b: String = "OK" platformStatic fun test1() { diff --git a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt b/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt index 3a59218af95..2102b61952b 100644 --- a/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt +++ b/compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt @@ -3,7 +3,7 @@ package test import kotlin.platform.platformStatic class A { - default object { + companion object { [platformStatic] val b: String = "OK" var A.c: String diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt index 98635e90872..ce48fbfc6c6 100644 --- a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt +++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt @@ -10,7 +10,7 @@ annotation class AFloat(val value: Float) class Test { - default object { + companion object { val vstring: String = "Test" val vchar: Char = 'c' val vint: Int = 10 diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt index 99ae40be29f..9c0944a7948 100644 --- a/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt +++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt @@ -10,7 +10,7 @@ annotation class AFloat(val value: Float) trait Test { - default object { + companion object { val vstring: String = "Test" val vchar: Char = 'c' val vint: Int = 10 diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt b/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt index ce470daf5c7..516f88002ef 100644 --- a/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt +++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt @@ -1,7 +1,7 @@ package test class KotlinClass { - default object { + companion object { val FOO: Int = 10 } } diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt index 17600d44ccc..25f2bce225f 100644 --- a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt +++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt @@ -2,7 +2,7 @@ package test class Test { - default object { + companion object { public val valProp: Int = 10 public var varProp: Int = 10 diff --git a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt index 312fb432f24..9d8b9a15fbe 100644 --- a/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt +++ b/compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt @@ -2,7 +2,7 @@ package test trait Test { - default object { + companion object { public val valProp: Int = 10 } diff --git a/compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt b/compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt index 0ee67fb0f46..baa345e6441 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt @@ -3,7 +3,7 @@ package library public enum class EnumClass { ENTRY - public default object { + public companion object { public fun entry(): EnumClass = ENTRY } } diff --git a/compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt b/compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt index db9b321e084..a39361f316c 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { fun foo() = 42 val bar = "OK" } diff --git a/compiler/testData/diagnostics/tests/MultipleBounds.kt b/compiler/testData/diagnostics/tests/MultipleBounds.kt index 7e9e1937f22..746332c7049 100644 --- a/compiler/testData/diagnostics/tests/MultipleBounds.kt +++ b/compiler/testData/diagnostics/tests/MultipleBounds.kt @@ -17,7 +17,7 @@ trait G { class C() : A(), B class D() { - default object : A(), B {} + companion object : A(), B {} } class Test1() @@ -72,7 +72,7 @@ val t3 = test2(C()) class Test where - class object T : Foo, + class object T : Foo, class object T : A {} val x : Int = 0 \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/MultipleBounds.txt b/compiler/testData/diagnostics/tests/MultipleBounds.txt index 6833d725e17..6fc591e9688 100644 --- a/compiler/testData/diagnostics/tests/MultipleBounds.txt +++ b/compiler/testData/diagnostics/tests/MultipleBounds.txt @@ -52,8 +52,8 @@ package Jet87 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default : Jet87.A, Jet87.B { - private constructor Default() + internal 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 internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt index 5a331272c2a..d66d11cb20d 100644 --- a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt +++ b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt @@ -3,24 +3,24 @@ package foo class X {} val s = java -val ss = System -val sss = X -val x = "${System}" +val ss = System +val sss = X +val x = "${System}" val xs = java.lang -val xss = java.lang.System -val xsss = foo.X +val xss = java.lang.System +val xsss = foo.X val xssss = foo -val f = { System } +val f = { System } fun main(args : Array) { java = null - System = null - System!! - java.lang.System = null - java.lang.System!! - System is Int + System = null + System!! + java.lang.System = null + java.lang.System!! + System is Int System() - (System) - @foo System - null in System + (System) + @foo System + null in System } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/annotations/annotationModifier.kt b/compiler/testData/diagnostics/tests/annotations/annotationModifier.kt index 10e1f0fdc79..35d4889f7a9 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationModifier.kt +++ b/compiler/testData/diagnostics/tests/annotations/annotationModifier.kt @@ -1,7 +1,7 @@ annotation class B class A { - annotation default object {} + annotation companion object {} } annotation object O {} diff --git a/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt b/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt index c522f88ea61..cb5eeb91023 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationModifier.txt @@ -10,8 +10,8 @@ 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.kt b/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.kt index f6b695ba50c..cf65dd2ccb3 100644 --- a/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.kt +++ b/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.kt @@ -11,7 +11,7 @@ annotation class Annotation4() { } annotation class Annotation5() { - default object {} + companion object {} } annotation class Annotation6() { diff --git a/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt b/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt index 29d787298a4..72b3b44134d 100644 --- a/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt +++ b/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.txt @@ -50,8 +50,8 @@ 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/cast/WhenWithExpression.kt b/compiler/testData/diagnostics/tests/cast/WhenWithExpression.kt index 9511a9a1818..9a60e0bf91e 100644 --- a/compiler/testData/diagnostics/tests/cast/WhenWithExpression.kt +++ b/compiler/testData/diagnostics/tests/cast/WhenWithExpression.kt @@ -1,5 +1,5 @@ class List(val size : Int) { - default object { + companion object { val Nil = List(0) } } diff --git a/compiler/testData/diagnostics/tests/cast/WhenWithExpression.txt b/compiler/testData/diagnostics/tests/cast/WhenWithExpression.txt index bb3de2c406b..a95d1885531 100644 --- a/compiler/testData/diagnostics/tests/cast/WhenWithExpression.txt +++ b/compiler/testData/diagnostics/tests/cast/WhenWithExpression.txt @@ -9,8 +9,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt index dbdcb31376c..aef51074ce8 100644 --- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt +++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt @@ -3,7 +3,7 @@ class A() { val x = 1 - default object { + companion object { val y = x } } diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt index df08a60fd31..5873b35b5a2 100644 --- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt +++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt @@ -7,8 +7,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt index db447e235cd..450938b6ca4 100644 --- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt +++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt @@ -2,14 +2,14 @@ package foo fun test() { A.d - A.Default.f + A.Companion.f B.D CCC CCC.classObjectVar } class A() { - public default object { + public companion object { val d = 3 private object f { @@ -19,12 +19,12 @@ class A() { class B { class D { - private default object + private companion object } } class CCC() { - private default object { + private companion object { val classObjectVar = 3 } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.txt b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.txt index efa641d6ce1..d1b06390c7d 100644 --- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.txt +++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.txt @@ -9,8 +9,8 @@ package foo { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public default object Default { - private constructor Default() + public companion object Companion { + private constructor Companion() internal final val d: kotlin.Int = 3 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -37,8 +37,8 @@ package foo { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - private default object Default { - private constructor Default() + private 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 @@ -52,8 +52,8 @@ package foo { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - private default object Default { - private constructor Default() + private companion object Companion { + private constructor Companion() internal final val classObjectVar: kotlin.Int = 3 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/ClassObjects.kt b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt index e4411ab055b..0f24874764d 100644 --- a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt +++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt @@ -1,22 +1,22 @@ package Jet86 class A { - default object { + companion object { val x = 1 } - default object { + companion object { val x = 1 } } class AA { - default object { + companion object { val x = 1 } - default object A { + companion object A { val x = 1 } - default object AA { + companion object AA { val x = 1 } } @@ -26,7 +26,7 @@ class B() { } object b { - default object { + companion object { val x = 1 } // error } @@ -35,7 +35,7 @@ val a = A.x val c = B.x val d = b.x -val s = System // error +val s = System // error fun test() { System.out.println() java.lang.System.out.println() diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt index 9bfbe8cf52f..4a62c1dcccb 100644 --- a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt +++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt @@ -13,16 +13,16 @@ package Jet86 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -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 default object A { + internal 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 default object AA { + internal 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,8 +52,8 @@ package Jet86 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -75,8 +75,8 @@ package Jet86 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt index 1250c66cfe1..95bd086a371 100644 --- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt +++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt @@ -5,7 +5,7 @@ class A { inner class Inner - default object { + companion object { class Nested2 @@ -28,20 +28,20 @@ object O { fun f() { A.c A.hashCode() - A().Nested + A().Nested A.Nested() A().Inner() - A.Default.Nested - A.Default.Inner + A.Companion.Nested + A.Companion.Inner A.Inner - A.Default.c - A.Default.Obj2 - A.Default.Obj2.c + A.Companion.c + A.Companion.Obj2 + A.Companion.Obj2.c - A.Default.Nested2() - A.Default.c + A.Companion.Nested2() + A.Companion.c A.Obj - A.Default.Obj2 + A.Companion.Obj2 A.Obj2 A.Obj2.c A.Nested2 diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.txt index 50633f5a713..fc49dd6b7c1 100644 --- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.txt @@ -9,8 +9,8 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt b/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt index f0c0f89aedd..2e1a5c26ed8 100644 --- a/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt +++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt @@ -2,16 +2,16 @@ class A { inner class B { - default object { } + companion object { } } } class B { - default object { + companion object { class B { - default object { + companion object { class C { - default object { } + companion object { } } } } @@ -20,6 +20,6 @@ class B { class C { class D { - default object { } + companion object { } } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.txt index 31f2daa1e5c..4894c197add 100644 --- a/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.txt @@ -12,8 +12,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -27,8 +27,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -39,8 +39,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -51,8 +51,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -75,8 +75,8 @@ 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.kt b/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.kt index d20e968cdb9..2e155653321 100644 --- a/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.kt +++ b/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.kt @@ -4,6 +4,6 @@ open class ToResolve(f : (Int) -> Int) fun testFun(a : Int) = 12 class TestSome

{ - default object : ToResolve<P>({testFun(it)}) { + companion object : ToResolve<P>({testFun(it)}) { } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt b/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt index f02cc3353ee..450d0bf71c1 100644 --- a/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt +++ b/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt @@ -9,8 +9,8 @@ package test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default : test.ToResolve

{ - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.kt b/compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.kt index 396f9b9cb6e..ee2ef6db157 100644 --- a/compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.kt +++ b/compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.kt @@ -1,9 +1,9 @@ fun test() { class A { - default object {} + companion object {} } object { - default object {} + companion object {} } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt b/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt index 4e5db8eb0cd..a42df203d13 100644 --- a/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt +++ b/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt @@ -1,13 +1,13 @@ package test class A { - object Default + object Companion - default object + companion object } class B { - default object Named + companion object Named object Named } @@ -15,5 +15,5 @@ class B { class C { class Named - default object Named + companion object Named } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.txt b/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.txt index 67dfe12d1c4..bf8bdb4b687 100644 --- a/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.txt +++ b/compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.txt @@ -8,15 +8,15 @@ package test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal object Default { - private constructor Default() + internal 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 default object Default { - private constructor Default() + internal 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 @@ -36,7 +36,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal default object Named { + internal 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 default object Named { + internal 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/deprecatedClassObjectSyntax.kt b/compiler/testData/diagnostics/tests/classObjects/deprecatedClassObjectSyntax.kt index 26b0f0e690c..31d39ef389b 100644 --- a/compiler/testData/diagnostics/tests/classObjects/deprecatedClassObjectSyntax.kt +++ b/compiler/testData/diagnostics/tests/classObjects/deprecatedClassObjectSyntax.kt @@ -13,13 +13,13 @@ trait B { } class C { - default class object + companion class object } fun main() { A A.A - g(B.Default) + g(B.Companion) g(B) A.ext() diff --git a/compiler/testData/diagnostics/tests/classObjects/deprecatedClassObjectSyntax.txt b/compiler/testData/diagnostics/tests/classObjects/deprecatedClassObjectSyntax.txt index 72b5659c112..67797fee6f9 100644 --- a/compiler/testData/diagnostics/tests/classObjects/deprecatedClassObjectSyntax.txt +++ b/compiler/testData/diagnostics/tests/classObjects/deprecatedClassObjectSyntax.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 default object A { + internal 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 @@ -23,8 +23,8 @@ internal trait B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default : G { - private constructor Default() + internal companion object Companion : G { + 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 @@ -37,8 +37,8 @@ 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt b/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt index 1a4b6b353b5..bc68cc2cd51 100644 --- a/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt +++ b/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt @@ -1,9 +1,9 @@ package f -import f.A.Default.B +import f.A.Companion.B class A { - default object { + companion object { class B } } diff --git a/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.txt index dd29b09915f..bb42bfbd4e4 100644 --- a/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.txt @@ -1,7 +1,7 @@ package package f { - internal fun test(): f.A.Default.B + internal fun test(): f.A.Companion.B internal final class A { public constructor A() @@ -9,8 +9,8 @@ package f { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt index 085afefd689..0f9078d0057 100644 --- a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt +++ b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt @@ -2,25 +2,25 @@ package a class A { - default object { + companion object { fun foo() {} } } private class B { - default object { + companion object { fun bar() {} } } class C { - private default object { + private companion object { fun baz() {} } } private class D { - private default object { + private companion object { fun quux() {} } } diff --git a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.txt b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.txt index 7f73b4a44a1..d7d63a939a4 100644 --- a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.txt +++ b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.txt @@ -8,8 +8,8 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -23,8 +23,8 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - private default object Default { - private constructor Default() + private 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -38,8 +38,8 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - private default object Default { - private constructor Default() + private companion object Companion { + private constructor Companion() internal final fun baz(): kotlin.Unit 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,8 +53,8 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - private default object Default { - private constructor Default() + private 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 internal final fun quux(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/classObjects/kt3866.kt b/compiler/testData/diagnostics/tests/classObjects/kt3866.kt index d9fb9dd0291..f5e88e734f6 100644 --- a/compiler/testData/diagnostics/tests/classObjects/kt3866.kt +++ b/compiler/testData/diagnostics/tests/classObjects/kt3866.kt @@ -4,11 +4,11 @@ open class C { fun C.foo() {} open class X { - default object : C() {} + companion object : C() {} } open class Y { - default object : C() {} + companion object : C() {} } fun bar() { diff --git a/compiler/testData/diagnostics/tests/classObjects/kt3866.txt b/compiler/testData/diagnostics/tests/classObjects/kt3866.txt index d1aadb17cc7..c99e4379f37 100644 --- a/compiler/testData/diagnostics/tests/classObjects/kt3866.txt +++ b/compiler/testData/diagnostics/tests/classObjects/kt3866.txt @@ -16,8 +16,8 @@ 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 default object Default : C { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -30,8 +30,8 @@ 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 default object Default : C { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.kt b/compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.kt index b23925fe4db..9690fb58523 100644 --- a/compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.kt +++ b/compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.kt @@ -1,17 +1,17 @@ class A { inner class I { - default object A + companion object A - default object B + companion object B - default object C + companion object C } } object O { - default object A + companion object A - default object B + companion object B - default object C + companion object C } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.txt b/compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.txt index 3283a3a7855..a9c1723bb4f 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 default object A { + internal 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 default object B { + internal 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 default object C { + internal 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 default object A { + internal 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 default object B { + internal 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 default object C { + internal 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.kt b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt index be681f32115..0674449e84c 100644 --- a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt +++ b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt @@ -1,8 +1,8 @@ class A { - private default object { + private companion object { class B { class C { - default object { + companion object { fun foo() {} } } @@ -10,6 +10,6 @@ class A { } } -fun f1() = A.Default.B.C +fun f1() = A.Companion.B.C -fun f2() = A.Default.B.C.foo() \ No newline at end of file +fun f2() = A.Companion.B.C.foo() \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.txt index a0c8752ff90..8b90236669d 100644 --- a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.txt @@ -1,6 +1,6 @@ package -internal fun f1(): A.Default.B.C.Default +internal fun f1(): A.Companion.B.C.Companion internal fun f2(): kotlin.Unit internal final class A { @@ -9,8 +9,8 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - private default object Default { - private constructor Default() + private 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 @@ -27,8 +27,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.kt b/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.kt index f69424bfef4..826b847b9f1 100644 --- a/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.kt +++ b/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.kt @@ -3,7 +3,7 @@ package test class Test { fun test(): Int = 12 - default object { + companion object { val a = test() // Check if resolver will be able to infer type of a variable } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt index 81f89d906c7..6e8772eef9f 100644 --- a/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt @@ -9,8 +9,8 @@ package test { internal final fun test(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt index 165539c9541..a3684704dc0 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt @@ -247,7 +247,7 @@ class ForwardAccessToBackingField() { //kt-147 } class ClassObject() { - default object { + companion object { val x : Int init { diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt index b3e33c8eead..d497cbb3128 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt @@ -49,8 +49,8 @@ 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 default object Default { - private constructor Default() + internal 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 internal final fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt index 677df9edbc7..f25b1645484 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt @@ -10,7 +10,7 @@ enum class Direction { } class A { - default object { + companion object { } } diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt index 4f725c04b0f..d3f0757387a 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.txt @@ -12,8 +12,8 @@ package kt1185 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt index 30b37e678f9..ab3cfab05fc 100644 --- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt +++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt @@ -13,7 +13,7 @@ object Obj { } class AClass() { - default object { + companion object { val y : Any? = 2 } } diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.txt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.txt index a5c3a326725..3a763b2f2a2 100644 --- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.txt +++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.txt @@ -11,8 +11,8 @@ package example { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt index 497b98d90a1..b940b6d1a44 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt +++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt @@ -1,12 +1,12 @@ -// !DIAGNOSTICS: -MANY_DEFAULT_OBJECTS -REDECLARATION +// !DIAGNOSTICS: -MANY_COMPANION_OBJECTS -REDECLARATION // KT-3464 Front-end shouldn't allow override modifier in class declaration override class A { - override default object {} - open default object {} - abstract default object {} - final default object {} + override companion object {} + open companion object {} + abstract companion object {} + final companion object {} } override object B1 {} diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt index c8dd0db3b88..2988193d0a1 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt +++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.txt @@ -6,29 +6,29 @@ 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 default object Default { - private constructor Default() + internal 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 default object Default { - private constructor Default() + internal 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 default object Default { - private constructor Default() + internal 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt index d05edaae0f9..dc8d5d4ed08 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt @@ -1,5 +1,5 @@ class C { - default object { + companion object { val x = 1 fun getX() = 1 } diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt index 7a5a8bab094..02966baf381 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.txt @@ -6,8 +6,8 @@ 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 default object Default { - private constructor Default() + internal 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 internal final fun getX(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt index dfc68f1a3ba..f4fc2430b45 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt @@ -1,11 +1,11 @@ class C { - default object {} + companion object {} - val Default = C + val Companion = C } class D { - default object {} + companion object {} val `OBJECT$` = D } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt index 2466d290dc3..137e6e30c68 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.txt @@ -2,13 +2,13 @@ package internal final class C { public constructor C() - internal final val Default: C.Default + internal final val Companion: C.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 default object Default { - private constructor Default() + internal 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 @@ -17,13 +17,13 @@ internal final class C { internal final class D { public constructor D() - internal final val `OBJECT$`: D.Default + internal final val `OBJECT$`: D.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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt index 3b5ba2f2ce3..a22a0719636 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt @@ -1,5 +1,5 @@ class C { - default object { + companion object { val X = 1 val `X$1` = 1 } diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt index 00d875f9ad0..69a7fd892ec 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.txt @@ -7,8 +7,8 @@ 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 default object Default { - private constructor Default() + internal companion object Companion { + private constructor Companion() internal final val X: kotlin.Int = 1 internal final val `X$1`: 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/classObjectCopiedFieldObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt index 8dd4f8c6b1a..63f2176ecf8 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt @@ -1,19 +1,19 @@ class B { - default object A { + companion object A { } val A = this } class C { - default object A { + companion object A { val A = this } } class D { - default object { + companion object { val `OBJECT$` = this } diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.txt index f3d32919b9b..f238d17009b 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 default object A { + internal 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 default object A { + internal 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 @@ -32,14 +32,14 @@ internal final class C { internal final class D { public constructor D() - internal final val `OBJECT$`: D.Default + internal final val `OBJECT$`: D.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 default object Default { - private constructor Default() - internal final val `OBJECT$`: D.Default + internal 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 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/enum/classObjectInEnum.kt b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.kt index 76e610b22c0..1da92d8da3e 100644 --- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.kt +++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.kt @@ -1,7 +1,7 @@ enum class E { ENTRY - default object { + companion object { fun entry() = ENTRY } } diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt index a1a608ae87d..c623bd6b74e 100644 --- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt +++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.txt @@ -21,8 +21,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt index 5b0d97e7e26..fe3ad2c99ed 100644 --- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt +++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt @@ -1,7 +1,7 @@ enum class E { ENTRY - private default object + private companion object } fun foo() = E.values() diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt index 2b564fc63ff..ee13f7170ea 100644 --- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt +++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.txt @@ -3,7 +3,7 @@ package internal fun bar(): E internal fun baz(): E internal fun foo(): kotlin.Array -internal fun quux(): E.Default +internal fun quux(): E.Companion internal final enum class E : kotlin.Enum { public enum entry ENTRY : E { @@ -24,8 +24,8 @@ 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 - private default object Default { - private constructor Default() + private 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 diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.kt b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.kt index c176631cdc7..c184e506e4a 100644 --- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.kt +++ b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.kt @@ -2,7 +2,7 @@ enum class E { FIRST SECOND { - default object { + companion object { fun foo() = 42 } } diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt index d4f3bd60a89..b8230784896 100644 --- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt @@ -22,8 +22,8 @@ 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 - public default object Default { - private constructor Default() + 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/enum/enumModifier.kt b/compiler/testData/diagnostics/tests/enum/enumModifier.kt index 6b1efccfbbf..3f9a6e12e8d 100644 --- a/compiler/testData/diagnostics/tests/enum/enumModifier.kt +++ b/compiler/testData/diagnostics/tests/enum/enumModifier.kt @@ -1,7 +1,7 @@ enum class B {} class A { - enum default object {} + enum companion object {} } enum object O {} diff --git a/compiler/testData/diagnostics/tests/enum/enumModifier.txt b/compiler/testData/diagnostics/tests/enum/enumModifier.txt index feeaf926c8c..41c0e5e2159 100644 --- a/compiler/testData/diagnostics/tests/enum/enumModifier.txt +++ b/compiler/testData/diagnostics/tests/enum/enumModifier.txt @@ -10,8 +10,8 @@ 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.kt b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.kt index 440197fec79..9bd71186e81 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.kt +++ b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.kt @@ -3,14 +3,14 @@ class A { ENTRY } - default object { + companion object { } } class B { - default object { + companion object { } enum class E { diff --git a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt index 723c15cfe23..8dcbe3d4c70 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.txt @@ -6,8 +6,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -44,8 +44,8 @@ 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.kt b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.kt index d95b4797609..a95430c721f 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.kt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { enum class E { ENTRY } diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt index eaca0c96064..17e31be20fb 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.txt @@ -6,16 +6,16 @@ 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 default object Default { - private constructor Default() + internal 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 final enum class E : kotlin.Enum { - public enum entry ENTRY : A.Default.E { + internal final enum class E : kotlin.Enum { + public enum entry ENTRY : A.Companion.E { private constructor ENTRY() - public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int + public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final override /*1*/ /*fake_override*/ fun name(): kotlin.String @@ -24,7 +24,7 @@ internal final class A { } private constructor E() - public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int + public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final override /*1*/ /*fake_override*/ fun name(): kotlin.String @@ -32,8 +32,8 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Default.E - public final /*synthesized*/ fun values(): kotlin.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E + public final /*synthesized*/ fun values(): kotlin.Array } } } diff --git a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt index f2dd8b0c906..5c974e726e1 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt +++ b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt @@ -3,7 +3,7 @@ class A { ENTRY } - default object { + companion object { enum class E { ENTRY2 } diff --git a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt index 23e79f94d6a..db6cdc88759 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.txt @@ -6,16 +6,16 @@ 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 default object Default { - private constructor Default() + internal 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 final enum class E : kotlin.Enum { - public enum entry ENTRY2 : A.Default.E { + internal final enum class E : kotlin.Enum { + public enum entry ENTRY2 : A.Companion.E { private constructor ENTRY2() - public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int + public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final override /*1*/ /*fake_override*/ fun name(): kotlin.String @@ -24,7 +24,7 @@ internal final class A { } private constructor E() - public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int + public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final override /*1*/ /*fake_override*/ fun name(): kotlin.String @@ -32,8 +32,8 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Default.E - public final /*synthesized*/ fun values(): kotlin.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E + public final /*synthesized*/ fun values(): kotlin.Array } } diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt index 146ae72f0f4..1fe8e7f37bd 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt +++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { enum class E { ENTRY } // OK } diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt index d7aee6f9ed1..e6bdad7eff0 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt +++ b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.txt @@ -37,16 +37,16 @@ internal final class A { } } - internal default object Default { - private constructor Default() + internal 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 final enum class E : kotlin.Enum { - public enum entry ENTRY : A.Default.E { + internal final enum class E : kotlin.Enum { + public enum entry ENTRY : A.Companion.E { private constructor ENTRY() - public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int + public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final override /*1*/ /*fake_override*/ fun name(): kotlin.String @@ -55,7 +55,7 @@ internal final class A { } private constructor E() - public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Default.E): kotlin.Int + public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A.Companion.E): kotlin.Int public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public final override /*1*/ /*fake_override*/ fun name(): kotlin.String @@ -63,8 +63,8 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Default.E - public final /*synthesized*/ fun values(): kotlin.Array + public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A.Companion.E + public final /*synthesized*/ fun values(): kotlin.Array } } } diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt index 76dd2cd2c7b..22bcf3d7748 100644 --- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt +++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt @@ -6,7 +6,7 @@ enum class E { ANOTHER class Nested { - default object { + companion object { fun foo() = 42 } } diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt index cde99a9473a..413fa058df1 100644 --- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt +++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.txt @@ -45,8 +45,8 @@ package foo { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt index afcf88f1379..fdeeaa86a42 100644 --- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt +++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt @@ -1,7 +1,7 @@ enum class E { ENTRY - default object { + companion object { fun foo(): E = ENTRY fun bar(): Array = values() fun baz(): E = valueOf("ENTRY") diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt index 9879893af82..9a5fd651d4e 100644 --- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt +++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.txt @@ -29,8 +29,8 @@ internal final enum class E : kotlin.Enum { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String internal final fun zab(): E - internal default object Default { - private constructor Default() + internal companion object Companion { + private constructor Companion() internal final val valuez: kotlin.Array internal final fun bar(): kotlin.Array internal final fun baz(): E diff --git a/compiler/testData/diagnostics/tests/extensions/classObject.kt b/compiler/testData/diagnostics/tests/extensions/classObject.kt index 0081ea5beec..e392d98976b 100644 --- a/compiler/testData/diagnostics/tests/extensions/classObject.kt +++ b/compiler/testData/diagnostics/tests/extensions/classObject.kt @@ -1,7 +1,7 @@ trait Tr -class A { default object } -class B { default object : Tr } +class A { companion object } +class B { companion object : Tr } fun Any.f1() {} fun Any?.f2() {} diff --git a/compiler/testData/diagnostics/tests/extensions/classObject.txt b/compiler/testData/diagnostics/tests/extensions/classObject.txt index 439e033bdfa..2c41e8e463e 100644 --- a/compiler/testData/diagnostics/tests/extensions/classObject.txt +++ b/compiler/testData/diagnostics/tests/extensions/classObject.txt @@ -13,8 +13,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -27,8 +27,8 @@ 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 default object Default : Tr { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt index 3ca7a41ca7f..8de61054bd3 100644 --- a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt +++ b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt @@ -5,7 +5,7 @@ trait JPAEntityClass { } class Foo { - default object : JPAEntityClass + companion object : JPAEntityClass } fun main(args: Array) { diff --git a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt index 89bc70b1ff7..5f572946249 100644 --- a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt +++ b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.txt @@ -9,8 +9,8 @@ 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 default object Default : JPAEntityClass { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/extensions/kt3470.kt b/compiler/testData/diagnostics/tests/extensions/kt3470.kt index 013dec39342..60704abda29 100644 --- a/compiler/testData/diagnostics/tests/extensions/kt3470.kt +++ b/compiler/testData/diagnostics/tests/extensions/kt3470.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { fun foo() = toString() } } diff --git a/compiler/testData/diagnostics/tests/extensions/kt3470.txt b/compiler/testData/diagnostics/tests/extensions/kt3470.txt index 91b99a5364a..bab8a01bb5e 100644 --- a/compiler/testData/diagnostics/tests/extensions/kt3470.txt +++ b/compiler/testData/diagnostics/tests/extensions/kt3470.txt @@ -8,8 +8,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/imports/Imports.kt b/compiler/testData/diagnostics/tests/imports/Imports.kt index 0fc409835de..e7b5fdd7a96 100644 --- a/compiler/testData/diagnostics/tests/imports/Imports.kt +++ b/compiler/testData/diagnostics/tests/imports/Imports.kt @@ -5,12 +5,12 @@ import b.B //class import b.foo //function import b.ext //extension function import b.value //property -import b.C.Default.bar //function from default object -import b.C.Default.cValue //property from default object +import b.C.Companion.bar //function from companion object +import b.C.Companion.cValue //property from companion object import b.constant.fff //function from val import b.constant.dValue //property from val import b.constant -import b.E.Default.f //val from default object +import b.E.Companion.f //val from companion object import smth.illegal import b.C.smth.illegal import b.bar.smth @@ -42,7 +42,7 @@ fun B.ext() {} val value = 0 class C() { - default object { + companion object { fun bar() {} val cValue = 1 } @@ -56,7 +56,7 @@ class D() { val constant = D() class E() { - default object { + companion object { val f = F() } } @@ -85,14 +85,14 @@ fun foo() { //FILE:d.kt package d -import d.A.Default.B -import d.A.Default.C +import d.A.Companion.B +import d.A.Companion.C val b : B = B() val c : B = C class A() { - default object { + companion object { open class B() {} object C : B() {} } diff --git a/compiler/testData/diagnostics/tests/imports/Imports.txt b/compiler/testData/diagnostics/tests/imports/Imports.txt index 6764355891e..f034ddc20c3 100644 --- a/compiler/testData/diagnostics/tests/imports/Imports.txt +++ b/compiler/testData/diagnostics/tests/imports/Imports.txt @@ -24,8 +24,8 @@ package b { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal companion object Companion { + private constructor Companion() internal final val cValue: kotlin.Int = 1 internal final fun bar(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -49,8 +49,8 @@ package b { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -81,8 +81,8 @@ package c { } package d { - internal val b: d.A.Default.B - internal val c: d.A.Default.B + internal val b: d.A.Companion.B + internal val c: d.A.Companion.B internal final class A { public constructor A() @@ -90,8 +90,8 @@ package d { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 @@ -103,7 +103,7 @@ package d { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal object C : d.A.Default.B { + internal object C : d.A.Companion.B { 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/imports/StarImportFromObject.kt b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.kt index 9818fd785fd..7629cc09f3e 100644 --- a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.kt +++ b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.kt @@ -30,7 +30,7 @@ class A { object J } - default object CO { + companion object CO { object H } } diff --git a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt index 49a347042c2..6a3bfbd4875 100644 --- a/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt +++ b/compiler/testData/diagnostics/tests/imports/StarImportFromObject.txt @@ -22,7 +22,7 @@ package a { } } - internal default object CO { + internal 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/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt index 37d1b2bc75a..c94d9ba916f 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt @@ -3,5 +3,5 @@ package bar fun main(args : Array) { class Some - Some[] names = ["ads"] + Some[] names = ["ads"] } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt702.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt702.kt index 27ecf297f02..34f96780858 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt702.kt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt702.kt @@ -5,7 +5,7 @@ package a fun getJavaClass() : java.lang.Class { } public class Throwables() { - default object { + companion object { public fun propagateIfInstanceOf(throwable : Throwable?, declaredType : Class?>?) : Unit { if (((throwable != null) && declaredType?.isInstance(throwable)!!)) { diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt702.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt702.txt index cfab2c628be..a22dc01c1e3 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt702.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt702.txt @@ -9,8 +9,8 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public default object Default { - private constructor Default() + 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 final fun propagateIfInstanceOf(/*0*/ throwable: kotlin.Throwable?, /*1*/ declaredType: java.lang.Class?): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt index c338b6ee408..750f34289b6 100644 --- a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt +++ b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt @@ -1,6 +1,6 @@ class Test { [`InnerAnnotation`InnerAnnotation] - default object : StaticClass(), InnerClass() { + companion object : StaticClass(), InnerClass() { } diff --git a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt index 10399c337dd..384be552dc7 100644 --- a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt +++ b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.txt @@ -6,8 +6,8 @@ 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 default object Default : Test.StaticClass, Test.InnerClass { - private constructor Default() + Test.InnerAnnotation() Test.InnerAnnotation() internal 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 public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/deepInnerClass.kt b/compiler/testData/diagnostics/tests/inner/deepInnerClass.kt index 80ee5010332..715960984f0 100644 --- a/compiler/testData/diagnostics/tests/inner/deepInnerClass.kt +++ b/compiler/testData/diagnostics/tests/inner/deepInnerClass.kt @@ -4,7 +4,7 @@ class A { class B { fun test() { class C() : PT> { - default object : P<W, T> { + companion object : P<W, T> { } inner class D : PT> diff --git a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt index c523d23bac9..da5f275fa8e 100644 --- a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt +++ b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt @@ -7,7 +7,7 @@ object A { } class B { - default object { + companion object { class LoginFormPage() : Request({ val failed = session.get("LOGIN_FAILED") }) diff --git a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt index eb4665571c2..af616eee21c 100644 --- a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt +++ b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt @@ -45,8 +45,8 @@ package f { } } - internal default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/inner/illegalModifier.kt b/compiler/testData/diagnostics/tests/inner/illegalModifier.kt index a6f040fff64..dc22042df29 100644 --- a/compiler/testData/diagnostics/tests/inner/illegalModifier.kt +++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.kt @@ -11,7 +11,7 @@ class D { inner object G inner enum class R inner annotation class S - inner default object + inner companion object } enum class H { @@ -31,7 +31,7 @@ object N { } class P { - default object { + companion object { inner class Q } } diff --git a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt index 45620b8d7c4..6a0b0928288 100644 --- a/compiler/testData/diagnostics/tests/inner/illegalModifier.txt +++ b/compiler/testData/diagnostics/tests/inner/illegalModifier.txt @@ -30,8 +30,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -150,8 +150,8 @@ 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.kt b/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.kt index 93fb37d2e17..6b059b2cfc2 100644 --- a/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.kt +++ b/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { fun test(t: TestInner) = 42 } diff --git a/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.txt b/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.txt index a5a5984a6ba..d060d06e2ab 100644 --- a/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.txt +++ b/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.txt @@ -6,8 +6,8 @@ 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 default object Default { - private constructor Default() + internal 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 internal final fun test(/*0*/ t: Test.TestInner): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt index fab6114c5a3..7872b82b912 100644 --- a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt +++ b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt @@ -1,11 +1,11 @@ open class SomeClass class TestSome

{ - default object : SomeClass<P>() { + companion object : SomeClass<P>() { } } class Test { - default object : InnerClass() { + companion object : InnerClass() { val a = object: InnerClass() { } diff --git a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt index 72c6e7ee52f..4eaab369371 100644 --- a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt +++ b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt @@ -15,8 +15,8 @@ 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 default object Default : Test.InnerClass { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -38,8 +38,8 @@ 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 default object Default : SomeClass

{ - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt index 01338933bcd..95b3b9e8619 100644 --- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt +++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt @@ -1,24 +1,24 @@ trait N { fun foo() = 1 } class WithClassObject { - default object {} + companion object {} class Nested() - class NestedWithClassObject { default object : N } + class NestedWithClassObject { companion object : N } enum class NestedEnum { A } object NestedObj : N { fun invoke() = 1 } } class WithoutClassObject { class Nested() - class NestedWithClassObject { default object : N } + class NestedWithClassObject { companion object : N } enum class NestedEnum { A } object NestedObj : N { fun invoke() = 1 } } object Obj { class Nested() - class NestedWithClassObject { default object : N } + class NestedWithClassObject { companion object : N } enum class NestedEnum { A } object NestedObj : N { fun invoke() = 1 } } diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt index 52074c1cfc7..ad4402a6a7c 100644 --- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt +++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.txt @@ -61,8 +61,8 @@ internal object Obj { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default : N { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -77,8 +77,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -130,8 +130,8 @@ 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 default object Default : N { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -192,8 +192,8 @@ 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 default object Default : N { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.kt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.kt index dfa71fa7a0e..fb452a3238a 100644 --- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.kt +++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.kt @@ -1,11 +1,11 @@ class Outer { class Nested { - default object { + companion object { fun foo() = 42 } } - default object { + companion object { fun bar() = 239 } } diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.txt index 5a19ea0d297..4ed342756fe 100644 --- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.txt +++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.txt @@ -9,8 +9,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -23,8 +23,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.kt b/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.kt index 8fc800a83ef..6bc832b5785 100644 --- a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.kt +++ b/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.kt @@ -1,7 +1,7 @@ open class PackageTest class MoreTest() { - default object: PackageTest() { + companion object: PackageTest() { } diff --git a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.txt b/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.txt index c0928b2f8e4..f48d81e912f 100644 --- a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.txt +++ b/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.txt @@ -6,8 +6,8 @@ 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 default object Default : PackageTest { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.kt b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.kt index 77c97bf74ce..b5b7acf6b4b 100644 --- a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.kt +++ b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.kt @@ -1,7 +1,7 @@ class Test { [ClassObjectAnnotation] [NestedAnnotation] - default object { + companion object { annotation class ClassObjectAnnotation } diff --git a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt index 4fa80d77371..0f532d1c5a4 100644 --- a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt +++ b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt @@ -6,8 +6,8 @@ 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.Default.ClassObjectAnnotation() Test.NestedAnnotation() internal default object Default { - private constructor Default() + Test.Companion.ClassObjectAnnotation() Test.NestedAnnotation() internal 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 diff --git a/compiler/testData/diagnostics/tests/j+k/InnerClassFromJava.kt b/compiler/testData/diagnostics/tests/j+k/InnerClassFromJava.kt index aaece5b28c5..674063ec398 100644 --- a/compiler/testData/diagnostics/tests/j+k/InnerClassFromJava.kt +++ b/compiler/testData/diagnostics/tests/j+k/InnerClassFromJava.kt @@ -6,7 +6,7 @@ public interface I extends Boo { // FILE: Baz.kt public trait Foo { - default object { + companion object { public val EMPTY: Foo = object : Foo{} } } diff --git a/compiler/testData/diagnostics/tests/j+k/InnerClassFromJava.txt b/compiler/testData/diagnostics/tests/j+k/InnerClassFromJava.txt index 2d584881adf..105375fc8d0 100644 --- a/compiler/testData/diagnostics/tests/j+k/InnerClassFromJava.txt +++ b/compiler/testData/diagnostics/tests/j+k/InnerClassFromJava.txt @@ -31,8 +31,8 @@ public trait Foo { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public default object Default { - private constructor Default() + public companion object Companion { + private constructor Companion() public final val EMPTY: Foo 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.kt b/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt index fd76487c2fa..f21ddf85566 100644 --- a/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt +++ b/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt @@ -1,5 +1,5 @@ class Foo { - default object { + companion object { val bar = 1 fun test(a: Foo.`object`) { diff --git a/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt b/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt index 7b0e204fdd7..b916a671d55 100644 --- a/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt +++ b/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt @@ -6,8 +6,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/j+k/javaStaticImport.kt b/compiler/testData/diagnostics/tests/j+k/javaStaticImport.kt index 0a143084ca3..ce86bd30e39 100644 --- a/compiler/testData/diagnostics/tests/j+k/javaStaticImport.kt +++ b/compiler/testData/diagnostics/tests/j+k/javaStaticImport.kt @@ -16,7 +16,7 @@ public class AsmUtil { // FILE: First.kt package frontend public class JvmDeclarationOrigin { - default object { + companion object { public val NO_ORIGIN: JvmDeclarationOrigin = JvmDeclarationOrigin() } } diff --git a/compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt b/compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt index de71f804af2..6a1ca31528e 100644 --- a/compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt +++ b/compiler/testData/diagnostics/tests/j+k/javaStaticImport.txt @@ -32,8 +32,8 @@ package frontend { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public default object Default { - private constructor Default() + public companion object Companion { + private constructor Companion() public final val NO_ORIGIN: frontend.JvmDeclarationOrigin 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/modifiers/defaultModifier.kt b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.kt index b64c14f5e44..29a2a6e2848 100644 --- a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.kt +++ b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.kt @@ -1,55 +1,55 @@ -default class A { - default object { +companion class A { + companion object { } } class B { - default object + companion object val c: Int = 1 } class C { - default object A { + companion object A { } } class D { - default object A { - default object { + companion object A { + companion object { } } } -default object G { - default object +companion object G { + companion object } -default trait H { - default object +companion trait H { + companion object } class J { - default object C { - default object + companion object C { + companion object } } -default enum class Enum { +companion enum class Enum { E1 E2 - default object + companion object } -default fun main() { +companion fun main() { } -default var prop: Int = 1 - default get - default set +companion var prop: Int = 1 + companion get + companion set -class Z(default val c: Int) \ No newline at end of file +class Z(companion val c: Int) \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt index cc2001b7a06..6c83df0f81c 100644 --- a/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt +++ b/compiler/testData/diagnostics/tests/modifiers/defaultModifier.txt @@ -9,8 +9,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -24,8 +24,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -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 default object A { + internal 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,14 +52,14 @@ 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 default object A { + internal 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 default object Default { - private constructor Default() + internal 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 @@ -96,8 +96,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -114,8 +114,8 @@ internal object G { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 @@ -127,8 +127,8 @@ internal trait H { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 @@ -141,14 +141,14 @@ 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 default object C { + internal 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.kt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.kt index 8f1f406ac7f..1db09763c82 100644 --- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.kt +++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.kt @@ -7,7 +7,7 @@ package p public class A { public class B public object C - default object { + companion object { public class D { public object E } @@ -21,10 +21,10 @@ public class M1 { public val a: A = A() public val b: A.B = A.B() public val c: A.C = A.C - public val d: A.Default.D = A.Default.D() - public val e: A.Default.D.E = A.Default.D.E + public val d: A.Companion.D = A.Companion.D() + public val e: A.Companion.D.E = A.Companion.D.E public val f: A.F = A().F() - public val g: A.Default.G = A.Default.G() + public val g: A.Companion.G = A.Companion.G() } // MODULE: m2 @@ -35,7 +35,7 @@ package p public class A { public class B public class C - default object { + companion object { public class D { public class E } @@ -47,8 +47,8 @@ public class A { public fun a(p: A) {} public fun b(p: A.B) {} public fun c(p: A.C) {} -public fun d(p: A.Default.D) {} -public fun e(p: A.Default.D.E) {} +public fun d(p: A.Companion.D) {} +public fun e(p: A.Companion.D.E) {} public fun f(p: A.F) {} public fun g(p: A.G) {} diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt index f05286f5dae..4d4770cc374 100644 --- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt +++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt @@ -23,8 +23,8 @@ package p { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - public default object Default { - private constructor Default() + 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 @@ -64,10 +64,10 @@ package p { public final val a: p.A public final val b: p.A.B public final val c: p.A.C - public final val d: p.A.Default.D - public final val e: p.A.Default.D.E + public final val d: p.A.Companion.D + public final val e: p.A.Companion.D.E public final val f: p.A.F - public final val g: p.A.Default.G + public final val g: p.A.Companion.G 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 @@ -82,8 +82,8 @@ package p { public fun a(/*0*/ p: p.A): kotlin.Unit public fun b(/*0*/ p: p.A.B): kotlin.Unit public fun c(/*0*/ p: p.A.C): kotlin.Unit - public fun d(/*0*/ p: p.A.Default.D): kotlin.Unit - public fun e(/*0*/ p: p.A.Default.D.E): kotlin.Unit + public fun d(/*0*/ p: p.A.Companion.D): kotlin.Unit + public fun e(/*0*/ p: p.A.Companion.D.E): kotlin.Unit public fun f(/*0*/ p: p.A.F): kotlin.Unit public fun g(/*0*/ p: p.A.G): kotlin.Unit @@ -107,8 +107,8 @@ package p { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - public default object Default { - private constructor Default() + 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 @@ -154,8 +154,8 @@ package p { public fun a(/*0*/ p: p.A): kotlin.Unit public fun b(/*0*/ p: p.A.B): kotlin.Unit public fun c(/*0*/ p: p.A.C): kotlin.Unit - public fun d(/*0*/ p: p.A.Default.D): kotlin.Unit - public fun e(/*0*/ p: p.A.Default.D.E): kotlin.Unit + public fun d(/*0*/ p: p.A.Companion.D): kotlin.Unit + public fun e(/*0*/ p: p.A.Companion.D.E): kotlin.Unit public fun f(/*0*/ p: p.A.F): kotlin.Unit public fun g(/*0*/ p: p.A.G): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.kt b/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.kt index d798bf97531..1b2d3819d80 100644 --- a/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.kt +++ b/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.kt @@ -1,10 +1,10 @@ //no nested class access via instance reference error fun test() { - A.Default.f("") + A.Companion.f("") } class A() { - default object { + companion object { object f { fun invoke(i: Int) = i } diff --git a/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.txt b/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.txt index 056c4b1434d..00d457b024d 100644 --- a/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.txt +++ b/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.txt @@ -8,8 +8,8 @@ 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/objects/upperBoundViolated.kt b/compiler/testData/diagnostics/tests/objects/upperBoundViolated.kt index 1e700b84593..20162fc1ec9 100644 --- a/compiler/testData/diagnostics/tests/objects/upperBoundViolated.kt +++ b/compiler/testData/diagnostics/tests/objects/upperBoundViolated.kt @@ -5,5 +5,5 @@ object O1 : Trait object O2 : Trait<String> class C { - default object : Trait<IntRange> + companion object : Trait<IntRange> } diff --git a/compiler/testData/diagnostics/tests/objects/upperBoundViolated.txt b/compiler/testData/diagnostics/tests/objects/upperBoundViolated.txt index c53984f2a68..f49c77fc807 100644 --- a/compiler/testData/diagnostics/tests/objects/upperBoundViolated.txt +++ b/compiler/testData/diagnostics/tests/objects/upperBoundViolated.txt @@ -6,8 +6,8 @@ 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 default object Default : Trait { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.kt b/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.kt index 43f07a8abb3..257ca589532 100644 --- a/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.kt +++ b/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.kt @@ -13,7 +13,7 @@ class Tram { } class Yvayva { - default object { + companion object { fun fghj() { } class fghj() { } @@ -23,7 +23,7 @@ class Yvayva { class Rtyu { fun ololo() { } - default object { + companion object { class ololo() { } } } diff --git a/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.txt b/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.txt index e443254d96d..72d377e6ae9 100644 --- a/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.txt +++ b/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.txt @@ -10,8 +10,8 @@ package constructorVsFun { internal final fun ololo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 @@ -46,8 +46,8 @@ package constructorVsFun { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/override/kt4785classObject.kt b/compiler/testData/diagnostics/tests/override/kt4785classObject.kt index ca58cf81665..f74c61f073a 100644 --- a/compiler/testData/diagnostics/tests/override/kt4785classObject.kt +++ b/compiler/testData/diagnostics/tests/override/kt4785classObject.kt @@ -7,7 +7,7 @@ trait B { } class C { - default object : A, B { + companion object : A, B { fun bar() = null } } diff --git a/compiler/testData/diagnostics/tests/override/kt4785classObject.txt b/compiler/testData/diagnostics/tests/override/kt4785classObject.txt index bed14310fad..d5d884b91da 100644 --- a/compiler/testData/diagnostics/tests/override/kt4785classObject.txt +++ b/compiler/testData/diagnostics/tests/override/kt4785classObject.txt @@ -20,8 +20,8 @@ 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 default object Default : A, B { - private constructor Default() + internal 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 public open override /*2*/ /*fake_override*/ fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.kt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.kt index e8b1de01010..4ccc2f901a6 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.kt +++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.kt @@ -1,7 +1,7 @@ package kt2247 class B { - default object { + companion object { class Y { } } diff --git a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.txt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.txt index b192d3a18ca..dcefdb1e758 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.txt @@ -8,8 +8,8 @@ package kt2247 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt index 83a3eeaac99..1a0cb9798e2 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt +++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt @@ -3,7 +3,7 @@ enum class E { SECOND - default object { + companion object { class FIRST val SECOND = this diff --git a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt index f1eb2c7ed0f..9232d2a4170 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.txt @@ -29,9 +29,9 @@ 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 default object Default { - private constructor Default() - internal final val SECOND: E.Default + internal 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 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/redeclarations/PropertyAndInnerClass.kt b/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt index 8428d162f9e..c0b49246c3c 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt +++ b/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt @@ -5,7 +5,7 @@ public class A() { } public class B() { - default object { + companion object { public val FOO: String = "test" public class FOO() { } diff --git a/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.txt b/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.txt index 9c59fd47290..a8bf7ec3db3 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.txt @@ -21,8 +21,8 @@ public final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public default object Default { - private constructor Default() + public companion object Companion { + private constructor Companion() public final val FOO: kotlin.String = "test" 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/RedeclarationInDefaultObject.kt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.kt index e0fb7f8190d..856d17914a8 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.kt +++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.kt @@ -1,5 +1,5 @@ class A { - default object B { + companion object B { class G val G = 1 } diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.txt b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.txt index 7af510ead65..d46148e983d 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 default object B { + internal 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.kt b/compiler/testData/diagnostics/tests/redeclarations/kt2438.kt index e236ee0a1fc..f3999c352f8 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/kt2438.kt +++ b/compiler/testData/diagnostics/tests/redeclarations/kt2438.kt @@ -12,7 +12,7 @@ class B { class A { class B - default object { + companion object { class B class B } diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2438.txt b/compiler/testData/diagnostics/tests/redeclarations/kt2438.txt index 6bc5da4790a..416dd3dff8b 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/kt2438.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/kt2438.txt @@ -22,8 +22,8 @@ package kt2438 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/regressions/kt2956.kt b/compiler/testData/diagnostics/tests/regressions/kt2956.kt index 3cf659d35ca..e128a6685de 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt2956.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt2956.kt @@ -1 +1 @@ -val a: String = Nothing \ No newline at end of file +val a: String = Nothing \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/regressions/kt3647.kt b/compiler/testData/diagnostics/tests/regressions/kt3647.kt index 494e4b73ade..75416a55034 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt3647.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt3647.kt @@ -1,7 +1,7 @@ // KT-3647 Unexpected compilation error: "Expression is inaccessible from a nested class" class Test(val value: Int) { - default object { + companion object { fun create(init: () -> Int): Test { return Test(init()) } diff --git a/compiler/testData/diagnostics/tests/regressions/kt3647.txt b/compiler/testData/diagnostics/tests/regressions/kt3647.txt index 55b59779a4c..a204d9b0474 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt3647.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt3647.txt @@ -7,8 +7,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/regressions/kt394.kt b/compiler/testData/diagnostics/tests/regressions/kt394.kt index a4ea99d08d4..53a666fc641 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt394.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt394.kt @@ -1,9 +1,9 @@ -// KT-394 Make default object members visible inside the owning class +// KT-394 Make companion object members visible inside the owning class class X() { // class Y {} - default object{ + companion object{ class Y() {} } diff --git a/compiler/testData/diagnostics/tests/regressions/kt394.txt b/compiler/testData/diagnostics/tests/regressions/kt394.txt index 31ef07d0d12..504ecc7c733 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt394.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt394.txt @@ -2,13 +2,13 @@ package internal final class X { public constructor X() - internal final val y: X.Default.Y + internal final val y: X.Companion.Y 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/regressions/kt4827.kt b/compiler/testData/diagnostics/tests/regressions/kt4827.kt index 5b5a3fb7040..e39d7a40565 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt4827.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt4827.kt @@ -11,6 +11,6 @@ class C { } fun f() { - TestInterface() + TestInterface() C.I() } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.kt b/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.kt index 16783107737..4d9c7cc96e7 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.kt @@ -4,12 +4,12 @@ package demo class Foo { - default object { + companion object { class Bar() { } } } class User { fun main() : Unit { - var boo : Foo.Default.Bar? /* <-- this reference is red */ = Foo.Default.Bar() + var boo : Foo.Companion.Bar? /* <-- this reference is red */ = Foo.Companion.Bar() } } diff --git a/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.txt b/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.txt index 224ee6e3499..d271c081925 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.txt @@ -8,8 +8,8 @@ package demo { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/regressions/kt575.kt b/compiler/testData/diagnostics/tests/regressions/kt575.kt index d75b221e2a4..5d131517cfe 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt575.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt575.kt @@ -1,9 +1,9 @@ -// KT-575 Cannot ++ a default object member +// KT-575 Cannot ++ a companion object member package kt575 class Creature() { - default object { + companion object { var numCreated : Int = 0 private set } diff --git a/compiler/testData/diagnostics/tests/regressions/kt575.txt b/compiler/testData/diagnostics/tests/regressions/kt575.txt index 973fdac4ce4..508acebe0b1 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt575.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt575.txt @@ -24,8 +24,8 @@ package kt575 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/regressions/kt588.kt b/compiler/testData/diagnostics/tests/regressions/kt588.kt index 309501ca125..583b205e211 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt588.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt588.kt @@ -1,7 +1,7 @@ // KT-588 Unresolved static method class Test() : Thread("Test") { - default object { + companion object { fun init2() { } diff --git a/compiler/testData/diagnostics/tests/regressions/kt588.txt b/compiler/testData/diagnostics/tests/regressions/kt588.txt index cc9751b7498..dd0e95541e9 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt588.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt588.txt @@ -71,8 +71,8 @@ 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 default object Default { - private constructor Default() + internal 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 internal final fun init2(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/regressions/kt701.kt b/compiler/testData/diagnostics/tests/regressions/kt701.kt index 56c1d6a31d8..3316f214bb7 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt701.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt701.kt @@ -2,7 +2,7 @@ fun getJavaClass() : java.lang.Class { return "" as Class } public class Throwables() { - default object { + companion object { public fun propagateIfInstanceOf(throwable : Throwable?, declaredType : Class?>?) { if (((throwable != null) && declaredType?.isInstance(throwable)!!)) { diff --git a/compiler/testData/diagnostics/tests/regressions/kt701.txt b/compiler/testData/diagnostics/tests/regressions/kt701.txt index 01b367dadee..f3e59053049 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt701.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt701.txt @@ -8,8 +8,8 @@ public final class Throwables { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public default object Default { - private constructor Default() + 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 final fun propagateIfInstanceOf(/*0*/ throwable: kotlin.Throwable?, /*1*/ declaredType: java.lang.Class?): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.kt b/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.kt index de3ff0f0eaf..39a538eaf91 100644 --- a/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.kt +++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.kt @@ -1,4 +1,4 @@ -//KT-3833 Invoke method not working inside default object? +//KT-3833 Invoke method not working inside companion object? package m class Either1 { @@ -26,7 +26,7 @@ object Foo{ } class C{ - default object { + companion object { fun f(){ Foo.v() } diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.txt b/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.txt index 51e1150d2fb..a033f313ed1 100644 --- a/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.txt +++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.txt @@ -8,8 +8,8 @@ package m { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.kt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.kt index 9e7ccdf4a67..23ccbae857e 100644 --- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.kt +++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { } } diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt index 0c960519873..208ebaee71e 100644 --- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt +++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.txt @@ -9,8 +9,8 @@ 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.kt b/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.kt index b2166ab85c7..0fa69d95043 100644 --- a/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.kt +++ b/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.kt @@ -1,7 +1,7 @@ fun devNull(obj: Any?) {} open class A { - default object { + companion object { val internal_val = 1 public val public_val: Int = 2 private val private_val = 3 diff --git a/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.txt b/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.txt index d95a7395044..94ac4035096 100644 --- a/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.txt +++ b/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.txt @@ -10,8 +10,8 @@ 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 default object Default { - private constructor Default() + internal companion object Companion { + private constructor Companion() internal final val internal_val: kotlin.Int = 1 private final val private_val: kotlin.Int = 3 protected final val protected_val: kotlin.Int = 5 diff --git a/compiler/testData/diagnostics/tests/scopes/kt587.kt b/compiler/testData/diagnostics/tests/scopes/kt587.kt index ac04a22f0e9..9e4b325ea89 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt587.kt +++ b/compiler/testData/diagnostics/tests/scopes/kt587.kt @@ -1,9 +1,9 @@ // KT-587 Unresolved reference class Main { - default object { + companion object { class States() { - default object { + companion object { public val N: States = States() // : States unresolved } } diff --git a/compiler/testData/diagnostics/tests/scopes/kt587.txt b/compiler/testData/diagnostics/tests/scopes/kt587.txt index 07cbed8f5f2..d369b097404 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt587.txt +++ b/compiler/testData/diagnostics/tests/scopes/kt587.txt @@ -6,8 +6,8 @@ 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 default object Default { - private constructor Default() + internal 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 @@ -18,9 +18,9 @@ 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 default object Default { - private constructor Default() - public final val N: Main.Default.States + internal 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 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/scopes/kt900-1.kt b/compiler/testData/diagnostics/tests/scopes/kt900-1.kt index bb0da7d73a3..825a7e289a8 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt900-1.kt +++ b/compiler/testData/diagnostics/tests/scopes/kt900-1.kt @@ -1,7 +1,7 @@ -// import all members from default object +// import all members from companion object package c -import c.A.Default.B +import c.A.Companion.B import c.M.* fun foo() { @@ -10,9 +10,9 @@ fun foo() { } class A() { - default object { + companion object { class B() { - default object { + companion object { } } } diff --git a/compiler/testData/diagnostics/tests/scopes/kt900-1.txt b/compiler/testData/diagnostics/tests/scopes/kt900-1.txt index 17d7ae85e90..9cea85b39ea 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt900-1.txt +++ b/compiler/testData/diagnostics/tests/scopes/kt900-1.txt @@ -9,8 +9,8 @@ package c { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 @@ -21,8 +21,8 @@ package c { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/scopes/kt900.kt b/compiler/testData/diagnostics/tests/scopes/kt900.kt index 755aeb03825..8b321444717 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt900.kt +++ b/compiler/testData/diagnostics/tests/scopes/kt900.kt @@ -13,9 +13,9 @@ fun foo() { } class A() { - default object { + companion object { class B() { - default object { + companion object { fun foo() {} } } @@ -36,8 +36,8 @@ object N { package b import b.N.M -import b.A.Default.P -import b.A.Default.B +import b.A.Companion.P +import b.A.Companion.B fun foo() { val b : B = B() @@ -49,9 +49,9 @@ fun foo() { } class A() { - default object { + companion object { class B() { - default object { + companion object { fun foo() {} } } diff --git a/compiler/testData/diagnostics/tests/scopes/kt900.txt b/compiler/testData/diagnostics/tests/scopes/kt900.txt index 4ccbbbf5c02..2204ed98f3a 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt900.txt +++ b/compiler/testData/diagnostics/tests/scopes/kt900.txt @@ -9,8 +9,8 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 @@ -21,8 +21,8 @@ package a { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -65,8 +65,8 @@ package b { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 @@ -77,8 +77,8 @@ package b { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.kt index aed9f3cd0ba..d3bbc486c60 100644 --- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.kt +++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.kt @@ -10,7 +10,7 @@ enum class B { } class C { - default object { + companion object { constructor() {} } } diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt index 16da2d008ac..d00ae6ea107 100644 --- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt +++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.txt @@ -39,8 +39,8 @@ 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.kt b/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.kt index 81b345fc81f..55fdf0cb517 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.kt +++ b/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.kt @@ -3,12 +3,12 @@ open class T { } class A { - default object: T() { + companion object: T() { } } class B { - default object: T() { + companion object: T() { } } diff --git a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.txt b/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.txt index 277fb4a7d29..4f1ae8c514b 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.txt +++ b/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.txt @@ -9,8 +9,8 @@ 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 default object Default : T { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -24,8 +24,8 @@ 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 default object Default : T { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/subtyping/kt2069.kt b/compiler/testData/diagnostics/tests/subtyping/kt2069.kt index 96de1603900..80fb566a259 100644 --- a/compiler/testData/diagnostics/tests/subtyping/kt2069.kt +++ b/compiler/testData/diagnostics/tests/subtyping/kt2069.kt @@ -10,5 +10,5 @@ class T : T1 { super.foo() } - default object {} + companion object {} } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/subtyping/kt2069.txt b/compiler/testData/diagnostics/tests/subtyping/kt2069.txt index 6d967a2e5e7..2c550ba3ab3 100644 --- a/compiler/testData/diagnostics/tests/subtyping/kt2069.txt +++ b/compiler/testData/diagnostics/tests/subtyping/kt2069.txt @@ -10,8 +10,8 @@ package kt2069 { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.kt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.kt index 2f40f38a4a2..f7d08d071e7 100644 --- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.kt +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.kt @@ -1,6 +1,6 @@ class C { suppress("warnings") - default object { + companion object { val foo: String?? = null as Nothing? } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.txt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.txt index a001b81b159..ea69719d7df 100644 --- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.txt +++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.txt @@ -6,8 +6,8 @@ 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 default object Default { - private constructor Default() + kotlin.suppress(names = {"warnings"}: kotlin.Array) internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.kt b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.kt index 7d7aef9080b..3e56fe04b26 100644 --- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.kt +++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.kt @@ -1,6 +1,6 @@ class C { suppress("REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION") - default object { + companion object { val foo: String?? = ""!! as String?? } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.txt b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.txt index 21f44b3f9d2..b3c52081a6b 100644 --- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.txt +++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.txt @@ -6,8 +6,8 @@ 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 default object Default { - private constructor Default() + kotlin.suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}: kotlin.Array) internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.kt b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.kt index ba0844f6b98..09b3c3b7c5b 100644 --- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.kt +++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.kt @@ -1,6 +1,6 @@ class C { suppress("REDUNDANT_NULLABLE") - default object { + companion object { val foo: String?? = null as Nothing?? } } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.txt b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.txt index d8d78238293..78fa887a55d 100644 --- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.txt +++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.txt @@ -6,8 +6,8 @@ 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 default object Default { - private constructor Default() + kotlin.suppress(names = {"REDUNDANT_NULLABLE"}: kotlin.Array) internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.kt b/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.kt index 0ef5fbaa321..51c208ab923 100644 --- a/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.kt +++ b/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.kt @@ -27,7 +27,7 @@ class Test { t.apply(t.foo()) } - default object { + companion object { fun test(t: Test) { t.apply(t.foo()) } diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.txt b/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.txt index 715d8f66bcb..3e4c1fff9d4 100644 --- a/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.txt +++ b/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.txt @@ -14,8 +14,8 @@ internal final class Test { internal final fun test(/*0*/ t: Test): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 internal final fun test(/*0*/ t: Test): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.kt b/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.kt index f85e9a9b2f2..83dc5362460 100644 --- a/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.kt +++ b/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.kt @@ -26,7 +26,7 @@ class Test { t.apply(t.i) } - default object { + companion object { fun test(t: Test) { t.apply(t.i) } diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.txt b/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.txt index e9df610f398..fcefe2bb028 100644 --- a/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.txt +++ b/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.txt @@ -14,8 +14,8 @@ internal final class Test { internal final fun test(/*0*/ t: Test): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 internal final fun test(/*0*/ t: Test): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.kt b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.kt index 426f1fca673..c3495363e2f 100644 --- a/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.kt +++ b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.kt @@ -26,7 +26,7 @@ class Test { t.i = getT() } - default object { + companion object { fun test(t: Test) { t.i = getT() } diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.txt b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.txt index 4f0ceeec74e..7d70cd713f4 100644 --- a/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.txt +++ b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.txt @@ -14,8 +14,8 @@ internal final class Test { internal final fun test(/*0*/ t: Test): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 internal final fun test(/*0*/ t: Test): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.kt index 1c8bfc76571..f17edd48402 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.kt @@ -11,7 +11,7 @@ class A { nativeGetter fun foo(a: Double): String? = null - default object { + companion object { nativeGetter fun get(a: String): Any? = null @@ -31,7 +31,7 @@ class B { nativeGetter object Obj1 {} - default object { + companion object { nativeGetter val foo = 0 @@ -66,7 +66,7 @@ class C { nativeGetter fun baz(a: String = "foo"): Int? = 0 - default object { + companion object { nativeGetter fun Int.get(a: String): Int? = 1 diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt index 6910b4e0f4c..570b82d35e6 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.txt @@ -9,8 +9,8 @@ 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 default object Default { - private constructor Default() + internal 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? kotlin.js.nativeGetter() internal final fun get(/*0*/ a: kotlin.String): kotlin.Any? @@ -27,8 +27,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -64,8 +64,8 @@ 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 default object Default { - private constructor Default() + internal 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 diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.kt index 12c1b34af21..3db04173aa8 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.kt @@ -13,7 +13,7 @@ class A { nativeGetter fun foo(a: Double): String? = null - default object { + companion object { nativeGetter fun get(a: String): Any? = null @@ -32,7 +32,7 @@ class A { nativeGetter object Obj1 {} - default object { + companion object { nativeGetter val foo = 0 diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt index 599822fcbec..544a20ab761 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.txt @@ -22,8 +22,8 @@ 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 default object Default { - private constructor Default() + internal 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? kotlin.js.nativeGetter() internal final fun get(/*0*/ a: kotlin.String): kotlin.Any? @@ -40,8 +40,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.kt index 3b666d140aa..f001ff1423c 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.kt @@ -12,7 +12,7 @@ class A { nativeGetter fun foo(a: Double): String? = null - default object { + companion object { nativeGetter fun get(a: String): Any? = null @@ -40,7 +40,7 @@ class A { nativeGetter object Obj1 {} - default object { + companion object { nativeGetter val foo = 0 diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt index 781656c0639..eb2ad831a63 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.txt @@ -22,8 +22,8 @@ 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 default object Default { - private constructor Default() + internal 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? kotlin.js.nativeGetter() internal final fun get(/*0*/ a: kotlin.String): kotlin.Any? @@ -43,8 +43,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.kt index 831902b66ce..81043b44702 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.kt @@ -10,7 +10,7 @@ class A { nativeGetter fun foo(a: Double): String? = null - default object { + companion object { nativeGetter fun get(a: String): Any? = null @@ -29,7 +29,7 @@ class B { nativeGetter object Obj1 {} - default object { + companion object { nativeGetter val foo = 0 diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt index 6343aa6f369..f487b191fca 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.txt @@ -9,8 +9,8 @@ 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 default object Default { - private constructor Default() + internal 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? kotlin.js.nativeGetter() internal final fun get(/*0*/ a: kotlin.String): kotlin.Any? @@ -27,8 +27,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.kt index cf35b74c24b..2d36b9c0fd1 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.kt @@ -20,7 +20,7 @@ class A { nativeInvoke object Obj1 {} - default object { + companion object { nativeInvoke fun foo() {} diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt index b0cd645b33f..78f50a102b4 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.txt @@ -11,8 +11,8 @@ 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 default object Default { - private constructor Default() + internal 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 kotlin.js.nativeInvoke() internal final fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.kt index fe626a59aff..35384f621b3 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.kt @@ -31,7 +31,7 @@ class A { fun Int.invoke(a: String, b: Int) = "OK" } - default object { + companion object { nativeInvoke fun foo() {} diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt index 0f576ec3dfa..e23fcc7a9b3 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.txt @@ -24,8 +24,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.kt index a720572ad61..5cf55719013 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.kt @@ -24,7 +24,7 @@ class A { fun invoke(a: String): Int = 0 } - default object { + companion object { nativeInvoke fun foo() {} diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt index 0e551bd0729..809da4004d4 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.txt @@ -24,8 +24,8 @@ internal final class A { kotlin.js.nativeInvoke() internal final fun kotlin.Int.invoke(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int): kotlin.String } - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.kt index 39d48f47421..d6aa823283a 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.kt @@ -19,7 +19,7 @@ class A { nativeInvoke object Obj {} - default object { + companion object { nativeInvoke fun foo() {} diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt index ef24ed7b7ad..b73fecfbb66 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.txt @@ -11,8 +11,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.kt index b124a4eda81..26af65cd3e5 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.kt @@ -17,7 +17,7 @@ class A { nativeSetter fun set5(a: Double, v: String): CharSequence = "OK" - default object { + companion object { nativeSetter fun set(a: String, v: Any?): Any? = null @@ -43,7 +43,7 @@ class B { nativeSetter object Obj1 {} - default object { + companion object { nativeSetter val foo = 0 diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt index 334201407d8..4cd8dc9b1cd 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.txt @@ -11,8 +11,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -31,8 +31,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.kt index 41e15645605..ba1af5aa1e1 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.kt @@ -19,7 +19,7 @@ class A { nativeSetter fun set5(a: Double, v: String): CharSequence = "OK" - default object { + companion object { nativeSetter fun set(a: String, v: Any?): Any? = null @@ -44,7 +44,7 @@ class A { nativeSetter object Obj1 {} - default object { + companion object { nativeSetter val foo = 0 diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt index 3ce2b2873d4..22f7161f708 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.txt @@ -24,8 +24,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -44,8 +44,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.kt index 44757509d4b..ebaf3c43ce3 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.kt @@ -18,7 +18,7 @@ class A { nativeSetter fun set5(a: Double, v: String): CharSequence = "OK" - default object { + companion object { nativeSetter fun set(a: String, v: Any?): Any? = null @@ -37,7 +37,7 @@ class A { nativeSetter object Obj1 {} - default object { + companion object { nativeSetter val foo = 0 diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt index e667bf55991..5bd2f53d23f 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.txt @@ -24,8 +24,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -42,8 +42,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.kt index 470df316389..f16eec5a97b 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.kt @@ -10,7 +10,7 @@ class A { nativeSetter fun foo(a: Int, v: String) {} - default object { + companion object { nativeSetter fun set(a: String, v: Any?): Any? = null @@ -29,7 +29,7 @@ class B { nativeSetter object Obj1 {} - default object { + companion object { nativeSetter val foo = 0 diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt index d4aeca6826d..efcf38715ed 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.txt @@ -9,8 +9,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -27,8 +27,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt index 25355708844..dcb9faf69a7 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt @@ -23,7 +23,7 @@ trait T { fun foo() fun bar() {} - default object { + companion object { val baz: Int val boo: Int = noImpl @@ -40,7 +40,7 @@ class C { fun foo() fun bar() {} - default object { + companion object { val baz: Int val boo: Int = noImpl diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt index d8e2667d7fa..8c8a4777cfb 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.txt @@ -19,8 +19,8 @@ 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 default object Default { - private constructor Default() + internal companion object Companion { + private constructor Companion() internal final val baz: kotlin.Int internal final val boo: kotlin.Int internal final fun bar(): kotlin.String @@ -50,8 +50,8 @@ kotlin.js.native() internal trait T { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal companion object Companion { + private constructor Companion() internal final val baz: kotlin.Int internal final val boo: kotlin.Int internal final fun bar(): kotlin.String diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt index ff7e4e26ed1..825b4120b83 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt @@ -4,7 +4,7 @@ annotation class AnnClass(val a: Class<*>) class MyClass { - AnnClass(javaClass()) default object { + AnnClass(javaClass()) companion object { } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt index 25fa856277e..e0c8cb3c1ce 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.txt @@ -16,8 +16,8 @@ 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: java.lang.Class) internal default object Default { - private constructor Default() + test.AnnClass(a = test.MyClass.class: java.lang.Class) internal 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 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt index 6997830106d..a3e73216a62 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt @@ -23,7 +23,7 @@ object B: A() { class C { - default object: A() { + companion object: A() { [platformStatic] override fun a() {} [platformStatic] override fun b() {} diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt index e5c1c4b5273..86954fd365f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt @@ -27,8 +27,8 @@ 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 default object Default : A { - private constructor Default() + internal 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 kotlin.platform.platformStatic() internal final override /*1*/ fun c(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt index e62c94f2c65..f5dfa1a51dd 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt @@ -2,7 +2,7 @@ import kotlin.platform.platformStatic class A { - default object { + companion object { platformStatic fun a1() { } @@ -28,7 +28,7 @@ class A { } trait B { - default object { + companion object { platformStatic fun a1() { } diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt index bcffbc31c4f..69bcae1df46 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt @@ -16,8 +16,8 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -40,8 +40,8 @@ internal trait B { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt index 22a9686f629..d0bd5676c75 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt @@ -7,7 +7,7 @@ open class B { } class A { - default object : B() { + companion object : B() { var p1:Int = 1 [platformStatic] set(p: Int) { p1 = 1 diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt index 97e282acede..309dfb892db 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt @@ -20,8 +20,8 @@ internal final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - internal default object Default : B { - private constructor Default() + internal 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 internal final var p1: kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt index 5fa427a2dd8..516b004dcec 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt @@ -12,7 +12,7 @@ class A { y : KMemberFunction0 } - default object { + companion object { fun main() { ::Inner val y = A::Inner diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.txt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.txt index af5ca8ddb0a..4f9c3879f5c 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.txt @@ -7,8 +7,8 @@ internal final class A { internal final fun main(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 internal final fun main(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt index 8279eeb0cf6..7e99d54b9df 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt @@ -12,7 +12,7 @@ class A { y : KFunction0 } - default object { + companion object { fun main() { ::Nested val y = A::Nested diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.txt b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.txt index a6be1f3d3d2..a48761c5540 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.txt @@ -7,8 +7,8 @@ internal final class A { internal final fun main(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 internal final fun main(): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt index 40ff1c348eb..1de45895a3f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt @@ -5,7 +5,7 @@ open class Base { } class Derived : Base() { - default object { + companion object { platformStatic fun foo() {} } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt index 1a06a86eda4..5e591856bca 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt @@ -15,8 +15,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/body.kt b/compiler/testData/diagnostics/testsWithStdLib/native/body.kt index 3646a355181..32074626c6c 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/native/body.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/native/body.kt @@ -5,7 +5,7 @@ import kotlin.jvm.* class C { native fun foo() {} - default object { + companion object { native fun foo() {} } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/body.txt b/compiler/testData/diagnostics/testsWithStdLib/native/body.txt index f5c66fa3f74..1fbbb013f0f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/native/body.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/native/body.txt @@ -10,8 +10,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/noBody.kt b/compiler/testData/diagnostics/testsWithStdLib/native/noBody.kt index f45c28d0d10..e7478789198 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/native/noBody.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/native/noBody.kt @@ -5,7 +5,7 @@ native fun foo() class C { native fun foo() - default object { + companion object { native fun foo() } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/noBody.txt b/compiler/testData/diagnostics/testsWithStdLib/native/noBody.txt index f5c66fa3f74..1fbbb013f0f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/native/noBody.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/native/noBody.txt @@ -10,8 +10,8 @@ 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 default object Default { - private constructor Default() + internal 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 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/trait.kt b/compiler/testData/diagnostics/testsWithStdLib/native/trait.kt index 7d31ebe9e72..e312f88ad3c 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/native/trait.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/native/trait.kt @@ -4,7 +4,7 @@ trait Tr { native fun foo() native fun bar() {} - default object { + companion object { native fun foo() native fun bar() {} } diff --git a/compiler/testData/diagnostics/testsWithStdLib/native/trait.txt b/compiler/testData/diagnostics/testsWithStdLib/native/trait.txt index c675af28bd4..fa7e017e32c 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/native/trait.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/native/trait.txt @@ -7,8 +7,8 @@ internal trait Tr { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - internal default object Default { - private constructor Default() + internal 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 kotlin.jvm.native() internal final fun foo(): kotlin.Unit diff --git a/compiler/testData/evaluate/constant/classObjectProperty.kt b/compiler/testData/evaluate/constant/classObjectProperty.kt index 7293ef31c7a..b44b2fa3450 100644 --- a/compiler/testData/evaluate/constant/classObjectProperty.kt +++ b/compiler/testData/evaluate/constant/classObjectProperty.kt @@ -13,7 +13,7 @@ class A { // val prop4: 2 val prop4 = A.a + 1 - default object { + companion object { val a = 1 } } diff --git a/compiler/testData/lineNumber/classObject.kt b/compiler/testData/lineNumber/classObject.kt index dab1676bfe2..8baad0f725d 100644 --- a/compiler/testData/lineNumber/classObject.kt +++ b/compiler/testData/lineNumber/classObject.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { val prop = test.lineNumber() fun foo(): Int { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt index 669a5110394..229529a45a2 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt @@ -3,7 +3,7 @@ package test annotation class Anno class Class { - default object { + companion object { [Anno] var property: Int = 42 } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt index 828525abbf2..e2156acd967 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt @@ -7,8 +7,8 @@ internal final annotation class Anno : kotlin.Annotation { internal final class Class { /*primary*/ public constructor Class() - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() test.Anno() internal final var property: kotlin.Int internal final fun (): kotlin.Int internal final fun (/*0*/ : kotlin.Int): kotlin.Unit diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt index b2d30c6f1d2..cfe2a312d62 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt @@ -1,7 +1,7 @@ package test class A { - default object { + companion object { annotation class Anno1 class B { @@ -10,4 +10,4 @@ class A { } } -A.Default.Anno1 A.Default.B.Anno2 class C \ No newline at end of file +A.Companion.Anno1 A.Companion.B.Anno2 class C \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt index 5df4dfc04e5..1feb38a4e09 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.txt @@ -3,8 +3,8 @@ package test internal final class A { /*primary*/ public constructor A() - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() internal final annotation class Anno1 : kotlin.Annotation { /*primary*/ public constructor Anno1() @@ -20,6 +20,6 @@ internal final class A { } } -test.A.Default.Anno1() test.A.Default.B.Anno2() internal final class C { +test.A.Companion.Anno1() test.A.Companion.B.Anno2() internal final class C { /*primary*/ public constructor C() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt index 2aa7b90e3a0..0980ccf0965 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt @@ -3,7 +3,7 @@ package test annotation class Anno class Class { - default object { + companion object { Anno class Nested } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt index f12fc3065ff..8ee4f1000d0 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.txt @@ -7,8 +7,8 @@ internal final annotation class Anno : kotlin.Annotation { internal final class Class { /*primary*/ public constructor Class() - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() test.Anno() internal final class Nested { /*primary*/ public constructor Nested() diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt index 147a5c26ee7..d4e56195e7d 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt @@ -3,5 +3,5 @@ package test annotation class Anno class Class { - Anno default object + Anno companion object } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.txt index 8a75c745461..4d86be1c00d 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 default object Default { - /*primary*/ private constructor Default() + test.Anno() internal companion object Companion { + /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt index a23c1cad869..09bd24d0877 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt @@ -3,7 +3,7 @@ package test class A { class B { - default object { + companion object { val TEST = 1 } } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt index 2b62f505d81..d6e4080d184 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt @@ -6,8 +6,8 @@ internal final class A { internal final class B { /*primary*/ public constructor B() - internal default object Default { - /*primary*/ private constructor Default() + internal 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.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt index 8fb85209ab1..cb3ac1a6be1 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt @@ -6,5 +6,5 @@ deprecated("Class") class Class { deprecated("Inner") inner class Inner - deprecated("default object") default object + deprecated("companion object") companion object } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt index 91f36755925..bcf4276b7d8 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.txt @@ -3,8 +3,8 @@ package test kotlin.deprecated(value = "Class": kotlin.String) internal final class Class { /*primary*/ public constructor Class() - kotlin.deprecated(value = "default object": kotlin.String) internal default object Default { - /*primary*/ private constructor Default() + kotlin.deprecated(value = "companion object": kotlin.String) internal companion object Companion { + /*primary*/ private constructor Companion() } kotlin.deprecated(value = "Inner": kotlin.String) internal final inner class Inner { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt index 51b5f3010d3..14be4f84c5e 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt @@ -10,5 +10,5 @@ Anno(ElementType.METHOD) class Class { Anno(ElementType.TYPE) class Nested - Anno(ElementType.ANNOTATION_TYPE) default object + Anno(ElementType.ANNOTATION_TYPE) companion object } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt index 3f5863313f0..e2ac333aaa8 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt @@ -9,8 +9,8 @@ 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 default object Default { - /*primary*/ private constructor Default() + test.Anno(t = ElementType.ANNOTATION_TYPE: java.lang.annotation.ElementType) internal companion object Companion { + /*primary*/ private constructor Companion() } test.Anno(t = ElementType.PARAMETER: java.lang.annotation.ElementType) internal final inner class Inner { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt index ab001e21ed5..f98ddfe0b21 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt @@ -3,7 +3,7 @@ package test annotation class Anno class Class { - default object { + companion object { [Anno] val property: Int get() = 42 } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt index fee5273bef9..da941ca4922 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt @@ -7,8 +7,8 @@ internal final annotation class Anno : kotlin.Annotation { internal final class Class { /*primary*/ public constructor Class() - internal default object Default { - /*primary*/ private constructor Default() + internal 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.kt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt index 3ad4958d35d..2d2b2025b92 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt @@ -3,7 +3,7 @@ package test annotation class Anno trait Trait { - default object { + companion object { [Anno] val property: Int get() = 42 } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt index b57cd3f65f7..6446b9f670b 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt @@ -6,8 +6,8 @@ internal final annotation class Anno : kotlin.Annotation { internal trait Trait { - internal default object Default { - /*primary*/ private constructor Default() + internal 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.kt b/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt index 11f94904c20..c45d2c81be0 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt +++ b/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt @@ -2,7 +2,7 @@ package test class ConstructorTypeParamClassObjectTypeConflict { - default object { + companion object { trait test } @@ -10,7 +10,7 @@ class ConstructorTypeParamClassObjectTypeConflict { } class ConstructorTypeParamClassObjectConflict { - default object { + companion object { val test = 12 } @@ -18,7 +18,7 @@ class ConstructorTypeParamClassObjectConflict { } class TestConstructorParamClassObjectConflict(test: String) { - default object { + companion object { val test = 12 } @@ -27,7 +27,7 @@ class TestConstructorParamClassObjectConflict(test: String) { class TestConstructorValClassObjectConflict(val test: String) { - default object { + companion object { val test = 12 } @@ -35,7 +35,7 @@ class TestConstructorValClassObjectConflict(val test: String) { } class TestClassObjectAndClassConflict { - default object { + companion object { val bla = 12 } diff --git a/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt index a8c5aeb86d7..bf17b3e4335 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt @@ -5,8 +5,8 @@ internal final class ConstructorTypeParamClassObjectConflict { internal final val some: kotlin.Int = 12 internal final fun (): kotlin.Int - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() internal final val test: kotlin.Int = 12 internal final fun (): kotlin.Int } @@ -17,8 +17,8 @@ internal final class ConstructorTypeParamClassObjectTypeConflict { internal final val some: test? internal final fun (): test? - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() internal trait test { } @@ -32,8 +32,8 @@ internal final class TestClassObjectAndClassConflict { internal final val some: kotlin.String = "More" internal final fun (): kotlin.String - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() internal final val bla: kotlin.Int = 12 internal final fun (): kotlin.Int } @@ -44,8 +44,8 @@ internal final class TestConstructorParamClassObjectConflict { internal final val some: kotlin.String internal final fun (): kotlin.String - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() internal final val test: kotlin.Int = 12 internal final fun (): kotlin.Int } @@ -58,8 +58,8 @@ internal final class TestConstructorValClassObjectConflict { internal final val test: kotlin.String internal final fun (): kotlin.String - internal default object Default { - /*primary*/ private constructor Default() + internal 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/class/NamedObjectInClassObject.kt b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt index c2752d45ff8..7390a574f8f 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt +++ b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt @@ -2,7 +2,7 @@ package test public class Outer { - public default object { + public companion object { public object Obj { public val v: String = "val" public fun f(): String = "fun" diff --git a/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt index 81144403ba0..65ab629cd15 100644 --- a/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt @@ -3,8 +3,8 @@ package test public final class Outer { /*primary*/ public constructor Outer() - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() public object Obj { /*primary*/ private constructor Obj() diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt index 45deb1bd0cf..353ed9cbaa2 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt @@ -2,7 +2,7 @@ package test class ClassObjectDeclaresProperty { - default object { + companion object { val i = 1 } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt index 44732c22346..a83697fe438 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt @@ -3,8 +3,8 @@ package test internal final class ClassObjectDeclaresProperty { /*primary*/ public constructor ClassObjectDeclaresProperty() - internal default object Default { - /*primary*/ private constructor Default() + internal 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.kt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt index b3846d19650..6537b468786 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt @@ -2,7 +2,7 @@ package test class ClassObjectDeclaresProperty { - default object { + companion object { var s = "" } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt index 2ac02ab7989..f0d9c749f0b 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.txt @@ -3,8 +3,8 @@ package test internal final class ClassObjectDeclaresProperty { /*primary*/ public constructor ClassObjectDeclaresProperty() - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() internal final var s: kotlin.String internal final fun (): kotlin.String internal final fun (/*0*/ : kotlin.String): kotlin.Unit diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt index 2e0a0329081..94c6dfbae08 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt @@ -1,14 +1,14 @@ package test public class Pub { - default object {} + companion object {} } private class Pri { - default object {} + companion object {} } class Int { - default object {} + companion object {} } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.txt index e622bd681c2..96ecec3c116 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.txt @@ -3,23 +3,23 @@ package test internal final class Int { /*primary*/ public constructor Int() - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() } } private final class Pri { /*primary*/ public constructor Pri() - private default object Default { - /*primary*/ private constructor Default() + private companion object Companion { + /*primary*/ private constructor Companion() } } public final class Pub { /*primary*/ public constructor Pub() - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt index 20efdff3fcf..2f1fc7d8467 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt @@ -1,37 +1,37 @@ package test public class PubPri { - private default object {} + private companion object {} } public class PubInt { - internal default object {} + internal companion object {} } public class PubPub { - public default object {} + public companion object {} } internal class IntPri { - private default object {} + private companion object {} } internal class IntInt { - internal default object {} + internal companion object {} } internal class IntPub { - public default object {} + public companion object {} } private class PriPri { - private default object {} + private companion object {} } private class PriInt { - internal default object {} + internal companion object {} } private class PriPub { - public default object {} + public companion object {} } \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.txt index 7b5444d8069..1b0e73143fa 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.txt @@ -3,71 +3,71 @@ package test internal final class IntInt { /*primary*/ public constructor IntInt() - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() } } internal final class IntPri { /*primary*/ public constructor IntPri() - private default object Default { - /*primary*/ private constructor Default() + private companion object Companion { + /*primary*/ private constructor Companion() } } internal final class IntPub { /*primary*/ public constructor IntPub() - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() } } private final class PriInt { /*primary*/ public constructor PriInt() - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() } } private final class PriPri { /*primary*/ public constructor PriPri() - private default object Default { - /*primary*/ private constructor Default() + private companion object Companion { + /*primary*/ private constructor Companion() } } private final class PriPub { /*primary*/ public constructor PriPub() - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() } } public final class PubInt { /*primary*/ public constructor PubInt() - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() } } public final class PubPri { /*primary*/ public constructor PubPri() - private default object Default { - /*primary*/ private constructor Default() + private companion object Companion { + /*primary*/ private constructor Companion() } } public final class PubPub { /*primary*/ public constructor PubPub() - public default object Default { - /*primary*/ private constructor Default() + public companion object Companion { + /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt index 991734ce43e..29271b710be 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt @@ -3,6 +3,6 @@ package test trait Bbb class ClassObjectextendsTrait { - default object : Bbb { + companion object : Bbb { } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.txt index 3e1a6f29bce..73f09d0410f 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.txt @@ -6,7 +6,7 @@ internal trait Bbb { internal final class ClassObjectextendsTrait { /*primary*/ public constructor ClassObjectextendsTrait() - internal default object Default : test.Bbb { - /*primary*/ private constructor Default() + internal companion object Companion : test.Bbb { + /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt index 5517c42d6eb..b1c7808e9d3 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt @@ -3,6 +3,6 @@ package test trait Bbb

class ClassObjectExtendsTraitWithTP { - default object : Bbb { + companion object : Bbb { } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt index cb1ea473f82..8f2854a4f3d 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt @@ -6,7 +6,7 @@ internal trait Bbb { internal final class ClassObjectExtendsTraitWithTP { /*primary*/ public constructor ClassObjectExtendsTraitWithTP() - internal default object Default : test.Bbb { - /*primary*/ private constructor Default() + internal companion object Companion : test.Bbb { + /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt index 3f114948cac..4e271d43734 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt @@ -2,7 +2,7 @@ package test class A { - default object { + companion object { val some = 1 } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt index ec369bdda36..e15bec6dae7 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt @@ -5,8 +5,8 @@ internal final class A { internal final val other: kotlin.Int = 1 internal final fun (): kotlin.Int - internal default object Default { - /*primary*/ private constructor Default() + internal 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.kt b/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt index 8a2d87c1213..0e5081cf714 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt @@ -7,5 +7,5 @@ trait T { class A : T { override fun foo(): Int = 42 - default object : T by A() + companion object : T by A() } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt b/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt index ec091e0f524..27b2ae84b9a 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.txt @@ -4,8 +4,8 @@ internal final class A : test.T { /*primary*/ public constructor A() internal open override /*1*/ fun foo(): kotlin.Int - internal default object Default : test.T { - /*primary*/ private constructor Default() + internal 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.kt b/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt index cb68ff12326..564deb2f35f 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt @@ -2,7 +2,7 @@ package test class TestFirst { - default object { + companion object { fun testing(a: InnerClass) = 45 fun testing(a: NotInnerClass) = 45 } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt index dce1711ea63..117ed5991d4 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.txt @@ -3,8 +3,8 @@ package test internal final class TestFirst { /*primary*/ public constructor TestFirst() - internal default object Default { - /*primary*/ private constructor Default() + internal 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.kt b/compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt index b5bcbabf0a6..61ae8a96514 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt @@ -1,7 +1,7 @@ package test class NamedClassObject { - default object Named { + companion object Named { fun f(): Int = 1 } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.txt b/compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.txt index d2a5e178f0b..897ec8914cf 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 default object Named { + internal companion object Named { /*primary*/ private constructor Named() internal final fun f(): kotlin.Int } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt b/compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt index 4be3e48a1a3..d58df5fba55 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt @@ -1,6 +1,6 @@ package test class SimpleClassObject() { - default object { + companion object { } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.txt b/compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.txt index b1880422d48..967bd3e5a56 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 default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt index 481451719b9..848a8a5be19 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt @@ -3,7 +3,7 @@ package test class Test { - default object { + companion object { public val prop1 : Int = 10 diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt index 474b32086bf..ce10dbf8cc5 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt @@ -3,8 +3,8 @@ package test internal final class Test { /*primary*/ public constructor Test() - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() public final val prop1: kotlin.Int = 10 public final fun (): kotlin.Int public final var prop2: kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt index b62e26e6969..8c3c948b699 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt @@ -3,7 +3,7 @@ package test trait Test { - default object { + companion object { public val prop1 : Int = 10 diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt index f4b6c2dd8c5..4ce9d34ef02 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt @@ -2,8 +2,8 @@ package test internal trait Test { - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() public final val prop1: kotlin.Int = 10 public final fun (): kotlin.Int public final var prop2: kotlin.Int diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt index 37c529e2634..d2bd779222c 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt +++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt @@ -1,7 +1,7 @@ package test class A { - default object { } + companion object { } enum class E { ENTRY } diff --git a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt index e3a078f43f3..57d8ab835bd 100644 --- a/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.txt @@ -3,8 +3,8 @@ package test internal final class A { /*primary*/ public constructor A() - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() } internal final enum class E : kotlin.Enum { diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt index 38ce1c3ca04..6ea9f30d9f7 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt @@ -1,6 +1,6 @@ package test trait TheTrait { - default object { + companion object { } } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.txt index 40e2fb05269..d81db790a29 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.txt @@ -2,7 +2,7 @@ package test internal trait TheTrait { - internal default object Default { - /*primary*/ private constructor Default() + internal companion object Companion { + /*primary*/ private constructor Companion() } } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt index 729e11da295..f26d6d2e7f1 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt @@ -1,7 +1,7 @@ package test class Some { - TestAnnotation default object { + TestAnnotation companion object { annotation class TestAnnotation } } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt index e826bd45301..fa60e4307c8 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.txt @@ -3,8 +3,8 @@ package test internal final class Some { /*primary*/ public constructor Some() - test.Some.Default.TestAnnotation() internal default object Default { - /*primary*/ private constructor Default() + test.Some.Companion.TestAnnotation() internal companion object Companion { + /*primary*/ private constructor Companion() internal final annotation class TestAnnotation : kotlin.Annotation { /*primary*/ public constructor TestAnnotation() diff --git a/compiler/testData/psi/ByClauses.kt b/compiler/testData/psi/ByClauses.kt index deded280bb8..b67905fa56d 100644 --- a/compiler/testData/psi/ByClauses.kt +++ b/compiler/testData/psi/ByClauses.kt @@ -1,23 +1,23 @@ class A : b by a { - default object {} + companion object {} } class A : b by a + b() * 5 { - default object {} + companion object {} } class A : b by (a) { - default object {} + companion object {} } class A : b by (a {}) { - default object {} + companion object {} } class A : b by a[a {}] { - default object {} + companion object {} } class A : b by a(a {}) { - default object {} + companion object {} } class A : b by object { fun f() = a {} } { - default object {} + companion object {} } \ No newline at end of file diff --git a/compiler/testData/psi/ByClauses.txt b/compiler/testData/psi/ByClauses.txt index 64f67937ab0..e879e3b5b5e 100644 --- a/compiler/testData/psi/ByClauses.txt +++ b/compiler/testData/psi/ByClauses.txt @@ -25,7 +25,7 @@ JetFile: ByClauses.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -77,7 +77,7 @@ JetFile: ByClauses.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -114,7 +114,7 @@ JetFile: ByClauses.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -160,7 +160,7 @@ JetFile: ByClauses.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -209,7 +209,7 @@ JetFile: ByClauses.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -259,7 +259,7 @@ JetFile: ByClauses.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -321,7 +321,7 @@ JetFile: ByClauses.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/CommentsBinding.kt b/compiler/testData/psi/CommentsBinding.kt index 6a5a28656be..acfab924bf7 100644 --- a/compiler/testData/psi/CommentsBinding.kt +++ b/compiler/testData/psi/CommentsBinding.kt @@ -41,9 +41,9 @@ class D { foo() // statement } // end of foo - // default object - default object { - } // end of default object + // companion object + companion object { + } // end of companion object } // This is v diff --git a/compiler/testData/psi/CommentsBinding.txt b/compiler/testData/psi/CommentsBinding.txt index 4ed6b672ab2..79582bd0b22 100644 --- a/compiler/testData/psi/CommentsBinding.txt +++ b/compiler/testData/psi/CommentsBinding.txt @@ -264,10 +264,10 @@ JetFile: CommentsBinding.kt PsiComment(EOL_COMMENT)('// end of foo') PsiWhiteSpace('\n\n ') OBJECT_DECLARATION - PsiComment(EOL_COMMENT)('// default object') + PsiComment(EOL_COMMENT)('// companion object') PsiWhiteSpace('\n ') MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -276,7 +276,7 @@ JetFile: CommentsBinding.kt PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') - PsiComment(EOL_COMMENT)('// end of default object') + PsiComment(EOL_COMMENT)('// end of companion object') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') diff --git a/compiler/testData/psi/DefaultKeyword.kt b/compiler/testData/psi/DefaultKeyword.kt index a7db886a43e..67a1ed91cd9 100644 --- a/compiler/testData/psi/DefaultKeyword.kt +++ b/compiler/testData/psi/DefaultKeyword.kt @@ -1,44 +1,44 @@ class A { - default object { + companion object { } } class A { - default object + companion object val c: Int = 1 } class B { - public default object A { + public companion object A { } } class B { - default object A { - default object { + companion object A { + companion object { } } } -default object B +companion object B //should be error -default object { +companion object { } object A { - default object + companion object } trait A { - default object + companion object class C { - default object C { - default object + companion object C { + companion object } } } @@ -46,27 +46,27 @@ trait A { enum class D { A B - default object + companion object } class A { - default class object + companion class object } //should be error class A { - class default object + class companion object } class A { - default public final object + companion public final object } //should be error -default class {} +companion class {} //should be error -val t = default object { +val t = companion object { } @@ -74,12 +74,12 @@ enum class I { A B - default object + companion object } enum class I { A B - default object {} + companion object {} } \ No newline at end of file diff --git a/compiler/testData/psi/DefaultKeyword.txt b/compiler/testData/psi/DefaultKeyword.txt index 6c799f667b9..24e42fb7335 100644 --- a/compiler/testData/psi/DefaultKeyword.txt +++ b/compiler/testData/psi/DefaultKeyword.txt @@ -11,7 +11,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -32,7 +32,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace('\n\n ') @@ -66,7 +66,7 @@ JetFile: DefaultKeyword.kt MODIFIER_LIST PsiElement(public)('public') PsiWhiteSpace(' ') - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -90,7 +90,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -102,7 +102,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -117,7 +117,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n\n') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -128,7 +128,7 @@ JetFile: DefaultKeyword.kt PsiComment(EOL_COMMENT)('//should be error') PsiWhiteSpace('\n') MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -151,7 +151,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace('\n') @@ -167,7 +167,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace('\n\n ') @@ -181,7 +181,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -193,7 +193,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace('\n ') @@ -224,7 +224,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace('\n') @@ -240,7 +240,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(class)('class') PsiWhiteSpace(' ') @@ -261,7 +261,7 @@ JetFile: DefaultKeyword.kt CLASS PsiElement(class)('class') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('default') + PsiElement(IDENTIFIER)('companion') PsiWhiteSpace(' ') OBJECT_DECLARATION PsiElement(object)('object') @@ -280,7 +280,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(public)('public') PsiWhiteSpace(' ') @@ -294,7 +294,7 @@ JetFile: DefaultKeyword.kt PsiComment(EOL_COMMENT)('//should be error') PsiWhiteSpace('\n') MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(class)('class') PsiErrorElement:Name expected @@ -314,7 +314,7 @@ JetFile: DefaultKeyword.kt PsiElement(EQ)('=') PsiWhiteSpace(' ') REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('default') + PsiElement(IDENTIFIER)('companion') PsiWhiteSpace(' ') PsiErrorElement:Property getter or setter expected PsiElement(object)('object') @@ -344,7 +344,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace('\n') @@ -371,7 +371,7 @@ JetFile: DefaultKeyword.kt PsiWhiteSpace('\n\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/NamedClassObject.kt b/compiler/testData/psi/NamedClassObject.kt index 52d771c2d74..83232c7b3d1 100644 --- a/compiler/testData/psi/NamedClassObject.kt +++ b/compiler/testData/psi/NamedClassObject.kt @@ -1,11 +1,11 @@ class A { - default object Default + companion object Companion - default object B + companion object B - default object C {} + companion object C {} - default object + companion object object C } diff --git a/compiler/testData/psi/NamedClassObject.txt b/compiler/testData/psi/NamedClassObject.txt index 7c4b1bcb263..4cb96c3eeeb 100644 --- a/compiler/testData/psi/NamedClassObject.txt +++ b/compiler/testData/psi/NamedClassObject.txt @@ -11,16 +11,16 @@ JetFile: NamedClassObject.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') OBJECT_DECLARATION_NAME - PsiElement(IDENTIFIER)('Default') + PsiElement(IDENTIFIER)('Companion') PsiWhiteSpace('\n\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -29,7 +29,7 @@ JetFile: NamedClassObject.kt PsiWhiteSpace('\n\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -42,7 +42,7 @@ JetFile: NamedClassObject.kt PsiWhiteSpace('\n\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace('\n\n ') diff --git a/compiler/testData/psi/SimpleClassMembers.kt b/compiler/testData/psi/SimpleClassMembers.kt index 80314a0b44d..e5e974e75da 100644 --- a/compiler/testData/psi/SimpleClassMembers.kt +++ b/compiler/testData/psi/SimpleClassMembers.kt @@ -19,23 +19,23 @@ class foo { class Bar { object foo { - default object { + companion object { } - private default object { + private companion object { } - private default object : Fooo { + private companion object : Fooo { } - private default object : Fooo, Bar by foo { + private companion object : Fooo, Bar by foo { } - private default object : Fooo, Bar by foo, Goo() + private companion object : Fooo, Bar by foo, Goo() } class Bar {} @@ -58,23 +58,23 @@ class foo { typealias foo = bar - default object { + companion object { } - private default object { + private companion object { } - private default object : Fooo { + private companion object : Fooo { } - private default object : Fooo, Bar by foo { + private companion object : Fooo, Bar by foo { } - private default object : Fooo, Bar by foo, Goo() + private companion object : Fooo, Bar by foo, Goo() } diff --git a/compiler/testData/psi/SimpleClassMembers.txt b/compiler/testData/psi/SimpleClassMembers.txt index e150ffcf9ef..a68dca8ba82 100644 --- a/compiler/testData/psi/SimpleClassMembers.txt +++ b/compiler/testData/psi/SimpleClassMembers.txt @@ -88,7 +88,7 @@ JetFile: SimpleClassMembers.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -101,7 +101,7 @@ JetFile: SimpleClassMembers.kt MODIFIER_LIST PsiElement(private)('private') PsiWhiteSpace(' ') - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -114,7 +114,7 @@ JetFile: SimpleClassMembers.kt MODIFIER_LIST PsiElement(private)('private') PsiWhiteSpace(' ') - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -136,7 +136,7 @@ JetFile: SimpleClassMembers.kt MODIFIER_LIST PsiElement(private)('private') PsiWhiteSpace(' ') - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -170,7 +170,7 @@ JetFile: SimpleClassMembers.kt MODIFIER_LIST PsiElement(private)('private') PsiWhiteSpace(' ') - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -281,7 +281,7 @@ JetFile: SimpleClassMembers.kt PsiWhiteSpace('\n\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -294,7 +294,7 @@ JetFile: SimpleClassMembers.kt MODIFIER_LIST PsiElement(private)('private') PsiWhiteSpace(' ') - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -307,7 +307,7 @@ JetFile: SimpleClassMembers.kt MODIFIER_LIST PsiElement(private)('private') PsiWhiteSpace(' ') - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -329,7 +329,7 @@ JetFile: SimpleClassMembers.kt MODIFIER_LIST PsiElement(private)('private') PsiWhiteSpace(' ') - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') @@ -363,7 +363,7 @@ JetFile: SimpleClassMembers.kt MODIFIER_LIST PsiElement(private)('private') PsiWhiteSpace(' ') - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/annotation/ShortAnnotations.kt b/compiler/testData/psi/annotation/ShortAnnotations.kt index 844f976206b..b71744aa0db 100644 --- a/compiler/testData/psi/annotation/ShortAnnotations.kt +++ b/compiler/testData/psi/annotation/ShortAnnotations.kt @@ -9,7 +9,7 @@ foo bar(1) buzz(1) zoo typealias T = Int class Foo { - foo bar(1) buzz(1) zoo default object {} + foo bar(1) buzz(1) zoo companion object {} foo bar(1) buzz(1) zoo class A foo bar(1) buzz(1) zoo object B foo bar(1) buzz(1) zoo fun a() {} diff --git a/compiler/testData/psi/annotation/ShortAnnotations.txt b/compiler/testData/psi/annotation/ShortAnnotations.txt index 21e97e362d4..2b82edc2d13 100644 --- a/compiler/testData/psi/annotation/ShortAnnotations.txt +++ b/compiler/testData/psi/annotation/ShortAnnotations.txt @@ -475,7 +475,7 @@ JetFile: ShortAnnotations.kt REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('zoo') PsiWhiteSpace(' ') - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/examples/PolymorphicClassObjects.kt b/compiler/testData/psi/examples/PolymorphicClassObjects.kt index 52fee9ff0ec..fdeadc1e859 100644 --- a/compiler/testData/psi/examples/PolymorphicClassObjects.kt +++ b/compiler/testData/psi/examples/PolymorphicClassObjects.kt @@ -9,7 +9,7 @@ open class Buildable { class List { - default object : Buildable { + companion object : Buildable { override fun newBuilder() : Builder } diff --git a/compiler/testData/psi/examples/PolymorphicClassObjects.txt b/compiler/testData/psi/examples/PolymorphicClassObjects.txt index a13b5550775..57fb8663e64 100644 --- a/compiler/testData/psi/examples/PolymorphicClassObjects.txt +++ b/compiler/testData/psi/examples/PolymorphicClassObjects.txt @@ -133,7 +133,7 @@ JetFile: PolymorphicClassObjects.kt PsiWhiteSpace('\n\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/examples/UpdateOperation.kt b/compiler/testData/psi/examples/UpdateOperation.kt index a6d65965684..4c3ce1d1aa4 100644 --- a/compiler/testData/psi/examples/UpdateOperation.kt +++ b/compiler/testData/psi/examples/UpdateOperation.kt @@ -1,5 +1,5 @@ class Pair(x : Int, y : Int) { - default object { + companion object { fun copy(from : Pair, x : Int = from.x, y : Int = from.y) = Pair(x, y) } } diff --git a/compiler/testData/psi/examples/UpdateOperation.txt b/compiler/testData/psi/examples/UpdateOperation.txt index a28b6207fe5..8e3928b7a64 100644 --- a/compiler/testData/psi/examples/UpdateOperation.txt +++ b/compiler/testData/psi/examples/UpdateOperation.txt @@ -34,7 +34,7 @@ JetFile: UpdateOperation.kt PsiWhiteSpace('\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/recovery/kt2172.kt b/compiler/testData/psi/recovery/kt2172.kt index 7a5c60d2d3d..deb9a20f71d 100644 --- a/compiler/testData/psi/recovery/kt2172.kt +++ b/compiler/testData/psi/recovery/kt2172.kt @@ -1,6 +1,6 @@ class Foo { - default object { + companion object { val } } \ No newline at end of file diff --git a/compiler/testData/psi/recovery/kt2172.txt b/compiler/testData/psi/recovery/kt2172.txt index e82d68665c0..43f1e93cbd1 100644 --- a/compiler/testData/psi/recovery/kt2172.txt +++ b/compiler/testData/psi/recovery/kt2172.txt @@ -11,7 +11,7 @@ JetFile: kt2172.kt PsiWhiteSpace('\n\n ') OBJECT_DECLARATION MODIFIER_LIST - PsiElement(default)('default') + PsiElement(companion)('companion') PsiWhiteSpace(' ') PsiElement(object)('object') PsiWhiteSpace(' ') diff --git a/compiler/testData/psiUtil/isLocalClass.kt b/compiler/testData/psiUtil/isLocalClass.kt index 4b5a26f9f39..112ac258ded 100644 --- a/compiler/testData/psiUtil/isLocalClass.kt +++ b/compiler/testData/psiUtil/isLocalClass.kt @@ -2,7 +2,7 @@ class A { class B object G - default object { + companion object { class C object H diff --git a/compiler/testData/recursiveProcessor/declarations.kt b/compiler/testData/recursiveProcessor/declarations.kt index 62395d2ba8c..221a1776ee4 100644 --- a/compiler/testData/recursiveProcessor/declarations.kt +++ b/compiler/testData/recursiveProcessor/declarations.kt @@ -13,7 +13,7 @@ abstract class Class : Trait { fun classFunc(): Unit {} val classProp: Any? = null - default object { + companion object { fun classObjFunc(): Unit {} val classObjProp: Any? = null } @@ -30,7 +30,7 @@ trait Outer { } abstract class NestedClass { - default object { + companion object { fun nestedClassObjFunc(): Unit {} } } diff --git a/compiler/testData/recursiveProcessor/declarations.txt b/compiler/testData/recursiveProcessor/declarations.txt index da3fc02b078..24af7081591 100644 --- a/compiler/testData/recursiveProcessor/declarations.txt +++ b/compiler/testData/recursiveProcessor/declarations.txt @@ -5,16 +5,16 @@ Class.classFunc:SimpleFunctionDescriptor Class.classProp:PropertyDescriptor Class.this:ReceiverParameterDescriptor Class:ClassDescriptorWithResolutionScopes -Default.:PropertyGetterDescriptor -Default.():ConstructorDescriptor -Default.():ConstructorDescriptor -Default.classObjFunc:SimpleFunctionDescriptor -Default.classObjProp:PropertyDescriptor -Default.nestedClassObjFunc:SimpleFunctionDescriptor -Default.this:ReceiverParameterDescriptor -Default.this:ReceiverParameterDescriptor -Default:ClassDescriptorWithResolutionScopes -Default:ClassDescriptorWithResolutionScopes +Companion.:PropertyGetterDescriptor +Companion.():ConstructorDescriptor +Companion.():ConstructorDescriptor +Companion.classObjFunc:SimpleFunctionDescriptor +Companion.classObjProp:PropertyDescriptor +Companion.nestedClassObjFunc:SimpleFunctionDescriptor +Companion.this:ReceiverParameterDescriptor +Companion.this:ReceiverParameterDescriptor +Companion:ClassDescriptorWithResolutionScopes +Companion:ClassDescriptorWithResolutionScopes NestedClass.():ConstructorDescriptor NestedClass.this:ReceiverParameterDescriptor NestedClass:ClassDescriptorWithResolutionScopes @@ -50,12 +50,12 @@ fake Class.hashCode:DeserializedCallableMemberDescriptor fake Class.toString:DeserializedCallableMemberDescriptor fake Class.traitFunc:SimpleFunctionDescriptor fake Class.traitProp:PropertyDescriptor -fake Default.equals:DeserializedCallableMemberDescriptor -fake Default.equals:DeserializedCallableMemberDescriptor -fake Default.hashCode:DeserializedCallableMemberDescriptor -fake Default.hashCode:DeserializedCallableMemberDescriptor -fake Default.toString:DeserializedCallableMemberDescriptor -fake Default.toString:DeserializedCallableMemberDescriptor +fake Companion.equals:DeserializedCallableMemberDescriptor +fake Companion.equals:DeserializedCallableMemberDescriptor +fake Companion.hashCode:DeserializedCallableMemberDescriptor +fake Companion.hashCode:DeserializedCallableMemberDescriptor +fake Companion.toString:DeserializedCallableMemberDescriptor +fake Companion.toString:DeserializedCallableMemberDescriptor fake NestedClass.equals:DeserializedCallableMemberDescriptor fake NestedClass.hashCode:DeserializedCallableMemberDescriptor fake NestedClass.toString:DeserializedCallableMemberDescriptor diff --git a/compiler/testData/renderer/Classes.kt b/compiler/testData/renderer/Classes.kt index 1ee0f6fd345..20e7febcbd7 100644 --- a/compiler/testData/renderer/Classes.kt +++ b/compiler/testData/renderer/Classes.kt @@ -23,7 +23,7 @@ internal class InternalClass { trait TheTrait { fun abstractFun() - default object : TheClass { + companion object : TheClass { fun classObjectFunction(): Int {} } } @@ -55,9 +55,9 @@ public trait TwoUpperBounds where T : Number, T : Any //public constructor InternalClass() defined in rendererTest.InternalClass //internal trait TheTrait defined in rendererTest //internal abstract fun abstractFun(): kotlin.Unit defined in rendererTest.TheTrait -//internal default object : rendererTest.TheClass defined in rendererTest.TheTrait -//private constructor Default() defined in rendererTest.TheTrait.Default -//internal final fun classObjectFunction(): kotlin.Int defined in rendererTest.TheTrait.Default +//internal 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 //public constructor WithReified() defined in rendererTest.WithReified // defined in rendererTest.WithReified diff --git a/compiler/testData/resolve/candidatesPriority/classObjectOuterResolve.resolve b/compiler/testData/resolve/candidatesPriority/classObjectOuterResolve.resolve index a25af81c178..7e75effcc99 100644 --- a/compiler/testData/resolve/candidatesPriority/classObjectOuterResolve.resolve +++ b/compiler/testData/resolve/candidatesPriority/classObjectOuterResolve.resolve @@ -1,7 +1,7 @@ fun ~test~test() = 1 class Test { - default object { + companion object { fun call() = `test`test() } diff --git a/compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve b/compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve index 21c38db2bd1..635371af247 100644 --- a/compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve +++ b/compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve @@ -5,7 +5,7 @@ package test import testing.TestClass class WithClassObject { - default object { + companion object { class ~class-object~TestClass } diff --git a/compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve b/compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve index 2c1ff062c5c..c5f64b731e7 100644 --- a/compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve +++ b/compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve @@ -4,7 +4,7 @@ package test import testing.custom.* -// Default import has priority over on-demand ones. No conflicts are expected. +// Companion import has priority over on-demand ones. No conflicts are expected. val a1: `kotlin::List`List? = null //FILE:javaUtilImport.kt @@ -13,7 +13,7 @@ package test import java.util.* -// Default imports take over import-on-demand +// Companion imports take over import-on-demand // TODO: Fix for lazy resolve test // val a2: 'kotlin::List'List? = null @@ -24,7 +24,7 @@ package test import testing.custom.* import java.util.* -// Default import has priority over on-demand ones. No conflicts are expected. +// Companion import has priority over on-demand ones. No conflicts are expected. val a3: `kotlin::List`List? = null //FILE:singleClassImportFromJavaUtil.kt diff --git a/compiler/testData/resolveAnnotations/testFile.kt b/compiler/testData/resolveAnnotations/testFile.kt index 544c54cb96c..403123fd60b 100644 --- a/compiler/testData/resolveAnnotations/testFile.kt +++ b/compiler/testData/resolveAnnotations/testFile.kt @@ -5,7 +5,7 @@ package test import test.MyEnum.* ANNOTATION class MyClass [ANNOTATION]([ANNOTATION] param: Int, [ANNOTATION] val consProp: Int) { - ANNOTATION default object { + ANNOTATION companion object { } ANNOTATION var prop: Int = 1 diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.kt b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.kt index 4c585e83b7d..8bbe40421cf 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.kt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { fun invoke(i: Int) = i } } diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.txt b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.txt index 90a13efba23..e4c39fd0022 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.txt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.txt @@ -1,5 +1,5 @@ class A { - default object { + companion object { fun invoke(i: Int) = i } } @@ -9,7 +9,7 @@ fun test() = A(1) Resolved call: -Resulting descriptor: default object defined in A +Resulting descriptor: companion object defined in A Explicit receiver kind = NO_EXPLICIT_RECEIVER Dispatch receiver = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.kt b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.kt index b2d4d49e984..ea2f0ec4a30 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.kt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { fun invoke(i: Int) = i } } diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.txt b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.txt index bfaeb30ec59..6dae22cc3d3 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.txt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.txt @@ -1,5 +1,5 @@ class A { - default object { + companion object { fun invoke(i: Int) = i } } @@ -9,10 +9,10 @@ fun test() = A(1) Resolved call: -Resulting descriptor: fun invoke(i: Int): Int defined in A.Default +Resulting descriptor: fun invoke(i: Int): Int defined in A.Companion Explicit receiver kind = DISPATCH_RECEIVER -Dispatch receiver = A {Default} +Dispatch receiver = A {Companion} Extension receiver = NO_RECEIVER Value arguments mapping: diff --git a/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt b/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt index 75dad89dacb..2e3dfd511f0 100644 --- a/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt +++ b/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt @@ -1,5 +1,5 @@ class Foo { - default object { + companion object { val baz = Foo() } } diff --git a/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt b/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt index 69203541940..6e14e89573c 100644 --- a/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt +++ b/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt @@ -1,5 +1,5 @@ class Foo { - default object { + companion object { val baz = Foo() } } @@ -11,8 +11,8 @@ fun test() { Resolved call: -Resulting descriptor: val baz: Foo defined in Foo.Default +Resulting descriptor: val baz: Foo defined in Foo.Companion Explicit receiver kind = DISPATCH_RECEIVER -Dispatch receiver = Foo {Default} +Dispatch receiver = Foo {Companion} Extension receiver = NO_RECEIVER diff --git a/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt b/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt index e45096f8e90..54a07a6cad6 100644 --- a/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt +++ b/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt @@ -6,8 +6,8 @@ fun test() { Resolved call: -Resulting descriptor: val EMPTY: IntRange defined in kotlin.IntRange.Default +Resulting descriptor: val EMPTY: IntRange defined in kotlin.IntRange.Companion Explicit receiver kind = DISPATCH_RECEIVER -Dispatch receiver = IntRange {Default} +Dispatch receiver = IntRange {Companion} Extension receiver = NO_RECEIVER diff --git a/compiler/testData/serialization/builtinsSerializer/annotationTargets.kt b/compiler/testData/serialization/builtinsSerializer/annotationTargets.kt index 623d5dcb350..48c1245967f 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationTargets.kt +++ b/compiler/testData/serialization/builtinsSerializer/annotationTargets.kt @@ -32,6 +32,6 @@ class C1 [anno("constructor")] () { anno("nested class") class C2 - anno("default object") - default object {} + anno("companion object") + companion object {} } diff --git a/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt b/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt index 2d09c3c391a..38ac00117c5 100644 --- a/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt +++ b/compiler/testData/serialization/builtinsSerializer/annotationTargets.txt @@ -16,8 +16,8 @@ test.anno(x = "top level class": kotlin.String) internal final class C1 { public constructor C2() } - test.anno(x = "default object": kotlin.String) internal default object Default { - private constructor Default() + test.anno(x = "companion object": kotlin.String) internal companion object Companion { + private constructor Companion() } } diff --git a/compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt b/compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt index a5e2dc435fd..77d407a25a8 100644 --- a/compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt +++ b/compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt @@ -1,9 +1,9 @@ class MyClass { - deprecated("") default object { + deprecated("") companion object { } } // TESTED_OBJECT_KIND: class -// TESTED_OBJECTS: MyClass$Default +// TESTED_OBJECTS: MyClass$Companion // FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_DEPRECATED, ACC_SUPER diff --git a/compiler/testData/writeFlags/class/visibility/private/innerEnum.kt b/compiler/testData/writeFlags/class/visibility/private/innerEnum.kt index 32768434706..9e741f1e400 100644 --- a/compiler/testData/writeFlags/class/visibility/private/innerEnum.kt +++ b/compiler/testData/writeFlags/class/visibility/private/innerEnum.kt @@ -1,4 +1,4 @@ -// NO_FLAGS because we put enum in default object of foo. When it will be fixed - MyClass should have ACC_PRIVATE flag +// NO_FLAGS because we put enum in companion object of foo. When it will be fixed - MyClass should have ACC_PRIVATE flag class Foo { private enum class MyClass() { diff --git a/compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt b/compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt index 98cf104d973..7db0e803903 100644 --- a/compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt +++ b/compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt @@ -2,7 +2,7 @@ class Foo { {Foo.test()} - default object { + companion object { private fun test() { } @@ -10,5 +10,5 @@ class Foo { } // TESTED_OBJECT_KIND: function -// TESTED_OBJECTS: Foo$Default, test +// TESTED_OBJECTS: Foo$Companion, test // FLAGS: ACC_PRIVATE, ACC_FINAL \ No newline at end of file diff --git a/compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt b/compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt index fa0dcac320d..19cc387a84e 100644 --- a/compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt +++ b/compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt @@ -2,11 +2,11 @@ class Foo { {Foo.test} - default object { + companion object { private val test = "String" } } // TESTED_OBJECT_KIND: function -// TESTED_OBJECTS: Foo$Default, getTest +// TESTED_OBJECTS: Foo$Companion, getTest // FLAGS: ACC_PRIVATE, ACC_FINAL \ No newline at end of file diff --git a/compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt b/compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt index 7c3368ebf6f..a22eefa5b65 100644 --- a/compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt +++ b/compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt @@ -2,11 +2,11 @@ class Foo { {Foo.test} - default object { + companion object { private var test = "String" } } // TESTED_OBJECT_KIND: function -// TESTED_OBJECTS: Foo$Default, setTest +// TESTED_OBJECTS: Foo$Companion, setTest // FLAGS: ACC_PRIVATE, ACC_FINAL \ No newline at end of file diff --git a/compiler/testData/writeFlags/function/constructors/classObject.kt b/compiler/testData/writeFlags/function/constructors/classObject.kt index c514b0ec93f..17a1b46110d 100644 --- a/compiler/testData/writeFlags/function/constructors/classObject.kt +++ b/compiler/testData/writeFlags/function/constructors/classObject.kt @@ -1,8 +1,8 @@ class Foo { - default object { + companion object { } } // TESTED_OBJECT_KIND: function -// TESTED_OBJECTS: Foo$Default, +// TESTED_OBJECTS: Foo$Companion, // FLAGS: ACC_PRIVATE diff --git a/compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt b/compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt index b7cfa214485..a2ccd17a383 100644 --- a/compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt +++ b/compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt @@ -1,9 +1,9 @@ class MyClass() { - default object { + companion object { deprecated("") fun test() {} } } // TESTED_OBJECT_KIND: function -// TESTED_OBJECTS: MyClass$Default, test +// TESTED_OBJECTS: MyClass$Companion, test // FLAGS: ACC_DEPRECATED, ACC_PUBLIC, ACC_FINAL diff --git a/compiler/testData/writeFlags/innerClass/visibility/internalClassObject.kt b/compiler/testData/writeFlags/innerClass/visibility/internalClassObject.kt index 8ba9b044696..7146343aaca 100644 --- a/compiler/testData/writeFlags/innerClass/visibility/internalClassObject.kt +++ b/compiler/testData/writeFlags/innerClass/visibility/internalClassObject.kt @@ -1,8 +1,8 @@ class Foo { - default object { + companion object { } } // TESTED_OBJECT_KIND: innerClass -// TESTED_OBJECTS: Foo, Default +// TESTED_OBJECTS: Foo, Companion // FLAGS: ACC_FINAL, ACC_PUBLIC, ACC_STATIC diff --git a/compiler/testData/writeFlags/innerClass/visibility/privateClassObject.kt b/compiler/testData/writeFlags/innerClass/visibility/privateClassObject.kt index 91ff8272db8..d366ef202c6 100644 --- a/compiler/testData/writeFlags/innerClass/visibility/privateClassObject.kt +++ b/compiler/testData/writeFlags/innerClass/visibility/privateClassObject.kt @@ -1,8 +1,8 @@ class Foo { - private default object { + private companion object { } } // TESTED_OBJECT_KIND: innerClass -// TESTED_OBJECTS: Foo, Default +// TESTED_OBJECTS: Foo, Companion // FLAGS: ACC_FINAL, ACC_PRIVATE, ACC_STATIC diff --git a/compiler/testData/writeFlags/innerClass/visibility/publicClassObject.kt b/compiler/testData/writeFlags/innerClass/visibility/publicClassObject.kt index e4370e33357..0a2f9e04750 100644 --- a/compiler/testData/writeFlags/innerClass/visibility/publicClassObject.kt +++ b/compiler/testData/writeFlags/innerClass/visibility/publicClassObject.kt @@ -1,8 +1,8 @@ class Foo { - public default object { + public companion object { } } // TESTED_OBJECT_KIND: innerClass -// TESTED_OBJECTS: Foo, Default +// TESTED_OBJECTS: Foo, Companion // FLAGS: ACC_FINAL, ACC_PUBLIC, ACC_STATIC diff --git a/compiler/testData/writeFlags/property/classObject/class/delegatedProtectedVar.kt b/compiler/testData/writeFlags/property/classObject/class/delegatedProtectedVar.kt index 81cd603aeeb..25210dc1442 100644 --- a/compiler/testData/writeFlags/property/classObject/class/delegatedProtectedVar.kt +++ b/compiler/testData/writeFlags/property/classObject/class/delegatedProtectedVar.kt @@ -10,7 +10,7 @@ class TestDelegate() { class Test { - default object { + companion object { protected var prop: Int by TestDelegate() } } @@ -20,11 +20,11 @@ class Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop$delegate +// TESTED_OBJECTS: Test$Companion, prop$delegate // ABSENT: TRUE // TESTED_OBJECT_KIND: property diff --git a/compiler/testData/writeFlags/property/classObject/class/delegatedPublicVal.kt b/compiler/testData/writeFlags/property/classObject/class/delegatedPublicVal.kt index 721f0946d01..72b879a91a7 100644 --- a/compiler/testData/writeFlags/property/classObject/class/delegatedPublicVal.kt +++ b/compiler/testData/writeFlags/property/classObject/class/delegatedPublicVal.kt @@ -5,7 +5,7 @@ class TestDelegate() { } class Test { - default object { + companion object { public val prop: Int by TestDelegate() } } @@ -15,11 +15,11 @@ class Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop$delegate +// TESTED_OBJECTS: Test$Companion, prop$delegate // ABSENT: TRUE // TESTED_OBJECT_KIND: property diff --git a/compiler/testData/writeFlags/property/classObject/class/internalVal.kt b/compiler/testData/writeFlags/property/classObject/class/internalVal.kt index 2af5820bd0d..e82c7ae752f 100644 --- a/compiler/testData/writeFlags/property/classObject/class/internalVal.kt +++ b/compiler/testData/writeFlags/property/classObject/class/internalVal.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { var prop: Int = 0; } } @@ -9,5 +9,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PUBLIC // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE diff --git a/compiler/testData/writeFlags/property/classObject/class/internalVar.kt b/compiler/testData/writeFlags/property/classObject/class/internalVar.kt index 2af5820bd0d..e82c7ae752f 100644 --- a/compiler/testData/writeFlags/property/classObject/class/internalVar.kt +++ b/compiler/testData/writeFlags/property/classObject/class/internalVar.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { var prop: Int = 0; } } @@ -9,5 +9,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PUBLIC // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE diff --git a/compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt index cc41c55f11b..5eb2e7e2702 100644 --- a/compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { var prop: Int = 0 private set } @@ -10,5 +10,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PRIVATE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/class/noBackingField.kt b/compiler/testData/writeFlags/property/classObject/class/noBackingField.kt index e6dda375ee8..a6f22881003 100644 --- a/compiler/testData/writeFlags/property/classObject/class/noBackingField.kt +++ b/compiler/testData/writeFlags/property/classObject/class/noBackingField.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { var prop: Int get() { return 10 @@ -15,5 +15,5 @@ class Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE diff --git a/compiler/testData/writeFlags/property/classObject/class/privateVal.kt b/compiler/testData/writeFlags/property/classObject/class/privateVal.kt index c33450e9c02..8d7e2596133 100644 --- a/compiler/testData/writeFlags/property/classObject/class/privateVal.kt +++ b/compiler/testData/writeFlags/property/classObject/class/privateVal.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { private val prop = 0; } } @@ -9,5 +9,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PRIVATE, ACC_FINAL // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/class/privateVar.kt b/compiler/testData/writeFlags/property/classObject/class/privateVar.kt index fcbdc67f551..63179ef97e9 100644 --- a/compiler/testData/writeFlags/property/classObject/class/privateVar.kt +++ b/compiler/testData/writeFlags/property/classObject/class/privateVar.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { private var prop = 0; } } @@ -9,5 +9,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PRIVATE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/class/protectedVal.kt b/compiler/testData/writeFlags/property/classObject/class/protectedVal.kt index 729667b95c9..273672263a7 100644 --- a/compiler/testData/writeFlags/property/classObject/class/protectedVal.kt +++ b/compiler/testData/writeFlags/property/classObject/class/protectedVal.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { protected val prop: Int = 0; } } @@ -9,5 +9,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PROTECTED, ACC_FINAL // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt index d620609491c..bab2cc582d1 100644 --- a/compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { protected var prop: Int = 0 private set } @@ -10,5 +10,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PRIVATE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE diff --git a/compiler/testData/writeFlags/property/classObject/class/publicVal.kt b/compiler/testData/writeFlags/property/classObject/class/publicVal.kt index 49090eb22db..aa800315716 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicVal.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicVal.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { public val prop: Int = 0; } } @@ -9,5 +9,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt b/compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt index 5a2fc673ae3..4d4326198d7 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { public val prop: Int = 0 get() { return $prop @@ -12,5 +12,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PRIVATE, ACC_FINAL // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/class/publicVar.kt b/compiler/testData/writeFlags/property/classObject/class/publicVar.kt index 6d1a2988d08..24875986f47 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicVar.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicVar.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { public var prop: Int = 0; } } @@ -9,5 +9,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PUBLIC // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt b/compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt index de7f4f19da0..8b805854a9c 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { public var prop: Int = 0 set(i : Int) { $prop = i @@ -12,5 +12,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PRIVATE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt index f9be8e26c07..4e4da195e44 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { public var prop: Int = 0 private set } @@ -10,5 +10,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PRIVATE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt b/compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt index dc60da36bf7..d15356aa56b 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { public var prop: Int = 0 protected set } @@ -10,5 +10,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PROTECTED // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt b/compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt index 5dab1594050..0c97bb5b99d 100644 --- a/compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt +++ b/compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { public var prop: Int = 0 public set } @@ -10,5 +10,5 @@ class Test { // FLAGS: ACC_STATIC, ACC_PUBLIC // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE diff --git a/compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt b/compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt index 4edd53208bc..432f20b1c24 100644 --- a/compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt +++ b/compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt @@ -1,6 +1,6 @@ class Test(val prop: String) { - default object { + companion object { public val prop : String = "CO"; } diff --git a/compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt b/compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt index 6d311ad5451..4229b8d5418 100644 --- a/compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt +++ b/compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt @@ -17,7 +17,7 @@ class Test { public val prop: Int by TestDelegate({10}) - default object { + companion object { public var prop: Int by TestDelegate({10}) } } diff --git a/compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt b/compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt index 89e55737922..4ee5c2cd433 100644 --- a/compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt +++ b/compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt @@ -17,7 +17,7 @@ class Test { public var prop: String = "" - default object { + companion object { public var prop: Int by TestDelegate({10}) } } diff --git a/compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt b/compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt index 1aa85241b47..b0da149404d 100644 --- a/compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt +++ b/compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt @@ -2,7 +2,7 @@ class Test { public var prop: Int = 0; - default object { + companion object { public val prop: Int = 0; } } diff --git a/compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt b/compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt index bf9c75b89fd..f6f8a7bd43d 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt @@ -9,7 +9,7 @@ class TestDelegate() { } trait Test { - default object { + companion object { protected var prop: Int by TestDelegate() } } @@ -19,11 +19,11 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop$delegate +// TESTED_OBJECTS: Test$Companion, prop$delegate // FLAGS: ACC_FINAL, ACC_PRIVATE // TESTED_OBJECT_KIND: property diff --git a/compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt b/compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt index 3f215c26bec..a5e20461659 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt @@ -5,7 +5,7 @@ class TestDelegate() { } trait Test { - default object { + companion object { public val prop: Int by TestDelegate() } } @@ -15,11 +15,11 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop$delegate +// TESTED_OBJECTS: Test$Companion, prop$delegate // FLAGS: ACC_FINAL, ACC_PRIVATE // TESTED_OBJECT_KIND: property diff --git a/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt b/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt index fe9a4588f8e..5e683811d47 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/internalVal.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { val prop: Int = 0; } } @@ -9,5 +9,5 @@ trait Test { // FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE, ACC_FINAL \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt b/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt index 055c6297d55..e702feafe76 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/internalVar.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { var prop: Int = 0; } } @@ -9,5 +9,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE diff --git a/compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt index d8194f367ef..1e44a6f72c4 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { var prop: Int = 0 private set } @@ -10,5 +10,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/noBackingField.kt b/compiler/testData/writeFlags/property/classObject/trait/noBackingField.kt index 81874d9857b..134974165db 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/noBackingField.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/noBackingField.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { var prop: Int get() { return 10 @@ -15,5 +15,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // ABSENT: TRUE diff --git a/compiler/testData/writeFlags/property/classObject/trait/privateVal.kt b/compiler/testData/writeFlags/property/classObject/trait/privateVal.kt index a1e707f555b..a50ec0ef3ec 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/privateVal.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/privateVal.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { private val prop = 0; } } @@ -9,5 +9,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE, ACC_FINAL \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/privateVar.kt b/compiler/testData/writeFlags/property/classObject/trait/privateVar.kt index 53a6c6e34a1..42cc3f626dc 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/privateVar.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/privateVar.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { private var prop = 0; } } @@ -9,5 +9,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt b/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt index 6ecc2dbb3d1..be22ea7a9ee 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { protected val prop: Int = 0 } } @@ -9,5 +9,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE, ACC_FINAL \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt index 0940cb2553a..01e3ebdb493 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { protected var prop: Int = 0 private set } @@ -10,5 +10,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt index a609b7d6632..8baaed18a9d 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVal.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { public val prop: Int = 0; } } @@ -9,5 +9,5 @@ trait Test { // FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE, ACC_FINAL \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt b/compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt index df0494ffe5f..96426d70215 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { public val prop: Int = 0 get() { return $prop @@ -12,5 +12,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE, ACC_FINAL \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt index 115f77c9890..c7b4c80f4aa 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVar.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { public var prop: Int = 0 } } @@ -9,5 +9,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt index 3b6c04effd1..c906b7d8602 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { public var prop: Int = 0 set(i : Int) { $prop = i @@ -12,5 +12,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt index 57bb8ca63ad..c92e0eb90f2 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { public var prop: Int = 0 private set } @@ -10,5 +10,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE \ No newline at end of file diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt index 2668bf99c5f..fd9db353663 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { public var prop: Int = 0 protected set } @@ -10,5 +10,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE diff --git a/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt b/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt index 369e38a1aa3..b9b73820007 100644 --- a/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt +++ b/compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt @@ -1,5 +1,5 @@ trait Test { - default object { + companion object { public var prop: Int = 0 public set } @@ -10,5 +10,5 @@ trait Test { // ABSENT: TRUE // TESTED_OBJECT_KIND: property -// TESTED_OBJECTS: Test$Default, prop +// TESTED_OBJECTS: Test$Companion, prop // FLAGS: ACC_PRIVATE diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java index 41561652390..106ec265fcb 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java @@ -207,6 +207,6 @@ public class KotlinLightClassCoherenceTest extends KotlinAsJavaTestBase { } public void testClassObject() throws Exception { - doTest("test.WithClassObject." + SpecialNames.DEFAULT_NAME_FOR_DEFAULT_OBJECT.asString()); + doTest("test.WithClassObject." + SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT.asString()); } } diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java index c70719ad3e0..fd090f9b4f5 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java @@ -140,7 +140,7 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase } public void testInClassObjectActual() throws Exception { - checkMethodGenericParameter("test.PlatformStaticClass." + SpecialNames.DEFAULT_NAME_FOR_DEFAULT_OBJECT.asString(), "inClassObject", 0, "T"); + checkMethodGenericParameter("test.PlatformStaticClass." + SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT.asString(), "inClassObject", 0, "T"); } public void testInClass() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java index e3f60804352..e6921b39d03 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java @@ -144,8 +144,8 @@ public class ClassGenTest extends CodegenTestCase { loadFile("classes/classObjectIsInnerClass.kt"); GeneratedClassLoader loader = generateAndCreateClassLoader(); Class a = loader.loadClass("A"); - Class defaultObject = loader.loadClass("A$" + SpecialNames.DEFAULT_NAME_FOR_DEFAULT_OBJECT.asString()); - assertSameElements(a.getDeclaredClasses(), defaultObject); - assertEquals(a, defaultObject.getDeclaringClass()); + Class companionObject = loader.loadClass("A$" + SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT.asString()); + assertSameElements(a.getDeclaredClasses(), companionObject); + assertEquals(a, companionObject.getDeclaringClass()); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java index 704c660bf02..f63667e92ea 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java @@ -44,14 +44,14 @@ public class InnerClassInfoGenTest extends CodegenTestCase { public void testInnerClassInfo() { InnerClassAttribute innerB = new InnerClassAttribute("A$B", "A", "B", ACC_PUBLIC | ACC_STATIC | ACC_FINAL); InnerClassAttribute innerC = new InnerClassAttribute("A$B$C", "A$B", "C", ACC_PUBLIC | ACC_FINAL); - String defaultObjectDefaultName = SpecialNames.DEFAULT_NAME_FOR_DEFAULT_OBJECT.asString(); - InnerClassAttribute innerADefaultObject = new InnerClassAttribute( - "A$" + defaultObjectDefaultName, "A", defaultObjectDefaultName, ACC_PUBLIC | ACC_STATIC | ACC_FINAL); + String companionObjectDefaultName = SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT.asString(); + InnerClassAttribute innerACompanionObject = new InnerClassAttribute( + "A$" + companionObjectDefaultName, "A", companionObjectDefaultName, ACC_PUBLIC | ACC_STATIC | ACC_FINAL); - extractAndCompareInnerClasses("A", innerB, innerADefaultObject); + extractAndCompareInnerClasses("A", innerB, innerACompanionObject); extractAndCompareInnerClasses("A$B", innerB, innerC); extractAndCompareInnerClasses("A$B$C", innerB, innerC); - extractAndCompareInnerClasses("A$" + defaultObjectDefaultName, innerADefaultObject); + extractAndCompareInnerClasses("A$" + companionObjectDefaultName, innerACompanionObject); } public void testLocalClass() { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java index 3db18635941..cd9fafa88d9 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java @@ -44,7 +44,7 @@ public class OuterClassGenTest extends CodegenTestCase { } public void testClassObject() throws Exception { - doTest("foo.Foo$" + SpecialNames.DEFAULT_NAME_FOR_DEFAULT_OBJECT.asString(), "outerClassInfo"); + doTest("foo.Foo$" + SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT.asString(), "outerClassInfo"); } public void testInnerClass() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java index 689ec66c970..33560155b15 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java @@ -248,7 +248,7 @@ public class PropertyGenTest extends CodegenTestCase { findDeclaredMethodByName(c, "getExtension"); findDeclaredMethodByName(c, "setExtension"); - findDeclaredMethodByName(initializedClassLoader.loadClass("C$" + SpecialNames.DEFAULT_NAME_FOR_DEFAULT_OBJECT.asString()), "getClassObjectVal"); + findDeclaredMethodByName(initializedClassLoader.loadClass("C$" + SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT.asString()), "getClassObjectVal"); assertNull("Property should not have a getter", findDeclaredMethodByNameOrNull(c, "getVarNoAccessors")); assertNull("Property should not have a setter", findDeclaredMethodByNameOrNull(c, "setVarNoAccessors")); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index aad590c056b..fa21943e785 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -48,7 +48,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.zip.ZipOutputStream; -import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonDefaultObject; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isObject; import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile; diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index 7455c3eb214..2803c94b8a8 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -45,7 +45,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonDefaultObject; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonCompanionObject; public abstract class AbstractAnnotationDescriptorResolveTest extends JetLiteFixture { private static final DescriptorRenderer WITH_ANNOTATION_ARGUMENT_TYPES = new DescriptorRendererBuilder() @@ -77,9 +77,9 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends JetLiteFix ClassDescriptor myClass = getClassDescriptor(testPackage, "MyClass"); checkDescriptor(expectedAnnotation, myClass); - ClassDescriptor defaultObjectDescriptor = myClass.getDefaultObjectDescriptor(); - assert defaultObjectDescriptor != null : "Cannot find default object for class " + myClass.getName(); - checkDescriptor(expectedAnnotation, defaultObjectDescriptor); + ClassDescriptor companionObjectDescriptor = myClass.getCompanionObjectDescriptor(); + assert companionObjectDescriptor != null : "Cannot find companion object for class " + myClass.getName(); + checkDescriptor(expectedAnnotation, companionObjectDescriptor); checkDescriptor(expectedAnnotation, getInnerClassDescriptor(myClass, "InnerClass")); FunctionDescriptor foo = getFunctionDescriptor(myClass, "foo"); @@ -230,7 +230,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends JetLiteFix @NotNull private ClassDescriptor getLocalObjectDescriptor(@NotNull String name) { ClassDescriptor localClassDescriptor = getLocalClassDescriptor(name); - if (isNonDefaultObject(localClassDescriptor)) { + if (isNonCompanionObject(localClassDescriptor)) { return localClassDescriptor; } diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java index 4b72d2a31d4..11acd536584 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java @@ -9283,23 +9283,23 @@ public final class DebugProtoBuf { */ int getFqName(); - // optional int32 default_object_name = 4; + // optional int32 companion_object_name = 4; /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 

-     * If this field is present, it contains the name of default object.
+     * If this field is present, it contains the name of companion object.
      *
*/ - boolean hasDefaultObjectName(); + boolean hasCompanionObjectName(); /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-     * If this field is present, it contains the name of default object.
+     * If this field is present, it contains the name of companion object.
      *
*/ - int getDefaultObjectName(); + int getCompanionObjectName(); // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5; /** @@ -9533,7 +9533,7 @@ public final class DebugProtoBuf { } case 32: { bitField0_ |= 0x00000004; - defaultObjectName_ = input.readInt32(); + companionObjectName_ = input.readInt32(); break; } case 42: { @@ -10460,28 +10460,28 @@ public final class DebugProtoBuf { return fqName_; } - // optional int32 default_object_name = 4; - public static final int DEFAULT_OBJECT_NAME_FIELD_NUMBER = 4; - private int defaultObjectName_; + // optional int32 companion_object_name = 4; + public static final int COMPANION_OBJECT_NAME_FIELD_NUMBER = 4; + private int companionObjectName_; /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-     * If this field is present, it contains the name of default object.
+     * If this field is present, it contains the name of companion object.
      *
*/ - public boolean hasDefaultObjectName() { + public boolean hasCompanionObjectName() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-     * If this field is present, it contains the name of default object.
+     * If this field is present, it contains the name of companion object.
      *
*/ - public int getDefaultObjectName() { - return defaultObjectName_; + public int getCompanionObjectName() { + return companionObjectName_; } // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5; @@ -10726,7 +10726,7 @@ public final class DebugProtoBuf { private void initFields() { flags_ = 0; fqName_ = 0; - defaultObjectName_ = 0; + companionObjectName_ = 0; typeParameter_ = java.util.Collections.emptyList(); supertype_ = java.util.Collections.emptyList(); nestedClassName_ = java.util.Collections.emptyList(); @@ -10795,7 +10795,7 @@ public final class DebugProtoBuf { output.writeInt32(3, fqName_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeInt32(4, defaultObjectName_); + output.writeInt32(4, companionObjectName_); } for (int i = 0; i < typeParameter_.size(); i++) { output.writeMessage(5, typeParameter_.get(i)); @@ -10838,7 +10838,7 @@ public final class DebugProtoBuf { } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(4, defaultObjectName_); + .computeInt32Size(4, companionObjectName_); } for (int i = 0; i < typeParameter_.size(); i++) { size += com.google.protobuf.CodedOutputStream @@ -11004,7 +11004,7 @@ public final class DebugProtoBuf { bitField0_ = (bitField0_ & ~0x00000001); fqName_ = 0; bitField0_ = (bitField0_ & ~0x00000002); - defaultObjectName_ = 0; + companionObjectName_ = 0; bitField0_ = (bitField0_ & ~0x00000004); if (typeParameterBuilder_ == null) { typeParameter_ = java.util.Collections.emptyList(); @@ -11079,7 +11079,7 @@ public final class DebugProtoBuf { if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.defaultObjectName_ = defaultObjectName_; + result.companionObjectName_ = companionObjectName_; if (typeParameterBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008)) { typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); @@ -11156,8 +11156,8 @@ public final class DebugProtoBuf { if (other.hasFqName()) { setFqName(other.getFqName()); } - if (other.hasDefaultObjectName()) { - setDefaultObjectName(other.getDefaultObjectName()); + if (other.hasCompanionObjectName()) { + setCompanionObjectName(other.getCompanionObjectName()); } if (typeParameterBuilder_ == null) { if (!other.typeParameter_.isEmpty()) { @@ -11454,51 +11454,51 @@ public final class DebugProtoBuf { return this; } - // optional int32 default_object_name = 4; - private int defaultObjectName_ ; + // optional int32 companion_object_name = 4; + private int companionObjectName_ ; /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-       * If this field is present, it contains the name of default object.
+       * If this field is present, it contains the name of companion object.
        *
*/ - public boolean hasDefaultObjectName() { + public boolean hasCompanionObjectName() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-       * If this field is present, it contains the name of default object.
+       * If this field is present, it contains the name of companion object.
        *
*/ - public int getDefaultObjectName() { - return defaultObjectName_; + public int getCompanionObjectName() { + return companionObjectName_; } /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-       * If this field is present, it contains the name of default object.
+       * If this field is present, it contains the name of companion object.
        *
*/ - public Builder setDefaultObjectName(int value) { + public Builder setCompanionObjectName(int value) { bitField0_ |= 0x00000004; - defaultObjectName_ = value; + companionObjectName_ = value; onChanged(); return this; } /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-       * If this field is present, it contains the name of default object.
+       * If this field is present, it contains the name of companion object.
        *
*/ - public Builder clearDefaultObjectName() { + public Builder clearCompanionObjectName() { bitField0_ = (bitField0_ & ~0x00000004); - defaultObjectName_ = 0; + companionObjectName_ = 0; onChanged(); return this; } @@ -16964,48 +16964,49 @@ public final class DebugProtoBuf { "brains.kotlin.serialization.TypeParamete" + "r.Variance:\003INV\022=\n\013upper_bound\030\005 \003(\0132(.o", "rg.jetbrains.kotlin.serialization.Type\"$" + - "\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\257\005\n" + + "\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\261\005\n" + "\005Class\022\020\n\005flags\030\001 \001(\005:\0010\022\017\n\007fq_name\030\003 \002(" + - "\005\022\033\n\023default_object_name\030\004 \001(\005\022I\n\016type_p" + - "arameter\030\005 \003(\01321.org.jetbrains.kotlin.se" + - "rialization.TypeParameter\022;\n\tsupertype\030\006" + - " \003(\0132(.org.jetbrains.kotlin.serializatio" + - "n.Type\022\031\n\021nested_class_name\030\007 \003(\005\022<\n\006mem" + - "ber\030\013 \003(\0132,.org.jetbrains.kotlin.seriali" + - "zation.Callable\022\022\n\nenum_entry\030\014 \003(\005\022Y\n\023p", - "rimary_constructor\030\r \001(\0132<.org.jetbrains" + - ".kotlin.serialization.Class.PrimaryConst" + - "ructor\022K\n\025secondary_constructor\030\016 \003(\0132,." + - "org.jetbrains.kotlin.serialization.Calla" + - "ble\032P\n\022PrimaryConstructor\022:\n\004data\030\001 \001(\0132" + + "\005\022\035\n\025companion_object_name\030\004 \001(\005\022I\n\016type" + + "_parameter\030\005 \003(\01321.org.jetbrains.kotlin." + + "serialization.TypeParameter\022;\n\tsupertype" + + "\030\006 \003(\0132(.org.jetbrains.kotlin.serializat" + + "ion.Type\022\031\n\021nested_class_name\030\007 \003(\005\022<\n\006m" + + "ember\030\013 \003(\0132,.org.jetbrains.kotlin.seria" + + "lization.Callable\022\022\n\nenum_entry\030\014 \003(\005\022Y\n", + "\023primary_constructor\030\r \001(\0132<.org.jetbrai" + + "ns.kotlin.serialization.Class.PrimaryCon" + + "structor\022K\n\025secondary_constructor\030\016 \003(\0132" + ",.org.jetbrains.kotlin.serialization.Cal" + - "lable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022\016\n\nE" + - "NUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTATIO" + - "N_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJECT\020\006*" + - "\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(\0132,.org.", - "jetbrains.kotlin.serialization.Callable*" + - "\005\010d\020\310\001\"\300\005\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\024\n\014ge" + - "tter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005\022I" + - "\n\016type_parameter\030\004 \003(\01321.org.jetbrains.k" + - "otlin.serialization.TypeParameter\022?\n\rrec" + - "eiver_type\030\005 \001(\0132(.org.jetbrains.kotlin." + - "serialization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017valu" + - "e_parameter\030\007 \003(\0132;.org.jetbrains.kotlin" + - ".serialization.Callable.ValueParameter\022=" + - "\n\013return_type\030\010 \002(\0132(.org.jetbrains.kotl", - "in.serialization.Type\032\263\001\n\016ValueParameter" + - "\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004type\030\003 " + - "\002(\0132(.org.jetbrains.kotlin.serialization" + - ".Type\022E\n\023vararg_element_type\030\004 \001(\0132(.org" + - ".jetbrains.kotlin.serialization.Type*\005\010d" + - "\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFA" + - "KE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHES" + - "IZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VAL\020\001" + - "\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010Mod" + - "ality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002", - "*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVATE\020" + - "\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVATE_" + - "TO_THIS\020\004\022\t\n\005LOCAL\020\005B\022B\rDebugProtoBuf\210\001\000" + "lable\032P\n\022PrimaryConstructor\022:\n\004data\030\001 \001(" + + "\0132,.org.jetbrains.kotlin.serialization.C" + + "allable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022\016\n" + + "\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTAT" + + "ION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJECT\020" + + "\006*\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(\0132,.or", + "g.jetbrains.kotlin.serialization.Callabl" + + "e*\005\010d\020\310\001\"\300\005\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\024\n\014" + + "getter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005" + + "\022I\n\016type_parameter\030\004 \003(\01321.org.jetbrains" + + ".kotlin.serialization.TypeParameter\022?\n\rr" + + "eceiver_type\030\005 \001(\0132(.org.jetbrains.kotli" + + "n.serialization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017va" + + "lue_parameter\030\007 \003(\0132;.org.jetbrains.kotl" + + "in.serialization.Callable.ValueParameter" + + "\022=\n\013return_type\030\010 \002(\0132(.org.jetbrains.ko", + "tlin.serialization.Type\032\263\001\n\016ValueParamet" + + "er\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004type\030" + + "\003 \002(\0132(.org.jetbrains.kotlin.serializati" + + "on.Type\022E\n\023vararg_element_type\030\004 \001(\0132(.o" + + "rg.jetbrains.kotlin.serialization.Type*\005" + + "\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n\r" + + "FAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTH" + + "ESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VAL" + + "\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010M" + + "odality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT", + "\020\002*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVAT" + + "E\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVAT" + + "E_TO_THIS\020\004\022\t\n\005LOCAL\020\005B\022B\rDebugProtoBuf\210" + + "\001\000" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -17077,7 +17078,7 @@ public final class DebugProtoBuf { internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_org_jetbrains_kotlin_serialization_Class_descriptor, - new java.lang.String[] { "Flags", "FqName", "DefaultObjectName", "TypeParameter", "Supertype", "NestedClassName", "Member", "EnumEntry", "PrimaryConstructor", "SecondaryConstructor", }); + new java.lang.String[] { "Flags", "FqName", "CompanionObjectName", "TypeParameter", "Supertype", "NestedClassName", "Member", "EnumEntry", "PrimaryConstructor", "SecondaryConstructor", }); internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor = internal_static_org_jetbrains_kotlin_serialization_Class_descriptor.getNestedTypes().get(0); internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable = new diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java index 2a5475b0d10..6b54f144ad8 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java @@ -1762,7 +1762,7 @@ public final class DebugJvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-     * True iff this field is a backing field for a default object and is really present as a static
+     * True iff this field is a backing field for a companion object and is really present as a static
      * field in the outer class, not as an instance field here
      *
*/ @@ -1771,7 +1771,7 @@ public final class DebugJvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-     * True iff this field is a backing field for a default object and is really present as a static
+     * True iff this field is a backing field for a companion object and is really present as a static
      * field in the outer class, not as an instance field here
      *
*/ @@ -1936,7 +1936,7 @@ public final class DebugJvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-     * True iff this field is a backing field for a default object and is really present as a static
+     * True iff this field is a backing field for a companion object and is really present as a static
      * field in the outer class, not as an instance field here
      *
*/ @@ -1947,7 +1947,7 @@ public final class DebugJvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-     * True iff this field is a backing field for a default object and is really present as a static
+     * True iff this field is a backing field for a companion object and is really present as a static
      * field in the outer class, not as an instance field here
      *
*/ @@ -2397,7 +2397,7 @@ public final class DebugJvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-       * True iff this field is a backing field for a default object and is really present as a static
+       * True iff this field is a backing field for a companion object and is really present as a static
        * field in the outer class, not as an instance field here
        *
*/ @@ -2408,7 +2408,7 @@ public final class DebugJvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-       * True iff this field is a backing field for a default object and is really present as a static
+       * True iff this field is a backing field for a companion object and is really present as a static
        * field in the outer class, not as an instance field here
        *
*/ @@ -2419,7 +2419,7 @@ public final class DebugJvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-       * True iff this field is a backing field for a default object and is really present as a static
+       * True iff this field is a backing field for a companion object and is really present as a static
        * field in the outer class, not as an instance field here
        *
*/ @@ -2433,7 +2433,7 @@ public final class DebugJvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-       * True iff this field is a backing field for a default object and is really present as a static
+       * True iff this field is a backing field for a companion object and is really present as a static
        * field in the outer class, not as an instance field here
        *
*/ diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java b/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java index 16f30f1fd0d..73c63c984ff 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java @@ -263,9 +263,9 @@ public class DescriptorValidator { } } - ClassDescriptor defaultObjectDescriptor = descriptor.getDefaultObjectDescriptor(); - if (defaultObjectDescriptor != null && !defaultObjectDescriptor.isDefaultObject()) { - report(collector, defaultObjectDescriptor, "Default object should be marked as such"); + ClassDescriptor companionObjectDescriptor = descriptor.getCompanionObjectDescriptor(); + if (companionObjectDescriptor != null && !companionObjectDescriptor.isCompanionObject()) { + report(collector, companionObjectDescriptor, "Companion object should be marked as such"); } return true; diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java index b09ab289b9e..3aa70bfaafb 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java @@ -47,7 +47,7 @@ public final class JvmAbi { //TODO: To be removed after kotlin M11 @Deprecated - public static final String DEPRECATED_DEFAULT_OBJECT_FIELD = "OBJECT$"; + public static final String DEPRECATED_COMPANION_OBJECT_FIELD = "OBJECT$"; @NotNull public static String getSyntheticMethodNameForAnnotatedProperty(@NotNull Name propertyName) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt index 5309e2d1469..a6e7956aebc 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt @@ -85,7 +85,7 @@ class LazyJavaClassDescriptor( override fun getUnsubstitutedPrimaryConstructor(): ConstructorDescriptor? = null - override fun getDefaultObjectDescriptor(): ClassDescriptor? = null + override fun getCompanionObjectDescriptor(): ClassDescriptor? = null override fun getConstructors() = scopeForMemberLookup.constructors() @@ -100,7 +100,7 @@ class LazyJavaClassDescriptor( override fun getFunctionTypeForSamInterface(): JetType? = functionTypeForSamInterface() - override fun isDefaultObject() = false + override fun isCompanionObject() = false override fun toString() = "lazy java class $fqName" diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt index 5ae2893e957..fdd2872c58d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt @@ -159,7 +159,7 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader> enumMemberNames; /** - * Creates and initializes descriptors for enum entry with the given name and its default object + * Creates and initializes descriptors for enum entry with the given name and its companion object * @param enumMemberNames needed for fake overrides resolution */ @NotNull @@ -115,7 +115,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase { @Nullable @Override - public ClassDescriptor getDefaultObjectDescriptor() { + public ClassDescriptor getCompanionObjectDescriptor() { return null; } @@ -143,7 +143,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase { } @Override - public boolean isDefaultObject() { + public boolean isCompanionObject() { return false; } @@ -219,7 +219,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase { @NotNull private JetScope getSupertypeScope() { Collection supertype = getTypeConstructor().getSupertypes(); - assert supertype.size() == 1 : "Enum entry and its default object both should have exactly one supertype: " + supertype; + assert supertype.size() == 1 : "Enum entry and its companion object both should have exactly one supertype: " + supertype; return supertype.iterator().next().getMemberScope(); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java index a4f32e50b90..e475ea116a6 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java @@ -169,8 +169,8 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor { } @Override - public ClassDescriptor getDefaultObjectDescriptor() { - return original.getDefaultObjectDescriptor(); + public ClassDescriptor getCompanionObjectDescriptor() { + return original.getCompanionObjectDescriptor(); } @NotNull @@ -197,8 +197,8 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor { } @Override - public boolean isDefaultObject() { - return original.isDefaultObject(); + public boolean isCompanionObject() { + return original.isCompanionObject(); } @Override diff --git a/core/descriptors/src/org/jetbrains/kotlin/name/SpecialNames.java b/core/descriptors/src/org/jetbrains/kotlin/name/SpecialNames.java index 79fd98eb123..b2f826fec40 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/name/SpecialNames.java +++ b/core/descriptors/src/org/jetbrains/kotlin/name/SpecialNames.java @@ -23,7 +23,7 @@ public class SpecialNames { public static final Name NO_NAME_PROVIDED = Name.special(""); public static final Name ROOT_PACKAGE = Name.special(""); - public static final Name DEFAULT_NAME_FOR_DEFAULT_OBJECT = Name.identifier("Default"); + public static final Name DEFAULT_NAME_FOR_COMPANION_OBJECT = Name.identifier("Companion"); // This name is used as a key for the case when something has no name _due to a syntactic error_ // Example: fun (x: Int) = 5 diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.java index 12bba7cdf4c..a8f65fec1b1 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.java @@ -53,7 +53,7 @@ public interface DescriptorRenderer extends Renderer { .setWithoutTypeParameters(true) .setWithoutFunctionParameterNames(true) .setReceiverAfterName(true) - .setRenderDefaultObjectName(true) + .setRenderCompanionObjectName(true) .setWithoutSuperTypes(true) .setStartFromName(true).build(); @@ -78,7 +78,7 @@ public interface DescriptorRenderer extends Renderer { DescriptorRenderer HTML_NAMES_WITH_SHORT_TYPES = new DescriptorRendererBuilder() .setWithDefinedIn(false) .setNameShortness(NameShortness.SHORT) - .setRenderDefaultObjectName(true) + .setRenderCompanionObjectName(true) .setTextFormat(TextFormat.HTML).build(); DescriptorRenderer HTML = new DescriptorRendererBuilder().setTextFormat(TextFormat.HTML).build(); diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java index 8f20a742de5..5e9121e1f62 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java @@ -64,7 +64,7 @@ public class DescriptorRendererBuilder { @NotNull private Collection excludedAnnotationClasses = Collections.emptyList(); private boolean receiverAfterName = false; - private boolean renderDefaultObjectName = false; + private boolean renderCompanionObjectName = false; public DescriptorRendererBuilder() { } @@ -201,8 +201,8 @@ public class DescriptorRendererBuilder { } @NotNull - public DescriptorRendererBuilder setRenderDefaultObjectName(boolean renderDefaultObjectName) { - this.renderDefaultObjectName = renderDefaultObjectName; + public DescriptorRendererBuilder setRenderCompanionObjectName(boolean renderCompanionObjectName) { + this.renderCompanionObjectName = renderCompanionObjectName; return this; } @@ -243,7 +243,7 @@ public class DescriptorRendererBuilder { normalizedVisibilities, showInternalKeyword, prettyFunctionTypes, uninferredTypeParameterAsName, overrideRenderingPolicy, valueParametersHandler, textFormat, excludedAnnotationClasses, includePropertyConstant, includeSynthesizedParameterNames, withoutFunctionParameterNames, withoutTypeParameters, receiverAfterName, - renderDefaultObjectName, withoutSuperTypes, typeNormalizer, renderDefaultValues, flexibleTypesForCode, + renderCompanionObjectName, withoutSuperTypes, typeNormalizer, renderDefaultValues, flexibleTypesForCode, secondaryConstructorsAsPrimary); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java index 7c3678c5263..32324e7c74d 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.utils.UtilsPackage; import java.util.*; -import static org.jetbrains.kotlin.resolve.DescriptorUtils.isDefaultObject; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isCompanionObject; import static org.jetbrains.kotlin.types.TypeUtils.CANT_INFER_FUNCTION_PARAM_TYPE; public class DescriptorRendererImpl implements DescriptorRenderer { @@ -63,7 +63,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { private final boolean includeSynthesizedParameterNames; private final boolean withoutFunctionParameterNames; private final boolean withoutTypeParameters; - private final boolean renderDefaultObjectName; + private final boolean renderCompanionObjectName; private final boolean withoutSuperTypes; private final boolean receiverAfterName; private final boolean renderDefaultValues; @@ -102,7 +102,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { boolean withoutFunctionParameterNames, boolean withoutTypeParameters, boolean receiverAfterName, - boolean renderDefaultObjectName, + boolean renderCompanionObjectName, boolean withoutSuperTypes, @NotNull Function1 typeNormalizer, boolean renderDefaultValues, @@ -131,7 +131,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { this.withoutFunctionParameterNames = withoutFunctionParameterNames; this.withoutTypeParameters = withoutTypeParameters; this.receiverAfterName = receiverAfterName; - this.renderDefaultObjectName = renderDefaultObjectName; + this.renderCompanionObjectName = renderCompanionObjectName; this.withoutSuperTypes = withoutSuperTypes; this.typeNormalizer = typeNormalizer; this.renderDefaultValues = renderDefaultValues; @@ -238,10 +238,10 @@ public class DescriptorRendererImpl implements DescriptorRenderer { builder.append(renderName(descriptor.getName())); } - private void renderDefaultObjectName(@NotNull DeclarationDescriptor descriptor, @NotNull StringBuilder builder) { - if (renderDefaultObjectName) { + private void renderCompanionObjectName(@NotNull DeclarationDescriptor descriptor, @NotNull StringBuilder builder) { + if (renderCompanionObjectName) { if (startFromName) { - builder.append("default object"); + builder.append("companion object"); } renderSpaceIfNeeded(builder); DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration(); @@ -958,12 +958,12 @@ public class DescriptorRendererImpl implements DescriptorRenderer { renderClassKindPrefix(klass, builder); } - if (!isDefaultObject(klass)) { + if (!isCompanionObject(klass)) { if (!startFromName) renderSpaceIfNeeded(builder); renderName(klass, builder); } else { - renderDefaultObjectName(klass, builder); + renderCompanionObjectName(klass, builder); } List typeParameters = klass.getTypeConstructor().getParameters(); @@ -1009,8 +1009,8 @@ public class DescriptorRendererImpl implements DescriptorRenderer { @NotNull public static String getClassKindPrefix(@NotNull ClassDescriptor klass) { - if (klass.isDefaultObject()) { - return "default object"; + if (klass.isCompanionObject()) { + return "companion object"; } switch (klass.getKind()) { case CLASS: diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java index a82d0676d32..cd21f7e8adb 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java @@ -193,7 +193,7 @@ public class DescriptorUtils { public static ClassDescriptor getContainingClass(@NotNull DeclarationDescriptor descriptor) { DeclarationDescriptor containing = descriptor.getContainingDeclaration(); while (containing != null) { - if (containing instanceof ClassDescriptor && !isDefaultObject(containing)) { + if (containing instanceof ClassDescriptor && !isCompanionObject(containing)) { return (ClassDescriptor) containing; } containing = containing.getContainingDeclaration(); @@ -253,16 +253,16 @@ public class DescriptorUtils { return descriptor instanceof FunctionExpressionDescriptor; } - public static boolean isDefaultObject(@Nullable DeclarationDescriptor descriptor) { - return isKindOf(descriptor, ClassKind.OBJECT) && ((ClassDescriptor) descriptor).isDefaultObject(); + public static boolean isCompanionObject(@Nullable DeclarationDescriptor descriptor) { + return isKindOf(descriptor, ClassKind.OBJECT) && ((ClassDescriptor) descriptor).isCompanionObject(); } public static boolean isAnonymousObject(@NotNull DeclarationDescriptor descriptor) { return isClass(descriptor) && descriptor.getName().equals(SpecialNames.NO_NAME_PROVIDED); } - public static boolean isNonDefaultObject(@NotNull DeclarationDescriptor descriptor) { - return isKindOf(descriptor, ClassKind.OBJECT) && !((ClassDescriptor) descriptor).isDefaultObject(); + public static boolean isNonCompanionObject(@NotNull DeclarationDescriptor descriptor) { + return isKindOf(descriptor, ClassKind.OBJECT) && !((ClassDescriptor) descriptor).isCompanionObject(); } public static boolean isObject(@NotNull DeclarationDescriptor descriptor) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt index 137bb9ca871..8d1d11a60a8 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.builtins.KotlinBuiltIns -public fun ClassDescriptor.getClassObjectReferenceTarget(): ClassDescriptor = getDefaultObjectDescriptor() ?: this +public fun ClassDescriptor.getClassObjectReferenceTarget(): ClassDescriptor = getCompanionObjectDescriptor() ?: this public fun DeclarationDescriptor.getImportableDescriptor(): DeclarationDescriptor { return when { @@ -67,7 +67,7 @@ public val ClassDescriptor.classObjectDescriptor: ClassDescriptor? assert(container is ClassDescriptor && container.getKind() == ENUM_CLASS) container as ClassDescriptor } - else -> getDefaultObjectDescriptor() + else -> getCompanionObjectDescriptor() } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java index 0d8a572cd7c..5b1d232c011 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java @@ -144,8 +144,8 @@ public class MemberComparator implements Comparator { return class1.getKind().ordinal() - class2.getKind().ordinal(); } - if (class1.isDefaultObject() != class2.isDefaultObject()) { - return class1.isDefaultObject() ? 1 : -1; + if (class1.isCompanionObject() != class2.isCompanionObject()) { + return class1.isCompanionObject() ? 1 : -1; } } else { diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/EnumValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/EnumValue.java index a65bf2945b1..dcbb5b950c3 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/EnumValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/EnumValue.java @@ -32,7 +32,7 @@ public class EnumValue extends CompileTimeConstant { @Override public JetType getType(@NotNull KotlinBuiltIns kotlinBuiltIns) { JetType type = value.getClassObjectType(); - assert type != null : "Enum entry should have a default object: " + value; + assert type != null : "Enum entry should have a companion object: " + value; return type; } diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt index f00247bb806..fd87e26a421 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt @@ -59,10 +59,10 @@ object RuntimeTypeMapper : JavaToKotlinClassMapBuilder() { kotlinFqNameToJvmDesc[DescriptorUtils.getFqNameSafe(kotlinDescriptor)] = jvmDesc jvmDescToKotlinClassId[jvmDesc] = kotlinDescriptor.classId - val defaultObject = kotlinDescriptor.getDefaultObjectDescriptor() - if (defaultObject != null) { + val companionObject = kotlinDescriptor.getCompanionObjectDescriptor() + if (companionObject != null) { // TODO: see org.jetbrains.kotlin.codegen.intrinsics.IntrinsicObjects, extract that logic to core/ - recordMapping(defaultObject, "Lkotlin/jvm/internal/${kotlinDescriptor.getName().asString()}DefaultObject;") + recordMapping(companionObject, "Lkotlin/jvm/internal/${kotlinDescriptor.getName().asString()}CompanionObject;") } } diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/PrimitiveDefaultObjects.kt b/core/runtime.jvm/src/kotlin/jvm/internal/PrimitiveCompanionObjects.kt similarity index 74% rename from core/runtime.jvm/src/kotlin/jvm/internal/PrimitiveDefaultObjects.kt rename to core/runtime.jvm/src/kotlin/jvm/internal/PrimitiveCompanionObjects.kt index 8eeeecd29a0..f037f796695 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/PrimitiveDefaultObjects.kt +++ b/core/runtime.jvm/src/kotlin/jvm/internal/PrimitiveCompanionObjects.kt @@ -16,22 +16,22 @@ package kotlin.jvm.internal -private object DoubleDefaultObject : FloatingPointConstants { +private object DoubleCompanionObject : FloatingPointConstants { override val POSITIVE_INFINITY : Double = java.lang.Double.POSITIVE_INFINITY override val NEGATIVE_INFINITY : Double = java.lang.Double.NEGATIVE_INFINITY override val NaN : Double = java.lang.Double.NaN } -private object FloatDefaultObject : FloatingPointConstants { +private object FloatCompanionObject : FloatingPointConstants { override val POSITIVE_INFINITY : Float = java.lang.Float.POSITIVE_INFINITY override val NEGATIVE_INFINITY : Float = java.lang.Float.NEGATIVE_INFINITY override val NaN : Float = java.lang.Float.NaN } -private object IntDefaultObject {} -private object LongDefaultObject {} -private object ShortDefaultObject {} -private object ByteDefaultObject {} +private object IntCompanionObject {} +private object LongCompanionObject {} +private object ShortCompanionObject {} +private object ByteCompanionObject {} -private object StringDefaultObject {} -private object EnumDefaultObject {} \ No newline at end of file +private object StringCompanionObject {} +private object EnumCompanionObject {} \ No newline at end of file diff --git a/core/serialization.jvm/src/jvm_descriptors.proto b/core/serialization.jvm/src/jvm_descriptors.proto index 2b78dca86d5..c22870ec47e 100644 --- a/core/serialization.jvm/src/jvm_descriptors.proto +++ b/core/serialization.jvm/src/jvm_descriptors.proto @@ -52,7 +52,7 @@ message JvmFieldSignature { required int32 name = 1; required JvmType type = 2; - // True iff this field is a backing field for a default object and is really present as a static + // True iff this field is a backing field for a companion object and is really present as a static // field in the outer class, not as an instance field here optional bool is_static_in_outer = 3 [default = false]; } diff --git a/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java index 007da8dea58..7134a6f8d5f 100644 --- a/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java +++ b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java @@ -1379,7 +1379,7 @@ public final class JvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-     * True iff this field is a backing field for a default object and is really present as a static
+     * True iff this field is a backing field for a companion object and is really present as a static
      * field in the outer class, not as an instance field here
      *
*/ @@ -1388,7 +1388,7 @@ public final class JvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-     * True iff this field is a backing field for a default object and is really present as a static
+     * True iff this field is a backing field for a companion object and is really present as a static
      * field in the outer class, not as an instance field here
      *
*/ @@ -1526,7 +1526,7 @@ public final class JvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-     * True iff this field is a backing field for a default object and is really present as a static
+     * True iff this field is a backing field for a companion object and is really present as a static
      * field in the outer class, not as an instance field here
      *
*/ @@ -1537,7 +1537,7 @@ public final class JvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-     * True iff this field is a backing field for a default object and is really present as a static
+     * True iff this field is a backing field for a companion object and is really present as a static
      * field in the outer class, not as an instance field here
      *
*/ @@ -1880,7 +1880,7 @@ public final class JvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-       * True iff this field is a backing field for a default object and is really present as a static
+       * True iff this field is a backing field for a companion object and is really present as a static
        * field in the outer class, not as an instance field here
        *
*/ @@ -1891,7 +1891,7 @@ public final class JvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-       * True iff this field is a backing field for a default object and is really present as a static
+       * True iff this field is a backing field for a companion object and is really present as a static
        * field in the outer class, not as an instance field here
        *
*/ @@ -1902,7 +1902,7 @@ public final class JvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-       * True iff this field is a backing field for a default object and is really present as a static
+       * True iff this field is a backing field for a companion object and is really present as a static
        * field in the outer class, not as an instance field here
        *
*/ @@ -1916,7 +1916,7 @@ public final class JvmProtoBuf { * optional bool is_static_in_outer = 3 [default = false]; * * 
-       * True iff this field is a backing field for a default object and is really present as a static
+       * True iff this field is a backing field for a companion object and is really present as a static
        * field in the outer class, not as an instance field here
        *
*/ diff --git a/core/serialization/src/descriptors.proto b/core/serialization/src/descriptors.proto index 425158e7db1..757e1f6ea61 100644 --- a/core/serialization/src/descriptors.proto +++ b/core/serialization/src/descriptors.proto @@ -179,8 +179,8 @@ message Class { required int32 fq_name = 3; - // If this field is present, it contains the name of default object. - optional int32 default_object_name = 4; + // If this field is present, it contains the name of companion object. + optional int32 companion_object_name = 4; repeated TypeParameter type_parameter = 5; repeated Type supertype = 6; diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java index a8d8e3dedfc..3b80de41d31 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java @@ -83,7 +83,7 @@ public class DescriptorSerializer { ProtoBuf.Class.Builder builder = ProtoBuf.Class.newBuilder(); int flags = Flags.getClassFlags(hasAnnotations(classDescriptor), classDescriptor.getVisibility(), classDescriptor.getModality(), - classDescriptor.getKind(), classDescriptor.isInner(), classDescriptor.isDefaultObject()); + classDescriptor.getKind(), classDescriptor.isInner(), classDescriptor.isCompanionObject()); builder.setFlags(flags); builder.setFqName(getClassId(classDescriptor)); @@ -133,9 +133,9 @@ public class DescriptorSerializer { } } - ClassDescriptor defaultObjectDescriptor = classDescriptor.getDefaultObjectDescriptor(); - if (defaultObjectDescriptor != null) { - builder.setDefaultObjectName(stringTable.getSimpleNameIndex(defaultObjectDescriptor.getName())); + ClassDescriptor companionObjectDescriptor = classDescriptor.getCompanionObjectDescriptor(); + if (companionObjectDescriptor != null) { + builder.setCompanionObjectName(stringTable.getSimpleNameIndex(companionObjectDescriptor.getName())); } extension.serializeClass(classDescriptor, builder, stringTable); diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java b/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java index ce026f40796..eabf52491cc 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java @@ -74,18 +74,18 @@ public class Flags { Modality modality, ClassKind kind, boolean inner, - boolean isDefaultObject + boolean isCompanionObject ) { return HAS_ANNOTATIONS.toFlags(hasAnnotations) | MODALITY.toFlags(modality(modality)) | VISIBILITY.toFlags(visibility(visibility)) - | CLASS_KIND.toFlags(classKind(kind, isDefaultObject)) + | CLASS_KIND.toFlags(classKind(kind, isCompanionObject)) | INNER.toFlags(inner) ; } - private static ProtoBuf.Class.Kind classKind(ClassKind kind, boolean isDefaultObject) { - if (isDefaultObject) return ProtoBuf.Class.Kind.CLASS_OBJECT; + private static ProtoBuf.Class.Kind classKind(ClassKind kind, boolean isCompanionObject) { + if (isCompanionObject) return ProtoBuf.Class.Kind.CLASS_OBJECT; switch (kind) { case CLASS: diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java index 479edd6a729..226574c94e3 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java @@ -7306,23 +7306,23 @@ public final class ProtoBuf { */ int getFqName(); - // optional int32 default_object_name = 4; + // optional int32 companion_object_name = 4; /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-     * If this field is present, it contains the name of default object.
+     * If this field is present, it contains the name of companion object.
      *
*/ - boolean hasDefaultObjectName(); + boolean hasCompanionObjectName(); /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-     * If this field is present, it contains the name of default object.
+     * If this field is present, it contains the name of companion object.
      *
*/ - int getDefaultObjectName(); + int getCompanionObjectName(); // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5; /** @@ -7500,7 +7500,7 @@ public final class ProtoBuf { } case 32: { bitField0_ |= 0x00000004; - defaultObjectName_ = input.readInt32(); + companionObjectName_ = input.readInt32(); break; } case 42: { @@ -8225,28 +8225,28 @@ public final class ProtoBuf { return fqName_; } - // optional int32 default_object_name = 4; - public static final int DEFAULT_OBJECT_NAME_FIELD_NUMBER = 4; - private int defaultObjectName_; + // optional int32 companion_object_name = 4; + public static final int COMPANION_OBJECT_NAME_FIELD_NUMBER = 4; + private int companionObjectName_; /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-     * If this field is present, it contains the name of default object.
+     * If this field is present, it contains the name of companion object.
      *
*/ - public boolean hasDefaultObjectName() { + public boolean hasCompanionObjectName() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-     * If this field is present, it contains the name of default object.
+     * If this field is present, it contains the name of companion object.
      *
*/ - public int getDefaultObjectName() { - return defaultObjectName_; + public int getCompanionObjectName() { + return companionObjectName_; } // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5; @@ -8481,7 +8481,7 @@ public final class ProtoBuf { private void initFields() { flags_ = 0; fqName_ = 0; - defaultObjectName_ = 0; + companionObjectName_ = 0; typeParameter_ = java.util.Collections.emptyList(); supertype_ = java.util.Collections.emptyList(); nestedClassName_ = java.util.Collections.emptyList(); @@ -8550,7 +8550,7 @@ public final class ProtoBuf { output.writeInt32(3, fqName_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeInt32(4, defaultObjectName_); + output.writeInt32(4, companionObjectName_); } for (int i = 0; i < typeParameter_.size(); i++) { output.writeMessage(5, typeParameter_.get(i)); @@ -8592,7 +8592,7 @@ public final class ProtoBuf { } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(4, defaultObjectName_); + .computeInt32Size(4, companionObjectName_); } for (int i = 0; i < typeParameter_.size(); i++) { size += com.google.protobuf.CodedOutputStream @@ -8727,7 +8727,7 @@ public final class ProtoBuf { bitField0_ = (bitField0_ & ~0x00000001); fqName_ = 0; bitField0_ = (bitField0_ & ~0x00000002); - defaultObjectName_ = 0; + companionObjectName_ = 0; bitField0_ = (bitField0_ & ~0x00000004); typeParameter_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000008); @@ -8777,7 +8777,7 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.defaultObjectName_ = defaultObjectName_; + result.companionObjectName_ = companionObjectName_; if (((bitField0_ & 0x00000008) == 0x00000008)) { typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); bitField0_ = (bitField0_ & ~0x00000008); @@ -8824,8 +8824,8 @@ public final class ProtoBuf { if (other.hasFqName()) { setFqName(other.getFqName()); } - if (other.hasDefaultObjectName()) { - setDefaultObjectName(other.getDefaultObjectName()); + if (other.hasCompanionObjectName()) { + setCompanionObjectName(other.getCompanionObjectName()); } if (!other.typeParameter_.isEmpty()) { if (typeParameter_.isEmpty()) { @@ -9057,51 +9057,51 @@ public final class ProtoBuf { return this; } - // optional int32 default_object_name = 4; - private int defaultObjectName_ ; + // optional int32 companion_object_name = 4; + private int companionObjectName_ ; /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-       * If this field is present, it contains the name of default object.
+       * If this field is present, it contains the name of companion object.
        *
*/ - public boolean hasDefaultObjectName() { + public boolean hasCompanionObjectName() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-       * If this field is present, it contains the name of default object.
+       * If this field is present, it contains the name of companion object.
        *
*/ - public int getDefaultObjectName() { - return defaultObjectName_; + public int getCompanionObjectName() { + return companionObjectName_; } /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-       * If this field is present, it contains the name of default object.
+       * If this field is present, it contains the name of companion object.
        *
*/ - public Builder setDefaultObjectName(int value) { + public Builder setCompanionObjectName(int value) { bitField0_ |= 0x00000004; - defaultObjectName_ = value; + companionObjectName_ = value; return this; } /** - * optional int32 default_object_name = 4; + * optional int32 companion_object_name = 4; * * 
-       * If this field is present, it contains the name of default object.
+       * If this field is present, it contains the name of companion object.
        *
*/ - public Builder clearDefaultObjectName() { + public Builder clearCompanionObjectName() { bitField0_ = (bitField0_ & ~0x00000004); - defaultObjectName_ = 0; + companionObjectName_ = 0; return this; } diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt index dde9a10a1bb..ed19e11c281 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt @@ -64,7 +64,7 @@ public class DeserializedClassDescriptor( private val containingDeclaration = outerContext.containingDeclaration private val primaryConstructor = c.storageManager.createNullableLazyValue { computePrimaryConstructor() } private val constructors = c.storageManager.createLazyValue { computeConstructors() } - private val defaultObjectDescriptor = c.storageManager.createNullableLazyValue { computeDefaultObjectDescriptor() } + private val companionObjectDescriptor = c.storageManager.createNullableLazyValue { computeCompanionObjectDescriptor() } private val annotations = if (!Flags.HAS_ANNOTATIONS.get(classProto.getFlags())) { @@ -92,7 +92,7 @@ public class DeserializedClassDescriptor( override fun getStaticScope() = staticScope - override fun isDefaultObject(): Boolean = isDefault + override fun isCompanionObject(): Boolean = isDefault private fun computePrimaryConstructor(): ConstructorDescriptor? { if (!classProto.hasPrimaryConstructor()) return null @@ -119,14 +119,14 @@ public class DeserializedClassDescriptor( override fun getConstructors() = constructors() - private fun computeDefaultObjectDescriptor(): ClassDescriptor? { - if (!classProto.hasDefaultObjectName()) return null + private fun computeCompanionObjectDescriptor(): ClassDescriptor? { + if (!classProto.hasCompanionObjectName()) return null - val defaultObjectName = c.nameResolver.getName(classProto.getDefaultObjectName()) - return memberScope.getClassifier(defaultObjectName) as? ClassDescriptor + val companionObjectName = c.nameResolver.getName(classProto.getCompanionObjectName()) + return memberScope.getClassifier(companionObjectName) as? ClassDescriptor } - override fun getDefaultObjectDescriptor(): ClassDescriptor? = defaultObjectDescriptor() + override fun getCompanionObjectDescriptor(): ClassDescriptor? = companionObjectDescriptor() private fun computeSuperTypes(): Collection { val supertypes = ArrayList(classProto.getSupertypeCount()) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 646600e19bf..2af46222e13 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -790,7 +790,7 @@ fun main(args: Array) { model("codegen/box/bridges", targetBackend = TargetBackend.JS) } - testClass(javaClass()) { + testClass(javaClass()) { model("codegen/box/objectIntrinsics", targetBackend = TargetBackend.JS) } } diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt index 81cecb72b6a..31e5f9659df 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt @@ -56,8 +56,8 @@ fun box(): String { ) { commonCasesWithTestNotRenamed() - case("class", "class $KEYWORD_MARKER { default object {} }", "", testNotRenamedByName) - case("trait", "trait $KEYWORD_MARKER { default object {} }", "", testNotRenamedByName) + case("class", "class $KEYWORD_MARKER { companion object {} }", "", testNotRenamedByName) + case("trait", "trait $KEYWORD_MARKER { companion object {} }", "", testNotRenamedByName) case("enum", "enum class $KEYWORD_MARKER { foo }", "", testNotRenamed("$KEYWORD_MARKER.foo")) case("object", "object $KEYWORD_MARKER {}", "", testNotRenamedByName) } @@ -106,7 +106,7 @@ fun box(): String { suite("insideClassObject", """ class TestClass { - default object { + companion object { $DEFINITION_MARKER fun test() { diff --git a/grammar/src/class_members.grm b/grammar/src/class_members.grm index 818607114da..a48a283e2e0 100644 --- a/grammar/src/class_members.grm +++ b/grammar/src/class_members.grm @@ -27,7 +27,7 @@ class Example(a : Foo, i : Int) : Bar(i), Some { */ memberDeclaration - : defaultObject + : companionObject : object : function : property @@ -42,7 +42,7 @@ anonymousInitializer : block ; -defaultObject +companionObject : modifiers "class" object ; diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt index 92a63aadcd9..553313302db 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt @@ -88,7 +88,7 @@ public class ReferenceVariantsHelper( val qualifier = context[BindingContext.QUALIFIER, receiverExpression] if (qualifier != null) { - // It's impossible to add extension function for package or class (if it's default object, expression type is not null) + // It's impossible to add extension function for package or class (if it's companion object, expression type is not null) qualifier.scope.getDescriptorsFiltered(kindFilter exclude DescriptorKindExclude.Extensions, nameFilter).filterTo(descriptors) { callType.canCall(it) } } diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt index 6432e6f01a1..5a1ed98dce7 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt @@ -26,7 +26,7 @@ import java.util.HashSet import java.util.LinkedHashSet public fun JetScope.getImplicitReceiversWithInstance(): List { - // we use a set to workaround a bug with receiver for default object present twice in the result of getImplicitReceiversHierarchy() + // we use a set to workaround a bug with receiver for companion object present twice in the result of getImplicitReceiversHierarchy() val receivers = LinkedHashSet(getImplicitReceiversHierarchy()) val withInstance = HashSet() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties index 5520aee3357..6297fbb0417 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties @@ -389,7 +389,7 @@ usageType.type.definition = Type definition usageType.is = Target type of 'is' operation usageType.as = Target type of 'as' operation usageType.class.object = Nested class/object -usageType.default.object = Default object +usageType.companion.object = Companion object usageType.instantiation = Instantiation usageType.function.call = Function call usageType.implicit.get = Implicit 'get' diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt index 06784f17e32..f0032689b4e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt @@ -66,7 +66,7 @@ private class ClassClsStubBuilder( supertypeIds } } - private val defaultObjectName = if (classProto.hasDefaultObjectName()) c.nameResolver.getName(classProto.getDefaultObjectName()) else null + private val companionObjectName = if (classProto.hasCompanionObjectName()) c.nameResolver.getName(classProto.getCompanionObjectName()) else null private val classOrObjectStub = createClassOrObjectStubAndModifierListStub() @@ -94,14 +94,14 @@ private class ClassClsStubBuilder( val additionalModifiers = when (classKind) { ProtoBuf.Class.Kind.ENUM_CLASS -> listOf(JetTokens.ENUM_KEYWORD) ProtoBuf.Class.Kind.ANNOTATION_CLASS -> listOf(JetTokens.ANNOTATION_KEYWORD) - ProtoBuf.Class.Kind.CLASS_OBJECT -> listOf(JetTokens.DEFAULT_KEYWORD) + ProtoBuf.Class.Kind.CLASS_OBJECT -> listOf(JetTokens.COMPANION_KEYWORD) else -> listOf() } return createModifierListStubForDeclaration(parent, classProto.getFlags(), relevantFlags, additionalModifiers) } private fun doCreateClassOrObjectStub(): StubElement { - val isDefaultObject = classKind == ProtoBuf.Class.Kind.CLASS_OBJECT + val isCompanionObject = classKind == ProtoBuf.Class.Kind.CLASS_OBJECT val fqName = outerContext.containerFqName.child(classId.getRelativeClassName().shortName()) val shortName = fqName.shortName()?.ref() val superTypeRefs = supertypeIds.filter { @@ -113,7 +113,7 @@ private class ClassClsStubBuilder( KotlinObjectStubImpl( parentStub, shortName, fqName, superTypeRefs, isTopLevel = !classId.isNestedClass(), - isDefault = isDefaultObject, + isDefault = isCompanionObject, isLocal = false, isObjectLiteral = false ) @@ -164,19 +164,19 @@ private class ClassClsStubBuilder( private fun createClassBodyAndMemberStubs() { val classBody = KotlinPlaceHolderStubImpl(classOrObjectStub, JetStubElementTypes.CLASS_BODY) - createDefaultObjectStub(classBody) + createCompanionObjectStub(classBody) createEnumEntryStubs(classBody) createCallableMemberStubs(classBody) createInnerAndNestedClasses(classBody) } - private fun createDefaultObjectStub(classBody: KotlinPlaceHolderStubImpl) { - if (defaultObjectName == null) { + private fun createCompanionObjectStub(classBody: KotlinPlaceHolderStubImpl) { + if (companionObjectName == null) { return } - val defaultObjectId = classId.createNestedClassId(defaultObjectName) - createNestedClassStub(classBody, defaultObjectId) + val companionObjectId = classId.createNestedClassId(companionObjectName) + createNestedClassStub(classBody, companionObjectId) } private fun createEnumEntryStubs(classBody: KotlinPlaceHolderStubImpl) { @@ -213,7 +213,7 @@ private class ClassClsStubBuilder( private fun createInnerAndNestedClasses(classBody: KotlinPlaceHolderStubImpl) { classProto.getNestedClassNameList().forEach { id -> val nestedClassName = c.nameResolver.getName(id) - if (nestedClassName != defaultObjectName) { + if (nestedClassName != companionObjectName) { val nestedClassId = classId.createNestedClassId(nestedClassName) createNestedClassStub(classBody, nestedClassId) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt index e7f74dc359c..7a0b5e741b1 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt @@ -210,7 +210,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) { } val typeConstraintListStub = KotlinPlaceHolderStubImpl(parent, JetStubElementTypes.TYPE_CONSTRAINT_LIST) for ((name, type) in protosForTypeConstraintList) { - val typeConstraintStub = KotlinTypeConstraintStubImpl(typeConstraintListStub, isDefaultObjectConstraint = false) + val typeConstraintStub = KotlinTypeConstraintStubImpl(typeConstraintListStub, isCompanionObjectConstraint = false) KotlinNameReferenceExpressionStubImpl(typeConstraintStub, name.ref()) createTypeReferenceStub(typeConstraintStub, type) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt index 1de42f53cbe..d73957b2b16 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt @@ -149,18 +149,18 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List when { // Treat object accesses as variables to simulate the old behaviour (when variables were created for objects) - DescriptorUtils.isNonDefaultObject(descriptor), DescriptorUtils.isEnumEntry(descriptor) -> getVariableUsageType() - DescriptorUtils.isDefaultObject(descriptor) -> DEFAULT_OBJECT_ACCESS + DescriptorUtils.isNonCompanionObject(descriptor), DescriptorUtils.isEnumEntry(descriptor) -> getVariableUsageType() + DescriptorUtils.isCompanionObject(descriptor) -> COMPANION_OBJECT_ACCESS else -> getClassUsageType() } is PackageViewDescriptor -> { @@ -232,7 +232,7 @@ enum class UsageTypeEnum { TYPE_DEFINITION IS CLASS_OBJECT_ACCESS - DEFAULT_OBJECT_ACCESS + COMPANION_OBJECT_ACCESS EXTENSION_RECEIVER_TYPE SUPER_TYPE_QUALIFIER diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt index a24746574de..0d9b5098338 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt @@ -99,7 +99,7 @@ private object DeclarationKindDetector : JetVisitor( override fun visitParameter(d: JetParameter, _: Unit?) = detect(d, "parameter", newLineNeeded = false) override fun visitObjectDeclaration(d: JetObjectDeclaration, _: Unit?): AnnotationHostKind? { - if (d.isDefault()) return detect(d, "default object", name = "${d.getName()} of ${d.getStrictParentOfType()?.getName()}") + if (d.isCompanion()) return detect(d, "companion object", name = "${d.getName()} of ${d.getStrictParentOfType()?.getName()}") if (d.getParent() is JetObjectLiteralExpression) return null return detect(d, "object") } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt index 9d63a37afa3..41ae4016505 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt @@ -51,12 +51,12 @@ public fun PsiReference.matchesTarget(candidateTarget: PsiElement): Boolean { if (this is JetReference) { return targets.any { it is PsiMethod && it.isConstructor() && it.getContainingClass() == unwrappedCandidate - || it is JetObjectDeclaration && it.isDefault() && it.getNonStrictParentOfType() == unwrappedCandidate + || it is JetObjectDeclaration && it.isCompanion() && it.getNonStrictParentOfType() == unwrappedCandidate } } if (this is PsiReferenceExpression && candidateTarget is JetObjectDeclaration && unwrappedTargets.size() == 1) { val referredClass = unwrappedTargets.first() - if (referredClass is JetClass && candidateTarget in referredClass.getDefaultObjects()) { + if (referredClass is JetClass && candidateTarget in referredClass.getCompanionObjects()) { val parentReference = getParent().getReference() if (parentReference != null) { return parentReference.unwrappedTargets.any { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java index 0cdd8c0e435..2dfd5671c0a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java @@ -45,15 +45,15 @@ public class KotlinReferencesSearcher extends QueryExecutorBase() { + if (element instanceof JetObjectDeclaration && ((JetObjectDeclaration) element).isCompanion()) { + PsiField fieldForCompanionObject = ApplicationManager.getApplication().runReadAction(new Computable() { @Override public PsiField compute() { - return LightClassUtil.getLightFieldForDefaultObject(element); + return LightClassUtil.getLightFieldForCompanionObject(element); } }); - if (fieldForDefaultObject != null) { - searchNamedElement(queryParameters, fieldForDefaultObject); + if (fieldForCompanionObject != null) { + searchNamedElement(queryParameters, fieldForCompanionObject); } } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt index 24c5b2bcfae..29969ffebc7 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt @@ -63,7 +63,7 @@ fun PsiNamedElement.getAccessorNames(readable: Boolean = true, writable: Boolean return Collections.emptyList() } -public fun PsiNamedElement.getClassNameForDefaultObject(): String? { +public fun PsiNamedElement.getClassNameForCompanionObject(): String? { return if (this is JetObjectDeclaration) { getNonStrictParentOfType()?.getName() } else { @@ -105,7 +105,7 @@ public abstract class UsagesSearchHelper { protected open fun makeWordList(target: UsagesSearchTarget): List { return with(target.element) { - getName().singletonOrEmptyList() + getAccessorNames() + getClassNameForDefaultObject().singletonOrEmptyList() + getSpecialNamesToSearch() + getName().singletonOrEmptyList() + getAccessorNames() + getClassNameForCompanionObject().singletonOrEmptyList() + getSpecialNamesToSearch() } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt index 41d4d0ce2e8..c045ce51d11 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportsUtils.kt @@ -61,9 +61,9 @@ public fun JetType.canBeReferencedViaImport(): Boolean { return descriptor != null && descriptor.canBeReferencedViaImport() } -// for cases when class qualifier refers default object treats it like reference to class itself +// for cases when class qualifier refers companion object treats it like reference to class itself public fun JetReferenceExpression.getImportableTargets(bindingContext: BindingContext): Collection { - val targets = bindingContext[BindingContext.SHORT_REFERENCE_TO_DEFAULT_OBJECT, this]?.let { listOf(it) } + val targets = bindingContext[BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, this]?.let { listOf(it) } ?: bindingContext[BindingContext.REFERENCE_TARGET, this]?.let { listOf(it) } ?: bindingContext[BindingContext.AMBIGUOUS_REFERENCE_TARGET, this] ?: listOf() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt index a2a63d9168a..72f479c8d07 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt @@ -150,7 +150,7 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options. ShortenTypesVisitor(file, elementFilter, failedToImportDescriptors), ShortenThisExpressionsVisitor(file, elementFilter, failedToImportDescriptors), ShortenQualifiedExpressionsVisitor(file, elementFilter, failedToImportDescriptors), - RemoveExplicitDefaultObjectReferenceVisitor(file, elementFilter, failedToImportDescriptors) + RemoveExplicitCompanionObjectReferenceVisitor(file, elementFilter, failedToImportDescriptors) ) val descriptorsToImport = visitors.flatMap { analyzeReferences(elementsToUse, it) }.toSet() visitors.forEach { it.shortenElements(elementsToUse) } @@ -409,7 +409,7 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options. } } - private class RemoveExplicitDefaultObjectReferenceVisitor( + private class RemoveExplicitCompanionObjectReferenceVisitor( file: JetFile, elementFilter: (PsiElement) -> FilterResult, failedToImportDescriptors: Set @@ -434,7 +434,7 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options. val selectorExpression = qualifiedExpression.getSelectorExpression() ?: return false val selectorTarget = selectorExpression.singleTarget(bindingContext) ?: return false - if (receiverTarget.getDefaultObjectDescriptor() != selectorTarget) return false + if (receiverTarget.getCompanionObjectDescriptor() != selectorTarget) return false val selectorsSelector = (qualifiedExpression.getParent() as? JetDotQualifiedExpression)?.getSelectorExpression() if (selectorsSelector == null) { diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java index cebad271b8f..f2bd77c95af 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java @@ -61,7 +61,7 @@ public class JetDeclarationMover extends AbstractJetUpDownMover { @Override public void visitObjectDeclaration(@NotNull JetObjectDeclaration declaration) { - if (declaration.isDefault()) { + if (declaration.isCompanion()) { memberSuspects.add(declaration.getClassKeyword()); } } diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt index 71d2cf70643..13ebc1549b8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt @@ -144,7 +144,7 @@ private class JetDeclarationRemotenessWeigher(private val file: JetFile) : Looku } val qualifiedName = qualifiedName(o) - // Invalid name can be met for default object descriptor: Test.MyTest.A..testOther + // Invalid name can be met for companion object descriptor: Test.MyTest.A..testOther if (qualifiedName != null && isValidJavaFqName(qualifiedName)) { val importPath = ImportPath(qualifiedName) val fqName = importPath.fqnPart() diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt index 738d9efeeb5..84ef584c648 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt @@ -231,7 +231,7 @@ class SmartCompletion( val typeParameter = type.type.getConstructor().getDeclarationDescriptor() as? TypeParameterDescriptor ?: return false if (!type.freeParameters.contains(typeParameter)) return false return KotlinBuiltIns.isAnyOrNullableAny(typeParameter.getUpperBoundsAsType()) - //TODO: check for default object constraint when they are supported + //TODO: check for companion object constraint when they are supported } private fun calcExpectedInfos(expression: JetExpression): Collection? { diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt index aeeb495c9f9..ddf558d0bed 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.idea.completion.isVisible import org.jetbrains.kotlin.idea.completion.ExpectedInfo -// adds java static members, enum members and members from default object +// adds java static members, enum members and members from companion object class StaticMembers( val bindingContext: BindingContext, val resolutionFacade: ResolutionFacade, @@ -85,16 +85,16 @@ class StaticMembers( classDescriptor.getStaticScope().getAllDescriptors().forEach(::processMember) - val defaultObject = classDescriptor.getDefaultObjectDescriptor() - if (defaultObject != null) { - defaultObject.getDefaultType().getMemberScope().getAllDescriptors() + val companionObject = classDescriptor.getCompanionObjectDescriptor() + if (companionObject != null) { + companionObject.getDefaultType().getMemberScope().getAllDescriptors() .filter { !it.isExtension } .forEach(::processMember) } var members = classDescriptor.getDefaultType().getMemberScope().getAllDescriptors() if (classDescriptor.getKind() != ClassKind.ENUM_CLASS) { - members = members.filter { DescriptorUtils.isNonDefaultObject(it) } + members = members.filter { DescriptorUtils.isNonCompanionObject(it) } } members.forEach(::processMember) } diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt index eb520be917a..829897fb35a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt @@ -134,7 +134,7 @@ class TypeInstantiationItems( ): LookupElement? { var lookupElement = lookupElementFactory.createLookupElement(classifier, resolutionFacade, bindingContext, false) - if (DescriptorUtils.isNonDefaultObject(classifier)) { + if (DescriptorUtils.isNonCompanionObject(classifier)) { return lookupElement.addTail(tail) } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt index 1f1a28a720e..08e37ceef3c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt @@ -304,7 +304,7 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult element is JetClassInitializer -> { val parent = getElementToCalculateClassName(element.getParent()) // Class-object initializer - if (parent is JetObjectDeclaration && parent.isDefault()) { + if (parent is JetObjectDeclaration && parent.isCompanion()) { return PositionedElement(getInternalClassNameForElement(parent.getParent(), typeMapper, file, isInLibrary).className, parent) } return getInternalClassNameForElement(element, typeMapper, file, isInLibrary) diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/JetUsageTypeProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/JetUsageTypeProvider.kt index 1a45069078b..ac2b9560d6d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/JetUsageTypeProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/JetUsageTypeProvider.kt @@ -44,7 +44,7 @@ public object JetUsageTypeProvider : UsageTypeProviderEx { TYPE_DEFINITION -> JetUsageTypes.TYPE_DEFINITION IS -> JetUsageTypes.IS CLASS_OBJECT_ACCESS -> JetUsageTypes.CLASS_OBJECT_ACCESS - DEFAULT_OBJECT_ACCESS -> JetUsageTypes.DEFAULT_OBJECT_ACCESS + COMPANION_OBJECT_ACCESS -> JetUsageTypes.COMPANION_OBJECT_ACCESS EXTENSION_RECEIVER_TYPE -> JetUsageTypes.EXTENSION_RECEIVER_TYPE SUPER_TYPE_QUALIFIER -> JetUsageTypes.SUPER_TYPE_QUALIFIER @@ -85,7 +85,7 @@ object JetUsageTypes { val TYPE_DEFINITION = UsageType(JetBundle.message("usageType.type.definition")) val IS = UsageType(JetBundle.message("usageType.is")) val CLASS_OBJECT_ACCESS = UsageType(JetBundle.message("usageType.class.object")) - val DEFAULT_OBJECT_ACCESS = UsageType(JetBundle.message("usageType.default.object")) + val COMPANION_OBJECT_ACCESS = UsageType(JetBundle.message("usageType.companion.object")) val EXTENSION_RECEIVER_TYPE = UsageType(JetBundle.message("usageType.extension.receiver.type")) val SUPER_TYPE_QUALIFIER = UsageType(JetBundle.message("usageType.super.type.qualifier")) diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java index f1d6c1d6b32..952f11a9a4a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java @@ -170,7 +170,7 @@ public class KotlinCallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i if (descriptor == null) return null; if (element instanceof JetClassOrObject) { - if (element instanceof JetObjectDeclaration && ((JetObjectDeclaration) element).isDefault()) { + if (element instanceof JetObjectDeclaration && ((JetObjectDeclaration) element).isCompanion()) { descriptor = descriptor.getContainingDeclaration(); if (!(descriptor instanceof ClassDescriptor)) return null; diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt index 1c6f0efb8f3..8a69e92c852 100644 --- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt @@ -183,8 +183,8 @@ public class KotlinImportOptimizer() : ImportOptimizer { } - private fun JetElement.classForDefaultObjectReference(): ClassDescriptor? { - return analyze()[BindingContext.SHORT_REFERENCE_TO_DEFAULT_OBJECT, this as? JetReferenceExpression] + private fun JetElement.classForCompanionObjectReference(): ClassDescriptor? { + return analyze()[BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, this as? JetReferenceExpression] } override fun visitJetElement(element: JetElement) { @@ -192,8 +192,8 @@ public class KotlinImportOptimizer() : ImportOptimizer { if (reference is JetReference) { val referencedName = (element as? JetNameReferenceExpression)?.getReferencedNameAsName() //TODO: other types of references - //class qualifiers that refer to default objects should be considered (containing) class references - val targets = element.classForDefaultObjectReference()?.let { listOf(it) } + //class qualifiers that refer to companion objects should be considered (containing) class references + val targets = element.classForCompanionObjectReference()?.let { listOf(it) } ?: reference.resolveToDescriptors() for (target in targets) { if (!target.canBeReferencedViaImport()) continue @@ -223,7 +223,7 @@ public class KotlinImportOptimizer() : ImportOptimizer { private fun isAccessibleAsMember(target: DeclarationDescriptor, place: JetElement): Boolean { val container = target.getContainingDeclaration() if (container !is ClassDescriptor) return false - val scope = if (DescriptorUtils.isDefaultObject(container)) + val scope = if (DescriptorUtils.isCompanionObject(container)) container.getContainingDeclaration() as? ClassDescriptor ?: return false else container diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index c83b3452662..4d640826a1c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -101,8 +101,8 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() { if (!ProjectRootsUtil.isInProjectSource(declaration)) return // Simple PSI-based checks - val isDefaultObject = declaration is JetObjectDeclaration && declaration.isDefault() - if (declaration.getNameIdentifier() == null && !isDefaultObject) return + val isCompanionObject = declaration is JetObjectDeclaration && declaration.isCompanion() + if (declaration.getNameIdentifier() == null && !isCompanionObject) return if (declaration is JetEnumEntry) return if (declaration.hasModifier(JetTokens.OVERRIDE_KEYWORD)) return if (declaration is JetProperty && declaration.isLocal()) return @@ -118,7 +118,7 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() { if (hasNonTrivialUsages(declaration)) return if (declaration is JetClassOrObject && classOrObjectHasTextUsages(declaration)) return - val (inspectionTarget, textRange) = if (isDefaultObject && declaration.getNameIdentifier() == null) { + val (inspectionTarget, textRange) = if (isCompanionObject && declaration.getNameIdentifier() == null) { val objectKeyword = (declaration as JetObjectDeclaration).getObjectKeyword() Pair(declaration, TextRange(0, objectKeyword.getStartOffsetInParent() + objectKeyword.getTextLength())) } else { @@ -167,7 +167,7 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() { if (useScope is GlobalSearchScope) { var zeroOccurrences = true - for (name in listOf(declaration.getName()) + declaration.getAccessorNames() + declaration.getClassNameForDefaultObject().singletonOrEmptyList()) { + for (name in listOf(declaration.getName()) + declaration.getAccessorNames() + declaration.getClassNameForCompanionObject().singletonOrEmptyList()) { when (psiSearchHelper.isCheapEnoughToSearch(name, useScope, null, null)) { ZERO_OCCURRENCES -> {} // go on, check other names FEW_OCCURRENCES -> zeroOccurrences = false diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ClassObjectToDefaultObjectFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ClassObjectToDefaultObjectFix.kt index a7e168e791b..eb52f415199 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ClassObjectToDefaultObjectFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ClassObjectToDefaultObjectFix.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.* -public class ClassObjectToDefaultObjectFix(private val elem: JetObjectDeclaration) : JetIntentionAction(elem) { +public class ClassObjectToCompanionObjectFix(private val elem: JetObjectDeclaration) : JetIntentionAction(elem) { override fun getText(): String = JetBundle.message("migrate.class.object.to.default") override fun getFamilyName(): String = JetBundle.message("migrate.class.object.to.default.family") @@ -35,18 +35,18 @@ public class ClassObjectToDefaultObjectFix(private val elem: JetObjectDeclaratio class object Factory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic) = - (diagnostic.getPsiElement() as? JetObjectDeclaration)?.let { ClassObjectToDefaultObjectFix(it) } + (diagnostic.getPsiElement() as? JetObjectDeclaration)?.let { ClassObjectToCompanionObjectFix(it) } fun classKeywordToDefaultModifier(objectDeclaration: JetObjectDeclaration) { objectDeclaration.getClassKeyword()?.delete() - if (!objectDeclaration.hasModifier(JetTokens.DEFAULT_KEYWORD)) { - objectDeclaration.addModifier(JetTokens.DEFAULT_KEYWORD) + if (!objectDeclaration.hasModifier(JetTokens.COMPANION_KEYWORD)) { + objectDeclaration.addModifier(JetTokens.COMPANION_KEYWORD) } } } } -public class ClassObjectToDefaultObjectInWholeProjectFix(private val elem: JetObjectDeclaration) : JetIntentionAction(elem) { +public class ClassObjectToCompanionObjectInWholeProjectFix(private val elem: JetObjectDeclaration) : JetIntentionAction(elem) { override fun getText(): String = JetBundle.message("migrate.class.object.to.default.in.whole.project") override fun getFamilyName(): String = JetBundle.message("migrate.class.object.to.default.in.whole.project.family") @@ -54,20 +54,20 @@ public class ClassObjectToDefaultObjectInWholeProjectFix(private val elem: JetOb override fun invoke(project: Project, editor: Editor, file: JetFile) { val files = PluginJetFilesProvider.allFilesInProject(file.getProject()) - files.forEach { it.accept(ClassObjectToDefaultObjectVisitor) } + files.forEach { it.accept(ClassObjectToCompanionObjectVisitor) } } - private object ClassObjectToDefaultObjectVisitor : JetTreeVisitorVoid() { + private object ClassObjectToCompanionObjectVisitor : JetTreeVisitorVoid() { override fun visitObjectDeclaration(objectDeclaration: JetObjectDeclaration) { objectDeclaration.acceptChildren(this) if (objectDeclaration.getClassKeyword() != null) { - ClassObjectToDefaultObjectFix.classKeywordToDefaultModifier(objectDeclaration) + ClassObjectToCompanionObjectFix.classKeywordToDefaultModifier(objectDeclaration) } } } class object Factory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic) = - (diagnostic.getPsiElement() as? JetObjectDeclaration)?.let { ClassObjectToDefaultObjectInWholeProjectFix(it) } + (diagnostic.getPsiElement() as? JetObjectDeclaration)?.let { ClassObjectToCompanionObjectInWholeProjectFix(it) } } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java index 4d781895c35..46918d5937a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java @@ -296,8 +296,8 @@ public class QuickFixRegistrar { QuickFixes.factories.put(UNRESOLVED_REFERENCE, CreateClassFromReferenceExpressionActionFactory.INSTANCE$); QuickFixes.factories.put(UNRESOLVED_REFERENCE, CreateClassFromCallWithConstructorCalleeActionFactory.INSTANCE$); - QuickFixes.factories.put(DEPRECATED_CLASS_OBJECT_SYNTAX, ClassObjectToDefaultObjectFix.Factory); - QuickFixes.factories.put(DEPRECATED_CLASS_OBJECT_SYNTAX, ClassObjectToDefaultObjectInWholeProjectFix.Factory); + QuickFixes.factories.put(DEPRECATED_CLASS_OBJECT_SYNTAX, ClassObjectToCompanionObjectFix.Factory); + QuickFixes.factories.put(DEPRECATED_CLASS_OBJECT_SYNTAX, ClassObjectToCompanionObjectInWholeProjectFix.Factory); QuickFixes.factories.put(INIT_KEYWORD_BEFORE_CLASS_INITIALIZER_EXPECTED, AddInitKeywordFix.OBJECT$); } } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt index 9c32c31f461..cb4e90f62fa 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt @@ -79,7 +79,7 @@ public class CreateCallableFromUsageFix( val receiverInfo = callableInfo.receiverTypeInfo if (receiverInfo is TypeInfo.Empty) return !isExtension - // TODO: Remove after default object extensions are supported + // TODO: Remove after companion object extensions are supported if (isExtension && receiverInfo.staticContextRequired) return false val file = element.getContainingFile() as JetFile diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt index 6a8abf49abf..8fbfc4de809 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt @@ -152,7 +152,7 @@ data class ExtractionData( if (parent is JetQualifiedExpression && parent.getSelectorExpression() == ref) { val receiverDescriptor = (originalResolveResult.resolvedCall?.getDispatchReceiver() as? ThisReceiver)?.getDeclarationDescriptor() - if (!DescriptorUtils.isDefaultObject(receiverDescriptor) && parent.getReceiverExpression() !is JetSuperExpression) continue + if (!DescriptorUtils.isCompanionObject(receiverDescriptor) && parent.getReceiverExpression() !is JetSuperExpression) continue } // Skip P in type references like 'P.Q' if (parent is JetUserType && (parent.getParent() as? JetUserType)?.getQualifier() == parent) continue diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt index 17a8667ad9a..164b0415d3d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt @@ -330,8 +330,8 @@ public fun chooseContainerElement( if (this is JetPropertyAccessor) { return (getParent() as JetProperty).renderName() + if (isGetter()) ".get" else ".set" } - if (this is JetObjectDeclaration && this.isDefault()) { - return "Default object of ${getStrictParentOfType()?.renderName() ?: ""}" + if (this is JetObjectDeclaration && this.isCompanion()) { + return "Companion object of ${getStrictParentOfType()?.renderName() ?: ""}" } return (this as? PsiNamedElement)?.getName() ?: "" } diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationProducer.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationProducer.java index a6a5b1a6ae8..7621a23fc52 100644 --- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationProducer.java +++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationProducer.java @@ -28,7 +28,6 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.NotNullFunction; -import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; @@ -81,7 +80,7 @@ public class JetRunConfigurationProducer extends RuntimeConfigurationProducer im if (container instanceof JetFile) return PackageClassUtils.getPackageClassFqName(((JetFile) container).getPackageFqName()); if (container instanceof JetClassOrObject) { JetClassOrObject classOrObject = (JetClassOrObject) container; - if (classOrObject instanceof JetObjectDeclaration && ((JetObjectDeclaration) classOrObject).isDefault()) { + if (classOrObject instanceof JetObjectDeclaration && ((JetObjectDeclaration) classOrObject).isCompanion()) { classOrObject = PsiTreeUtil.getParentOfType(classOrObject, JetClass.class); } return classOrObject != null ? classOrObject.getFqName() : null; @@ -120,7 +119,7 @@ public class JetRunConfigurationProducer extends RuntimeConfigurationProducer im currentElement = PsiTreeUtil.getParentOfType((PsiElement) currentElement, JetClassOrObject.class, JetFile.class)) { JetDeclarationContainer entryPointContainer = currentElement; if (entryPointContainer instanceof JetClass) { - entryPointContainer = singleOrNull(((JetClass) currentElement).getDefaultObjects()); + entryPointContainer = singleOrNull(((JetClass) currentElement).getCompanionObjects()); } if (entryPointContainer != null && mainFunctionDetector.hasMain(entryPointContainer.getDeclarations())) return entryPointContainer; } diff --git a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.dependency.kt b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.dependency.kt index 796e18df1e2..59fbe476401 100644 --- a/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.dependency.kt +++ b/idea/testData/addImport/ConflictingNameAppearsAndHasUsage4.dependency.kt @@ -1,7 +1,7 @@ package dependency class Date { - default object { + companion object { val VALUE = 0 } } diff --git a/idea/testData/checker/Builders.kt b/idea/testData/checker/Builders.kt index f85264161f4..e92eecd8ff6 100644 --- a/idea/testData/checker/Builders.kt +++ b/idea/testData/checker/Builders.kt @@ -30,7 +30,7 @@ import java.util.* } class HTML() : TagWithText("html") { - default object : Factory { + companion object : Factory { override fun create() = HTML() } @@ -40,7 +40,7 @@ import java.util.* } class Head() : TagWithText("head") { - default object : Factory { + companion object : Factory { override fun create() = Head() } @@ -53,7 +53,7 @@ import java.util.* } class Body() : BodyTag("body") { - default object : Factory { + companion object : Factory { override fun create() = Body() } diff --git a/idea/testData/checker/ClassObjectInEnum.kt b/idea/testData/checker/ClassObjectInEnum.kt index afcf88f1379..fdeeaa86a42 100644 --- a/idea/testData/checker/ClassObjectInEnum.kt +++ b/idea/testData/checker/ClassObjectInEnum.kt @@ -1,7 +1,7 @@ enum class E { ENTRY - default object { + companion object { fun foo(): E = ENTRY fun bar(): Array = values() fun baz(): E = valueOf("ENTRY") diff --git a/idea/testData/checker/ClassObjects.kt b/idea/testData/checker/ClassObjects.kt index 2243485dbd4..edc6e74ec34 100644 --- a/idea/testData/checker/ClassObjects.kt +++ b/idea/testData/checker/ClassObjects.kt @@ -1,10 +1,10 @@ package Jet86 class A { - default object { + companion object { val x = 1 } - default object Another { // error + companion object Another { // error val x = 1 } } @@ -14,7 +14,7 @@ class B() { } object b { - default object { + companion object { val x = 1 } // error diff --git a/idea/testData/checker/DeprecatedClassObjectSyntax.kt b/idea/testData/checker/DeprecatedClassObjectSyntax.kt index 28762f55af4..4a1a9e99361 100644 --- a/idea/testData/checker/DeprecatedClassObjectSyntax.kt +++ b/idea/testData/checker/DeprecatedClassObjectSyntax.kt @@ -11,7 +11,7 @@ class B { } class C { - default class object G { + companion class object G { } } \ No newline at end of file diff --git a/idea/testData/checker/MultipleBounds.kt b/idea/testData/checker/MultipleBounds.kt index 46337372c0b..063cf655220 100644 --- a/idea/testData/checker/MultipleBounds.kt +++ b/idea/testData/checker/MultipleBounds.kt @@ -11,7 +11,7 @@ trait B { class C() : A(), B class D() { - default object : A(), B {} + companion object : A(), B {} } class Test1() diff --git a/idea/testData/checker/PlatformStaticUsagesRuntime.kt b/idea/testData/checker/PlatformStaticUsagesRuntime.kt index 0441c18f4b7..aa9d49ae695 100644 --- a/idea/testData/checker/PlatformStaticUsagesRuntime.kt +++ b/idea/testData/checker/PlatformStaticUsagesRuntime.kt @@ -3,7 +3,7 @@ import kotlin.platform.platformStatic platformStatic class A { platformStatic - default object { + companion object { platformStatic fun a1() { } @@ -18,21 +18,21 @@ class s = object { - platformStatic fun a3() { + platformStatic fun a3() { } } } - platformStatic fun a4() { + platformStatic fun a4() { } } platformStatic trait B { - default object { - platformStatic fun a1() { + companion object { + platformStatic fun a1() { } } @@ -45,13 +45,13 @@ trait s = object { - platformStatic fun a3() { + platformStatic fun a3() { } } } - platformStatic fun a4() { + platformStatic fun a4() { } } \ No newline at end of file diff --git a/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt b/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt index 40219030345..75b1c68ea7c 100644 --- a/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt +++ b/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt @@ -1,19 +1,19 @@ class B { - default object A { + companion object A { } val A = this } class C { - default object A { + companion object A { val A = this } } class D { - default object A { + companion object A { val `OBJECT$` = this } diff --git a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt index 60e7be43d45..487d6326158 100644 --- a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt +++ b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt @@ -1,5 +1,5 @@ class C { - default object { + companion object { val x = 1 fun getX() = 1 } diff --git a/idea/testData/checker/regression/extensionMemberInClassObject.kt b/idea/testData/checker/regression/extensionMemberInClassObject.kt index 26c690f54a8..c110c3c33b5 100644 --- a/idea/testData/checker/regression/extensionMemberInClassObject.kt +++ b/idea/testData/checker/regression/extensionMemberInClassObject.kt @@ -3,7 +3,7 @@ trait Bar { } class A { - default object : Bar + companion object : Bar } fun test() { diff --git a/idea/testData/codeInsight/lineMarker/ClassObjectInStaticNestedClass.kt b/idea/testData/codeInsight/lineMarker/ClassObjectInStaticNestedClass.kt index b3c41dd37e4..296219d9dd0 100644 --- a/idea/testData/codeInsight/lineMarker/ClassObjectInStaticNestedClass.kt +++ b/idea/testData/codeInsight/lineMarker/ClassObjectInStaticNestedClass.kt @@ -4,7 +4,7 @@ trait TestTrait { class A { class B { - default object : TestTrait { // TODO: No line marker + companion object : TestTrait { // TODO: No line marker override fun test() { } } diff --git a/idea/testData/completion/basic/common/ExtensionFunctionInClassObject.kt b/idea/testData/completion/basic/common/ExtensionFunctionInClassObject.kt index 00ade7b45df..5697cda313a 100644 --- a/idea/testData/completion/basic/common/ExtensionFunctionInClassObject.kt +++ b/idea/testData/completion/basic/common/ExtensionFunctionInClassObject.kt @@ -3,11 +3,11 @@ package p class B class R { - default object { + companion object { fun B.f() { this. } } } -// EXIST: { itemText: "f", tailText: "() for B in R.Default" } +// EXIST: { itemText: "f", tailText: "() for B in R.Companion" } diff --git a/idea/testData/completion/basic/common/InClassObject.kt b/idea/testData/completion/basic/common/InClassObject.kt index 51f32cbf233..ed1d6d48a63 100644 --- a/idea/testData/completion/basic/common/InClassObject.kt +++ b/idea/testData/completion/basic/common/InClassObject.kt @@ -4,7 +4,7 @@ class C { inner class InnerClass object AnObject - default object { + companion object { val classObjectField = 0 class ClassObjectClass diff --git a/idea/testData/completion/basic/common/InNestedClass.kt b/idea/testData/completion/basic/common/InNestedClass.kt index f00bf6705e1..c92f2c79748 100644 --- a/idea/testData/completion/basic/common/InNestedClass.kt +++ b/idea/testData/completion/basic/common/InNestedClass.kt @@ -9,7 +9,7 @@ class C { } } - default object { + companion object { fun fromClassObject(){} } } diff --git a/idea/testData/completion/basic/common/NestedClassesOnClassWithDefaultObject.kt b/idea/testData/completion/basic/common/NestedClassesOnClassWithDefaultObject.kt index 0c73a85a851..382e6136834 100644 --- a/idea/testData/completion/basic/common/NestedClassesOnClassWithDefaultObject.kt +++ b/idea/testData/completion/basic/common/NestedClassesOnClassWithDefaultObject.kt @@ -2,7 +2,7 @@ class A { class Nested inner class Inner - default object { + companion object { class Nested2 val c: Int = 1 object Obj2 @@ -19,7 +19,7 @@ fun some() { } // EXIST: Nested -// EXIST: Default +// EXIST: Companion // EXIST: c // EXIST: foo // EXIST: Obj diff --git a/idea/testData/completion/basic/common/NestedClassesOnClassWithNamedDefaultObject.kt b/idea/testData/completion/basic/common/NestedClassesOnClassWithNamedDefaultObject.kt index 0369ebea36c..d5dd47cb135 100644 --- a/idea/testData/completion/basic/common/NestedClassesOnClassWithNamedDefaultObject.kt +++ b/idea/testData/completion/basic/common/NestedClassesOnClassWithNamedDefaultObject.kt @@ -2,7 +2,7 @@ class A { class Nested inner class Inner - default object Named { + companion object Named { class Nested2 val c: Int = 1 object Obj2 diff --git a/idea/testData/completion/basic/common/NestedClassesOnDefaultObjectLiteral.kt b/idea/testData/completion/basic/common/NestedClassesOnDefaultObjectLiteral.kt index fca31fec862..ede0074889c 100644 --- a/idea/testData/completion/basic/common/NestedClassesOnDefaultObjectLiteral.kt +++ b/idea/testData/completion/basic/common/NestedClassesOnDefaultObjectLiteral.kt @@ -2,7 +2,7 @@ class A { class Nested inner class Inner - default object Named { + companion object Named { class Nested2 val c: Int = 1 object Obj2 diff --git a/idea/testData/completion/basic/common/OverloadFunctions.kt b/idea/testData/completion/basic/common/OverloadFunctions.kt index 03095238b43..e22e880b0a1 100644 --- a/idea/testData/completion/basic/common/OverloadFunctions.kt +++ b/idea/testData/completion/basic/common/OverloadFunctions.kt @@ -1,7 +1,7 @@ package Test.MyTest class A { - default object { + companion object { public fun testOther() { } diff --git a/idea/testData/completion/basic/common/classObjectElementsInClass.kt b/idea/testData/completion/basic/common/classObjectElementsInClass.kt index d792d042d26..181acc3ab1b 100644 --- a/idea/testData/completion/basic/common/classObjectElementsInClass.kt +++ b/idea/testData/completion/basic/common/classObjectElementsInClass.kt @@ -1,5 +1,5 @@ class Some { - default object { + companion object { val coProp = 12 fun coFun = 12 diff --git a/idea/testData/completion/basic/common/extensions/ExtensionOnNestedClassObject.kt b/idea/testData/completion/basic/common/extensions/ExtensionOnNestedClassObject.kt index 22268ee1a50..c05c9121a9a 100644 --- a/idea/testData/completion/basic/common/extensions/ExtensionOnNestedClassObject.kt +++ b/idea/testData/completion/basic/common/extensions/ExtensionOnNestedClassObject.kt @@ -2,11 +2,11 @@ package foo class A { class B { - default object + companion object } } -fun A.B.Default.foo() {} +fun A.B.Companion.foo() {} fun some() { A.B. diff --git a/idea/testData/completion/basic/common/extensions/NoExtensionFromOuter.kt b/idea/testData/completion/basic/common/extensions/NoExtensionFromOuter.kt index 22a71a5aeec..d66275f9bb9 100644 --- a/idea/testData/completion/basic/common/extensions/NoExtensionFromOuter.kt +++ b/idea/testData/completion/basic/common/extensions/NoExtensionFromOuter.kt @@ -1,7 +1,7 @@ class C { fun String.memberExtForString(){} - default object { + companion object { fun foo() { "". } diff --git a/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.dependency.kt b/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.dependency.kt index cab9c0b53b3..d34ba00be0a 100644 --- a/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.dependency.kt +++ b/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.dependency.kt @@ -8,7 +8,7 @@ fun some() { } class Some { - default object { + companion object { object NamedObjectInClassObject } } diff --git a/idea/testData/completion/handlers/ClassFromClassObject.kt b/idea/testData/completion/handlers/ClassFromClassObject.kt index 79730de367e..1a332e1eca9 100644 --- a/idea/testData/completion/handlers/ClassFromClassObject.kt +++ b/idea/testData/completion/handlers/ClassFromClassObject.kt @@ -1,9 +1,9 @@ class Test { - default object { + companion object { class Some } } fun test() { - Test.Default.S + Test.Companion.S } \ No newline at end of file diff --git a/idea/testData/completion/handlers/ClassFromClassObject.kt.after b/idea/testData/completion/handlers/ClassFromClassObject.kt.after index 67472b6022b..38470f274cc 100644 --- a/idea/testData/completion/handlers/ClassFromClassObject.kt.after +++ b/idea/testData/completion/handlers/ClassFromClassObject.kt.after @@ -1,9 +1,9 @@ class Test { - default object { + companion object { class Some } } fun test() { - Test.Default.Some + Test.Companion.Some } \ No newline at end of file diff --git a/idea/testData/completion/handlers/ClassFromClassObjectInPackage.kt b/idea/testData/completion/handlers/ClassFromClassObjectInPackage.kt index 72f0fb5a3b9..0365331324b 100644 --- a/idea/testData/completion/handlers/ClassFromClassObjectInPackage.kt +++ b/idea/testData/completion/handlers/ClassFromClassObjectInPackage.kt @@ -1,11 +1,11 @@ package a class Test { - default object { + companion object { class Some } } fun test() { - a.Test.Default.S + a.Test.Companion.S } \ No newline at end of file diff --git a/idea/testData/completion/handlers/ClassFromClassObjectInPackage.kt.after b/idea/testData/completion/handlers/ClassFromClassObjectInPackage.kt.after index c44ecb507f2..599c7583d0f 100644 --- a/idea/testData/completion/handlers/ClassFromClassObjectInPackage.kt.after +++ b/idea/testData/completion/handlers/ClassFromClassObjectInPackage.kt.after @@ -1,11 +1,11 @@ package a class Test { - default object { + companion object { class Some } } fun test() { - a.Test.Default.Some + a.Test.Companion.Some } \ No newline at end of file diff --git a/idea/testData/completion/handlers/ExistingSingleBrackets.kt b/idea/testData/completion/handlers/ExistingSingleBrackets.kt index 7b7d870a7b5..4508bc0e9fc 100644 --- a/idea/testData/completion/handlers/ExistingSingleBrackets.kt +++ b/idea/testData/completion/handlers/ExistingSingleBrackets.kt @@ -1,7 +1,7 @@ package Test.MyTest class A { - default object { + companion object { public fun testOther(a: Int) { } diff --git a/idea/testData/completion/handlers/ExistingSingleBrackets.kt.after b/idea/testData/completion/handlers/ExistingSingleBrackets.kt.after index c50e1491960..7aea66933f4 100644 --- a/idea/testData/completion/handlers/ExistingSingleBrackets.kt.after +++ b/idea/testData/completion/handlers/ExistingSingleBrackets.kt.after @@ -1,7 +1,7 @@ package Test.MyTest class A { - default object { + companion object { public fun testOther(a: Int) { } diff --git a/idea/testData/completion/handlers/SingleBrackets.kt b/idea/testData/completion/handlers/SingleBrackets.kt index ffddb36acc4..9c5baa5e7ec 100644 --- a/idea/testData/completion/handlers/SingleBrackets.kt +++ b/idea/testData/completion/handlers/SingleBrackets.kt @@ -1,7 +1,7 @@ package Test.MyTest class A { - default object { + companion object { public fun testOther(a: Boolean) { } diff --git a/idea/testData/completion/handlers/SingleBrackets.kt.after b/idea/testData/completion/handlers/SingleBrackets.kt.after index 9a0d6478c52..d0b01a4660c 100644 --- a/idea/testData/completion/handlers/SingleBrackets.kt.after +++ b/idea/testData/completion/handlers/SingleBrackets.kt.after @@ -1,7 +1,7 @@ package Test.MyTest class A { - default object { + companion object { public fun testOther(a: Boolean) { } diff --git a/idea/testData/completion/handlers/basic/ClassWithClassObject.kt b/idea/testData/completion/handlers/basic/ClassWithClassObject.kt index db8a60b55a6..14de688f380 100644 --- a/idea/testData/completion/handlers/basic/ClassWithClassObject.kt +++ b/idea/testData/completion/handlers/basic/ClassWithClassObject.kt @@ -1,5 +1,5 @@ class AClass { - default object {} + companion object {} } fun foo() { diff --git a/idea/testData/completion/handlers/basic/ClassWithClassObject.kt.after b/idea/testData/completion/handlers/basic/ClassWithClassObject.kt.after index 7bd334bdb86..eb0666a1883 100644 --- a/idea/testData/completion/handlers/basic/ClassWithClassObject.kt.after +++ b/idea/testData/completion/handlers/basic/ClassWithClassObject.kt.after @@ -1,5 +1,5 @@ class AClass { - default object {} + companion object {} } fun foo() { diff --git a/idea/testData/completion/handlers/multifile/ClassWithClassObject-2.kt b/idea/testData/completion/handlers/multifile/ClassWithClassObject-2.kt index 443f4e60ff6..f68d2fc737d 100644 --- a/idea/testData/completion/handlers/multifile/ClassWithClassObject-2.kt +++ b/idea/testData/completion/handlers/multifile/ClassWithClassObject-2.kt @@ -3,7 +3,7 @@ package pack class KtClass { fun foo(){} - default object { + companion object { fun staticFoo(){} } } \ No newline at end of file diff --git a/idea/testData/completion/handlers/smart/ClassInClassObject.kt b/idea/testData/completion/handlers/smart/ClassInClassObject.kt index 97e63949e05..0c923bf9509 100644 --- a/idea/testData/completion/handlers/smart/ClassInClassObject.kt +++ b/idea/testData/completion/handlers/smart/ClassInClassObject.kt @@ -1,9 +1,9 @@ class A { - default object { + companion object { class Inner {} } } -val v: A.Default.Inner = +val v: A.Companion.Inner = // ELEMENT: Inner diff --git a/idea/testData/completion/handlers/smart/ClassInClassObject.kt.after b/idea/testData/completion/handlers/smart/ClassInClassObject.kt.after index c511cccd8dd..8936819dd4c 100644 --- a/idea/testData/completion/handlers/smart/ClassInClassObject.kt.after +++ b/idea/testData/completion/handlers/smart/ClassInClassObject.kt.after @@ -1,9 +1,9 @@ class A { - default object { + companion object { class Inner {} } } -val v: A.Default.Inner = A.Default.Inner() +val v: A.Companion.Inner = A.Companion.Inner() // ELEMENT: Inner diff --git a/idea/testData/completion/handlers/smart/ClassObjectFieldKeywordName.kt b/idea/testData/completion/handlers/smart/ClassObjectFieldKeywordName.kt index 3b30bc27ff3..f7e2a9cb973 100644 --- a/idea/testData/completion/handlers/smart/ClassObjectFieldKeywordName.kt +++ b/idea/testData/completion/handlers/smart/ClassObjectFieldKeywordName.kt @@ -1,7 +1,7 @@ package `package` class `class` { - default object { + companion object { val `val` = `class`() } } diff --git a/idea/testData/completion/handlers/smart/ClassObjectFieldKeywordName.kt.after b/idea/testData/completion/handlers/smart/ClassObjectFieldKeywordName.kt.after index a0c64f2ae47..2f1a2993c50 100644 --- a/idea/testData/completion/handlers/smart/ClassObjectFieldKeywordName.kt.after +++ b/idea/testData/completion/handlers/smart/ClassObjectFieldKeywordName.kt.after @@ -1,7 +1,7 @@ package `package` class `class` { - default object { + companion object { val `val` = `class`() } } diff --git a/idea/testData/completion/handlers/smart/ClassObjectMethod1.kt b/idea/testData/completion/handlers/smart/ClassObjectMethod1.kt index 5df44f1ce9a..68952422d42 100644 --- a/idea/testData/completion/handlers/smart/ClassObjectMethod1.kt +++ b/idea/testData/completion/handlers/smart/ClassObjectMethod1.kt @@ -1,7 +1,7 @@ package sample class K { - default object { + companion object { fun bar(): K = K() } } diff --git a/idea/testData/completion/handlers/smart/ClassObjectMethod1.kt.after b/idea/testData/completion/handlers/smart/ClassObjectMethod1.kt.after index 6911f8093b6..be51d7a81d5 100644 --- a/idea/testData/completion/handlers/smart/ClassObjectMethod1.kt.after +++ b/idea/testData/completion/handlers/smart/ClassObjectMethod1.kt.after @@ -1,7 +1,7 @@ package sample class K { - default object { + companion object { fun bar(): K = K() } } diff --git a/idea/testData/completion/handlers/smart/ClassObjectMethod2.kt b/idea/testData/completion/handlers/smart/ClassObjectMethod2.kt index 6128d507e3a..3291239eb5e 100644 --- a/idea/testData/completion/handlers/smart/ClassObjectMethod2.kt +++ b/idea/testData/completion/handlers/smart/ClassObjectMethod2.kt @@ -1,7 +1,7 @@ package sample class K { - default object { + companion object { fun bar(p: Int): K = K() } } diff --git a/idea/testData/completion/handlers/smart/ClassObjectMethod2.kt.after b/idea/testData/completion/handlers/smart/ClassObjectMethod2.kt.after index f66de53ff65..0f9ad8c45ad 100644 --- a/idea/testData/completion/handlers/smart/ClassObjectMethod2.kt.after +++ b/idea/testData/completion/handlers/smart/ClassObjectMethod2.kt.after @@ -1,7 +1,7 @@ package sample class K { - default object { + companion object { fun bar(p: Int): K = K() } } diff --git a/idea/testData/completion/handlers/smart/ClassObjectMethod3.kt b/idea/testData/completion/handlers/smart/ClassObjectMethod3.kt index d9c6a3dbb15..2e0ebb3a41a 100644 --- a/idea/testData/completion/handlers/smart/ClassObjectMethod3.kt +++ b/idea/testData/completion/handlers/smart/ClassObjectMethod3.kt @@ -1,7 +1,7 @@ package sample class K { - default object { + companion object { fun bar(p: () -> Unit): K = K() } } diff --git a/idea/testData/completion/handlers/smart/ClassObjectMethod3.kt.after b/idea/testData/completion/handlers/smart/ClassObjectMethod3.kt.after index acf6fa42dd7..1d8b950d37b 100644 --- a/idea/testData/completion/handlers/smart/ClassObjectMethod3.kt.after +++ b/idea/testData/completion/handlers/smart/ClassObjectMethod3.kt.after @@ -1,7 +1,7 @@ package sample class K { - default object { + companion object { fun bar(p: () -> Unit): K = K() } } diff --git a/idea/testData/completion/handlers/smart/ClassObjectMethod4.kt b/idea/testData/completion/handlers/smart/ClassObjectMethod4.kt index d00db9ebeee..a3fed997505 100644 --- a/idea/testData/completion/handlers/smart/ClassObjectMethod4.kt +++ b/idea/testData/completion/handlers/smart/ClassObjectMethod4.kt @@ -1,7 +1,7 @@ package sample class K { - default object { + companion object { fun bar(p: (Int, String) -> Unit): K = K() } } diff --git a/idea/testData/completion/handlers/smart/ClassObjectMethod4.kt.after b/idea/testData/completion/handlers/smart/ClassObjectMethod4.kt.after index 3209cd19a4b..db9ce3d3363 100644 --- a/idea/testData/completion/handlers/smart/ClassObjectMethod4.kt.after +++ b/idea/testData/completion/handlers/smart/ClassObjectMethod4.kt.after @@ -1,7 +1,7 @@ package sample class K { - default object { + companion object { fun bar(p: (Int, String) -> Unit): K = K() } } diff --git a/idea/testData/completion/handlers/smart/MergeTail3.kt b/idea/testData/completion/handlers/smart/MergeTail3.kt index 35b92e2818b..2f13d381157 100644 --- a/idea/testData/completion/handlers/smart/MergeTail3.kt +++ b/idea/testData/completion/handlers/smart/MergeTail3.kt @@ -1,5 +1,5 @@ class C { - default object { + companion object { fun f1(): C = C() fun f2(): C = C() fun f3(): C? = C() diff --git a/idea/testData/completion/handlers/smart/MergeTail3.kt.after b/idea/testData/completion/handlers/smart/MergeTail3.kt.after index 3d833674c96..fd6e260f5b9 100644 --- a/idea/testData/completion/handlers/smart/MergeTail3.kt.after +++ b/idea/testData/completion/handlers/smart/MergeTail3.kt.after @@ -1,5 +1,5 @@ class C { - default object { + companion object { fun f1(): C = C() fun f2(): C = C() fun f3(): C? = C() diff --git a/idea/testData/completion/handlers/smart/MergeTail4.kt b/idea/testData/completion/handlers/smart/MergeTail4.kt index 15e81513baf..66476e4a198 100644 --- a/idea/testData/completion/handlers/smart/MergeTail4.kt +++ b/idea/testData/completion/handlers/smart/MergeTail4.kt @@ -1,5 +1,5 @@ class C { - default object { + companion object { fun f1(): C = C() fun f2(): C = C() fun f3(): C? = C() diff --git a/idea/testData/completion/handlers/smart/MergeTail4.kt.after b/idea/testData/completion/handlers/smart/MergeTail4.kt.after index 62603e364c4..48986743385 100644 --- a/idea/testData/completion/handlers/smart/MergeTail4.kt.after +++ b/idea/testData/completion/handlers/smart/MergeTail4.kt.after @@ -1,5 +1,5 @@ class C { - default object { + companion object { fun f1(): C = C() fun f2(): C = C() fun f3(): C? = C() diff --git a/idea/testData/completion/handlers/smart/NullableValue3.kt b/idea/testData/completion/handlers/smart/NullableValue3.kt index f0173db0208..9bf7cf17118 100644 --- a/idea/testData/completion/handlers/smart/NullableValue3.kt +++ b/idea/testData/completion/handlers/smart/NullableValue3.kt @@ -1,5 +1,5 @@ class K { - default object { + companion object { fun bar(): K? = K() } } diff --git a/idea/testData/completion/handlers/smart/NullableValue3.kt.after b/idea/testData/completion/handlers/smart/NullableValue3.kt.after index 32af89ff7ba..8810359cd9e 100644 --- a/idea/testData/completion/handlers/smart/NullableValue3.kt.after +++ b/idea/testData/completion/handlers/smart/NullableValue3.kt.after @@ -1,5 +1,5 @@ class K { - default object { + companion object { fun bar(): K? = K() } } diff --git a/idea/testData/completion/injava/ClassObject.java b/idea/testData/completion/injava/ClassObject.java index 506ebb0bbc3..a51dc953597 100644 --- a/idea/testData/completion/injava/ClassObject.java +++ b/idea/testData/completion/injava/ClassObject.java @@ -1,6 +1,6 @@ public class Testing { public static void test() { - mockLib.foo.LibClass.Default. + mockLib.foo.LibClass.Companion. } } diff --git a/idea/testData/completion/injava/ClassObjectField.java b/idea/testData/completion/injava/ClassObjectField.java index e944968728d..0173f41c06f 100644 --- a/idea/testData/completion/injava/ClassObjectField.java +++ b/idea/testData/completion/injava/ClassObjectField.java @@ -4,5 +4,5 @@ public class Testing { } } -// EXIST: Default +// EXIST: Companion // EXIST: OBJECT$ \ No newline at end of file diff --git a/idea/testData/completion/injava/NestedObjectInstance.java b/idea/testData/completion/injava/NestedObjectInstance.java index 88f97923c3c..b2ac7a09b0d 100644 --- a/idea/testData/completion/injava/NestedObjectInstance.java +++ b/idea/testData/completion/injava/NestedObjectInstance.java @@ -1,6 +1,6 @@ public class Testing { public static void test() { - mockLib.foo.LibClass.Default.NestedObject. + mockLib.foo.LibClass.Companion.NestedObject. } } diff --git a/idea/testData/completion/injava/ObjectInClassObjects.java b/idea/testData/completion/injava/ObjectInClassObjects.java index 73c4d544387..43d8f18cfee 100644 --- a/idea/testData/completion/injava/ObjectInClassObjects.java +++ b/idea/testData/completion/injava/ObjectInClassObjects.java @@ -1,5 +1,5 @@ public class Testing { - public static void test(mockLib.foo.F.Default.F.Default.) { + public static void test(mockLib.foo.F.Companion.F.Companion.) { } } diff --git a/idea/testData/completion/injava/mockLib/main.kt b/idea/testData/completion/injava/mockLib/main.kt index 4280ff372da..248a1ca9ee1 100644 --- a/idea/testData/completion/injava/mockLib/main.kt +++ b/idea/testData/completion/injava/mockLib/main.kt @@ -4,7 +4,7 @@ public class LibClass { public fun foo() { } - default object { + companion object { fun classObjectFun() { } @@ -40,9 +40,9 @@ public fun String.topLevelExtFunction(): String = "" public var topLevelVar: String = "" class F() { - default object { + companion object { class F { - default object { + companion object { object F { } } diff --git a/idea/testData/completion/smart/ClassObjectMembers.kt b/idea/testData/completion/smart/ClassObjectMembers.kt index 60de4d6b01e..94c8afb62a9 100644 --- a/idea/testData/completion/smart/ClassObjectMembers.kt +++ b/idea/testData/completion/smart/ClassObjectMembers.kt @@ -1,7 +1,7 @@ package sample class K { - default object { + companion object { val foo: K = K() fun bar(): K = K() val x: String = "" diff --git a/idea/testData/completion/smart/ClassObjectMembersForNullable.kt b/idea/testData/completion/smart/ClassObjectMembersForNullable.kt index b2debe5a8ec..9fd29a13127 100644 --- a/idea/testData/completion/smart/ClassObjectMembersForNullable.kt +++ b/idea/testData/completion/smart/ClassObjectMembersForNullable.kt @@ -1,7 +1,7 @@ package sample class K { - default object { + companion object { val foo: K = K() fun bar(): K = K() val x: String = "" diff --git a/idea/testData/completion/smart/ClassObjectMembersWithPrefix.kt b/idea/testData/completion/smart/ClassObjectMembersWithPrefix.kt index 6ead0af43f5..0cf5b8c5abd 100644 --- a/idea/testData/completion/smart/ClassObjectMembersWithPrefix.kt +++ b/idea/testData/completion/smart/ClassObjectMembersWithPrefix.kt @@ -1,7 +1,7 @@ package sample class Kool { - default object { + companion object { val foo: Kool = Kool() fun bar(): Kool = Kool() } diff --git a/idea/testData/completion/smart/InClassObject.kt b/idea/testData/completion/smart/InClassObject.kt index dc900054b6d..b1639472ae2 100644 --- a/idea/testData/completion/smart/InClassObject.kt +++ b/idea/testData/completion/smart/InClassObject.kt @@ -1,5 +1,5 @@ class C { - default object { + companion object { fun foo(): C { return } diff --git a/idea/testData/completion/smart/NoExtensionMethodFromClassObject.kt b/idea/testData/completion/smart/NoExtensionMethodFromClassObject.kt index 677dcb80b90..bd28a63efea 100644 --- a/idea/testData/completion/smart/NoExtensionMethodFromClassObject.kt +++ b/idea/testData/completion/smart/NoExtensionMethodFromClassObject.kt @@ -1,5 +1,5 @@ class X { - default object { + companion object { fun String.f(): X = X() fun g(): X = X() } diff --git a/idea/testData/completion/smart/functionReference/10.kt b/idea/testData/completion/smart/functionReference/10.kt index 752b602c99d..ea86e73c3a3 100644 --- a/idea/testData/completion/smart/functionReference/10.kt +++ b/idea/testData/completion/smart/functionReference/10.kt @@ -5,7 +5,7 @@ class C { listOf("a").filter() } - default object { + companion object { fun staticFoo(s: String): Boolean = true } } diff --git a/idea/testData/completion/smart/generics/GenericFunction5.kt b/idea/testData/completion/smart/generics/GenericFunction5.kt index 5789702c234..1a1760e396a 100644 --- a/idea/testData/completion/smart/generics/GenericFunction5.kt +++ b/idea/testData/completion/smart/generics/GenericFunction5.kt @@ -1,5 +1,5 @@ class C { - default object { + companion object { fun create(t: T): C{} } } diff --git a/idea/testData/completion/weighers/smart/NoNameSimilarityForQualifier.kt b/idea/testData/completion/weighers/smart/NoNameSimilarityForQualifier.kt index baeb6cdff0d..02941ae19ca 100644 --- a/idea/testData/completion/weighers/smart/NoNameSimilarityForQualifier.kt +++ b/idea/testData/completion/weighers/smart/NoNameSimilarityForQualifier.kt @@ -1,5 +1,5 @@ class Name { - default object { + companion object { fun create(): Name = Name() } } diff --git a/idea/testData/completion/weighers/smart/NullableExpected.kt b/idea/testData/completion/weighers/smart/NullableExpected.kt index e9e55c0e2ed..7c5750ccbe2 100644 --- a/idea/testData/completion/weighers/smart/NullableExpected.kt +++ b/idea/testData/completion/weighers/smart/NullableExpected.kt @@ -1,7 +1,7 @@ var global: C = C() abstract class C { - default object { + companion object { val INSTANCE = C() } } diff --git a/idea/testData/completion/weighers/smart/SmartPriority2.kt b/idea/testData/completion/weighers/smart/SmartPriority2.kt index 0f7f51efefd..c5b4890e253 100644 --- a/idea/testData/completion/weighers/smart/SmartPriority2.kt +++ b/idea/testData/completion/weighers/smart/SmartPriority2.kt @@ -3,7 +3,7 @@ var nullableX: C? = null var nullableFoo: C? = null abstract class C { - default object { + companion object { val INSTANCE_X = C() val INSTANCE_FOO = C() } diff --git a/idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt b/idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt index 2b56a62b6d5..ef05dbc04da 100644 --- a/idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt +++ b/idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt @@ -40,7 +40,7 @@ class Outer { } class ClassObject { - default object { + companion object { } } diff --git a/idea/testData/copyPaste/imports/ClassObject.expected.kt b/idea/testData/copyPaste/imports/ClassObject.expected.kt index bb467d4cf2f..e741af7b0ea 100644 --- a/idea/testData/copyPaste/imports/ClassObject.expected.kt +++ b/idea/testData/copyPaste/imports/ClassObject.expected.kt @@ -9,6 +9,6 @@ fun g(t: T): Int { B.f() A B - A.Default - B.Default + A.Companion + B.Companion } \ No newline at end of file diff --git a/idea/testData/copyPaste/imports/ClassObject.kt b/idea/testData/copyPaste/imports/ClassObject.kt index c4e6b3d3297..5ddaa580eb4 100644 --- a/idea/testData/copyPaste/imports/ClassObject.kt +++ b/idea/testData/copyPaste/imports/ClassObject.kt @@ -3,12 +3,12 @@ package a trait T class A { - default object: T { + companion object: T { } } class B { - default object { + companion object { fun f(): Int } } @@ -18,8 +18,8 @@ class B { B.f() A B - A.Default - B.Default + A.Companion + B.Companion } diff --git a/idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt b/idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt index bb6b9ec3fc4..7e4287d5999 100644 --- a/idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt +++ b/idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt @@ -7,7 +7,7 @@ class A { f() } - default object { + companion object { fun f() } } \ No newline at end of file diff --git a/idea/testData/copyPaste/imports/ClassObjectInner.expected.kt b/idea/testData/copyPaste/imports/ClassObjectInner.expected.kt index 76f3ce9c1c9..4042ea57944 100644 --- a/idea/testData/copyPaste/imports/ClassObjectInner.expected.kt +++ b/idea/testData/copyPaste/imports/ClassObjectInner.expected.kt @@ -2,5 +2,5 @@ package to import a.Outer -fun f(n: Outer.Default.Nested, e: Outer.Default.NestedEnum, o: Outer.Default.NestedObj, t: Outer.Default.NestedTrait, a: Outer.Default.NestedAnnotation) { +fun f(n: Outer.Companion.Nested, e: Outer.Companion.NestedEnum, o: Outer.Companion.NestedObj, t: Outer.Companion.NestedTrait, a: Outer.Companion.NestedAnnotation) { } \ No newline at end of file diff --git a/idea/testData/copyPaste/imports/ClassObjectInner.kt b/idea/testData/copyPaste/imports/ClassObjectInner.kt index 0b0fbba96ef..89f98639734 100644 --- a/idea/testData/copyPaste/imports/ClassObjectInner.kt +++ b/idea/testData/copyPaste/imports/ClassObjectInner.kt @@ -1,13 +1,13 @@ package a -import a.Outer.Default.Nested -import a.Outer.Default.NestedEnum -import a.Outer.Default.NestedObj -import a.Outer.Default.NestedTrait -import a.Outer.Default.NestedAnnotation +import a.Outer.Companion.Nested +import a.Outer.Companion.NestedEnum +import a.Outer.Companion.NestedObj +import a.Outer.Companion.NestedTrait +import a.Outer.Companion.NestedAnnotation class Outer { - default object { + companion object { class Nested { } enum class NestedEnum { diff --git a/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt b/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt index 0118b9dc820..63b8e7e6f02 100644 --- a/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt +++ b/idea/testData/copyPaste/imports/ClassResolvedToPackage.kt @@ -1,7 +1,7 @@ package a class a { - default object { + companion object { } } diff --git a/idea/testData/copyPaste/imports/ImportDependency.dependency.kt b/idea/testData/copyPaste/imports/ImportDependency.dependency.kt index bbcc0f19164..58f4653dedb 100644 --- a/idea/testData/copyPaste/imports/ImportDependency.dependency.kt +++ b/idea/testData/copyPaste/imports/ImportDependency.dependency.kt @@ -37,6 +37,6 @@ class Outer { } class ClassObject { - default object { + companion object { } } \ No newline at end of file diff --git a/idea/testData/copyPaste/imports/KotlinLibrary/Dependency.kt b/idea/testData/copyPaste/imports/KotlinLibrary/Dependency.kt index a4cb923f2d9..695460c1f34 100644 --- a/idea/testData/copyPaste/imports/KotlinLibrary/Dependency.kt +++ b/idea/testData/copyPaste/imports/KotlinLibrary/Dependency.kt @@ -38,6 +38,6 @@ class Outer { } class ClassObject { - default object { + companion object { } } \ No newline at end of file diff --git a/idea/testData/copyPaste/imports/NoImportForSamePackage.kt b/idea/testData/copyPaste/imports/NoImportForSamePackage.kt index 03e58235fcc..2db5f8d6fc7 100644 --- a/idea/testData/copyPaste/imports/NoImportForSamePackage.kt +++ b/idea/testData/copyPaste/imports/NoImportForSamePackage.kt @@ -40,7 +40,7 @@ class Outer { } class ClassObject { - default object { + companion object { } } diff --git a/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.expected.kt b/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.expected.kt index a2916de0987..80ff5525c48 100644 --- a/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.expected.kt +++ b/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.expected.kt @@ -19,7 +19,7 @@ object O2 { } class ClassObject { - default object { + companion object { } } diff --git a/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt b/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt index 691ce42122b..06d895dc4f3 100644 --- a/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt +++ b/idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt @@ -19,7 +19,7 @@ object O2 { } class ClassObject { - default object { + companion object { } } diff --git a/idea/testData/debugger/positionManager/classObject.kt b/idea/testData/debugger/positionManager/classObject.kt index b9d6342f885..33c62ae8708 100644 --- a/idea/testData/debugger/positionManager/classObject.kt +++ b/idea/testData/debugger/positionManager/classObject.kt @@ -1,11 +1,11 @@ class A { - default object { + companion object { { 1 + 1 // A val a = 1 // A fun foo() { - 1 // A\$Default\$1 + 1 // A\$Companion\$1 } } @@ -13,23 +13,23 @@ class A { val prop2: Int get() { - val a = 1 + 1 // A\$Default - return 1 // A\$Default + val a = 1 + 1 // A\$Companion + return 1 // A\$Companion } val prop3: Int - get() = 1 // A\$Default + get() = 1 // A\$Companion - fun foo() = 1 // A\$Default + fun foo() = 1 // A\$Companion fun foo2() { - "" // A\$Default + "" // A\$Companion val o = object { - val p = 1 // A\$Default\$foo2\$o\$1 + val p = 1 // A\$Companion\$foo2\$o\$1 val p2: Int get() { - return 1 // A\$Default\$foo2\$o\$1 + return 1 // A\$Companion\$foo2\$o\$1 } } } @@ -37,7 +37,7 @@ class A { } trait T { - default object { - val prop = 1 // T\$Default + companion object { + val prop = 1 // T\$Companion } } diff --git a/idea/testData/debugger/tinyApp/outs/frameClassObject.out b/idea/testData/debugger/tinyApp/outs/frameClassObject.out index ff9a01ed860..8049d79c0f3 100644 --- a/idea/testData/debugger/tinyApp/outs/frameClassObject.out +++ b/idea/testData/debugger/tinyApp/outs/frameClassObject.out @@ -11,7 +11,7 @@ fun main(args: Array) { } class A { - default object { + companion object { val prop = 1 fun myFun() = 1 } diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classObjectVal.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classObjectVal.kt index b59deb0b55e..f5ef7cf903a 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classObjectVal.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classObjectVal.kt @@ -10,7 +10,7 @@ class MyClass { val a = 1 } - default object { + companion object { val coProp = 1 } } diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt index ec07211032b..ea92882ef15 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt @@ -8,7 +8,7 @@ fun main(args: Array) { class TestClass { fun testFun() = 1 - default object { + companion object { val p = 1 } } diff --git a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.kt index 815a2cbdd65..65bfde40d52 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.kt @@ -5,7 +5,7 @@ fun main(args: Array) { } class A { - default object { + companion object { val prop = 1 fun myFun() = 1 } diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/accessors.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepInto/accessors.kt index a219609db10..13e700fa42c 100644 --- a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/accessors.kt +++ b/idea/testData/debugger/tinyApp/src/stepInto/stepInto/accessors.kt @@ -12,7 +12,7 @@ class A { prop = 2 } - default object { + companion object { private fun foo() { val a = 1 } diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/syntheticMethods.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepInto/syntheticMethods.kt index 8414a8c7443..da9c033db06 100644 --- a/idea/testData/debugger/tinyApp/src/stepInto/stepInto/syntheticMethods.kt +++ b/idea/testData/debugger/tinyApp/src/stepInto/stepInto/syntheticMethods.kt @@ -31,7 +31,7 @@ class A { f() } - default object { + companion object { fun test() { lambda { val a = 1 diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt index b820bcfdd1c..f9a99aa773e 100644 --- a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt +++ b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt @@ -6,7 +6,7 @@ class A { foo() } - default object { + companion object { fun foo() { val a = 1 } diff --git a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt index 671b8331869..c3a9fda1960 100644 --- a/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt +++ b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt @@ -1,7 +1,7 @@ package classObjectFunFromTopLevel class A { - default object { + companion object { fun bar() { val a = 1 } diff --git a/idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt b/idea/testData/decompiler/decompiledText/ClassWithClassObject.expected.kt index f25087928a6..1af8e45eb73 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() { - internal default object { + internal 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/ClassWithClassObject/ClassWithClassObject.kt b/idea/testData/decompiler/decompiledText/ClassWithClassObject/ClassWithClassObject.kt index 9079b25337b..1727a517fef 100644 --- a/idea/testData/decompiler/decompiledText/ClassWithClassObject/ClassWithClassObject.kt +++ b/idea/testData/decompiler/decompiledText/ClassWithClassObject/ClassWithClassObject.kt @@ -4,7 +4,7 @@ class ClassWithClassObject { fun f() { } - default object { + companion object { fun f() { } diff --git a/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses.expected.kt b/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses.expected.kt index a05c292d474..dec5f1c4c6a 100644 --- a/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses.expected.kt +++ b/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses.expected.kt @@ -4,5 +4,5 @@ package test public final class DependencyOnNestedClasses() : dependency.D.Nested { - internal final fun f(nc: dependency.D.Default.NestedInClassObject, i: dependency.D.Inner, ii: dependency.D.Inner.Inner, nn: dependency.D.Nested.Nested): dependency.D.Nested { /* compiled code */ } + internal final fun f(nc: dependency.D.Companion.NestedInClassObject, i: dependency.D.Inner, ii: dependency.D.Inner.Inner, nn: dependency.D.Nested.Nested): dependency.D.Nested { /* compiled code */ } } \ No newline at end of file diff --git a/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/Dependency.kt b/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/Dependency.kt index c7300ab3b5f..c1c94cccd8c 100644 --- a/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/Dependency.kt +++ b/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/Dependency.kt @@ -8,7 +8,7 @@ class D { class Nested } - default object { + companion object { class NestedInClassObject } } diff --git a/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/DependencyOnNestedClasses.kt b/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/DependencyOnNestedClasses.kt index cde8f3fc6b0..1aa84bcc86a 100644 --- a/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/DependencyOnNestedClasses.kt +++ b/idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/DependencyOnNestedClasses.kt @@ -3,7 +3,7 @@ package test import dependency.* public class DependencyOnNestedClasses : D.Nested() { - fun f(nc: D.Default.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested { + fun f(nc: D.Companion.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested { return D.Nested() } } diff --git a/idea/testData/decompiler/navigation/decompiled/WithInnerAndObject.kt b/idea/testData/decompiler/navigation/decompiled/WithInnerAndObject.kt index 1a1da414f73..d08b44b546c 100644 --- a/idea/testData/decompiler/navigation/decompiled/WithInnerAndObject.kt +++ b/idea/testData/decompiler/navigation/decompiled/WithInnerAndObject.kt @@ -4,7 +4,7 @@ package testData.libraries [[public final class WithInnerAndObject() { - [[public default object { + [[public companion object { [internal final fun foo(): kotlin.Unit { /* compiled code */ }] }]] diff --git a/idea/testData/decompiler/navigation/decompiled/WithTraitClassObject.kt b/idea/testData/decompiler/navigation/decompiled/WithTraitClassObject.kt index 0ebfc6026ea..92e4ebbab8b 100644 --- a/idea/testData/decompiler/navigation/decompiled/WithTraitClassObject.kt +++ b/idea/testData/decompiler/navigation/decompiled/WithTraitClassObject.kt @@ -4,6 +4,6 @@ package testData.libraries [[public final class WithTraitClassObject() { - [[public default object : testData.libraries.SimpleTrait { + [[public companion object : testData.libraries.SimpleTrait { }]] }]] diff --git a/idea/testData/decompiler/navigation/library/main.kt b/idea/testData/decompiler/navigation/library/main.kt index 4295cb9ac00..913ba00a9cd 100644 --- a/idea/testData/decompiler/navigation/library/main.kt +++ b/idea/testData/decompiler/navigation/library/main.kt @@ -10,7 +10,7 @@ public class SimpleTraitImpl : SimpleTrait { } public class WithInnerAndObject { - default object { + companion object { fun foo() { } } @@ -23,7 +23,7 @@ public class WithInnerAndObject { } public class WithTraitClassObject { - default object : SimpleTrait + companion object : SimpleTrait } public abstract class AbstractClass { diff --git a/idea/testData/decompiler/navigation/usercode/ClassObject.kt b/idea/testData/decompiler/navigation/usercode/ClassObject.kt index c2c21bc896a..f8f948b524d 100644 --- a/idea/testData/decompiler/navigation/usercode/ClassObject.kt +++ b/idea/testData/decompiler/navigation/usercode/ClassObject.kt @@ -5,5 +5,5 @@ fun foo() { } // main.kt -// default <1>object { +// companion <1>object { // fun <2>foo() { \ No newline at end of file diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt index 9a6d0f1b9e2..51ed3efd062 100644 --- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt +++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt @@ -17,7 +17,7 @@ a public class Annotations private [a] (private [a] val c1: Int, [a] val c2: Int [a] private set - private b(E.E2) default object { + private b(E.E2) companion object { } } diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt index 33fb41dc4e2..9c30cf95b99 100644 --- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt +++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt @@ -33,8 +33,8 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] CLASS_BODY: - OBJECT_DECLARATION:[fqName=Annotations.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] - MODIFIER_LIST:[private default] + OBJECT_DECLARATION:[fqName=Annotations.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + MODIFIER_LIST:[private companion] ANNOTATION_ENTRY:[hasValueArguments=false, shortName=b] CONSTRUCTOR_CALLEE: TYPE_REFERENCE: diff --git a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.kt b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.kt index e121eeee41e..0936f8f0f46 100644 --- a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.kt +++ b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.kt @@ -6,7 +6,7 @@ class ClassObject { val c = 1 - public default object { + public companion object { val j = 0 fun z() = 0 @@ -20,11 +20,11 @@ class ClassObject { class B { - default object { + companion object { class C { - default object { + companion object { class D { - default object { + companion object { val i = 3 fun f() { } diff --git a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt index f2e329be2e4..f9e260b68a7 100644 --- a/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt +++ b/idea/testData/decompiler/stubBuilder/ClassObject/ClassObject.txt @@ -7,17 +7,17 @@ PsiJetFileStubImpl[package=test.class_object] MODIFIER_LIST:[internal final] VALUE_PARAMETER_LIST: CLASS_BODY: - OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] - MODIFIER_LIST:[public default] + OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + MODIFIER_LIST:[public companion] CLASS_BODY: - PROPERTY:[fqName=test.class_object.ClassObject.Default.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=j] + PROPERTY:[fqName=test.class_object.ClassObject.Companion.j, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=j] MODIFIER_LIST:[internal final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - FUN:[fqName=test.class_object.ClassObject.Default.z, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=z] + FUN:[fqName=test.class_object.ClassObject.Companion.z, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=z] MODIFIER_LIST:[internal final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: @@ -25,22 +25,22 @@ PsiJetFileStubImpl[package=test.class_object] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - CLASS:[fqName=test.class_object.ClassObject.Default.A, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=A, superNames=[]] + CLASS:[fqName=test.class_object.ClassObject.Companion.A, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=A, superNames=[]] MODIFIER_LIST:[internal final] VALUE_PARAMETER_LIST: CLASS_BODY: - CLASS:[fqName=test.class_object.ClassObject.Default.A.B, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=B, superNames=[]] + CLASS:[fqName=test.class_object.ClassObject.Companion.A.B, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=B, superNames=[]] MODIFIER_LIST:[internal final] VALUE_PARAMETER_LIST: CLASS_BODY: - PROPERTY:[fqName=test.class_object.ClassObject.Default.A.B.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=i] + PROPERTY:[fqName=test.class_object.ClassObject.Companion.A.B.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=i] MODIFIER_LIST:[internal final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - FUN:[fqName=test.class_object.ClassObject.Default.A.B.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=f] + FUN:[fqName=test.class_object.ClassObject.Companion.A.B.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=f] MODIFIER_LIST:[internal final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: @@ -67,31 +67,31 @@ PsiJetFileStubImpl[package=test.class_object] MODIFIER_LIST:[internal final] VALUE_PARAMETER_LIST: CLASS_BODY: - OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] - MODIFIER_LIST:[internal default] + OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + MODIFIER_LIST:[internal companion] CLASS_BODY: - CLASS:[fqName=test.class_object.ClassObject.B.Default.C, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=C, superNames=[]] + CLASS:[fqName=test.class_object.ClassObject.B.Companion.C, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=C, superNames=[]] MODIFIER_LIST:[internal final] VALUE_PARAMETER_LIST: CLASS_BODY: - OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default.C.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] - MODIFIER_LIST:[internal default] + OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Companion.C.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + MODIFIER_LIST:[internal companion] CLASS_BODY: - CLASS:[fqName=test.class_object.ClassObject.B.Default.C.Default.D, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=D, superNames=[]] + CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=D, superNames=[]] MODIFIER_LIST:[internal final] VALUE_PARAMETER_LIST: CLASS_BODY: - OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] - MODIFIER_LIST:[internal default] + OBJECT_DECLARATION:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + MODIFIER_LIST:[internal companion] CLASS_BODY: - PROPERTY:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=i] + PROPERTY:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.i, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=i] MODIFIER_LIST:[internal final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - FUN:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=f] + FUN:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=f] MODIFIER_LIST:[internal final] VALUE_PARAMETER_LIST: TYPE_REFERENCE: @@ -99,7 +99,7 @@ PsiJetFileStubImpl[package=test.class_object] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] - CLASS:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default.Anno, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Anno, superNames=[Annotation]] + CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.Anno, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=Anno, superNames=[Annotation]] MODIFIER_LIST:[annotation internal final] VALUE_PARAMETER_LIST: DELEGATION_SPECIFIER_LIST: @@ -110,7 +110,7 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Annotation] CLASS_BODY: - CLASS:[fqName=test.class_object.ClassObject.B.Default.C.Default.D.Default.En, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=En, superNames=[Enum]] + CLASS:[fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.En, isEnumEntry=false, isLocal=false, isTopLevel=false, isTrait=false, name=En, superNames=[Enum]] MODIFIER_LIST:[enum internal final] VALUE_PARAMETER_LIST: DELEGATION_SPECIFIER_LIST: @@ -137,10 +137,10 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION:[referencedName=class_object] REFERENCE_EXPRESSION:[referencedName=ClassObject] REFERENCE_EXPRESSION:[referencedName=B] - REFERENCE_EXPRESSION:[referencedName=Default] + REFERENCE_EXPRESSION:[referencedName=Companion] REFERENCE_EXPRESSION:[referencedName=C] - REFERENCE_EXPRESSION:[referencedName=Default] + REFERENCE_EXPRESSION:[referencedName=Companion] REFERENCE_EXPRESSION:[referencedName=D] - REFERENCE_EXPRESSION:[referencedName=Default] + REFERENCE_EXPRESSION:[referencedName=Companion] REFERENCE_EXPRESSION:[referencedName=En] CLASS_BODY: diff --git a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/Dependency.kt b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/Dependency.kt index c7300ab3b5f..c1c94cccd8c 100644 --- a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/Dependency.kt +++ b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/Dependency.kt @@ -8,7 +8,7 @@ class D { class Nested } - default object { + companion object { class NestedInClassObject } } diff --git a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.kt b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.kt index cde8f3fc6b0..1aa84bcc86a 100644 --- a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.kt +++ b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.kt @@ -3,7 +3,7 @@ package test import dependency.* public class DependencyOnNestedClasses : D.Nested() { - fun f(nc: D.Default.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested { + fun f(nc: D.Companion.NestedInClassObject, i: D.Inner, ii: D.Inner.Inner, nn: D.Nested.Nested): D.Nested { return D.Nested() } } diff --git a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt index fb0c162df84..e5b0dcd9dca 100644 --- a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt +++ b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt @@ -25,7 +25,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=dependency] REFERENCE_EXPRESSION:[referencedName=D] - REFERENCE_EXPRESSION:[referencedName=Default] + REFERENCE_EXPRESSION:[referencedName=Companion] REFERENCE_EXPRESSION:[referencedName=NestedInClassObject] VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=i] TYPE_REFERENCE: diff --git a/idea/testData/decompiler/stubBuilder/Enum/Enum.kt b/idea/testData/decompiler/stubBuilder/Enum/Enum.kt index f30e57922d6..2436c5903d4 100644 --- a/idea/testData/decompiler/stubBuilder/Enum/Enum.kt +++ b/idea/testData/decompiler/stubBuilder/Enum/Enum.kt @@ -7,7 +7,7 @@ enum class Enum { open fun f() = 3 - default object { + companion object { val c: Int = 1 } } \ No newline at end of file diff --git a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt index 036177a026e..292d58d6e17 100644 --- a/idea/testData/decompiler/stubBuilder/Enum/Enum.txt +++ b/idea/testData/decompiler/stubBuilder/Enum/Enum.txt @@ -35,10 +35,10 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] REFERENCE_EXPRESSION:[referencedName=enum] REFERENCE_EXPRESSION:[referencedName=Enum] CLASS_BODY: - OBJECT_DECLARATION:[fqName=a.b.c.test.enum.Enum.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] - MODIFIER_LIST:[internal default] + OBJECT_DECLARATION:[fqName=a.b.c.test.enum.Enum.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + MODIFIER_LIST:[internal companion] CLASS_BODY: - PROPERTY:[fqName=a.b.c.test.enum.Enum.Default.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=c] + PROPERTY:[fqName=a.b.c.test.enum.Enum.Companion.c, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReceiverTypeRef=false, hasReturnTypeRef=true, isProbablyNothingType=false, isTopLevel=false, isVar=false, name=c] MODIFIER_LIST:[internal final] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt index 22d9d611adb..d357671a09f 100644 --- a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt +++ b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt @@ -52,7 +52,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_CONSTRAINT_LIST: - TYPE_CONSTRAINT:[isDefaultObjectConstraint=false] + TYPE_CONSTRAINT:[isCompanionObjectConstraint=false] REFERENCE_EXPRESSION:[referencedName=G] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt index cf984ff72cd..67ce668ec5d 100644 --- a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt +++ b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt @@ -32,7 +32,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=test] REFERENCE_EXPRESSION:[referencedName=T] TYPE_CONSTRAINT_LIST: - TYPE_CONSTRAINT:[isDefaultObjectConstraint=false] + TYPE_CONSTRAINT:[isCompanionObjectConstraint=false] REFERENCE_EXPRESSION:[referencedName=H] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -46,14 +46,14 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] - TYPE_CONSTRAINT:[isDefaultObjectConstraint=false] + TYPE_CONSTRAINT:[isCompanionObjectConstraint=false] REFERENCE_EXPRESSION:[referencedName=G] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=CharSequence] - TYPE_CONSTRAINT:[isDefaultObjectConstraint=false] + TYPE_CONSTRAINT:[isCompanionObjectConstraint=false] REFERENCE_EXPRESSION:[referencedName=C] TYPE_REFERENCE: NULLABLE_TYPE: diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt index cde62692f9a..772c46a97d5 100644 --- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt +++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt @@ -47,7 +47,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=Any] VALUE_PARAMETER_LIST: TYPE_CONSTRAINT_LIST: - TYPE_CONSTRAINT:[isDefaultObjectConstraint=false] + TYPE_CONSTRAINT:[isCompanionObjectConstraint=false] REFERENCE_EXPRESSION:[referencedName=T1] TYPE_REFERENCE: NULLABLE_TYPE: @@ -55,7 +55,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Any] - TYPE_CONSTRAINT:[isDefaultObjectConstraint=false] + TYPE_CONSTRAINT:[isCompanionObjectConstraint=false] REFERENCE_EXPRESSION:[referencedName=T1] TYPE_REFERENCE: NULLABLE_TYPE: @@ -63,14 +63,14 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - TYPE_CONSTRAINT:[isDefaultObjectConstraint=false] + TYPE_CONSTRAINT:[isCompanionObjectConstraint=false] REFERENCE_EXPRESSION:[referencedName=T1] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Int] - TYPE_CONSTRAINT:[isDefaultObjectConstraint=false] + TYPE_CONSTRAINT:[isCompanionObjectConstraint=false] REFERENCE_EXPRESSION:[referencedName=T7] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] @@ -353,14 +353,14 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=Unit] TYPE_CONSTRAINT_LIST: - TYPE_CONSTRAINT:[isDefaultObjectConstraint=false] + TYPE_CONSTRAINT:[isCompanionObjectConstraint=false] REFERENCE_EXPRESSION:[referencedName=G3] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=kotlin] REFERENCE_EXPRESSION:[referencedName=String] - TYPE_CONSTRAINT:[isDefaultObjectConstraint=false] + TYPE_CONSTRAINT:[isCompanionObjectConstraint=false] REFERENCE_EXPRESSION:[referencedName=G3] TYPE_REFERENCE: NULLABLE_TYPE: diff --git a/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference.kt b/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference.kt index 7afc23e7b2f..762628431a9 100644 --- a/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference.kt +++ b/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference.kt @@ -3,7 +3,7 @@ class A { class Nested() - class NestedWithClassObject { default object } + class NestedWithClassObject { companion object } enum class NestedEnum { A } object NestedObj { fun invoke() = 1 } } diff --git a/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference2.txt b/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference2.txt index 6d120ce2d80..79d3bd4b225 100644 --- a/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference2.txt +++ b/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference2.txt @@ -1,2 +1,2 @@ -Nested default object 'Default' accessed via instance reference \ No newline at end of file +Nested companion object 'Companion' accessed via instance reference \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/nestedClassShouldBeQualified.kt b/idea/testData/diagnosticMessage/nestedClassShouldBeQualified.kt index 0debad62f52..4828fb7835a 100644 --- a/idea/testData/diagnosticMessage/nestedClassShouldBeQualified.kt +++ b/idea/testData/diagnosticMessage/nestedClassShouldBeQualified.kt @@ -15,21 +15,21 @@ fun A.B.test() { } class C { - default object { + companion object { class D { class Nested } } } -fun C.Default.D.text() { +fun C.Companion.D.text() { Nested() ::Nested } class E { class F { - default object + companion object } } diff --git a/idea/testData/diagnosticMessage/nestedClassShouldBeQualified3.txt b/idea/testData/diagnosticMessage/nestedClassShouldBeQualified3.txt index 4ee0498f173..c6b00abe8c3 100644 --- a/idea/testData/diagnosticMessage/nestedClassShouldBeQualified3.txt +++ b/idea/testData/diagnosticMessage/nestedClassShouldBeQualified3.txt @@ -1,2 +1,2 @@ -Nested class 'Nested' should be qualified as 'C.Default.D.Nested' \ No newline at end of file +Nested class 'Nested' should be qualified as 'C.Companion.D.Nested' \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/nestedClassShouldBeQualified4.txt b/idea/testData/diagnosticMessage/nestedClassShouldBeQualified4.txt index 6b0d2a80c71..c6452f4d861 100644 --- a/idea/testData/diagnosticMessage/nestedClassShouldBeQualified4.txt +++ b/idea/testData/diagnosticMessage/nestedClassShouldBeQualified4.txt @@ -1,2 +1,2 @@ -Nested class 'Nested' should be qualified as 'C.Default.D::Nested' \ No newline at end of file +Nested class 'Nested' should be qualified as 'C.Companion.D::Nested' \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/nestedClassShouldBeQualified5.txt b/idea/testData/diagnosticMessage/nestedClassShouldBeQualified5.txt index 7d109728e1a..0fecbfc29ed 100644 --- a/idea/testData/diagnosticMessage/nestedClassShouldBeQualified5.txt +++ b/idea/testData/diagnosticMessage/nestedClassShouldBeQualified5.txt @@ -1,2 +1,2 @@ -Nested default object 'Default' should be qualified as 'E.F.Default' \ No newline at end of file +Nested companion object 'Companion' should be qualified as 'E.F.Companion' \ No newline at end of file diff --git a/idea/testData/editor/optimizeImports/DefaultObjectReference.dependency.kt b/idea/testData/editor/optimizeImports/DefaultObjectReference.dependency.kt index 400f0f53697..acd849c9d17 100644 --- a/idea/testData/editor/optimizeImports/DefaultObjectReference.dependency.kt +++ b/idea/testData/editor/optimizeImports/DefaultObjectReference.dependency.kt @@ -1,13 +1,13 @@ package d class A { - default object E { + companion object E { val c: Int } } class B { - default object F { + companion object F { val c: Int } } \ No newline at end of file diff --git a/idea/testData/editor/optimizeImports/Kt2709.kt b/idea/testData/editor/optimizeImports/Kt2709.kt index aa5b06386df..4720a8a1f2a 100644 --- a/idea/testData/editor/optimizeImports/Kt2709.kt +++ b/idea/testData/editor/optimizeImports/Kt2709.kt @@ -1,11 +1,11 @@ -import MyClass.Default.TEST +import MyClass.Companion.TEST fun main() { TEST } class MyClass { - default object { + companion object { object TEST {} } } diff --git a/idea/testData/editor/optimizeImports/Kt2709.kt.after b/idea/testData/editor/optimizeImports/Kt2709.kt.after index aa5b06386df..4720a8a1f2a 100644 --- a/idea/testData/editor/optimizeImports/Kt2709.kt.after +++ b/idea/testData/editor/optimizeImports/Kt2709.kt.after @@ -1,11 +1,11 @@ -import MyClass.Default.TEST +import MyClass.Companion.TEST fun main() { TEST } class MyClass { - default object { + companion object { object TEST {} } } diff --git a/idea/testData/editor/optimizeImports/MembersInScope.kt b/idea/testData/editor/optimizeImports/MembersInScope.kt index 3e17330cf42..fe3531ff18a 100644 --- a/idea/testData/editor/optimizeImports/MembersInScope.kt +++ b/idea/testData/editor/optimizeImports/MembersInScope.kt @@ -13,7 +13,7 @@ class Outer { inner class Inner2 } - default object { + companion object { class ClassObjectNested } diff --git a/idea/testData/editor/optimizeImports/MembersInScope.kt.after b/idea/testData/editor/optimizeImports/MembersInScope.kt.after index b51e047becc..599a8bee8a7 100644 --- a/idea/testData/editor/optimizeImports/MembersInScope.kt.after +++ b/idea/testData/editor/optimizeImports/MembersInScope.kt.after @@ -10,7 +10,7 @@ class Outer { inner class Inner2 } - default object { + companion object { class ClassObjectNested } diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.1.kt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.1.kt index ef734eb97b3..38d26036e9f 100644 --- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.1.kt +++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.1.kt @@ -20,7 +20,7 @@ public class X(bar: String? = A.BAR): A() { super.foo() } - default object: A() { + companion object: A() { } } diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt index b6c0496f613..998d39e24d3 100644 --- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt +++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt @@ -12,7 +12,7 @@ Parameter type (10: 16) fun foo(a: A) { Parameter type (32: 14) fun X.bar(a: A = A()) { Super type qualifier (20: 15) super.foo() Supertype (1: 39) public class X(bar: String? = A.BAR): A() { -Supertype (23: 21) default object: A() { +Supertype (23: 23) companion object: A() { Supertype (28: 11) object O: A() { Target type of 'is' operation (37: 24) return if (this is A) this as A else null Usage in cast target type (37: 35) return if (this is A) this as A else null diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.1.kt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.1.kt index ef734eb97b3..38d26036e9f 100644 --- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.1.kt +++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.1.kt @@ -20,7 +20,7 @@ public class X(bar: String? = A.BAR): A() { super.foo() } - default object: A() { + companion object: A() { } } diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.1.kt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.1.kt index ef734eb97b3..38d26036e9f 100644 --- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.1.kt +++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.1.kt @@ -20,7 +20,7 @@ public class X(bar: String? = A.BAR): A() { super.foo() } - default object: A() { + companion object: A() { } } diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt index 342bd765acc..ebc29f929ce 100644 --- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt +++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt @@ -3,5 +3,5 @@ Function call (7: 11) A.foos() New instance creation (2: 20) var next: A? = A() New instance creation (32: 18) fun X.bar(a: A = A()) { Supertype (1: 39) public class X(bar: String? = A.BAR): A() { -Supertype (23: 21) default object: A() { +Supertype (23: 23) companion object: A() { Supertype (28: 11) object O: A() { diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.1.kt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.1.kt index ef734eb97b3..38d26036e9f 100644 --- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.1.kt +++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.1.kt @@ -20,7 +20,7 @@ public class X(bar: String? = A.BAR): A() { super.foo() } - default object: A() { + companion object: A() { } } diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt index b6c0496f613..998d39e24d3 100644 --- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt +++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt @@ -12,7 +12,7 @@ Parameter type (10: 16) fun foo(a: A) { Parameter type (32: 14) fun X.bar(a: A = A()) { Super type qualifier (20: 15) super.foo() Supertype (1: 39) public class X(bar: String? = A.BAR): A() { -Supertype (23: 21) default object: A() { +Supertype (23: 23) companion object: A() { Supertype (28: 11) object O: A() { Target type of 'is' operation (37: 24) return if (this is A) this as A else null Usage in cast target type (37: 35) return if (this is A) this as A else null diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.1.kt b/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.1.kt index e17f6550e40..bccd7f8afac 100644 --- a/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.1.kt +++ b/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.1.kt @@ -20,7 +20,7 @@ public class X(bar: String? = Outer.A.BAR): Outer.A() { super.foo() } - default object: Outer.A() { + companion object: Outer.A() { } } diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt index b3dc0c53bd1..93d78b5dad9 100644 --- a/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt +++ b/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt @@ -12,7 +12,7 @@ Parameter type (10: 22) fun foo(a: Outer.A) { Parameter type (32: 20) fun X.bar(a: Outer.A = Outer.A()) { Super type qualifier (20: 21) super.foo() Supertype (1: 51) public class X(bar: String? = Outer.A.BAR): Outer.A() { -Supertype (23: 27) default object: Outer.A() { +Supertype (23: 29) companion object: Outer.A() { Supertype (28: 17) object O: Outer.A() { Target type of 'is' operation (37: 30) return if (this is Outer.A) this as Outer.A else null Usage in cast target type (37: 47) return if (this is Outer.A) this as Outer.A else null diff --git a/idea/testData/findUsages/kotlin/defaultObject/javaUsage.0.kt b/idea/testData/findUsages/kotlin/defaultObject/javaUsage.0.kt index 91122ae30cf..9b78414d9cd 100644 --- a/idea/testData/findUsages/kotlin/defaultObject/javaUsage.0.kt +++ b/idea/testData/findUsages/kotlin/defaultObject/javaUsage.0.kt @@ -4,7 +4,7 @@ import kotlin.platform.platformStatic class Foo { - default object { + companion object { fun f() { } diff --git a/idea/testData/findUsages/kotlin/defaultObject/javaUsage.1.java b/idea/testData/findUsages/kotlin/defaultObject/javaUsage.1.java index 7bdbda1eb52..1c61e93221c 100644 --- a/idea/testData/findUsages/kotlin/defaultObject/javaUsage.1.java +++ b/idea/testData/findUsages/kotlin/defaultObject/javaUsage.1.java @@ -2,7 +2,7 @@ class JavaUsage { public static void main(String[] args) { System.out.println(Foo.CONST); Foo.s(); - Foo.Default.f(); - Foo foo = new Foo(); // not usage of default object + Foo.Companion.f(); + Foo foo = new Foo(); // not usage of companion object } } \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/defaultObject/javaUsage.results.txt b/idea/testData/findUsages/kotlin/defaultObject/javaUsage.results.txt index 655a50ff2d2..daca4ec2ea8 100644 --- a/idea/testData/findUsages/kotlin/defaultObject/javaUsage.results.txt +++ b/idea/testData/findUsages/kotlin/defaultObject/javaUsage.results.txt @@ -1,3 +1,3 @@ Class static member access (3: 28) System.out.println(Foo.CONST); Class static member access (4: 9) Foo.s(); -Unclassified usage (5: 13) Foo.Default.f(); \ No newline at end of file +Unclassified usage (5: 13) Foo.Companion.f(); \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/defaultObject/named.0.kt b/idea/testData/findUsages/kotlin/defaultObject/named.0.kt index bb7b03a4715..fba6d2414c4 100644 --- a/idea/testData/findUsages/kotlin/defaultObject/named.0.kt +++ b/idea/testData/findUsages/kotlin/defaultObject/named.0.kt @@ -1,7 +1,7 @@ // PSI_ELEMENT: org.jetbrains.kotlin.psi.JetObjectDeclaration // OPTIONS: usages class Foo { - default object Bar { + companion object Bar { fun f() { } } diff --git a/idea/testData/findUsages/kotlin/defaultObject/named.1.kt b/idea/testData/findUsages/kotlin/defaultObject/named.1.kt index d13364e9e74..975ec964bfa 100644 --- a/idea/testData/findUsages/kotlin/defaultObject/named.1.kt +++ b/idea/testData/findUsages/kotlin/defaultObject/named.1.kt @@ -1,7 +1,7 @@ fun main(args: Array) { val p: Foo = Foo() // simple class usage - // default object usages + // companion object usages Foo.f() val x = Foo diff --git a/idea/testData/findUsages/kotlin/defaultObject/named.results.txt b/idea/testData/findUsages/kotlin/defaultObject/named.results.txt index 17be739f622..67183b61be0 100644 --- a/idea/testData/findUsages/kotlin/defaultObject/named.results.txt +++ b/idea/testData/findUsages/kotlin/defaultObject/named.results.txt @@ -1,4 +1,4 @@ -Default object (5: 5) Foo.f() -Default object (6: 13) val x = Foo -Default object (8: 9) Foo.Bar.f() -Default object (9: 18) val xx = Foo.Bar \ No newline at end of file +Companion object (5: 5) Foo.f() +Companion object (6: 13) val x = Foo +Companion object (8: 9) Foo.Bar.f() +Companion object (9: 18) val xx = Foo.Bar \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/defaultObject/simple.0.kt b/idea/testData/findUsages/kotlin/defaultObject/simple.0.kt index a98a1a37853..90ed9db2aa4 100644 --- a/idea/testData/findUsages/kotlin/defaultObject/simple.0.kt +++ b/idea/testData/findUsages/kotlin/defaultObject/simple.0.kt @@ -1,7 +1,7 @@ // PSI_ELEMENT: org.jetbrains.kotlin.psi.JetObjectDeclaration // OPTIONS: usages class Foo { - default object { + companion object { fun f() { } } diff --git a/idea/testData/findUsages/kotlin/defaultObject/simple.1.kt b/idea/testData/findUsages/kotlin/defaultObject/simple.1.kt index c56cbce46e1..5d22601f432 100644 --- a/idea/testData/findUsages/kotlin/defaultObject/simple.1.kt +++ b/idea/testData/findUsages/kotlin/defaultObject/simple.1.kt @@ -1,10 +1,10 @@ fun main(args: Array) { val p: Foo = Foo() // simple class usage - // default object usages + // companion object usages Foo.f() val x = Foo - Foo.Default.f() - val xx = Foo.Default + Foo.Companion.f() + val xx = Foo.Companion } \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/defaultObject/simple.results.txt b/idea/testData/findUsages/kotlin/defaultObject/simple.results.txt index 2420c11f001..86cefd39e25 100644 --- a/idea/testData/findUsages/kotlin/defaultObject/simple.results.txt +++ b/idea/testData/findUsages/kotlin/defaultObject/simple.results.txt @@ -1,4 +1,4 @@ -Default object (5: 5) Foo.f() -Default object (6: 13) val x = Foo -Default object (8: 9) Foo.Default.f() -Default object (9: 18) val xx = Foo.Default \ No newline at end of file +Companion object (5: 5) Foo.f() +Companion object (6: 13) val x = Foo +Companion object (8: 9) Foo.Companion.f() +Companion object (9: 18) val xx = Foo.Companion \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt index 3155d5d80d3..5520e055a0b 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt @@ -3,7 +3,7 @@ package server open class Server { - default object { + companion object { val NAME = "Server" } diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt index 0bfaf3e24fc..475e8e9089d 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt @@ -3,7 +3,7 @@ package server open class Server { - default object { + companion object { val NAME = "Server" } diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.1.kt index 2dfc6a94991..7968f64081a 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.1.kt @@ -20,7 +20,7 @@ class Client(name: String = Server.NAME): Server() { println("Client") } - default object: Server() { + companion object: Server() { } } diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt index f0136ded994..f081baf0c12 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt @@ -1,14 +1,14 @@ Class/object property type (6: 21) var nextServer: Server? = new Server() -Default object (32: 28) fun Client.bar(s: Server = Server.NAME) { -Default object (5: 29) class Client(name: String = Server.NAME): Server() { -Default object (7: 16) val name = Server.NAME +Companion object (32: 28) fun Client.bar(s: Server = Server.NAME) { +Companion object (5: 29) class Client(name: String = Server.NAME): Server() { +Companion object (7: 16) val name = Server.NAME Function return types (14: 26) fun getNextServer(): Server? { Function return types (40: 21) fun Any.asServer(): Server? { Local variable declaration (10: 21) val server: Server = s Parameter type (32: 19) fun Client.bar(s: Server = Server.NAME) { Parameter type (9: 16) fun foo(s: Server) { Super type qualifier (19: 15) super.work() -Supertype (23: 21) default object: Server() { +Supertype (23: 23) companion object: Server() { Supertype (28: 22) object ClientObject: Server() { Supertype (5: 43) class Client(name: String = Server.NAME): Server() { Target type of 'is' operation (41: 24) return if (this is Server) this as Server else null diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt index b8386c6ca60..f02df48f0be 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt @@ -3,7 +3,7 @@ package server open class Server { - default object { + companion object { val NAME = "Server" } diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt index 3155d5d80d3..5520e055a0b 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt @@ -3,7 +3,7 @@ package server open class Server { - default object { + companion object { val NAME = "Server" } diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt index 6f6c49dac03..68c13346dd7 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt @@ -1,7 +1,7 @@ Class/object property type (6: 21) var nextServer: Server? = new Server() -Default object (28: 28) fun Client.bar(s: Server = Server.NAME) { -Default object (5: 29) class Client(name: String = Server.NAME): Server() { -Default object (7: 16) val name = Server.NAME +Companion object (28: 28) fun Client.bar(s: Server = Server.NAME) { +Companion object (5: 29) class Client(name: String = Server.NAME): Server() { +Companion object (7: 16) val name = Server.NAME Function return types (14: 26) fun getNextServer(): Server? { Function return types (36: 21) fun Any.asServer(): Server? { Local variable declaration (10: 21) val server: Server = s diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.0.kt index 1855bad6c5d..eaf3c9f9af6 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.0.kt @@ -11,7 +11,7 @@ public open class Outer { } - default object { + companion object { public var bar: String = "bar"; public open fun foo() { diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.1.kt index 297a56deb81..1740a96a731 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.1.kt @@ -24,7 +24,7 @@ public class X(bar: String? = Inner.A.bar): Inner.A() { super.foo() } - default object: Inner.A() { + companion object: Inner.A() { } } diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt index 0634bbb153c..9dfbbfc9a98 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt @@ -1,8 +1,8 @@ Class/object property type (6: 21) var next: Inner.A? = Inner.A() -Default object (10: 15) Inner.A.bar = "" -Default object (11: 15) Inner.A.foo() -Default object (5: 37) public class X(bar: String? = Inner.A.bar): Inner.A() { -Default object (7: 32) val myBar: String? = Inner.A.bar +Companion object (10: 15) Inner.A.bar = "" +Companion object (11: 15) Inner.A.foo() +Companion object (5: 37) public class X(bar: String? = Inner.A.bar): Inner.A() { +Companion object (7: 32) val myBar: String? = Inner.A.bar Field declaration (6: 11) Inner.A next = new Inner.A(); Function return types (19: 26) fun getNext(): Inner.A? { Function return types (40: 22) fun Any.toA(): Inner.A? { @@ -13,7 +13,7 @@ New instance creation (6: 32) var next: Inner.A? = Inner.A() Parameter type (14: 22) fun foo(a: Inner.A) { Parameter type (36: 20) fun X.bar(a: Inner.A = Inner.A()) { Super type qualifier (24: 21) super.foo() -Supertype (27: 27) default object: Inner.A() { +Supertype (27: 29) companion object: Inner.A() { Supertype (32: 17) object O: Inner.A() { Supertype (5: 51) public class X(bar: String? = Inner.A.bar): Inner.A() { Target type of 'is' operation (41: 30) return if (this is Inner.A) this as Inner.A else null diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt index 958a57be483..ca283738b90 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt @@ -10,7 +10,7 @@ public open class Outer { } - default object { + companion object { public var bar: String = "bar"; public open fun foo() { diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.1.kt index 5acc774265f..7f502ea3383 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.1.kt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.1.kt @@ -24,7 +24,7 @@ public class X(bar: String? = Outer.A.bar): Outer.A() { super.foo() } - default object: Outer.A() { + companion object: Outer.A() { } } diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt index 20462154e0f..06ba3d62753 100644 --- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt +++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt @@ -1,8 +1,8 @@ Class/object property type (6: 21) var next: Outer.A? = Outer.A() -Default object (10: 15) Outer.A.bar = "" -Default object (11: 15) Outer.A.foo() -Default object (5: 37) public class X(bar: String? = Outer.A.bar): Outer.A() { -Default object (7: 32) val myBar: String? = Outer.A.bar +Companion object (10: 15) Outer.A.bar = "" +Companion object (11: 15) Outer.A.foo() +Companion object (5: 37) public class X(bar: String? = Outer.A.bar): Outer.A() { +Companion object (7: 32) val myBar: String? = Outer.A.bar Field declaration (6: 11) Outer.A next = new Outer.A(); Function return types (19: 26) fun getNext(): Outer.A? { Function return types (40: 22) fun Any.toA(): Outer.A? { @@ -13,7 +13,7 @@ New instance creation (6: 32) var next: Outer.A? = Outer.A() Parameter type (14: 22) fun foo(a: Outer.A) { Parameter type (36: 20) fun X.bar(a: Outer.A = Outer.A()) { Super type qualifier (24: 21) super.foo() -Supertype (27: 27) default object: Outer.A() { +Supertype (27: 29) companion object: Outer.A() { Supertype (32: 17) object O: Outer.A() { Supertype (5: 51) public class X(bar: String? = Outer.A.bar): Outer.A() { Target type of 'is' operation (41: 30) return if (this is Outer.A) this as Outer.A else null diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt index c8bfaf79f99..a94b31fed12 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt @@ -3,7 +3,7 @@ package server class A { - default object { + companion object { var foo: String = "foo" } } diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.1.java b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.1.java index f70bbf22ed8..a7a41dabe84 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.1.java +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.1.java @@ -4,9 +4,9 @@ import server.*; class Client { void fooBar() { - A.Default.setFoo("a"); + A.Companion.setFoo("a"); A.foo = "a"; - System.out.println("a.foo = " + A.Default.getFoo()); + System.out.println("a.foo = " + A.Companion.getFoo()); System.out.println("a.foo = " + A.foo); } } \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt index 4e40c422af3..f0574a4e93e 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt @@ -1,4 +1,4 @@ Unclassified usage (10: 43) System.out.println("a.foo = " + A.foo); -Unclassified usage (7: 19) A.Default.setFoo("a"); +Unclassified usage (7: 21) A.Companion.setFoo("a"); Unclassified usage (8: 11) A.foo = "a"; -Unclassified usage (9: 51) System.out.println("a.foo = " + A.Default.getFoo()); \ No newline at end of file +Unclassified usage (9: 53) System.out.println("a.foo = " + A.Companion.getFoo()); \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.0.kt index b5e4e41d632..2284c647369 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.0.kt @@ -3,7 +3,7 @@ package server trait Some { - default object { + companion object { val XX = 1 } } diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt index 212276028d8..9cbb8ae4021 100644 --- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt @@ -3,7 +3,7 @@ class Outer { val x = Outer.t - default object { + companion object { private val t = 1 } } diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt index 7e35065b9d9..b9dcb421722 100644 --- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt @@ -4,7 +4,7 @@ package server open class Server { - default object { + companion object { val NAME = "Server" } diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.1.kt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.1.kt index 2dfc6a94991..7968f64081a 100644 --- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.1.kt +++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.1.kt @@ -20,7 +20,7 @@ class Client(name: String = Server.NAME): Server() { println("Client") } - default object: Server() { + companion object: Server() { } } diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt index 8a0e5c88cc9..94964d2c894 100644 --- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt +++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt @@ -1,14 +1,14 @@ Class/object property type (Client) (6: 21) var nextServer: Server? = new Server() -Default object (Client) (5: 29) class Client(name: String = Server.NAME): Server() { -Default object (Client) (7: 16) val name = Server.NAME -Default object (bar) (32: 28) fun Client.bar(s: Server = Server.NAME) { +Companion object (Client) (5: 29) class Client(name: String = Server.NAME): Server() { +Companion object (Client) (7: 16) val name = Server.NAME +Companion object (bar) (32: 28) fun Client.bar(s: Server = Server.NAME) { Function return types (Client) (14: 26) fun getNextServer(): Server? { Function return types (asServer) (40: 21) fun Any.asServer(): Server? { Local variable declaration (Client) (10: 21) val server: Server = s Parameter type (Client) (9: 16) fun foo(s: Server) { Parameter type (bar) (32: 19) fun Client.bar(s: Server = Server.NAME) { Super type qualifier (Client) (19: 15) super.work() -Supertype (Client) (23: 21) default object: Server() { +Supertype (Client) (23: 23) companion object: Server() { Supertype (Client) (5: 43) class Client(name: String = Server.NAME): Server() { Supertype (ClientObject) (28: 22) object ClientObject: Server() { Target type of 'is' operation (asServer) (41: 24) return if (this is Server) this as Server else null diff --git a/idea/testData/formatter/ClassLineBreak.after.inv.kt b/idea/testData/formatter/ClassLineBreak.after.inv.kt index 9c99df50859..cd1b7e99349 100644 --- a/idea/testData/formatter/ClassLineBreak.after.inv.kt +++ b/idea/testData/formatter/ClassLineBreak.after.inv.kt @@ -1,10 +1,10 @@ class A { - default object { + companion object { } } class A { - default object { + companion object { } } diff --git a/idea/testData/formatter/ClassLineBreak.after.kt b/idea/testData/formatter/ClassLineBreak.after.kt index 699d90a032b..a3a57bf9f5f 100644 --- a/idea/testData/formatter/ClassLineBreak.after.kt +++ b/idea/testData/formatter/ClassLineBreak.after.kt @@ -1,13 +1,13 @@ class A { - default object + companion object { } } class A { - default object + companion object { } } diff --git a/idea/testData/formatter/ClassLineBreak.kt b/idea/testData/formatter/ClassLineBreak.kt index 77cf8946a74..fc6877adaf6 100644 --- a/idea/testData/formatter/ClassLineBreak.kt +++ b/idea/testData/formatter/ClassLineBreak.kt @@ -1,11 +1,11 @@ class A { - default object { + companion object { } } class A { - default object + companion object { } } diff --git a/idea/testData/formatter/EmptyBlocks.after.inv.kt b/idea/testData/formatter/EmptyBlocks.after.inv.kt index 6c6db921453..ac0c5af08fa 100644 --- a/idea/testData/formatter/EmptyBlocks.after.inv.kt +++ b/idea/testData/formatter/EmptyBlocks.after.inv.kt @@ -1,7 +1,7 @@ class Test {} class Other { - default object {} + companion object {} } object TestObject {} @@ -21,7 +21,7 @@ class Test1 { } class Other1 { - default object { + companion object { } } diff --git a/idea/testData/formatter/EmptyBlocks.kt b/idea/testData/formatter/EmptyBlocks.kt index 6c6db921453..ac0c5af08fa 100644 --- a/idea/testData/formatter/EmptyBlocks.kt +++ b/idea/testData/formatter/EmptyBlocks.kt @@ -1,7 +1,7 @@ class Test {} class Other { - default object {} + companion object {} } object TestObject {} @@ -21,7 +21,7 @@ class Test1 { } class Other1 { - default object { + companion object { } } diff --git a/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt index 0ed5cc01abd..024a7b0a44b 100644 --- a/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt +++ b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt @@ -18,13 +18,13 @@ val a = object: A {} val b = object: A {} class B { - default object: A { + companion object: A { } } class C { - default object: + companion object: A { } diff --git a/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt index 4e7adeb74e5..7f6c81442c4 100644 --- a/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt +++ b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt @@ -18,13 +18,13 @@ val a = object :A {} val b = object :A {} class B { - default object :A { + companion object :A { } } class C { - default object : + companion object : A { } diff --git a/idea/testData/formatter/SpaceAroundExtendColonInObjects.kt b/idea/testData/formatter/SpaceAroundExtendColonInObjects.kt index 4d54001b098..e7796470f10 100644 --- a/idea/testData/formatter/SpaceAroundExtendColonInObjects.kt +++ b/idea/testData/formatter/SpaceAroundExtendColonInObjects.kt @@ -18,13 +18,13 @@ val a = object:A {} val b = object : A {} class B { - default object:A { + companion object:A { } } class C { - default object : + companion object : A { } diff --git a/idea/testData/hierarchy/calls/callers/kotlinClass/main0.kt b/idea/testData/hierarchy/calls/callers/kotlinClass/main0.kt index 6ec4c3df85c..6515d853845 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinClass/main0.kt +++ b/idea/testData/hierarchy/calls/callers/kotlinClass/main0.kt @@ -12,7 +12,7 @@ class KClient { KA() } - default object { + companion object { val a = KA() } diff --git a/idea/testData/hierarchy/calls/callers/kotlinFunction/main0.kt b/idea/testData/hierarchy/calls/callers/kotlinFunction/main0.kt index 746419a7b43..643e4c69b1d 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinFunction/main0.kt +++ b/idea/testData/hierarchy/calls/callers/kotlinFunction/main0.kt @@ -17,7 +17,7 @@ class KClient { KBase().foo("") } - default object { + companion object { val a = KBase().foo("") + KA().foo("") } diff --git a/idea/testData/hierarchy/calls/callers/kotlinNestedClass/main0.kt b/idea/testData/hierarchy/calls/callers/kotlinNestedClass/main0.kt index 1de759015cd..5335b4e81bb 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinNestedClass/main0.kt +++ b/idea/testData/hierarchy/calls/callers/kotlinNestedClass/main0.kt @@ -14,7 +14,7 @@ class KClient { T.KA() } - default object { + companion object { val a = T.KA() } diff --git a/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/main0.kt b/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/main0.kt index 9f9fe80b725..8ac8cc3955f 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/main0.kt +++ b/idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/main0.kt @@ -14,7 +14,7 @@ class KClient { T().KA() } - default object { + companion object { val a = T().KA() } diff --git a/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/main0.kt b/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/main0.kt index b358478a34f..a8bc9517a9e 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/main0.kt +++ b/idea/testData/hierarchy/calls/callers/kotlinPackageFunction/main0.kt @@ -7,7 +7,7 @@ class KClient { packageFun("") } - default object { + companion object { val a = packageFun("") } diff --git a/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/main0.kt b/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/main0.kt index 4c99a26d4d8..f6c82208dfe 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/main0.kt +++ b/idea/testData/hierarchy/calls/callers/kotlinPackageProperty/main0.kt @@ -7,7 +7,7 @@ class KClient { packageVal = "" } - default object { + companion object { val a = packageVal } diff --git a/idea/testData/hierarchy/calls/callers/kotlinProperty/main0.kt b/idea/testData/hierarchy/calls/callers/kotlinProperty/main0.kt index b9242cc467f..b017d3c165e 100644 --- a/idea/testData/hierarchy/calls/callers/kotlinProperty/main0.kt +++ b/idea/testData/hierarchy/calls/callers/kotlinProperty/main0.kt @@ -17,7 +17,7 @@ class KClient { KA().name = "" } - default object { + companion object { val a = KBase().name + KA().name } diff --git a/idea/testData/hierarchy/class/type/ClassInClassObject/ClassInClassObject_verification.xml b/idea/testData/hierarchy/class/type/ClassInClassObject/ClassInClassObject_verification.xml index 01ae4b4a638..bf12b814acf 100644 --- a/idea/testData/hierarchy/class/type/ClassInClassObject/ClassInClassObject_verification.xml +++ b/idea/testData/hierarchy/class/type/ClassInClassObject/ClassInClassObject_verification.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/idea/testData/hierarchy/class/type/ClassInClassObject/main.kt b/idea/testData/hierarchy/class/type/ClassInClassObject/main.kt index bcfc65abca2..5de817dcced 100644 --- a/idea/testData/hierarchy/class/type/ClassInClassObject/main.kt +++ b/idea/testData/hierarchy/class/type/ClassInClassObject/main.kt @@ -1,5 +1,5 @@ class A { - default object { + companion object { class MyClass } } diff --git a/idea/testData/highlighter/deprecated/ClassObject.kt b/idea/testData/highlighter/deprecated/ClassObject.kt index 43e4ea6967c..745165118c0 100644 --- a/idea/testData/highlighter/deprecated/ClassObject.kt +++ b/idea/testData/highlighter/deprecated/ClassObject.kt @@ -1,25 +1,25 @@ fun test() { - MyClass.test + MyClass.test MyClass() val a: MyClass? = null val b: MyTrait? = null - MyTrait.test - MyTrait.Default - MyTrait - MyClass.Default - MyClass.Default.test + MyTrait.test + MyTrait.Companion + MyTrait + MyClass.Companion + MyClass.Companion.test a == b } class MyClass(): MyTrait { - deprecated("Use A instead") default object { + deprecated("Use A instead") companion object { val test: String = "" } } trait MyTrait { - deprecated("Use A instead") default object { + deprecated("Use A instead") companion object { val test: String = "" } } diff --git a/idea/testData/highlighter/deprecated/Function.kt b/idea/testData/highlighter/deprecated/Function.kt index 99b73193f01..99296aba236 100644 --- a/idea/testData/highlighter/deprecated/Function.kt +++ b/idea/testData/highlighter/deprecated/Function.kt @@ -12,7 +12,7 @@ deprecated("Use A instead") fun test4(x: Int, y: Int) { x + y } class MyClass() { deprecated("Use A instead") fun test2() {} - default object { + companion object { deprecated("Use A instead") fun test3() {} } } diff --git a/idea/testData/highlighter/deprecated/Property.kt b/idea/testData/highlighter/deprecated/Property.kt index 9d790b89183..ead5fadd039 100644 --- a/idea/testData/highlighter/deprecated/Property.kt +++ b/idea/testData/highlighter/deprecated/Property.kt @@ -15,7 +15,7 @@ class MyClass() { deprecated("Use A instead") val test2: String = "" deprecated("Use A instead") var test5: String = "" - default object { + companion object { deprecated("Use A instead") val test3: String = "" deprecated("Use A instead") var test6: String = "" } diff --git a/idea/testData/inspections/unusedSymbol/object/defaultObjectUnused.kt b/idea/testData/inspections/unusedSymbol/object/defaultObjectUnused.kt index 4140b1534ad..d11b277b208 100644 --- a/idea/testData/inspections/unusedSymbol/object/defaultObjectUnused.kt +++ b/idea/testData/inspections/unusedSymbol/object/defaultObjectUnused.kt @@ -1,10 +1,10 @@ class A { - default object { + companion object { } } class B { - default object Named { + companion object Named { } } diff --git a/idea/testData/inspections/unusedSymbol/object/defaultObjectUsed.kt b/idea/testData/inspections/unusedSymbol/object/defaultObjectUsed.kt index 01aa9da1541..9e07b9d3737 100644 --- a/idea/testData/inspections/unusedSymbol/object/defaultObjectUsed.kt +++ b/idea/testData/inspections/unusedSymbol/object/defaultObjectUsed.kt @@ -1,10 +1,10 @@ class A { - default object { + companion object { } } class B { - default object Named { + companion object Named { } } diff --git a/idea/testData/inspections/unusedSymbol/object/defaultObjectUsedInJava.java b/idea/testData/inspections/unusedSymbol/object/defaultObjectUsedInJava.java index cf56bad1a80..6a07336ac3a 100644 --- a/idea/testData/inspections/unusedSymbol/object/defaultObjectUsedInJava.java +++ b/idea/testData/inspections/unusedSymbol/object/defaultObjectUsedInJava.java @@ -1,4 +1,4 @@ -import defaultObjectUsedInJava.* +import companionObjectUsedInJava.* class JavaUsage { public static void main(String[] args) { diff --git a/idea/testData/inspections/unusedSymbol/object/defaultObjectUsedInJava.kt b/idea/testData/inspections/unusedSymbol/object/defaultObjectUsedInJava.kt index 1cc7e0a92db..636b40523b6 100644 --- a/idea/testData/inspections/unusedSymbol/object/defaultObjectUsedInJava.kt +++ b/idea/testData/inspections/unusedSymbol/object/defaultObjectUsedInJava.kt @@ -1,28 +1,28 @@ -package defaultObjectUsedInJava +package companionObjectUsedInJava import kotlin.platform.platformStatic class A { - default object { + companion object { val CONST = 42 } } class B { - default object { + companion object { platformStatic fun foo() { } } } class C { - default object Named { + companion object Named { val CONST = 42 } } class D { - default object Named { + companion object Named { platformStatic fun foo() { } } diff --git a/idea/testData/inspections/unusedSymbol/object/inspectionData/expected.xml b/idea/testData/inspections/unusedSymbol/object/inspectionData/expected.xml index 8984a4be145..46f1f56dd7f 100644 --- a/idea/testData/inspections/unusedSymbol/object/inspectionData/expected.xml +++ b/idea/testData/inspections/unusedSymbol/object/inspectionData/expected.xml @@ -38,7 +38,7 @@ light_idea_test_case Unused Symbol - Object 'Default' is never used + Object 'Companion' is never used diff --git a/idea/testData/javaFacade/classObject.kt b/idea/testData/javaFacade/classObject.kt index e5906c3c908..fec4e4c1b7e 100644 --- a/idea/testData/javaFacade/classObject.kt +++ b/idea/testData/javaFacade/classObject.kt @@ -1,7 +1,7 @@ package foo class TheClass() { - default object { + companion object { val out = System.out } } \ No newline at end of file diff --git a/idea/testData/javaFacade/classWithObjectLiteralInClassObjectField.kt b/idea/testData/javaFacade/classWithObjectLiteralInClassObjectField.kt index ac557f0f72f..652327231e2 100644 --- a/idea/testData/javaFacade/classWithObjectLiteralInClassObjectField.kt +++ b/idea/testData/javaFacade/classWithObjectLiteralInClassObjectField.kt @@ -3,7 +3,7 @@ package test trait A class B { - default object { + companion object { fun bar() = object : A { } } } diff --git a/idea/testData/javaFacade/wrapFunInClassObject.kt b/idea/testData/javaFacade/wrapFunInClassObject.kt index 0bb499734d2..600a14b3172 100644 --- a/idea/testData/javaFacade/wrapFunInClassObject.kt +++ b/idea/testData/javaFacade/wrapFunInClassObject.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { fun testing() { } } diff --git a/idea/testData/kotlinAndJavaChecker/ClassObjects.kt b/idea/testData/kotlinAndJavaChecker/ClassObjects.kt index 967686ced7e..7593a6c9366 100644 --- a/idea/testData/kotlinAndJavaChecker/ClassObjects.kt +++ b/idea/testData/kotlinAndJavaChecker/ClassObjects.kt @@ -1,5 +1,5 @@ class WithClassObject { - default object { + companion object { fun foo() {} val value: Int = 0 diff --git a/idea/testData/navigation/gotoClass/inClassObject.kt b/idea/testData/navigation/gotoClass/inClassObject.kt index b253c4ad786..ccde6fa34d5 100644 --- a/idea/testData/navigation/gotoClass/inClassObject.kt +++ b/idea/testData/navigation/gotoClass/inClassObject.kt @@ -1,7 +1,7 @@ package test class InClassObject { - default object { + companion object { class ClassObjectClass {} trait ClassObjectTrait {} @@ -15,7 +15,7 @@ class InClassObject { } // SEARCH_TEXT: ClassObject -// REF: (test.InClassObject.Default).ClassObjectClass -// REF: (test.InClassObject.Default).ClassObjectObject -// REF: (test.InClassObject.Default).ClassObjectTrait -// REF: (test.InClassObject.Default).ClassObjectTraitWithImpl \ No newline at end of file +// REF: (test.InClassObject.Companion).ClassObjectClass +// REF: (test.InClassObject.Companion).ClassObjectObject +// REF: (test.InClassObject.Companion).ClassObjectTrait +// REF: (test.InClassObject.Companion).ClassObjectTraitWithImpl \ No newline at end of file diff --git a/idea/testData/navigation/gotoSymbol/properties.kt b/idea/testData/navigation/gotoSymbol/properties.kt index 9eda6b9924f..eac3b2a38cb 100644 --- a/idea/testData/navigation/gotoSymbol/properties.kt +++ b/idea/testData/navigation/gotoSymbol/properties.kt @@ -11,7 +11,7 @@ trait SomeTrait { class Some() { val testInClass = 12 - default object { + companion object { val testInClassObject = 12 } } @@ -19,5 +19,5 @@ class Some() { // SEARCH_TEXT: test // REF: ().testGlobal // REF: (Some).testInClass -// REF: (Some.Default).testInClassObject +// REF: (Some.Companion).testInClassObject // REF: (SomeTrait).testInTrait \ No newline at end of file diff --git a/idea/testData/parameterInfo/functionParameterInfo/ExtensionOnClassObject.kt b/idea/testData/parameterInfo/functionParameterInfo/ExtensionOnClassObject.kt index cc5c106ea96..ba1950af3f4 100644 --- a/idea/testData/parameterInfo/functionParameterInfo/ExtensionOnClassObject.kt +++ b/idea/testData/parameterInfo/functionParameterInfo/ExtensionOnClassObject.kt @@ -3,7 +3,7 @@ trait A fun A.foo(i: Int) = i class B { - default object : A + companion object : A } fun test() { diff --git a/idea/testData/quickfix/autoImports/afterUnresolvedReferenceInCall.kt b/idea/testData/quickfix/autoImports/afterUnresolvedReferenceInCall.kt index a862e48b318..34d5e839e1c 100644 --- a/idea/testData/quickfix/autoImports/afterUnresolvedReferenceInCall.kt +++ b/idea/testData/quickfix/autoImports/afterUnresolvedReferenceInCall.kt @@ -1,5 +1,5 @@ // "Import" "true" -// ERROR: Please specify constructor invocation; classifier 'ArrayList' does not have a default object +// ERROR: Please specify constructor invocation; classifier 'ArrayList' does not have a companion object // KT-4000 diff --git a/idea/testData/quickfix/autoImports/beforeUnresolvedReferenceInCall.kt b/idea/testData/quickfix/autoImports/beforeUnresolvedReferenceInCall.kt index 911e96502b9..7eff2d31234 100644 --- a/idea/testData/quickfix/autoImports/beforeUnresolvedReferenceInCall.kt +++ b/idea/testData/quickfix/autoImports/beforeUnresolvedReferenceInCall.kt @@ -1,5 +1,5 @@ // "Import" "true" -// ERROR: Please specify constructor invocation; classifier 'ArrayList' does not have a default object +// ERROR: Please specify constructor invocation; classifier 'ArrayList' does not have a companion object // KT-4000 diff --git a/idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.data.Sample.kt b/idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.data.Sample.kt index 0a6fc962742..a98b432c2d7 100644 --- a/idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.data.Sample.kt +++ b/idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.data.Sample.kt @@ -1,7 +1,7 @@ package some public class Some { - default object { + companion object { public fun test() { } } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnClassObject.kt index b38e9522b58..08812e4fc5f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnClassObject.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnClassObject.kt @@ -1,7 +1,7 @@ // "Create function 'foo'" "true" class A(val n: T) { - default object { + companion object { fun foo(i: Int): Int { throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnClassObject.kt index 3d1a2f3b1c7..0ef88cb4eec 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnClassObject.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/beforeFunOnClassObject.kt @@ -1,7 +1,7 @@ // "Create function 'foo'" "true" class A(val n: T) { - default object { + companion object { } } diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInClassObject.kt index f84624897bc..40fc81dee95 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInClassObject.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInAccessorInClassObject.kt @@ -5,7 +5,7 @@ // ERROR: Unresolved reference: foo class A { - default object { + companion object { val test: Int get() { return foo } diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassObjectInitializer.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassObjectInitializer.kt index 0ca37dd660a..007637315d3 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassObjectInitializer.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassObjectInitializer.kt @@ -5,7 +5,7 @@ // ERROR: Unresolved reference: foo class A { - default object { + companion object { init { val t: Int = foo } diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInClassObject.kt index ded59f39be9..dc9b3649593 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInClassObject.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInPropertyInitializerInClassObject.kt @@ -3,7 +3,7 @@ // ERROR: Unresolved reference: foo class A { - default object { + companion object { val test: Int = foo } } \ No newline at end of file diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnClassObject.kt index 7f1f60c2f47..ebb7165a518 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnClassObject.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnClassObject.kt @@ -2,7 +2,7 @@ // ERROR: Property must be initialized or be abstract class A(val n: T) { - default object { + companion object { val foo: Int } diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnClassObject.kt index 113e29ead1a..d4033a26b27 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnClassObject.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnClassObject.kt @@ -2,7 +2,7 @@ // ERROR: Property must be initialized or be abstract class A(val n: T) { - default object { + companion object { } } diff --git a/idea/testData/quickfix/migration/afterClassObjectToDefaultSingle.kt b/idea/testData/quickfix/migration/afterClassObjectToDefaultSingle.kt index 53dc225950d..1fcf30dab28 100644 --- a/idea/testData/quickfix/migration/afterClassObjectToDefaultSingle.kt +++ b/idea/testData/quickfix/migration/afterClassObjectToDefaultSingle.kt @@ -1,7 +1,7 @@ // "Replace 'class' keyword with 'default' modifier" "true" class A { - public default object { + public companion object { } } \ No newline at end of file diff --git a/idea/testData/quickfix/migration/classObjectToDefaultMultiple.after.data.Sample.kt b/idea/testData/quickfix/migration/classObjectToDefaultMultiple.after.data.Sample.kt index e208663a588..c4d526f1f10 100644 --- a/idea/testData/quickfix/migration/classObjectToDefaultMultiple.after.data.Sample.kt +++ b/idea/testData/quickfix/migration/classObjectToDefaultMultiple.after.data.Sample.kt @@ -1,21 +1,21 @@ class D { - default public object Named { + companion public object Named { } } trait H { - default object { + companion object { } } class E { - default object { + companion object { class D { - default object { + companion object { class D { - default object + companion object } } } @@ -23,7 +23,7 @@ class E { } class K { - default object Default + companion object Companion class Object } \ No newline at end of file diff --git a/idea/testData/quickfix/migration/classObjectToDefaultMultiple.after.kt b/idea/testData/quickfix/migration/classObjectToDefaultMultiple.after.kt index 4870f704636..339254fd946 100644 --- a/idea/testData/quickfix/migration/classObjectToDefaultMultiple.after.kt +++ b/idea/testData/quickfix/migration/classObjectToDefaultMultiple.after.kt @@ -1,19 +1,19 @@ // "Replace 'class' keyword with 'default' modifier in whole project" "true" class A { - public default object { + public companion object { } } class B { - default object { + companion object { } } class C { - default object Named { + companion object Named { } } diff --git a/idea/testData/quickfix/migration/classObjectToDefaultMultiple.before.data.Sample.kt b/idea/testData/quickfix/migration/classObjectToDefaultMultiple.before.data.Sample.kt index 09f47aa7ed6..1915f0747ef 100644 --- a/idea/testData/quickfix/migration/classObjectToDefaultMultiple.before.data.Sample.kt +++ b/idea/testData/quickfix/migration/classObjectToDefaultMultiple.before.data.Sample.kt @@ -1,11 +1,11 @@ class D { - default public class object Named { + companion public class object Named { } } trait H { - default class object { + companion class object { } } @@ -23,7 +23,7 @@ class E { } class K { - default object Default + companion object Companion class Object } \ No newline at end of file diff --git a/idea/testData/quickfix/suppress/declarationKinds/afterClassObject.kt b/idea/testData/quickfix/suppress/declarationKinds/afterClassObject.kt index 28d80ce417c..b037ee41442 100644 --- a/idea/testData/quickfix/suppress/declarationKinds/afterClassObject.kt +++ b/idea/testData/quickfix/suppress/declarationKinds/afterClassObject.kt @@ -1,8 +1,8 @@ -// "Suppress 'REDUNDANT_NULLABLE' for default object Default of C" "true" +// "Suppress 'REDUNDANT_NULLABLE' for companion object Companion of C" "true" class C { [suppress("REDUNDANT_NULLABLE")] - default object { + companion object { var foo: String?? = null } } \ No newline at end of file diff --git a/idea/testData/quickfix/suppress/declarationKinds/beforeClassObject.kt b/idea/testData/quickfix/suppress/declarationKinds/beforeClassObject.kt index 0613b412776..278d65598db 100644 --- a/idea/testData/quickfix/suppress/declarationKinds/beforeClassObject.kt +++ b/idea/testData/quickfix/suppress/declarationKinds/beforeClassObject.kt @@ -1,7 +1,7 @@ -// "Suppress 'REDUNDANT_NULLABLE' for default object Default of C" "true" +// "Suppress 'REDUNDANT_NULLABLE' for companion object Companion of C" "true" class C { - default object { + companion object { var foo: String?? = null } } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt b/idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt index 6e2b1e7aa0c..60b3628a04d 100644 --- a/idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt +++ b/idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt @@ -1,6 +1,6 @@ // SIBLING: public class A { - default object { + companion object { private val t: Int = 1 } fun f() { diff --git a/idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt.conflicts b/idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt.conflicts index 8aabc42af8a..88506c0faf9 100644 --- a/idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt.conflicts +++ b/idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt.conflicts @@ -1 +1 @@ -Property A.Default.t will become invisible after extraction \ No newline at end of file +Property A.Companion.t will become invisible after extraction \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt b/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt index a7b176a6eac..695524929cb 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt +++ b/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt @@ -5,7 +5,7 @@ class MyClass { return coProp + 10 } - default object { + companion object { val coProp = 1 fun coFun() { diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt.after index 661ff135b24..60d187f49fc 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt.after @@ -4,7 +4,7 @@ class MyClass { return i() } - default object { + companion object { val coProp = 1 fun coFun() { diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt b/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt index 1a075b98c86..0988b2e3db1 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt +++ b/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt @@ -6,7 +6,7 @@ class A { return coProp + 10 } - default object { + companion object { val coProp = 1 fun coFun() { diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt.after index 8bc628bdc13..2eb5fbed247 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt.after @@ -5,7 +5,7 @@ class A { return i() } - default object { + companion object { val coProp = 1 fun coFun() { diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt index 3653bf1bc54..5cd2baac051 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt +++ b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt @@ -6,7 +6,7 @@ class MyClass { } public class P { - default object { + companion object { val a = 1 fun foo() = 1 } diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt.after index 51348928b66..b1c183ff326 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt.after @@ -5,7 +5,7 @@ class MyClass { } public class P { - default object { + companion object { val a = 1 fun foo() = 1 } diff --git a/idea/testData/refactoring/inline/property/ClassObjectProperty.kt b/idea/testData/refactoring/inline/property/ClassObjectProperty.kt index 49e6db7074f..1970afa033f 100644 --- a/idea/testData/refactoring/inline/property/ClassObjectProperty.kt +++ b/idea/testData/refactoring/inline/property/ClassObjectProperty.kt @@ -1,5 +1,5 @@ class Class { - default object { + companion object { val p = 239 } } diff --git a/idea/testData/refactoring/inline/property/ClassObjectProperty.kt.after b/idea/testData/refactoring/inline/property/ClassObjectProperty.kt.after index 22d696ec7ca..c9527a17e86 100644 --- a/idea/testData/refactoring/inline/property/ClassObjectProperty.kt.after +++ b/idea/testData/refactoring/inline/property/ClassObjectProperty.kt.after @@ -1,5 +1,5 @@ class Class { - default object { + companion object { } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/after/library/KtClass.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/after/library/KtClass.kt index 50092201270..de138722bb9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/after/library/KtClass.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/after/library/KtClass.kt @@ -2,19 +2,19 @@ package library class KtClass { class Inner { - default object { + companion object { fun foo(): Int = 1 } } - default object { + companion object { fun foo(): Int = 1 } } object KtObject { class Inner { - default object { + companion object { fun foo(): Int = 1 } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/after/source/Foo.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/after/source/Foo.kt index 22d7a468271..96356f21f15 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/after/source/Foo.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/after/source/Foo.kt @@ -3,7 +3,7 @@ package source import library.* class Bar { - default object { + companion object { val c : Int } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/before/library/KtClass.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/before/library/KtClass.kt index 50092201270..de138722bb9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/before/library/KtClass.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/before/library/KtClass.kt @@ -2,19 +2,19 @@ package library class KtClass { class Inner { - default object { + companion object { fun foo(): Int = 1 } } - default object { + companion object { fun foo(): Int = 1 } } object KtObject { class Inner { - default object { + companion object { fun foo(): Int = 1 } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/before/source/Foo.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/before/source/Foo.kt index ea7c7681eec..44b74bd1583 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/before/source/Foo.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/before/source/Foo.kt @@ -11,17 +11,17 @@ class Foo { val kt2 = KtObject.foo() val kt3 = KtClass.Inner.foo() val kt4 = KtObject.Inner.foo() - val kt5 = KtClass.Default.foo() - val kt6 = KtClass.Default + val kt5 = KtClass.Companion.foo() + val kt6 = KtClass.Companion val kt7 = KtClass val kt8 = Bar - val kt9 = Bar.Default - val kt10 = Bar.Default.c + val kt9 = Bar.Companion + val kt10 = Bar.Companion.c } class Bar { - default object { + companion object { val c : Int } } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/defaultObject/after/JavaUsage.java b/idea/testData/refactoring/rename/defaultObject/after/JavaUsage.java index f99099cce52..5d9406876a0 100644 --- a/idea/testData/refactoring/rename/defaultObject/after/JavaUsage.java +++ b/idea/testData/refactoring/rename/defaultObject/after/JavaUsage.java @@ -3,6 +3,6 @@ class JavaUsage { System.out.println(Foo.CONST); Foo.s(); Foo.Baz.f(); - Foo foo = new Foo(); // not usage of default object + Foo foo = new Foo(); // not usage of companion object } } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/defaultObject/after/toBeRenamed.kt b/idea/testData/refactoring/rename/defaultObject/after/toBeRenamed.kt index d6d3742bc81..4738d34f5d0 100644 --- a/idea/testData/refactoring/rename/defaultObject/after/toBeRenamed.kt +++ b/idea/testData/refactoring/rename/defaultObject/after/toBeRenamed.kt @@ -1,5 +1,5 @@ class Foo { - default object Baz { + companion object Baz { fun f() { } diff --git a/idea/testData/refactoring/rename/defaultObject/before/JavaUsage.java b/idea/testData/refactoring/rename/defaultObject/before/JavaUsage.java index 9dbd584aac2..70d5d6dc1e1 100644 --- a/idea/testData/refactoring/rename/defaultObject/before/JavaUsage.java +++ b/idea/testData/refactoring/rename/defaultObject/before/JavaUsage.java @@ -3,6 +3,6 @@ class JavaUsage { System.out.println(Foo.CONST); Foo.s(); Foo.Bar.f(); - Foo foo = new Foo(); // not usage of default object + Foo foo = new Foo(); // not usage of companion object } } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/defaultObject/before/toBeRenamed.kt b/idea/testData/refactoring/rename/defaultObject/before/toBeRenamed.kt index 21fb2b89146..06743a34047 100644 --- a/idea/testData/refactoring/rename/defaultObject/before/toBeRenamed.kt +++ b/idea/testData/refactoring/rename/defaultObject/before/toBeRenamed.kt @@ -1,5 +1,5 @@ class Foo { - default object Bar { + companion object Bar { fun f() { } diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/JavaUsage.java b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/JavaUsage.java index f99099cce52..5d9406876a0 100644 --- a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/JavaUsage.java +++ b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/JavaUsage.java @@ -3,6 +3,6 @@ class JavaUsage { System.out.println(Foo.CONST); Foo.s(); Foo.Baz.f(); - Foo foo = new Foo(); // not usage of default object + Foo foo = new Foo(); // not usage of companion object } } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/toBeRenamed.kt b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/toBeRenamed.kt index d6d3742bc81..4738d34f5d0 100644 --- a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/toBeRenamed.kt +++ b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/toBeRenamed.kt @@ -1,5 +1,5 @@ class Foo { - default object Baz { + companion object Baz { fun f() { } diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/JavaUsage.java b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/JavaUsage.java index 7bdbda1eb52..1c61e93221c 100644 --- a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/JavaUsage.java +++ b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/JavaUsage.java @@ -2,7 +2,7 @@ class JavaUsage { public static void main(String[] args) { System.out.println(Foo.CONST); Foo.s(); - Foo.Default.f(); - Foo foo = new Foo(); // not usage of default object + Foo.Companion.f(); + Foo foo = new Foo(); // not usage of companion object } } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/toBeRenamed.kt b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/toBeRenamed.kt index d85d01717cc..ec134e6bec4 100644 --- a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/toBeRenamed.kt +++ b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/toBeRenamed.kt @@ -1,5 +1,5 @@ class Foo { - default object { + companion object { fun f() { } diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/usage.kt b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/usage.kt index 4abbf279e77..86c214c2e8f 100644 --- a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/usage.kt +++ b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/usage.kt @@ -3,6 +3,6 @@ fun main(args: Array) { Foo.f() val x = Foo - Foo.Default.f() - val xx = Foo.Default + Foo.Companion.f() + val xx = Foo.Companion } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/defaultObject.test b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/defaultObject.test index 05278da2d6c..bdeee21524e 100644 --- a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/defaultObject.test +++ b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/defaultObject.test @@ -1,7 +1,7 @@ { "type": "KOTLIN_CLASS", - "classId": "/Foo.Default", - "oldName": "Default", + "classId": "/Foo.Companion", + "oldName": "Companion", "newName": "Baz", "mainFile": "toBeRenamed.kt" } \ No newline at end of file diff --git a/idea/testData/resolve/referenceInJava/ClassObjectField.java b/idea/testData/resolve/referenceInJava/ClassObjectField.java index d6d272091af..0a8b702924c 100644 --- a/idea/testData/resolve/referenceInJava/ClassObjectField.java +++ b/idea/testData/resolve/referenceInJava/ClassObjectField.java @@ -1,7 +1,7 @@ public class ClassObjectField { public static void foo() { - k.ClassWithClassObject.Default.f(); + k.ClassWithClassObject.Companion.f(); } } -// REF: default object of (k).ClassWithClassObject +// REF: companion object of (k).ClassWithClassObject diff --git a/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java b/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java index 7c4be6ec546..ab85aad25ee 100644 --- a/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java +++ b/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java @@ -6,4 +6,4 @@ public class ClassObjectField { } } -// REF: (k.StaticFieldInClassObjectInTrait.Default).XX \ No newline at end of file +// REF: (k.StaticFieldInClassObjectInTrait.Companion).XX \ No newline at end of file diff --git a/idea/testData/resolve/referenceInJava/DeprecatedClassObjectField.java b/idea/testData/resolve/referenceInJava/DeprecatedClassObjectField.java index 1ac0004f115..0199370c25f 100644 --- a/idea/testData/resolve/referenceInJava/DeprecatedClassObjectField.java +++ b/idea/testData/resolve/referenceInJava/DeprecatedClassObjectField.java @@ -4,4 +4,4 @@ public class ClassObjectField { } } -// REF: default object of (k).ClassWithClassObject +// REF: companion object of (k).ClassWithClassObject diff --git a/idea/testData/resolve/referenceInJava/dependencies.kt b/idea/testData/resolve/referenceInJava/dependencies.kt index 336b8e569a9..1830e1f1349 100644 --- a/idea/testData/resolve/referenceInJava/dependencies.kt +++ b/idea/testData/resolve/referenceInJava/dependencies.kt @@ -16,7 +16,7 @@ public fun topLevelFun() { } public class ClassWithClassObject { - default object { + companion object { fun f() = 1 } } @@ -26,7 +26,7 @@ public object KotlinObject { } public trait StaticFieldInClassObjectInTrait { - default object { + companion object { public val XX: String = "xx" } } diff --git a/idea/testData/resolve/references/ClassObjectClassLiteralReference.kt b/idea/testData/resolve/references/ClassObjectClassLiteralReference.kt index f6b28206dd7..27240a66b0a 100644 --- a/idea/testData/resolve/references/ClassObjectClassLiteralReference.kt +++ b/idea/testData/resolve/references/ClassObjectClassLiteralReference.kt @@ -1,7 +1,7 @@ package t class A { - default object Named { + companion object Named { } } diff --git a/idea/testData/resolve/references/ClassObjectClassLiteralReferenceWithField.kt b/idea/testData/resolve/references/ClassObjectClassLiteralReferenceWithField.kt index 31c1a665f24..10311ac660e 100644 --- a/idea/testData/resolve/references/ClassObjectClassLiteralReferenceWithField.kt +++ b/idea/testData/resolve/references/ClassObjectClassLiteralReferenceWithField.kt @@ -1,7 +1,7 @@ package t class A { - default object Named { + companion object Named { val i: Int } } diff --git a/idea/testData/resolve/references/ClassQualifierForNestedClassConstructorCall.kt b/idea/testData/resolve/references/ClassQualifierForNestedClassConstructorCall.kt index 0a123ec5e77..7721ad6ef33 100644 --- a/idea/testData/resolve/references/ClassQualifierForNestedClassConstructorCall.kt +++ b/idea/testData/resolve/references/ClassQualifierForNestedClassConstructorCall.kt @@ -1,7 +1,7 @@ package t class A { - default object Default { + companion object Companion { } diff --git a/idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForFunction.kt b/idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForFunction.kt index e76d7263eab..a73adcddee2 100644 --- a/idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForFunction.kt +++ b/idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForFunction.kt @@ -1,17 +1,17 @@ package t class A { - default object Default { + companion object Companion { } } -fun A.Default.foo() {} +fun A.Companion.foo() {} fun test() { A.foo() } -// REF: default object of (t).A +// REF: companion object of (t).A diff --git a/idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForProperty.kt b/idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForProperty.kt index 970577ec5ae..2bb49bebd85 100644 --- a/idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForProperty.kt +++ b/idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForProperty.kt @@ -1,7 +1,7 @@ package t class A { - default object B { + companion object B { } } @@ -13,5 +13,5 @@ fun test() { } -// REF: default object of (t).A +// REF: companion object of (t).A diff --git a/idea/testData/resolve/references/DefaultObjectAsReceiverForExtensionFunctionOnSuperType.kt b/idea/testData/resolve/references/DefaultObjectAsReceiverForExtensionFunctionOnSuperType.kt index 8a2d71fc7ca..4e15221c20b 100644 --- a/idea/testData/resolve/references/DefaultObjectAsReceiverForExtensionFunctionOnSuperType.kt +++ b/idea/testData/resolve/references/DefaultObjectAsReceiverForExtensionFunctionOnSuperType.kt @@ -3,7 +3,7 @@ package t trait Trait open class A { - default object Default : Trait { + companion object Companion : Trait { } } @@ -15,5 +15,5 @@ fun test() { } -// REF: default object of (t).A +// REF: companion object of (t).A diff --git a/idea/testData/resolve/references/DefaultObjectAsReceiverForMemberPropertyInSuperType.kt b/idea/testData/resolve/references/DefaultObjectAsReceiverForMemberPropertyInSuperType.kt index 50928090644..a79f2052162 100644 --- a/idea/testData/resolve/references/DefaultObjectAsReceiverForMemberPropertyInSuperType.kt +++ b/idea/testData/resolve/references/DefaultObjectAsReceiverForMemberPropertyInSuperType.kt @@ -5,7 +5,7 @@ trait Trait { } open class A { - default object Default : Trait { + companion object Companion : Trait { } } @@ -15,5 +15,5 @@ fun test() { } -// REF: default object of (t).A +// REF: companion object of (t).A diff --git a/idea/testData/resolve/references/DefaultObjectInShortReferenceFormCall.kt b/idea/testData/resolve/references/DefaultObjectInShortReferenceFormCall.kt index 3e467467bec..b1d7b90dd37 100644 --- a/idea/testData/resolve/references/DefaultObjectInShortReferenceFormCall.kt +++ b/idea/testData/resolve/references/DefaultObjectInShortReferenceFormCall.kt @@ -1,7 +1,7 @@ package t class A { - default object Default { + companion object Companion { fun test() } } @@ -11,5 +11,5 @@ fun test() { } -// REF: default object of (t).A +// REF: companion object of (t).A diff --git a/idea/testData/resolve/references/InObjectClassObject.kt b/idea/testData/resolve/references/InObjectClassObject.kt index fa625e47972..593f736966f 100644 --- a/idea/testData/resolve/references/InObjectClassObject.kt +++ b/idea/testData/resolve/references/InObjectClassObject.kt @@ -3,7 +3,7 @@ package test class A object b { - default object { + companion object { val x = A() } } diff --git a/idea/testData/resolve/references/InSecondClassObject.kt b/idea/testData/resolve/references/InSecondClassObject.kt index 4ec83db5f3d..a6d2a2dd541 100644 --- a/idea/testData/resolve/references/InSecondClassObject.kt +++ b/idea/testData/resolve/references/InSecondClassObject.kt @@ -3,11 +3,11 @@ package test class A class Many { - default object { + companion object { val x = A() } - default object { + companion object { val y = A() } } diff --git a/idea/testData/resolve/references/NamedClassObject.kt b/idea/testData/resolve/references/NamedClassObject.kt index e162adf8b85..9a2c464d20f 100644 --- a/idea/testData/resolve/references/NamedClassObject.kt +++ b/idea/testData/resolve/references/NamedClassObject.kt @@ -1,7 +1,7 @@ package a class A { - default object Named { + companion object Named { val i: Int } } @@ -10,4 +10,4 @@ fun main(args: Array) { A.Named.i } -// REF: default object of (a).A \ No newline at end of file +// REF: companion object of (a).A \ No newline at end of file diff --git a/idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt b/idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt index 474f8a5df05..48764f817fc 100644 --- a/idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt +++ b/idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt @@ -1,7 +1,7 @@ package testing object Testing { - default object { + companion object { va } } diff --git a/idea/testData/run/ClassesAndObjects/module/src/test.kt b/idea/testData/run/ClassesAndObjects/module/src/test.kt index fa7b4b2f88d..e4915abff69 100644 --- a/idea/testData/run/ClassesAndObjects/module/src/test.kt +++ b/idea/testData/run/ClassesAndObjects/module/src/test.kt @@ -11,7 +11,7 @@ object Foo { // RUN: q.Foo.InnerFoo class InnerFoo { - default object { + companion object { // RUN: q.Foo.InnerFoo platformStatic fun main(s: Array) { println("InnerFoo") @@ -38,7 +38,7 @@ object Foo2 { // RUN: q.Bar class Bar { - default object { + companion object { // RUN: q.Bar platformStatic fun main(s: Array) { println("Bar") @@ -48,7 +48,7 @@ class Bar { // RUN: q.QPackage class Bar2 { - default object { + companion object { // RUN: q.QPackage fun main(s: Array) { println("Bar2") diff --git a/idea/testData/search/annotations/testAnnotationsOnFunction.kt b/idea/testData/search/annotations/testAnnotationsOnFunction.kt index e6bfd37d69f..320d701d55a 100644 --- a/idea/testData/search/annotations/testAnnotationsOnFunction.kt +++ b/idea/testData/search/annotations/testAnnotationsOnFunction.kt @@ -17,7 +17,7 @@ class Test5() { } class Test6() { - default object { + companion object { Deprecated fun test6() {} } } diff --git a/idea/testData/shortenRefs/classObject.kt b/idea/testData/shortenRefs/classObject.kt index 6b291a294bd..5d88106dfc7 100644 --- a/idea/testData/shortenRefs/classObject.kt +++ b/idea/testData/shortenRefs/classObject.kt @@ -1,25 +1,25 @@ package p.q -fun foo(myC: p.q.MyClass, def: p.q.MyClass.Default, nes: p.q.MyClass.Default.Nested) { - p.q.MyClass.Default.foo() - p.q.MyClass.Default.coProp - p.q.MyClass.Default +fun foo(myC: p.q.MyClass, def: p.q.MyClass.Companion, nes: p.q.MyClass.Companion.Nested) { + p.q.MyClass.Companion.foo() + p.q.MyClass.Companion.coProp + p.q.MyClass.Companion p.q.MyClass p.q.MyClass.coProp p.q.MyClass.foo() - p.q.MyClass.bar(p.q.MyClass.Default) + p.q.MyClass.bar(p.q.MyClass.Companion) p.q.MyClass.bar(p.q.MyClass) - p.q.MyClass.Default.Nested.Default - p.q.MyClass.Default.Nested.Default.c - MyClass.Default + p.q.MyClass.Companion.Nested.Companion + p.q.MyClass.Companion.Nested.Companion.c + MyClass.Companion } class MyClass { - default object { + companion object { val coProp = 1 class Nested { - default object { + companion object { val c: Int = 1 } } @@ -28,7 +28,7 @@ class MyClass { } - fun bar(p: MyClass.Default) { + fun bar(p: MyClass.Companion) { } } } \ No newline at end of file diff --git a/idea/testData/shortenRefs/classObject.kt.after b/idea/testData/shortenRefs/classObject.kt.after index 0ac6a7d27db..82e03858509 100644 --- a/idea/testData/shortenRefs/classObject.kt.after +++ b/idea/testData/shortenRefs/classObject.kt.after @@ -1,6 +1,6 @@ package p.q -fun foo(myC: MyClass, def: MyClass.Default, nes: MyClass.Default.Nested) { +fun foo(myC: MyClass, def: MyClass.Companion, nes: MyClass.Companion.Nested) { MyClass.foo() MyClass.coProp MyClass @@ -9,17 +9,17 @@ fun foo(myC: MyClass, def: MyClass.Default, nes: MyClass.Default.Nested) { MyClass.foo() MyClass.bar(MyClass) MyClass.bar(MyClass) - MyClass.Default.Nested - MyClass.Default.Nested.c + MyClass.Companion.Nested + MyClass.Companion.Nested.c MyClass } class MyClass { - default object { + companion object { val coProp = 1 class Nested { - default object { + companion object { val c: Int = 1 } } @@ -28,7 +28,7 @@ class MyClass { } - fun bar(p: MyClass.Default) { + fun bar(p: MyClass.Companion) { } } } \ No newline at end of file diff --git a/idea/testData/structureView/fileStructure/Render.after b/idea/testData/structureView/fileStructure/Render.after index 8c7930a7548..f752cd9049a 100644 --- a/idea/testData/structureView/fileStructure/Render.after +++ b/idea/testData/structureView/fileStructure/Render.after @@ -12,7 +12,7 @@ Inner1 Inner2 -A6 - -default object of A6 + -companion object of A6 test(): Unit -A7 diff --git a/idea/testData/structureView/fileStructure/Render.kt b/idea/testData/structureView/fileStructure/Render.kt index 8f32044ba54..bd915e8ec8f 100644 --- a/idea/testData/structureView/fileStructure/Render.kt +++ b/idea/testData/structureView/fileStructure/Render.kt @@ -25,7 +25,7 @@ class A5 { inner class Inner2 } class A6 { - default object { + companion object { fun test() {} } } diff --git a/idea/testData/stubs/ClassObject.expected b/idea/testData/stubs/ClassObject.expected index 8eb46e3e5c5..fae92a85cb2 100644 --- a/idea/testData/stubs/ClassObject.expected +++ b/idea/testData/stubs/ClassObject.expected @@ -2,8 +2,8 @@ PsiJetFileStubImpl[package=] PACKAGE_DIRECTIVE: CLASS:[fqName=C, isEnumEntry=false, isLocal=false, isTopLevel=true, isTrait=false, name=C, superNames=[]] CLASS_BODY: - OBJECT_DECLARATION:[fqName=C.Default, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Default, superNames=[]] - MODIFIER_LIST:[default] + OBJECT_DECLARATION:[fqName=C.Companion, isDefault=true, isLocal=false, isObjectLiteral=false, isTopLevel=false, name=Companion, superNames=[]] + MODIFIER_LIST:[companion] CLASS_BODY: - FUN:[fqName=C.Default.foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=foo] + FUN:[fqName=C.Companion.foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isProbablyNothingType=false, isTopLevel=false, name=foo] VALUE_PARAMETER_LIST: diff --git a/idea/testData/stubs/ClassObject.kt b/idea/testData/stubs/ClassObject.kt index abbd15a8644..be791bf12f8 100644 --- a/idea/testData/stubs/ClassObject.kt +++ b/idea/testData/stubs/ClassObject.kt @@ -1,4 +1,4 @@ -class C { default object { +class C { companion object { fun foo() { } } diff --git a/idea/testData/stubs/SecondaryConstructors.expected b/idea/testData/stubs/SecondaryConstructors.expected index 2d95664715c..3fa0ff7b24a 100644 --- a/idea/testData/stubs/SecondaryConstructors.expected +++ b/idea/testData/stubs/SecondaryConstructors.expected @@ -41,7 +41,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE:[isAbsoluteInRootPackage=false] REFERENCE_EXPRESSION:[referencedName=Int] TYPE_CONSTRAINT_LIST: - TYPE_CONSTRAINT:[isDefaultObjectConstraint=false] + TYPE_CONSTRAINT:[isCompanionObjectConstraint=false] REFERENCE_EXPRESSION:[referencedName=G] TYPE_REFERENCE: USER_TYPE:[isAbsoluteInRootPackage=false] diff --git a/idea/testData/unifier/equivalence/declarations/classesAndObjects/members.kt b/idea/testData/unifier/equivalence/declarations/classesAndObjects/members.kt index 3c270314dfe..44f19b15c57 100644 --- a/idea/testData/unifier/equivalence/declarations/classesAndObjects/members.kt +++ b/idea/testData/unifier/equivalence/declarations/classesAndObjects/members.kt @@ -20,7 +20,7 @@ fun foo() { println(2) } - default object { + companion object { fun f() = 1 val g = f() - 1 } @@ -39,7 +39,7 @@ fun foo() { val p = 1 - default object { + companion object { fun f() = 1 val g = f() - 1 } @@ -77,7 +77,7 @@ fun foo() { println(2) } - default object { + companion object { fun f() = 1 val g = f() - 1 } @@ -103,7 +103,7 @@ fun foo() { println(2) } - default object { + companion object { fun f() = 1 val g = f() - 1 } @@ -129,7 +129,7 @@ fun foo() { println(2) } - default object { + companion object { fun f() = 1 val g = f() - 1 } diff --git a/idea/testData/unifier/equivalence/declarations/classesAndObjects/members.kt.match b/idea/testData/unifier/equivalence/declarations/classesAndObjects/members.kt.match index a64bff1e430..95c074de9cf 100644 --- a/idea/testData/unifier/equivalence/declarations/classesAndObjects/members.kt.match +++ b/idea/testData/unifier/equivalence/declarations/classesAndObjects/members.kt.match @@ -18,7 +18,7 @@ class A { println(2) } - default object { + companion object { fun f() = 1 val g = f() - 1 } @@ -37,7 +37,7 @@ class B { val p = 1 - default object { + companion object { fun f() = 1 val g = f() - 1 } diff --git a/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt index b919c380b4e..f7acacaeeca 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt @@ -35,7 +35,7 @@ public class QualifiedNamesTest: LightCodeInsightTestCase() { class Klass { class Nested - default object { + companion object { } } @@ -46,7 +46,7 @@ public class QualifiedNamesTest: LightCodeInsightTestCase() { } """ ) - assertEquals(listOf("foo.bar.Klass", "foo.bar.Klass.Nested", "foo.bar.Klass.Default", "foo.bar.Object", "foo.bar.anonymous", null), + assertEquals(listOf("foo.bar.Klass", "foo.bar.Klass.Nested", "foo.bar.Klass.Companion", "foo.bar.Object", "foo.bar.anonymous", null), getQualifiedNamesForDeclarations()) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java index fd9dc820f56..be53c1a9141 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java @@ -187,22 +187,22 @@ public class JetJavaFacadeTest extends JetLightCodeInsightFixtureTestCase { PsiField classobjField = theClass.findFieldByName("$classobj", false); assertNull(classobjField); - String defaultClassObjectName = SpecialNames.DEFAULT_NAME_FOR_DEFAULT_OBJECT.asString(); - PsiClass classObjectClass = theClass.findInnerClassByName(defaultClassObjectName, false); + String defaultCompanionObjectName = SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT.asString(); + PsiClass classObjectClass = theClass.findInnerClassByName(defaultCompanionObjectName, false); assertNotNull(classObjectClass); - assertEquals("foo.TheClass." + defaultClassObjectName, classObjectClass.getQualifiedName()); + assertEquals("foo.TheClass." + defaultCompanionObjectName, classObjectClass.getQualifiedName()); assertTrue(classObjectClass.hasModifierProperty(PsiModifier.STATIC)); - PsiField instance = theClass.findFieldByName(defaultClassObjectName, false); + PsiField instance = theClass.findFieldByName(defaultCompanionObjectName, false); assertNotNull(instance); - assertEquals("foo.TheClass." + defaultClassObjectName, instance.getType().getCanonicalText()); + assertEquals("foo.TheClass." + defaultCompanionObjectName, instance.getType().getCanonicalText()); assertTrue(instance.hasModifierProperty(PsiModifier.PUBLIC)); assertTrue(instance.hasModifierProperty(PsiModifier.STATIC)); assertTrue(instance.hasModifierProperty(PsiModifier.FINAL)); - PsiField deprecatedAccessor = theClass.findFieldByName(JvmAbi.DEPRECATED_DEFAULT_OBJECT_FIELD, false); + PsiField deprecatedAccessor = theClass.findFieldByName(JvmAbi.DEPRECATED_COMPANION_OBJECT_FIELD, false); assertNotNull(deprecatedAccessor); - assertEquals("foo.TheClass." + defaultClassObjectName, deprecatedAccessor.getType().getCanonicalText()); + assertEquals("foo.TheClass." + defaultCompanionObjectName, deprecatedAccessor.getType().getCanonicalText()); assertTrue(deprecatedAccessor.hasModifierProperty(PsiModifier.PUBLIC)); assertTrue(deprecatedAccessor.hasModifierProperty(PsiModifier.STATIC)); assertTrue(deprecatedAccessor.hasModifierProperty(PsiModifier.FINAL)); diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt index 5d376eb3908..42c63555c9c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt @@ -199,10 +199,10 @@ public class DebugTextByStubTest : LightCodeInsightFixtureTestCase() { } fun testClassObject() { - val tree = createStubTree("class A { default object Def {} }") - val defaultObject = tree.findChildStubByType(JetStubElementTypes.CLASS)!!.findChildStubByType(JetStubElementTypes.CLASS_BODY)!! + val tree = createStubTree("class A { companion object Def {} }") + val companionObject = tree.findChildStubByType(JetStubElementTypes.CLASS)!!.findChildStubByType(JetStubElementTypes.CLASS_BODY)!! .findChildStubByType(JetStubElementTypes.OBJECT_DECLARATION) - assertEquals("STUB: default object Def", JetObjectDeclaration(defaultObject as KotlinObjectStub).getDebugText()) + assertEquals("STUB: companion object Def", JetObjectDeclaration(companionObject as KotlinObjectStub).getDebugText()) } fun testPropertyAccessors() { diff --git a/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java b/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java index 76f2533be10..135ab79462f 100644 --- a/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java +++ b/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java @@ -39,11 +39,11 @@ public final class ReferenceUtils { public static String renderAsGotoImplementation(@NotNull PsiElement element) { PsiElement navigationElement = element.getNavigationElement(); - if (navigationElement instanceof JetObjectDeclaration && ((JetObjectDeclaration) navigationElement).isDefault()) { - //default presenter return null for default object + if (navigationElement instanceof JetObjectDeclaration && ((JetObjectDeclaration) navigationElement).isCompanion()) { + //default presenter return null for companion object JetClass containingClass = PsiTreeUtil.getParentOfType(navigationElement, JetClass.class); assert containingClass != null; - return "default object of " + renderAsGotoImplementation(containingClass); + return "companion object of " + renderAsGotoImplementation(containingClass); } Assert.assertTrue(navigationElement instanceof NavigationItem); diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ClassBodyConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ClassBodyConverter.kt index 56e2647f594..8f5e189f13d 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ClassBodyConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ClassBodyConverter.kt @@ -77,10 +77,10 @@ class ClassBodyConverter(private val psiClass: PsiClass, convertedMembers.remove(member) } - val useDefaultObject = shouldGenerateDefaultObject(convertedMembers) + val useCompanionObject = shouldGenerateCompanionObject(convertedMembers) val members = ArrayList() - val defaultObjectMembers = ArrayList() + val companionObjectMembers = ArrayList() var primaryConstructorSignature: PrimaryConstructorSignature? = null for ((psiMember, member) in convertedMembers) { if (member is PrimaryConstructor) { @@ -88,8 +88,8 @@ class ClassBodyConverter(private val psiClass: PsiClass, primaryConstructorSignature = member.createSignature(converter) members.add(member.initializer()) } - else if (useDefaultObject && member !is Class && psiMember.hasModifierProperty(PsiModifier.STATIC)) { - defaultObjectMembers.add(member) + else if (useCompanionObject && member !is Class && psiMember.hasModifierProperty(PsiModifier.STATIC)) { + companionObjectMembers.add(member) } else { members.add(member) @@ -108,7 +108,7 @@ class ClassBodyConverter(private val psiClass: PsiClass, val lBrace = LBrace().assignPrototype(psiClass.getLBrace()) val rBrace = RBrace().assignPrototype(psiClass.getRBrace()) - return ClassBody(primaryConstructorSignature, constructorConverter?.baseClassParams ?: listOf(), members, defaultObjectMembers, lBrace, rBrace) + return ClassBody(primaryConstructorSignature, constructorConverter?.baseClassParams ?: listOf(), members, companionObjectMembers, lBrace, rBrace) } private fun Converter.convertMember(member: PsiMember, @@ -123,15 +123,15 @@ class ClassBodyConverter(private val psiClass: PsiClass, } } - // do not convert private static methods into default object if possible - private fun shouldGenerateDefaultObject(convertedMembers: Map): Boolean { + // do not convert private static methods into companion object if possible + private fun shouldGenerateCompanionObject(convertedMembers: Map): Boolean { if (psiClass.isEnum()) return false val members = convertedMembers.keySet().filter { !it.isConstructor() } - val defaultObjectMembers = members.filter { it !is PsiClass && it.hasModifierProperty(PsiModifier.STATIC) } + val companionObjectMembers = members.filter { it !is PsiClass && it.hasModifierProperty(PsiModifier.STATIC) } val nestedClasses = members.filterIsInstance().filter { it.hasModifierProperty(PsiModifier.STATIC) } - if (defaultObjectMembers.all { it is PsiMethod && it.hasModifierProperty(PsiModifier.PRIVATE) }) { - return nestedClasses.any { nestedClass -> defaultObjectMembers.any { converter.referenceSearcher.findMethodCalls(it as PsiMethod, nestedClass).isNotEmpty() } } + if (companionObjectMembers.all { it is PsiMethod && it.hasModifierProperty(PsiModifier.PRIVATE) }) { + return nestedClasses.any { nestedClass -> companionObjectMembers.any { converter.referenceSearcher.findMethodCalls(it as PsiMethod, nestedClass).isNotEmpty() } } } else { return true diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt index 3a875baa355..eb8f702432e 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt @@ -216,7 +216,7 @@ class Converter private( // to convert fields and nested types - they are not allowed in Kotlin but we convert them and let user refactor code var classBody = ClassBodyConverter(psiClass, this, false).convertBody() - classBody = ClassBody(constructorSignature, classBody.baseClassParams, classBody.members, classBody.defaultObjectMembers, classBody.lBrace, classBody.rBrace) + classBody = ClassBody(constructorSignature, classBody.baseClassParams, classBody.members, classBody.companionObjectMembers, classBody.lBrace, classBody.rBrace) val annotationAnnotation = Annotation(Identifier("annotation").assignNoPrototype(), listOf(), false, false).assignNoPrototype() return Class(psiClass.declarationIdentifier(), diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/ClassBody.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/ClassBody.kt index c9aee24c4a5..33fa67e6955 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/ClassBody.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/ClassBody.kt @@ -24,26 +24,26 @@ class ClassBody ( val primaryConstructorSignature: PrimaryConstructorSignature?, val baseClassParams: List>, val members: List, - val defaultObjectMembers: List, + val companionObjectMembers: List, val lBrace: LBrace, val rBrace: RBrace) { fun append(builder: CodeBuilder) { val membersFiltered = members.filter { !it.isEmpty } - if (membersFiltered.isEmpty() && defaultObjectMembers.isEmpty()) return + if (membersFiltered.isEmpty() && companionObjectMembers.isEmpty()) return builder append " " append lBrace append "\n" builder.append(membersFiltered, "\n") - appendDefaultObject(builder, membersFiltered.isNotEmpty()) + appendCompanionObject(builder, membersFiltered.isNotEmpty()) builder append "\n" append rBrace } - private fun appendDefaultObject(builder: CodeBuilder, blankLineBefore: Boolean) { - if (defaultObjectMembers.isEmpty()) return + private fun appendCompanionObject(builder: CodeBuilder, blankLineBefore: Boolean) { + if (companionObjectMembers.isEmpty()) return if (blankLineBefore) builder.append("\n\n") - builder.append(defaultObjectMembers, "\n", "default object {\n", "\n}") + builder.append(companionObjectMembers, "\n", "companion object {\n", "\n}") } } diff --git a/j2k/testData/KotlinApi.kt b/j2k/testData/KotlinApi.kt index a42fc560d75..d2b8fddf665 100644 --- a/j2k/testData/KotlinApi.kt +++ b/j2k/testData/KotlinApi.kt @@ -6,7 +6,7 @@ public open class KotlinClass(public var field: Int) { public open fun foo(mutableCollection: MutableCollection, nullableCollection: Collection?): MutableList = arrayListOf() - default object { + companion object { public fun staticFun(p: Int): Int = p public var staticVar: Int = 1 public var staticProperty: Int diff --git a/j2k/testData/fileOrElement/annotations/annotationInterface3.kt b/j2k/testData/fileOrElement/annotations/annotationInterface3.kt index 0e4cdc32048..7d1205a6dc7 100644 --- a/j2k/testData/fileOrElement/annotations/annotationInterface3.kt +++ b/j2k/testData/fileOrElement/annotations/annotationInterface3.kt @@ -6,7 +6,7 @@ annotation class Anon(public val value: String) { B } - default object { + companion object { public val field: E = E.A } @@ -14,7 +14,7 @@ annotation class Anon(public val value: String) { Anon("a") trait I { - default object { + companion object { public val e: Anon.E = Anon.field } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt b/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt index d1dc60c8dfe..45d7cf30bfb 100644 --- a/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt +++ b/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { var str: String { str = "Ola" diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt b/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt index 86df1bf3988..7215bf3c2bf 100644 --- a/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt +++ b/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt @@ -1,6 +1,6 @@ // ERROR: Property must be initialized or be abstract class Library { - default object { + companion object { val ourOut: java.io.PrintStream } } diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt index fcfc9f36ff0..14d6bdc35b2 100644 --- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt +++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt @@ -1,5 +1,5 @@ class Library { - default object { + companion object { fun call() { } diff --git a/j2k/testData/fileOrElement/class/ClassShadowing.kt b/j2k/testData/fileOrElement/class/ClassShadowing.kt index 6b9ee77b6e4..82a71bba878 100644 --- a/j2k/testData/fileOrElement/class/ClassShadowing.kt +++ b/j2k/testData/fileOrElement/class/ClassShadowing.kt @@ -1,7 +1,7 @@ package test public class Short { - default object { + companion object { public fun valueOf(value: String): Short { return Short() } @@ -9,7 +9,7 @@ public class Short { } class Test { - default object { + companion object { public fun test() { test.Short.valueOf("1") test.Short.valueOf("1") diff --git a/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt b/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt index ac1d1897d88..3ff347c05cb 100644 --- a/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt +++ b/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt @@ -3,7 +3,7 @@ class S { return true } - default object { + companion object { var myI = 10 } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/class/oneStaticMethod.kt b/j2k/testData/fileOrElement/class/oneStaticMethod.kt index 24446e74be1..a0236ceb3e6 100644 --- a/j2k/testData/fileOrElement/class/oneStaticMethod.kt +++ b/j2k/testData/fileOrElement/class/oneStaticMethod.kt @@ -1,5 +1,5 @@ class S { - default object { + companion object { fun staticF(): Boolean { return true } diff --git a/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt b/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt index a55ebfbc01d..c8902c8ef92 100644 --- a/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt +++ b/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt @@ -3,7 +3,7 @@ class S { return true } - default object { + companion object { fun sI(): Int { return 1 } diff --git a/j2k/testData/fileOrElement/class/twoStaticMethod.kt b/j2k/testData/fileOrElement/class/twoStaticMethod.kt index fd375cd4eec..fba0061f696 100644 --- a/j2k/testData/fileOrElement/class/twoStaticMethod.kt +++ b/j2k/testData/fileOrElement/class/twoStaticMethod.kt @@ -1,5 +1,5 @@ class S { - default object { + companion object { fun sB(): Boolean { return true } diff --git a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt index 6727ff14939..926f48a1504 100644 --- a/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt +++ b/j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt @@ -1,5 +1,5 @@ public class A { - default object { + companion object { public fun main(args: Array) { System.out.println(Void.TYPE) System.out.println(Integer.TYPE) diff --git a/j2k/testData/fileOrElement/comments/comments2.kt b/j2k/testData/fileOrElement/comments/comments2.kt index d3f81579f7e..6f8dca67001 100644 --- a/j2k/testData/fileOrElement/comments/comments2.kt +++ b/j2k/testData/fileOrElement/comments/comments2.kt @@ -21,7 +21,7 @@ class A { protected /*it's protected*/ fun foo(c: Char) { } - default object { + companion object { public /*it's public*//*and static*//*and final*/ val C: Int = 1 } diff --git a/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt b/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt index 5f8c8a67410..4008e8bd050 100644 --- a/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt +++ b/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt @@ -3,7 +3,7 @@ package pack class C(arg1: Int, arg2: Int = 0, arg3: Int = 0) public class User { - default object { + companion object { public fun main() { val c1 = C(100, 100, 100) val c2 = C(100, 100) diff --git a/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt b/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt index bf64220e8a9..47c1a61e91c 100644 --- a/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt +++ b/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt @@ -19,7 +19,7 @@ class C(val myArg1: Int) { } public class User { - default object { + companion object { public fun main() { val c1 = C(100, 100, 100) val c2 = C(100, 100) diff --git a/j2k/testData/fileOrElement/constructors/chain.kt b/j2k/testData/fileOrElement/constructors/chain.kt index f2184bedcb4..f85850db162 100644 --- a/j2k/testData/fileOrElement/constructors/chain.kt +++ b/j2k/testData/fileOrElement/constructors/chain.kt @@ -10,7 +10,7 @@ class C(arg1: Int, arg2: Int, arg3: Int) { } public class User { - default object { + companion object { public fun main() { val c1 = C(1, 2, 3) val c2 = C(5, 6) diff --git a/j2k/testData/fileOrElement/constructors/customerBuilder.kt b/j2k/testData/fileOrElement/constructors/customerBuilder.kt index 48eccc0ce29..435c86ab6cb 100644 --- a/j2k/testData/fileOrElement/constructors/customerBuilder.kt +++ b/j2k/testData/fileOrElement/constructors/customerBuilder.kt @@ -34,7 +34,7 @@ class CustomerBuilder { } public class User { - default object { + companion object { public fun main() { val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build() System.out.println(customer.firstName) diff --git a/j2k/testData/fileOrElement/constructors/genericIdentifier.kt b/j2k/testData/fileOrElement/constructors/genericIdentifier.kt index 2049717754b..5fdedc462cd 100644 --- a/j2k/testData/fileOrElement/constructors/genericIdentifier.kt +++ b/j2k/testData/fileOrElement/constructors/genericIdentifier.kt @@ -21,7 +21,7 @@ public class Identifier { } public class User { - default object { + companion object { public fun main() { val i1 = Identifier("name", false, true) val i2 = Identifier("name", false) diff --git a/j2k/testData/fileOrElement/constructors/identifier.kt b/j2k/testData/fileOrElement/constructors/identifier.kt index 30737cc1acf..1aec354af0a 100644 --- a/j2k/testData/fileOrElement/constructors/identifier.kt +++ b/j2k/testData/fileOrElement/constructors/identifier.kt @@ -21,7 +21,7 @@ public class Identifier { } public class User { - default object { + companion object { public fun main() { val i1 = Identifier("name", false, true) val i2 = Identifier("name", false) diff --git a/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt index d536d215788..f67aeb5aee2 100644 --- a/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt +++ b/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt @@ -8,7 +8,7 @@ class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) { System.out.println(foo(1) + this.foo(2) + other.foo(3) + staticFoo(4) + C.staticFoo(5)) } - default object { + companion object { private fun staticFoo(p: Int): Int { return p } diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt index 54437129e4a..809aa3ec397 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt @@ -1,7 +1,7 @@ class A(nested: A.Nested = A.Nested(A.Nested.FIELD)) { class Nested(p: Int) { - default object { + companion object { public val FIELD: Int = 0 } diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt index 1449143d302..4b66aadb31f 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt @@ -4,7 +4,7 @@ import A.Nested class A(nested: Nested = Nested(Nested.FIELD)) { class Nested(p: Int) { - default object { + companion object { public val FIELD: Int = 0 } diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt index 53f45098635..436c8a67ff9 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt @@ -6,7 +6,7 @@ import pack.A.Nested class A(nested: Nested = Nested(Nested.FIELD)) { class Nested(p: Int) { - default object { + companion object { public val FIELD: Int = 0 } diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt index 2cf0810eca2..7578c0cbbe8 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt @@ -6,7 +6,7 @@ import pack.A.* class A(nested: Nested = Nested(Nested.FIELD)) { class Nested(p: Int) { - default object { + companion object { public val FIELD: Int = 0 } diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt index 343b97f5335..e9a4d885329 100644 --- a/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt +++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt @@ -1,7 +1,7 @@ open class Base(nested: Base.Nested) { class Nested(p: Int) { - default object { + companion object { public val FIELD: Int = 0 } diff --git a/j2k/testData/fileOrElement/constructors/noPrimary.kt b/j2k/testData/fileOrElement/constructors/noPrimary.kt index 49561741adb..cbe9c7f083f 100644 --- a/j2k/testData/fileOrElement/constructors/noPrimary.kt +++ b/j2k/testData/fileOrElement/constructors/noPrimary.kt @@ -12,7 +12,7 @@ class C { } public class User { - default object { + companion object { public fun main() { val c1 = C(1, 2, 3) val c2 = C(5, 6) diff --git a/j2k/testData/fileOrElement/constructors/parameterModification.kt b/j2k/testData/fileOrElement/constructors/parameterModification.kt index df35b9cff22..a50e9eb69ce 100644 --- a/j2k/testData/fileOrElement/constructors/parameterModification.kt +++ b/j2k/testData/fileOrElement/constructors/parameterModification.kt @@ -18,7 +18,7 @@ class C(arg1: Int, arg2: Int = 0, arg3: Int = 0) { } public class User { - default object { + companion object { public fun main() { val c1 = C(100, 100, 100) val c2 = C(100, 100) diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt index 127bab99d3a..cb66c08d309 100644 --- a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt +++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt @@ -48,7 +48,7 @@ class Outer { } } - default object { + companion object { fun foo() { val nested1 = Nested1(1) diff --git a/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt index ff3a82478e5..03ced10d81f 100644 --- a/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt +++ b/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt @@ -4,7 +4,7 @@ class C() { System.out.println(staticField1 + C.staticField2) } - default object { + companion object { private val staticField1 = 0 private val staticField2 = 0 } diff --git a/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt b/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt index 894db5c466e..d604c0830ac 100644 --- a/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt +++ b/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt @@ -16,7 +16,7 @@ public class Test { myName = foo(name) } - default object { + companion object { fun foo(n: String): String { return "" @@ -25,7 +25,7 @@ public class Test { } public class User { - default object { + companion object { public fun main() { val t = Test("name") } diff --git a/j2k/testData/fileOrElement/field/conversion.kt b/j2k/testData/fileOrElement/field/conversion.kt index 5b70f21564a..07673e1b1e8 100644 --- a/j2k/testData/fileOrElement/field/conversion.kt +++ b/j2k/testData/fileOrElement/field/conversion.kt @@ -5,7 +5,7 @@ class A { i = 10 } - default object { + companion object { fun getByte(): Byte { return 0 diff --git a/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt index 358ffecb0f0..c7d3dc4e925 100644 --- a/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt +++ b/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt @@ -17,7 +17,7 @@ class F { fun f4() { } - default object { + companion object { //c1 diff --git a/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt index 82e67bfdff9..527de4d41fe 100644 --- a/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt +++ b/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt @@ -1,5 +1,5 @@ class F { - default object { + companion object { //c1 diff --git a/j2k/testData/fileOrElement/function/main.kt b/j2k/testData/fileOrElement/function/main.kt index 5ed03f3a6bd..ca860457e83 100644 --- a/j2k/testData/fileOrElement/function/main.kt +++ b/j2k/testData/fileOrElement/function/main.kt @@ -1,4 +1,4 @@ -default object { +companion object { public fun main(args: Array) { } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/function/main2.kt b/j2k/testData/fileOrElement/function/main2.kt index c17342978b5..486e2f0463e 100644 --- a/j2k/testData/fileOrElement/function/main2.kt +++ b/j2k/testData/fileOrElement/function/main2.kt @@ -1,5 +1,5 @@ public class A { - default object { + companion object { public fun main(args: Array) { } } diff --git a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt index 5aa491efbe3..9a51945d7ee 100644 --- a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt +++ b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt @@ -1,6 +1,6 @@ // !forceNotNullTypes: false public class A { - default object { + companion object { public fun main(args: Array) { } } diff --git a/j2k/testData/fileOrElement/issues/arrayLength.kt b/j2k/testData/fileOrElement/issues/arrayLength.kt index fa4865f28cb..86189db46cc 100644 --- a/j2k/testData/fileOrElement/issues/arrayLength.kt +++ b/j2k/testData/fileOrElement/issues/arrayLength.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { public fun foo(args: Array): Int { return args.size() } diff --git a/j2k/testData/fileOrElement/issues/doNotQualifyStatic.kt b/j2k/testData/fileOrElement/issues/doNotQualifyStatic.kt index 62adfa1538a..a091f74fa18 100644 --- a/j2k/testData/fileOrElement/issues/doNotQualifyStatic.kt +++ b/j2k/testData/fileOrElement/issues/doNotQualifyStatic.kt @@ -6,7 +6,7 @@ class Outer { } } - default object { + companion object { public var o: Any? = Object() } } \ No newline at end of file diff --git a/j2k/testData/fileOrElement/issues/kt-1074.kt b/j2k/testData/fileOrElement/issues/kt-1074.kt index 0ed22c64622..6b126acd20c 100644 --- a/j2k/testData/fileOrElement/issues/kt-1074.kt +++ b/j2k/testData/fileOrElement/issues/kt-1074.kt @@ -1,7 +1,7 @@ package demo class Test { - default object { + companion object { fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) { if (fromIndex < 0) throw IndexOutOfBoundsException("fromIndex = " + fromIndex) diff --git a/j2k/testData/fileOrElement/issues/kt-638.kt b/j2k/testData/fileOrElement/issues/kt-638.kt index e23e1a6cbea..5ab0b5c3cee 100644 --- a/j2k/testData/fileOrElement/issues/kt-638.kt +++ b/j2k/testData/fileOrElement/issues/kt-638.kt @@ -21,7 +21,7 @@ public class Identifier { } public class User { - default object { + companion object { public fun main(args: Array) { val i1 = Identifier("name", false, true) val i2 = Identifier("name", false) diff --git a/j2k/testData/fileOrElement/issues/kt-807.kt b/j2k/testData/fileOrElement/issues/kt-807.kt index 9d6291e1c73..fba3563b94e 100644 --- a/j2k/testData/fileOrElement/issues/kt-807.kt +++ b/j2k/testData/fileOrElement/issues/kt-807.kt @@ -5,7 +5,7 @@ import java.io.* class FileRead { - default object { + companion object { public fun main(args: Array) { try { val fstream = FileInputStream() diff --git a/j2k/testData/fileOrElement/issues/kt-809-string.kt b/j2k/testData/fileOrElement/issues/kt-809-string.kt index 2973c8d304f..7dba4f3be5d 100644 --- a/j2k/testData/fileOrElement/issues/kt-809-string.kt +++ b/j2k/testData/fileOrElement/issues/kt-809-string.kt @@ -5,7 +5,7 @@ class Container { } class One { - default object { + companion object { var myContainer = Container() } } diff --git a/j2k/testData/fileOrElement/issues/kt-809.kt b/j2k/testData/fileOrElement/issues/kt-809.kt index 03773061156..4b0b12bfc93 100644 --- a/j2k/testData/fileOrElement/issues/kt-809.kt +++ b/j2k/testData/fileOrElement/issues/kt-809.kt @@ -5,7 +5,7 @@ class Container { } class One { - default object { + companion object { var myContainer = Container() } } diff --git a/j2k/testData/fileOrElement/issues/kt-820-field.kt b/j2k/testData/fileOrElement/issues/kt-820-field.kt index 96b7e34cf6d..3f34444dfdd 100644 --- a/j2k/testData/fileOrElement/issues/kt-820-field.kt +++ b/j2k/testData/fileOrElement/issues/kt-820-field.kt @@ -5,7 +5,7 @@ class Container { } class One { - default object { + companion object { var myContainer = Container() } } diff --git a/j2k/testData/fileOrElement/issues/kt-820-string.kt b/j2k/testData/fileOrElement/issues/kt-820-string.kt index fd2918197ef..f881ec36ec7 100644 --- a/j2k/testData/fileOrElement/issues/kt-820-string.kt +++ b/j2k/testData/fileOrElement/issues/kt-820-string.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { public fun toFileSystemSafeName(name: String): String { val size = name.length() return name diff --git a/j2k/testData/fileOrElement/issues/kt-820.kt b/j2k/testData/fileOrElement/issues/kt-820.kt index d01c0468374..8076429d846 100644 --- a/j2k/testData/fileOrElement/issues/kt-820.kt +++ b/j2k/testData/fileOrElement/issues/kt-820.kt @@ -5,7 +5,7 @@ class Container { } class One { - default object { + companion object { var myContainer = Container() } } diff --git a/j2k/testData/fileOrElement/issues/kt-824-isDir.kt b/j2k/testData/fileOrElement/issues/kt-824-isDir.kt index 9a6be7cc414..2f1e89665e7 100644 --- a/j2k/testData/fileOrElement/issues/kt-824-isDir.kt +++ b/j2k/testData/fileOrElement/issues/kt-824-isDir.kt @@ -6,7 +6,7 @@ import java.io.File * User: ignatov */ public class Test { - default object { + companion object { public fun isDir(parent: File?): Boolean { if (parent == null || !parent.exists()) { return false diff --git a/j2k/testData/fileOrElement/issues/kt-824.kt b/j2k/testData/fileOrElement/issues/kt-824.kt index 378d2630886..daeae7a16d5 100644 --- a/j2k/testData/fileOrElement/issues/kt-824.kt +++ b/j2k/testData/fileOrElement/issues/kt-824.kt @@ -5,7 +5,7 @@ class Container { } class One { - default object { + companion object { var myContainer = Container() } } diff --git a/j2k/testData/fileOrElement/issues/kt-837.kt b/j2k/testData/fileOrElement/issues/kt-837.kt index 932fa2c1182..d994a1f12ae 100644 --- a/j2k/testData/fileOrElement/issues/kt-837.kt +++ b/j2k/testData/fileOrElement/issues/kt-837.kt @@ -8,7 +8,7 @@ public class Language(protected var code: String) : Serializable { return other.toString() == this.toString() } - default object { + companion object { public var ENGLISH: Language = Language("en") public var SWEDISH: Language = Language("sv") private val serialVersionUID = -2442762969929206780 diff --git a/j2k/testData/fileOrElement/issues/kt-871.kt b/j2k/testData/fileOrElement/issues/kt-871.kt index c848bfd8771..1125ba9c3d6 100644 --- a/j2k/testData/fileOrElement/issues/kt-871.kt +++ b/j2k/testData/fileOrElement/issues/kt-871.kt @@ -1,7 +1,7 @@ package demo class Program { - default object { + companion object { public fun main(args: Array) { System.out.println("Halo!") } diff --git a/j2k/testData/fileOrElement/issues/kt-879.kt b/j2k/testData/fileOrElement/issues/kt-879.kt index 9145e6ecbcc..66f4e9c3ef9 100644 --- a/j2k/testData/fileOrElement/issues/kt-879.kt +++ b/j2k/testData/fileOrElement/issues/kt-879.kt @@ -1,5 +1,5 @@ class Test { - default object { + companion object { public fun getInt(i: Int): Int { when (i) { 0 -> return 0 diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java b/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java index def338399c8..a2ca67fd8e4 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java +++ b/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java @@ -4,7 +4,7 @@ import kotlinApi.KotlinClass; class C { int foo() { KotlinClass.staticVar = KotlinClass.staticVar * 2; - KotlinClass.Default.setStaticProperty(KotlinClass.Default.getStaticVar() + KotlinClass.Default.getStaticProperty()); - return KotlinClass.Default.staticFun(1); + KotlinClass.Companion.setStaticProperty(KotlinClass.Companion.getStaticVar() + KotlinClass.Companion.getStaticProperty()); + return KotlinClass.Companion.staticFun(1); } } diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java index 527c0eace67..671e0b46e2e 100644 --- a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java +++ b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java @@ -5,10 +5,10 @@ class A { int foo(KotlinClass c) { return c.getNullableProperty().length() + c.getProperty().length() - + KotlinClass.Default.getNullableStaticVar() - + KotlinClass.Default.getStaticVar() - + KotlinClass.Default.nullableStaticFun(1) - + KotlinClass.Default.staticFun(1) + + KotlinClass.Companion.getNullableStaticVar() + + KotlinClass.Companion.getStaticVar() + + KotlinClass.Companion.nullableStaticFun(1) + + KotlinClass.Companion.staticFun(1) + KotlinApiPackage.nullableGlobalFunction("").length() + KotlinApiPackage.globalFunction("").length(); } diff --git a/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt b/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt index 83c0e497992..db9fbb1a3bf 100644 --- a/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt +++ b/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt @@ -1,7 +1,7 @@ import java.lang.reflect.Constructor class X { - default object { + companion object { throws(javaClass()) fun foo(constructor: Constructor, args1: Array, args2: Array) { constructor.newInstance(*args1) diff --git a/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt b/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt index 7c069555687..746f1dcf4f3 100644 --- a/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt +++ b/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt @@ -2,7 +2,7 @@ class C { private val string = getString() - default object { + companion object { fun getString(): String? { return x() diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt index 09949e086fa..3e44b4a6588 100644 --- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt +++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt @@ -5,7 +5,7 @@ class A { privateStatic2() } - default object { + companion object { private val s = "abc" private fun privateStatic1() { diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt index 148579f20cc..403204f31f8 100644 --- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt +++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt @@ -4,7 +4,7 @@ class A { privateStatic2() } - default object { + companion object { public fun publicStatic() { privateStatic1() diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt index 87c5f8299ea..29c099a014e 100644 --- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt +++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt @@ -9,7 +9,7 @@ class A { privateStatic2() } - default object { + companion object { private fun privateStatic1() { } diff --git a/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt b/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt index 53e9a0b6436..a0030174b6b 100644 --- a/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt +++ b/j2k/testData/fileOrElement/switch/comlicatedFallDown.kt @@ -1,7 +1,7 @@ package demo public class SwitchDemo { - default object { + companion object { public fun print(o: Any) { System.out.println(o) } diff --git a/j2k/testData/fileOrElement/switch/emptySwitch.kt b/j2k/testData/fileOrElement/switch/emptySwitch.kt index 5e4cb8546b7..b8e59cfa9d9 100644 --- a/j2k/testData/fileOrElement/switch/emptySwitch.kt +++ b/j2k/testData/fileOrElement/switch/emptySwitch.kt @@ -1,5 +1,5 @@ public class NonDefault { - default object { + companion object { public fun main(args: Array) { val value = 3 diff --git a/j2k/testData/fileOrElement/switch/fallDown.kt b/j2k/testData/fileOrElement/switch/fallDown.kt index 82de392ce66..949d2a8cf83 100644 --- a/j2k/testData/fileOrElement/switch/fallDown.kt +++ b/j2k/testData/fileOrElement/switch/fallDown.kt @@ -1,7 +1,7 @@ package switch_demo public class SwitchDemo { - default object { + companion object { public fun main(args: Array) { val month = 8 val monthString: String diff --git a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt index 6be696bc612..b3d447c5ea8 100644 --- a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt +++ b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt @@ -1,5 +1,5 @@ public class C { - default object { + companion object { public fun main(args: Array) { when (args.size()) { 1 -> { diff --git a/j2k/testData/fileOrElement/switch/kt-539.kt b/j2k/testData/fileOrElement/switch/kt-539.kt index bd4801a2c1d..c92c2fcf3aa 100644 --- a/j2k/testData/fileOrElement/switch/kt-539.kt +++ b/j2k/testData/fileOrElement/switch/kt-539.kt @@ -1,7 +1,7 @@ package switch_demo public class SwitchDemo { - default object { + companion object { public fun main(args: Array) { val month = 8 diff --git a/j2k/testData/fileOrElement/switch/nondefault.kt b/j2k/testData/fileOrElement/switch/nondefault.kt index 826751551ae..8954eb2ca17 100644 --- a/j2k/testData/fileOrElement/switch/nondefault.kt +++ b/j2k/testData/fileOrElement/switch/nondefault.kt @@ -1,5 +1,5 @@ public class NonDefault { - default object { + companion object { public fun main(args: Array) { val value = 3 diff --git a/j2k/testData/fileOrElement/trait/interfaceWithFields.kt b/j2k/testData/fileOrElement/trait/interfaceWithFields.kt index 43a90b67e68..890a4bea0ad 100644 --- a/j2k/testData/fileOrElement/trait/interfaceWithFields.kt +++ b/j2k/testData/fileOrElement/trait/interfaceWithFields.kt @@ -1,5 +1,5 @@ trait INode { - default object { + companion object { public val IN: String = "in" public val AT: String = "@" public val COMMA_WITH_SPACE: String = COMMA + SPACE diff --git a/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt b/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt index a454609a491..9c442eeb6c3 100644 --- a/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt +++ b/j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt @@ -1,5 +1,5 @@ public trait INode { - default object { + companion object { public val IN: String = "in" public val AT: String = "@" public val COMMA_WITH_SPACE: String = COMMA + SPACE diff --git a/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt b/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt index 17dc095bcf2..a1882e71204 100644 --- a/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt +++ b/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt @@ -2,7 +2,7 @@ import java.util.* class A { - default object { + companion object { public fun foo(): Map { val props = Properties() return HashMap(props as Map) diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log b/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log index 687d949283e..29b384519d1 100644 --- a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log +++ b/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt b/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt index dceaef294f2..4680ae2c26f 100644 --- a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt +++ b/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new b/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new index bb50d7fc183..e9ccf1ab8db 100644 --- a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new +++ b/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log b/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log index 6bc3a50bee0..8dfe7647a28 100644 --- a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log +++ b/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt b/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt index 7f4d76ba88b..7dd5eac1a73 100644 --- a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt +++ b/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { val CONST = "bar" } } diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new b/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new index 7f4d76ba88b..7dd5eac1a73 100644 --- a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new +++ b/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { val CONST = "bar" } } diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index 1049b7f2a22..0a26a20ac94 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: src/const.kt End of files Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class out/production/module/test/Usage.class End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt index dceaef294f2..4680ae2c26f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt +++ b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new index bb50d7fc183..e9ccf1ab8db 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new +++ b/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index cce56fbf9fd..9e65adcda6c 100644 --- a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt index 3ce58ed9dc9..40bbe8de705 100644 --- a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt +++ b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt @@ -3,7 +3,7 @@ package test val CONST = "foo" class Klass { - default object { + companion object { val CONST = "bar" } } diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new index 3ce58ed9dc9..40bbe8de705 100644 --- a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new +++ b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new @@ -3,7 +3,7 @@ package test val CONST = "foo" class Klass { - default object { + companion object { val CONST = "bar" } } diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index 01ea0f084d3..673b3dfee4c 100644 --- a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/test/Trait$$TImpl.class -out/production/module/test/Trait$Default.class +out/production/module/test/Trait$Companion.class out/production/module/test/Trait.class End of files Compiling files: @@ -8,7 +8,7 @@ src/const.kt End of files Cleaning output files: out/production/module/test/Trait$$TImpl.class -out/production/module/test/Trait$Default.class +out/production/module/test/Trait$Companion.class out/production/module/test/Trait.class out/production/module/test/Usage.class End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt index dcbca7fe3a7..073204a43e1 100644 --- a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt +++ b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt @@ -1,7 +1,7 @@ package test trait Trait { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new index 926b500fbf0..86cc1439efd 100644 --- a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new +++ b/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new @@ -1,7 +1,7 @@ package test trait Trait { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index 28ca5a5e406..d46aaad630c 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -18,6 +18,6 @@ src/usageWithFunctionLiteral.kt End of files COMPILATION FAILED Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Please specify constructor invocation; classifier 'SamInterface' does not have a default object +Please specify constructor invocation; classifier 'SamInterface' does not have a companion object Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Please specify constructor invocation; classifier 'SamInterface' does not have a default object \ No newline at end of file +Please specify constructor invocation; classifier 'SamInterface' does not have a companion object \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index d7a173db691..e0426c17165 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: @@ -7,7 +7,7 @@ src/const.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt index dceaef294f2..4680ae2c26f 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new index bb50d7fc183..e9ccf1ab8db 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log index 6bc3a50bee0..8dfe7647a28 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt index 7f4d76ba88b..7dd5eac1a73 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { val CONST = "bar" } } diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new index 7f4d76ba88b..7dd5eac1a73 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { val CONST = "bar" } } diff --git a/js/js.libraries/src/internal/primitiveDefaultObjects.kt b/js/js.libraries/src/internal/primitiveCompanionObjects.kt similarity index 73% rename from js/js.libraries/src/internal/primitiveDefaultObjects.kt rename to js/js.libraries/src/internal/primitiveCompanionObjects.kt index 51892373fbe..0b8de080076 100644 --- a/js/js.libraries/src/internal/primitiveDefaultObjects.kt +++ b/js/js.libraries/src/internal/primitiveCompanionObjects.kt @@ -16,22 +16,22 @@ package kotlin.js.internal -private object DoubleDefaultObject : FloatingPointConstants { +private object DoubleCompanionObject : FloatingPointConstants { override val POSITIVE_INFINITY: Double = js("Number.POSITIVE_INFINITY") override val NEGATIVE_INFINITY: Double = js("Number.NEGATIVE_INFINITY") override val NaN: Double = js("Number.NaN") } -private object FloatDefaultObject : FloatingPointConstants { +private object FloatCompanionObject : FloatingPointConstants { override val POSITIVE_INFINITY : Float = js("Number.POSITIVE_INFINITY") override val NEGATIVE_INFINITY : Float = js("Number.NEGATIVE_INFINITY") override val NaN : Float = js("Number.NaN") } -private object IntDefaultObject {} -private object LongDefaultObject {} -private object ShortDefaultObject {} -private object ByteDefaultObject {} +private object IntCompanionObject {} +private object LongCompanionObject {} +private object ShortCompanionObject {} +private object ByteCompanionObject {} -private object StringDefaultObject {} -private object EnumDefaultObject {} +private object StringCompanionObject {} +private object EnumCompanionObject {} diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDefaultObjectTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDefaultObjectTest.kt index bcb97201d7c..e73cc3a2640 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDefaultObjectTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/AbstractDefaultObjectTest.kt @@ -18,4 +18,4 @@ package org.jetbrains.kotlin.js.test.semantics import org.jetbrains.kotlin.js.test.SingleFileTranslationTest -public abstract class AbstractDefaultObjectTest : SingleFileTranslationTest("objectIntrinsics/") +public abstract class AbstractCompanionObjectTest : SingleFileTranslationTest("objectIntrinsics/") diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DefaultObjectTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompanionObjectTestGenerated.java similarity index 95% rename from js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DefaultObjectTestGenerated.java rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompanionObjectTestGenerated.java index 1787f7f41e7..fe0b06f4ea7 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DefaultObjectTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompanionObjectTestGenerated.java @@ -31,7 +31,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/codegen/box/objectIntrinsics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class DefaultObjectTestGenerated extends AbstractDefaultObjectTest { +public class CompanionObjectTestGenerated extends AbstractCompanionObjectTest { public void testAllFilesPresentInObjectIntrinsics() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/objectIntrinsics"), Pattern.compile("^(.+)\\.kt$"), true); } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java index 1424687b2b3..d4c3d902455 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java @@ -85,8 +85,8 @@ public final class Namer { private static final String RECEIVER_PARAMETER_NAME = "$receiver"; private static final String THROW_NPE_FUN_NAME = "throwNPE"; - private static final String DEFAULT_OBJECT_GETTER = "object"; - private static final String DEFAULT_OBJECT_INITIALIZER = "object_initializer$"; + private static final String COMPANION_OBJECT_GETTER = "object"; + private static final String COMPANION_OBJECT_INITIALIZER = "object_initializer$"; private static final String PROTOTYPE_NAME = "prototype"; public static final String CAPTURED_VAR_FIELD = "v"; @@ -173,13 +173,13 @@ public final class Namer { } @NotNull - public static JsExpression getDefaultObjectAccessor(@NotNull JsExpression referenceToClass) { - return new JsNameRef(DEFAULT_OBJECT_GETTER, referenceToClass); + public static JsExpression getCompanionObjectAccessor(@NotNull JsExpression referenceToClass) { + return new JsNameRef(COMPANION_OBJECT_GETTER, referenceToClass); } @NotNull - public static String getNameForDefaultObjectInitializer() { - return DEFAULT_OBJECT_INITIALIZER; + public static String getNameForCompanionObjectInitializer() { + return COMPANION_OBJECT_INITIALIZER; } @NotNull diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java index ce9b7beb8fa..e694a1cd5cf 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java @@ -264,10 +264,10 @@ public final class StaticContext { return scope.declareFreshName(getSuggestedName(descriptor)); } }; - Rule constructorOrDefaultObjectHasTheSameNameAsTheClass = new Rule() { + Rule constructorOrCompanionObjectHasTheSameNameAsTheClass = new Rule() { @Override public JsName apply(@NotNull DeclarationDescriptor descriptor) { - if (descriptor instanceof ConstructorDescriptor || (DescriptorUtils.isDefaultObject(descriptor))) { + if (descriptor instanceof ConstructorDescriptor || (DescriptorUtils.isCompanionObject(descriptor))) { //noinspection ConstantConditions return getNameForDescriptor(descriptor.getContainingDeclaration()); } @@ -352,7 +352,7 @@ public final class StaticContext { addRule(namesForDynamic); addRule(namesForStandardClasses); - addRule(constructorOrDefaultObjectHasTheSameNameAsTheClass); + addRule(constructorOrCompanionObjectHasTheSameNameAsTheClass); addRule(propertyOrPropertyAccessor); addRule(predefinedObjectsHasUnobfuscatableNames); addRule(overridingDescriptorsReferToOriginalName); @@ -484,10 +484,10 @@ public final class StaticContext { result, namer.getModuleReference(program.getStringLiteral(moduleName))); } }; - Rule constructorOrDefaultObjectHasTheSameQualifierAsTheClass = new Rule() { + Rule constructorOrCompanionObjectHasTheSameQualifierAsTheClass = new Rule() { @Override public JsExpression apply(@NotNull DeclarationDescriptor descriptor) { - if (descriptor instanceof ConstructorDescriptor || DescriptorUtils.isDefaultObject(descriptor)) { + if (descriptor instanceof ConstructorDescriptor || DescriptorUtils.isCompanionObject(descriptor)) { //noinspection ConstantConditions return getQualifierForDescriptor(descriptor.getContainingDeclaration()); } @@ -531,7 +531,7 @@ public final class StaticContext { }; addRule(libraryObjectsHaveKotlinQualifier); - addRule(constructorOrDefaultObjectHasTheSameQualifierAsTheClass); + addRule(constructorOrCompanionObjectHasTheSameQualifierAsTheClass); addRule(standardObjectsHaveKotlinQualifier); addRule(packageLevelDeclarationsHaveEnclosingPackagesNamesAsQualifier); addRule(nativeObjectsHaveNativePartOfFullQualifier); diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt index 728f8d2218d..1e7e69ca5e3 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt @@ -98,7 +98,7 @@ private fun ReceiverParameterDescriptor.getNameForCapturedReceiver(): String { "receiverDescriptor = $this, " +"containingDeclaration = $containingDeclaration" } - if (DescriptorUtils.isDefaultObject(containingDeclaration)) { + if (DescriptorUtils.isCompanionObject(containingDeclaration)) { return containingDeclaration.getContainingDeclaration()!!.getNameForCapturedDescriptor(namePostfix = "$") } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java index 1430be32800..3e3c2bc7eba 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java @@ -124,7 +124,7 @@ public final class ClassTranslator extends AbstractTranslator { declarationContext = declarationContext.newDeclaration(descriptor, definitionPlace); } - declarationContext = fixContextForDefaultObjectAccessing(declarationContext); + declarationContext = fixContextForCompanionObjectAccessing(declarationContext); invocationArguments.add(getSuperclassReferences(declarationContext)); DelegationTranslator delegationTranslator = new DelegationTranslator(classDeclaration, context()); @@ -171,20 +171,20 @@ public final class ClassTranslator extends AbstractTranslator { return invocationArguments; } - private TranslationContext fixContextForDefaultObjectAccessing(TranslationContext declarationContext) { - // In Kotlin we can access to default object members without qualifier just by name, but we should translate it to access with FQ name. - // So create alias for default object receiver parameter. - ClassDescriptor defaultObjectDescriptor = descriptor.getDefaultObjectDescriptor(); - if (defaultObjectDescriptor != null) { - JsExpression referenceToClass = translateAsFQReference(defaultObjectDescriptor.getContainingDeclaration(), declarationContext); - JsExpression defaultObjectAccessor = Namer.getDefaultObjectAccessor(referenceToClass); - ReceiverParameterDescriptor defaultObjectReceiver = getReceiverParameterForDeclaration(defaultObjectDescriptor); - declarationContext.aliasingContext().registerAlias(defaultObjectReceiver, defaultObjectAccessor); + private TranslationContext fixContextForCompanionObjectAccessing(TranslationContext declarationContext) { + // In Kotlin we can access to companion object members without qualifier just by name, but we should translate it to access with FQ name. + // So create alias for companion object receiver parameter. + ClassDescriptor companionObjectDescriptor = descriptor.getCompanionObjectDescriptor(); + if (companionObjectDescriptor != null) { + JsExpression referenceToClass = translateAsFQReference(companionObjectDescriptor.getContainingDeclaration(), declarationContext); + JsExpression companionObjectAccessor = Namer.getCompanionObjectAccessor(referenceToClass); + ReceiverParameterDescriptor companionObjectReceiver = getReceiverParameterForDeclaration(companionObjectDescriptor); + declarationContext.aliasingContext().registerAlias(companionObjectReceiver, companionObjectAccessor); } - // Overlap alias of default object receiver for accessing from containing class(see previous if block), - // because inside default object we should use simple name for access. - if (isDefaultObject(descriptor)) { + // Overlap alias of companion object receiver for accessing from containing class(see previous if block), + // because inside companion object we should use simple name for access. + if (isCompanionObject(descriptor)) { declarationContext = declarationContext.innerContextWithAliased(descriptor.getThisAsReceiverParameter(), JsLiteral.THIS); } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java index 2ec1796cdde..2c2bf7fc076 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.types.JetType; import java.util.List; -import static org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.createDefaultObjectInitializer; +import static org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.createCompanionObjectInitializer; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getClassDescriptor; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDescriptor; import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getSupertypesWithoutFakes; @@ -85,7 +85,7 @@ public class DeclarationBodyVisitor extends TranslatorVisitor { @Override public Void visitObjectDeclaration(@NotNull JetObjectDeclaration declaration, TranslationContext context) { - if (!declaration.isDefault()) { + if (!declaration.isCompanion()) { // parsed it in initializer visitor => no additional actions are needed return null; } @@ -93,7 +93,7 @@ public class DeclarationBodyVisitor extends TranslatorVisitor { ClassDescriptor descriptor = getClassDescriptor(context.bindingContext(), declaration); JsFunction fun = TranslationUtils.simpleReturnFunction(context.getScopeForDescriptor(descriptor), value); - staticResult.add(createDefaultObjectInitializer(fun, context)); + staticResult.add(createCompanionObjectInitializer(fun, context)); return null; } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java index ae6ab642878..6dd88281b0c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java @@ -70,8 +70,8 @@ public final class InitializerUtils { initializers.add(expression.makeStmt()); } - public static JsPropertyInitializer createDefaultObjectInitializer(JsExpression value, TranslationContext context) { - JsStringLiteral defaultObjectInitStr = context.program().getStringLiteral(Namer.getNameForDefaultObjectInitializer()); - return new JsPropertyInitializer(defaultObjectInitStr, value); + public static JsPropertyInitializer createCompanionObjectInitializer(JsExpression value, TranslationContext context) { + JsStringLiteral companionObjectInitStr = context.program().getStringLiteral(Namer.getNameForCompanionObjectInitializer()); + return new JsPropertyInitializer(companionObjectInitStr, value); } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java index 06d482ed7ce..a0c5d22eafb 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerVisitor.java @@ -65,7 +65,7 @@ public final class InitializerVisitor extends TranslatorVisitor { @Override public Void visitObjectDeclaration(@NotNull JetObjectDeclaration declaration, @NotNull TranslationContext context) { - if (!declaration.isDefault()) { + if (!declaration.isCompanion()) { InitializerUtils.generateObjectInitializer(declaration, result, context); } return null; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt index 025fa36d7dd..27f855dafe8 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.objects import com.google.dart.compiler.backend.js.ast.JsArrayAccess import com.google.dart.compiler.backend.js.ast.JsExpression -import org.jetbrains.kotlin.backend.common.builtins.DefaultObjectMapping +import org.jetbrains.kotlin.backend.common.builtins.CompanionObjectMapping import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.js.config.LibrarySourcesConfig import org.jetbrains.kotlin.js.translate.context.TranslationContext @@ -35,12 +35,12 @@ class DefaultClassObjectIntrinsic(val fqName: FqName, val moduleName: String): O } } -public class ObjectIntrinsics : DefaultObjectMapping() { +public class ObjectIntrinsics : CompanionObjectMapping() { public fun getIntrinsic(classDescriptor: ClassDescriptor): ObjectIntrinsic { if (!hasMappingToObject(classDescriptor)) return NO_OBJECT_INTRINSIC val containingDeclaration = classDescriptor.getContainingDeclaration() - val name = Name.identifier(containingDeclaration.getName().asString() + "DefaultObject") + val name = Name.identifier(containingDeclaration.getName().asString() + "CompanionObject") return DefaultClassObjectIntrinsic(FqName("kotlin.js.internal").child(name), LibrarySourcesConfig.STDLIB_JS_MODULE_NAME) } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/DefaultObjectAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CompanionObjectAccessTranslator.java similarity index 77% rename from js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/DefaultObjectAccessTranslator.java rename to js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CompanionObjectAccessTranslator.java index ef079b79000..7478d101630 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/DefaultObjectAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CompanionObjectAccessTranslator.java @@ -35,20 +35,20 @@ import java.util.List; import static org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator.translateAsFQReference; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry; -import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonDefaultObject; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonCompanionObject; -public class DefaultObjectAccessTranslator extends AbstractTranslator implements CachedAccessTranslator { +public class CompanionObjectAccessTranslator extends AbstractTranslator implements CachedAccessTranslator { @NotNull - /*package*/ static DefaultObjectAccessTranslator newInstance( + /*package*/ static CompanionObjectAccessTranslator newInstance( @NotNull JetSimpleNameExpression expression, @NotNull TranslationContext context ) { DeclarationDescriptor referenceDescriptor = getDescriptorForReferenceExpression(context.bindingContext(), expression); assert referenceDescriptor != null : "JetSimpleName expression must reference a descriptor " + expression.getText(); - return new DefaultObjectAccessTranslator(referenceDescriptor, context); + return new CompanionObjectAccessTranslator(referenceDescriptor, context); } - /*package*/ static boolean isDefaultObjectReference( + /*package*/ static boolean isCompanionObjectReference( @NotNull JetReferenceExpression expression, @NotNull TranslationContext context ) { @@ -57,15 +57,15 @@ public class DefaultObjectAccessTranslator extends AbstractTranslator implements } @NotNull - private final JsExpression referenceToDefaultObject; + private final JsExpression referenceToCompanionObject; - private DefaultObjectAccessTranslator(@NotNull DeclarationDescriptor descriptor, @NotNull TranslationContext context) { + private CompanionObjectAccessTranslator(@NotNull DeclarationDescriptor descriptor, @NotNull TranslationContext context) { super(context); - this.referenceToDefaultObject = generateReferenceToDefaultObject(descriptor, context); + this.referenceToCompanionObject = generateReferenceToCompanionObject(descriptor, context); } @NotNull - private static JsExpression generateReferenceToDefaultObject(@NotNull DeclarationDescriptor descriptor, @NotNull TranslationContext context) { + private static JsExpression generateReferenceToCompanionObject(@NotNull DeclarationDescriptor descriptor, @NotNull TranslationContext context) { if (descriptor instanceof ClassDescriptor) { ObjectIntrinsic objectIntrinsic = context.intrinsics().getObjectIntrinsic((ClassDescriptor) descriptor); if (objectIntrinsic.exists()) { @@ -74,23 +74,23 @@ public class DefaultObjectAccessTranslator extends AbstractTranslator implements } JsExpression fqReference = translateAsFQReference(descriptor, context); - if (isNonDefaultObject(descriptor) || isEnumEntry(descriptor)) { + if (isNonCompanionObject(descriptor) || isEnumEntry(descriptor)) { return fqReference; } - return Namer.getDefaultObjectAccessor(fqReference); + return Namer.getCompanionObjectAccessor(fqReference); } @Override @NotNull public JsExpression translateAsGet() { - return referenceToDefaultObject; + return referenceToCompanionObject; } @Override @NotNull public JsExpression translateAsSet(@NotNull JsExpression toSetTo) { - throw new IllegalStateException("default object can't be set"); + throw new IllegalStateException("companion object can't be set"); } @NotNull diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java index fb52a57cfd2..520b287ba71 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java @@ -53,17 +53,17 @@ public final class ReferenceTranslator { ) { JsExpression simpleName = translateSimpleName(expression, context); - // Ignore qualifier if expression is EnumEntry or default object reference and always use FQ name. + // Ignore qualifier if expression is EnumEntry or companion object reference and always use FQ name. DeclarationDescriptor descriptor = BindingUtils.getDescriptorForReferenceExpression(context.bindingContext(), expression); //TODO: should go away when objects inside classes are supported - if (DescriptorUtils.isDefaultObject(descriptor) && !AnnotationsUtils.isNativeObject(descriptor)) { + if (DescriptorUtils.isCompanionObject(descriptor) && !AnnotationsUtils.isNativeObject(descriptor)) { return simpleName; } if (descriptor instanceof ClassDescriptor) { ClassDescriptor entryClass = (ClassDescriptor) descriptor; if (entryClass.getKind() == ClassKind.ENUM_ENTRY && !AnnotationsUtils.isNativeObject(entryClass)) { DeclarationDescriptor enumClass = entryClass.getContainingDeclaration(); - qualifier = Namer.getDefaultObjectAccessor(translateAsFQReference(enumClass, context)); + qualifier = Namer.getCompanionObjectAccessor(translateAsFQReference(enumClass, context)); } } @@ -109,8 +109,8 @@ public final class ReferenceTranslator { if (canBePropertyAccess(referenceExpression, context)) { return VariableAccessTranslator.newInstance(context, referenceExpression, receiver); } - if (DefaultObjectAccessTranslator.isDefaultObjectReference(referenceExpression, context)) { - return DefaultObjectAccessTranslator.newInstance(referenceExpression, context); + if (CompanionObjectAccessTranslator.isCompanionObjectReference(referenceExpression, context)) { + return CompanionObjectAccessTranslator.newInstance(referenceExpression, context); } return ReferenceAccessTranslator.newInstance(referenceExpression, context); } diff --git a/js/js.translator/testData/callableReference/property/cases/kClassInstanceIsInitializedFirst.kt b/js/js.translator/testData/callableReference/property/cases/kClassInstanceIsInitializedFirst.kt index 2ba371ecaa0..de0f3d9157b 100644 --- a/js/js.translator/testData/callableReference/property/cases/kClassInstanceIsInitializedFirst.kt +++ b/js/js.translator/testData/callableReference/property/cases/kClassInstanceIsInitializedFirst.kt @@ -4,7 +4,7 @@ package foo import kotlin.reflect.KMemberProperty class A { - default object { + companion object { val ref: KMemberProperty = A::foo } diff --git a/js/js.translator/testData/classObject/cases/accessing.kt b/js/js.translator/testData/classObject/cases/accessing.kt index 99e3ce5f7a7..a6b43e4ceba 100644 --- a/js/js.translator/testData/classObject/cases/accessing.kt +++ b/js/js.translator/testData/classObject/cases/accessing.kt @@ -3,7 +3,7 @@ package foo class Foo() { - default object { + companion object { val bar = "Foo.bar "; var boo = "FAIL"; fun baz() = "Foo.baz() " diff --git a/js/js.translator/testData/classObject/cases/defaultObjectSameNamesAsInOuter.kt b/js/js.translator/testData/classObject/cases/defaultObjectSameNamesAsInOuter.kt index 3c827c1d120..ba3b950b52b 100644 --- a/js/js.translator/testData/classObject/cases/defaultObjectSameNamesAsInOuter.kt +++ b/js/js.translator/testData/classObject/cases/defaultObjectSameNamesAsInOuter.kt @@ -4,7 +4,7 @@ class A { private val p: Int get() = 4 - default object B { + companion object B { val p: Int get() = 6 } diff --git a/js/js.translator/testData/classObject/cases/inTrait.kt b/js/js.translator/testData/classObject/cases/inTrait.kt index 095c971cb7e..55c2256a745 100644 --- a/js/js.translator/testData/classObject/cases/inTrait.kt +++ b/js/js.translator/testData/classObject/cases/inTrait.kt @@ -1,7 +1,7 @@ package foo trait A { - default object { + companion object { val OK: String = "OK" } } diff --git a/js/js.translator/testData/classObject/cases/namedClassObject.kt b/js/js.translator/testData/classObject/cases/namedClassObject.kt index 69b0b458e65..ed61b8dcd94 100644 --- a/js/js.translator/testData/classObject/cases/namedClassObject.kt +++ b/js/js.translator/testData/classObject/cases/namedClassObject.kt @@ -1,13 +1,13 @@ package foo trait Named { - default object Bar { + companion object Bar { val g = "a"; } } class Foo { - default object { + companion object { val g = "b"; } } @@ -16,11 +16,11 @@ fun box(): String { assertEquals("a", Named.Bar.g, "Named.Bar.g") assertEquals("a", Named.g, "Named.g") - assertEquals("b", Foo.Default.g, "Foo.Default.g") + assertEquals("b", Foo.Companion.g, "Foo.Companion.g") assertEquals("b", Foo.g, "Foo.g") assertEquals("b", foo(Foo), "foo(Foo)") - assertEquals("b", foo(Foo.Default), "foo(Foo.Default)") + assertEquals("b", foo(Foo.Companion), "foo(Foo.Companion)") assertEquals("c", Named.ext(), "Named.ext()") assertEquals("c", Named.Bar.ext(), "Named.Bar.ext()") @@ -28,6 +28,6 @@ fun box(): String { return "OK" } -fun foo(f: Foo.Default) = f.g +fun foo(f: Foo.Companion) = f.g fun Named.Bar.ext() = "c" \ No newline at end of file diff --git a/js/js.translator/testData/classObject/cases/setVar.kt b/js/js.translator/testData/classObject/cases/setVar.kt index 80bb89bf8e0..6ca171099be 100644 --- a/js/js.translator/testData/classObject/cases/setVar.kt +++ b/js/js.translator/testData/classObject/cases/setVar.kt @@ -2,7 +2,7 @@ package foo class A { var a = 3 - default object { + companion object { var a = -2 } } diff --git a/js/js.translator/testData/classObject/cases/simple.kt b/js/js.translator/testData/classObject/cases/simple.kt index 21ee2d15700..7e44474a300 100644 --- a/js/js.translator/testData/classObject/cases/simple.kt +++ b/js/js.translator/testData/classObject/cases/simple.kt @@ -2,7 +2,7 @@ package foo class A { val a = 3 - default object { + companion object { val a = 2 val b = 5 } diff --git a/js/js.translator/testData/classObject/cases/withInheritance.kt b/js/js.translator/testData/classObject/cases/withInheritance.kt index 468edbecf9f..d0074b54bd5 100644 --- a/js/js.translator/testData/classObject/cases/withInheritance.kt +++ b/js/js.translator/testData/classObject/cases/withInheritance.kt @@ -5,13 +5,13 @@ open class A { fun foo(): Int { return 5 } - default object: A() { + companion object: A() { val c = a } } class B { - default object: A() { + companion object: A() { } } diff --git a/js/js.translator/testData/closure/cases/closureInObject.kt b/js/js.translator/testData/closure/cases/closureInObject.kt index 2fe879ff30a..a9c8f3b5360 100644 --- a/js/js.translator/testData/closure/cases/closureInObject.kt +++ b/js/js.translator/testData/closure/cases/closureInObject.kt @@ -8,7 +8,7 @@ object A { } class B { - default object { + companion object { val a = 21 fun foo() = 3 diff --git a/js/js.translator/testData/closure/cases/closureThisAndClassObject.kt b/js/js.translator/testData/closure/cases/closureThisAndClassObject.kt index f28e301fecc..8ed9a4ae976 100644 --- a/js/js.translator/testData/closure/cases/closureThisAndClassObject.kt +++ b/js/js.translator/testData/closure/cases/closureThisAndClassObject.kt @@ -2,7 +2,7 @@ package foo class A { fun foo() = "O" - default object { + companion object { fun bar() = "K" } diff --git a/js/js.translator/testData/examples/sortedTests/unsupported/classObject.kt b/js/js.translator/testData/examples/sortedTests/unsupported/classObject.kt index 3a5db8d28b4..f98b0b91053 100644 --- a/js/js.translator/testData/examples/sortedTests/unsupported/classObject.kt +++ b/js/js.translator/testData/examples/sortedTests/unsupported/classObject.kt @@ -1,5 +1,5 @@ class C() { - default object { + companion object { fun create() = C() } } diff --git a/js/js.translator/testData/examples/sortedTests/unsupported/classObjectInterface.kt b/js/js.translator/testData/examples/sortedTests/unsupported/classObjectInterface.kt index bdd8a02741e..e0bf5e9269e 100644 --- a/js/js.translator/testData/examples/sortedTests/unsupported/classObjectInterface.kt +++ b/js/js.translator/testData/examples/sortedTests/unsupported/classObjectInterface.kt @@ -1,7 +1,7 @@ class C() { fun getInstance(): Runnable = C - default object: Runnable { + companion object: Runnable { override fun run(): Unit { } } diff --git a/js/js.translator/testData/examples/sortedTests/unsupported/classObjectMethod.kt b/js/js.translator/testData/examples/sortedTests/unsupported/classObjectMethod.kt index 90351144818..55dd6926eda 100644 --- a/js/js.translator/testData/examples/sortedTests/unsupported/classObjectMethod.kt +++ b/js/js.translator/testData/examples/sortedTests/unsupported/classObjectMethod.kt @@ -3,11 +3,11 @@ abstract open class Default { } class MyInt() { - default object : Default { + companion object : Default { override fun defaultValue(): Int = 610 } } -fun toDefault(t: T) where default object T : Default = T.defaultValue() +fun toDefault(t: T) where class object T : Default = T.defaultValue() fun box(): String = if (toDefault(MyInt()) == 610) "OK" else "fail" diff --git a/js/js.translator/testData/inline/cases/classObject.kt b/js/js.translator/testData/inline/cases/classObject.kt index 09f0ed0c097..11da10c3c26 100644 --- a/js/js.translator/testData/inline/cases/classObject.kt +++ b/js/js.translator/testData/inline/cases/classObject.kt @@ -15,7 +15,7 @@ class InlineAll { return s() } - default object { + companion object { inline fun inline(s: () -> String): String { return s() } diff --git a/js/js.translator/testData/inlineMultiFile/cases/trait/trait.2.kt b/js/js.translator/testData/inlineMultiFile/cases/trait/trait.2.kt index 57a1aaf0196..de108ce1839 100644 --- a/js/js.translator/testData/inlineMultiFile/cases/trait/trait.2.kt +++ b/js/js.translator/testData/inlineMultiFile/cases/trait/trait.2.kt @@ -11,7 +11,7 @@ trait InlineTrait { return s() } - default object { + companion object { inline final fun finalInline(s: () -> String): String { return s() } diff --git a/js/js.translator/testData/inlineStdlib/cases/callNameClash.kt b/js/js.translator/testData/inlineStdlib/cases/callNameClash.kt index b9ad5c4dcb8..18cf75675f5 100644 --- a/js/js.translator/testData/inlineStdlib/cases/callNameClash.kt +++ b/js/js.translator/testData/inlineStdlib/cases/callNameClash.kt @@ -7,7 +7,7 @@ fun f(x: Int): Int = x * 2 fun Int.f(): Int = this * 3 class A(var value: Int) { - default object { + companion object { fun f(): Int = 5 } diff --git a/js/js.translator/testData/native/cases/classObject.kt b/js/js.translator/testData/native/cases/classObject.kt index a7ba29b1d75..6ef46be3a05 100644 --- a/js/js.translator/testData/native/cases/classObject.kt +++ b/js/js.translator/testData/native/cases/classObject.kt @@ -3,7 +3,7 @@ package foo native class A(val c: Int) { native - default object { + companion object { val g: Int = noImpl val c: String = noImpl } diff --git a/js/js.translator/testData/native/cases/nestedElements.kt b/js/js.translator/testData/native/cases/nestedElements.kt index f138226acc5..705a6976754 100644 --- a/js/js.translator/testData/native/cases/nestedElements.kt +++ b/js/js.translator/testData/native/cases/nestedElements.kt @@ -97,7 +97,7 @@ object Object { var b: String = noImpl fun test(): Int = noImpl - default object { + companion object { val a: String = noImpl var b: String = noImpl fun test(): Int = noImpl @@ -109,7 +109,7 @@ object Object { var b: String = noImpl fun test(): Int = noImpl - default object { + companion object { val a: String = noImpl var b: String = noImpl fun test(): Int = noImpl @@ -121,7 +121,7 @@ object Object { var b: String fun test(): Int = noImpl - default object { + companion object { val a: String = noImpl var b: String = noImpl fun test(): Int = noImpl @@ -145,7 +145,7 @@ class Class { var b: String = noImpl fun test(): Int = noImpl - default object { + companion object { val a: String = noImpl var b: String = noImpl fun test(): Int = noImpl @@ -162,14 +162,14 @@ class Class { var b: String fun test(): Int = noImpl - default object { + companion object { val a: String = noImpl var b: String = noImpl fun test(): Int = noImpl } } - default object { + companion object { native("aaa") val a: Trait = noImpl var b: String = noImpl @@ -190,7 +190,7 @@ trait Trait { var b: String = noImpl fun test(): Int = noImpl - default object { + companion object { val a: String = noImpl var b: String = noImpl fun test(): Int = noImpl @@ -203,14 +203,14 @@ trait Trait { var b: String fun test(): Int = noImpl - default object { + companion object { val a: String = noImpl var b: String = noImpl fun test(): Int = noImpl } } - default object { + companion object { val a: Trait = noImpl var b: String = noImpl fun test(): Int = noImpl diff --git a/js/js.translator/testData/native/cases/vararg.kt b/js/js.translator/testData/native/cases/vararg.kt index febec4d2469..0a1dd160999 100644 --- a/js/js.translator/testData/native/cases/vararg.kt +++ b/js/js.translator/testData/native/cases/vararg.kt @@ -24,7 +24,7 @@ fun Bar.test2(order: Int, dummy: Int, vararg args: Int): Boolean = noImpl native class Bar(val size: Int, order: Int = 0) { fun test(order: Int, dummy: Int, vararg args: Int): Boolean = noImpl - default object { + companion object { fun startNewTest(): Boolean = noImpl var hasOrderProblem: Boolean = false } diff --git a/js/js.translator/testData/object/cases/objectInObject.kt b/js/js.translator/testData/object/cases/objectInObject.kt index 9533e996265..5d1bc8a743a 100644 --- a/js/js.translator/testData/object/cases/objectInObject.kt +++ b/js/js.translator/testData/object/cases/objectInObject.kt @@ -14,7 +14,7 @@ object B { } class C { - default object { + companion object { fun ov() = "d" } object query { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEnum.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEnum.kt index 0f0f34b2591..3bd5fdce9c1 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEnum.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEnum.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { fun enum() { enum() } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt index 126b9e86b8d..bf505bb11f8 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { fun eval() { eval() } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFor.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFor.kt index 92d756e63b8..f0c8143ff9d 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFor.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFor.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { fun `for`() { `for`() } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunIf.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunIf.kt index 97f48c05c4f..13b2356a7a7 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunIf.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunIf.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { fun `if`() { `if`() } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExport.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExport.kt index a8fa9258faf..541644d66fe 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExport.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExport.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { fun foo(export: String) { assertEquals("123", export) testRenamed("export", { export }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExtends.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExtends.kt index dcb38899868..b8a5ee9b743 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExtends.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExtends.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { fun foo(extends: String) { assertEquals("123", extends) testRenamed("extends", { extends }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamIn.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamIn.kt index bd218f859d9..da0dcf23b85 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamIn.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamIn.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { fun foo(`in`: String) { assertEquals("123", `in`) testRenamed("in", { `in` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamNull.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamNull.kt index 1b5d84103df..d05708c5c39 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamNull.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamNull.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { fun foo(`null`: String) { assertEquals("123", `null`) testRenamed("null", { `null` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFinally.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFinally.kt index f1d4de5b6a0..c623d76d529 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFinally.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFinally.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { val t: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFunction.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFunction.kt index 571493e7bd0..161604032d0 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFunction.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFunction.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { val t: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelPackage.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelPackage.kt index 67ba1d4c326..9827f672947 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelPackage.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelPackage.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { val t: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelReturn.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelReturn.kt index 3408753b136..af75150bc48 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelReturn.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelReturn.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { val t: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValConst.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValConst.kt index bcfca887621..13eb2f2c4ba 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValConst.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValConst.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { val const: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValContinue.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValContinue.kt index 36b07200eb9..a9354b81603 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValContinue.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValContinue.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { val `continue`: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt index 9e2837a132c..26704f44944 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { val debugger: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValDo.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValDo.kt index d4114a7d4fa..96551cc623d 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValDo.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValDo.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { val `do`: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDefault.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDefault.kt index 86523af4868..d9e89013e7d 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDefault.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDefault.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { var default: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDelete.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDelete.kt index 4cbecb65204..b79c9ddcfa5 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDelete.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDelete.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { var delete: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarElse.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarElse.kt index bb08c30efd9..08b13567130 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarElse.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarElse.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { var `else`: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarFalse.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarFalse.kt index 8677b2eed28..26c1aa94d85 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarFalse.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarFalse.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - default object { + companion object { var `false`: Int = 0 fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/toplevelClassDelete.kt b/js/js.translator/testData/reservedWords/cases/toplevelClassDelete.kt index 854fb7704b1..e58769efae0 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelClassDelete.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelClassDelete.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -class delete { default object {} } +class delete { companion object {} } fun box(): String { testNotRenamed("delete", { delete }) diff --git a/js/js.translator/testData/reservedWords/cases/toplevelClassEnum.kt b/js/js.translator/testData/reservedWords/cases/toplevelClassEnum.kt index fc4b27fc850..7bf579e7767 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelClassEnum.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelClassEnum.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -class enum { default object {} } +class enum { companion object {} } fun box(): String { testNotRenamed("enum", { enum }) diff --git a/js/js.translator/testData/reservedWords/cases/toplevelClassPackage.kt b/js/js.translator/testData/reservedWords/cases/toplevelClassPackage.kt index 4b4af94d385..6a727997074 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelClassPackage.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelClassPackage.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -class `package` { default object {} } +class `package` { companion object {} } fun box(): String { testNotRenamed("package", { `package` }) diff --git a/js/js.translator/testData/reservedWords/cases/toplevelClassReturn.kt b/js/js.translator/testData/reservedWords/cases/toplevelClassReturn.kt index af9b8d25a15..0e25c684554 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelClassReturn.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelClassReturn.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -class `return` { default object {} } +class `return` { companion object {} } fun box(): String { testNotRenamed("return", { `return` }) diff --git a/js/js.translator/testData/reservedWords/cases/toplevelTraitEval.kt b/js/js.translator/testData/reservedWords/cases/toplevelTraitEval.kt index 99c532581a4..a2772ee0556 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelTraitEval.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelTraitEval.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -trait eval { default object {} } +trait eval { companion object {} } fun box(): String { testNotRenamed("eval", { eval }) diff --git a/js/js.translator/testData/reservedWords/cases/toplevelTraitExport.kt b/js/js.translator/testData/reservedWords/cases/toplevelTraitExport.kt index ea16b553d1f..838bd7eac17 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelTraitExport.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelTraitExport.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -trait export { default object {} } +trait export { companion object {} } fun box(): String { testNotRenamed("export", { export }) diff --git a/js/js.translator/testData/reservedWords/cases/toplevelTraitSuper.kt b/js/js.translator/testData/reservedWords/cases/toplevelTraitSuper.kt index 670eb1fb486..abf4975b0bb 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelTraitSuper.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelTraitSuper.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -trait `super` { default object {} } +trait `super` { companion object {} } fun box(): String { testNotRenamed("super", { `super` }) diff --git a/js/js.translator/testData/reservedWords/cases/toplevelTraitThis.kt b/js/js.translator/testData/reservedWords/cases/toplevelTraitThis.kt index 0bfe817d5ed..c0d648a9976 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelTraitThis.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelTraitThis.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -trait `this` { default object {} } +trait `this` { companion object {} } fun box(): String { testNotRenamed("this", { `this` }) diff --git a/libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt b/libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt index fab9e0fc2d8..110e479146d 100644 --- a/libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt +++ b/libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt @@ -22,7 +22,7 @@ import java.util.* import kotlin.test.* import org.junit.Test as test -class DefaultObjectsExtensionsTest { +class CompanionObjectsExtensionsTest { test fun intTest() { val i = Int diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/0.kt b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/0.kt index 2f5a02fc10c..637df9d4864 100644 --- a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/0.kt +++ b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/0.kt @@ -8,7 +8,7 @@ import kotlinx.android.synthetic.layout.* class R { class id { - default object { + companion object { val login = 5 } } diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/1.kt b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/1.kt index 6a9f2085922..f872c70b195 100644 --- a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/1.kt +++ b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/1.kt @@ -8,7 +8,7 @@ import kotlinx.android.synthetic.layout.* class R { class id { - default object { + companion object { val login = 5 } } diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/0.kt b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/0.kt index 2f5a02fc10c..637df9d4864 100644 --- a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/0.kt +++ b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/0.kt @@ -8,7 +8,7 @@ import kotlinx.android.synthetic.layout.* class R { class id { - default object { + companion object { val login = 5 } } diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/1.kt b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/1.kt index 6a9f2085922..f872c70b195 100644 --- a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/1.kt +++ b/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/1.kt @@ -8,7 +8,7 @@ import kotlinx.android.synthetic.layout.* class R { class id { - default object { + companion object { val login = 5 } } diff --git a/plugins/android-compiler-plugin/testData/codegen/android/multiFile/0.kt b/plugins/android-compiler-plugin/testData/codegen/android/multiFile/0.kt index a3d611934e2..7cd6f5cebf9 100644 --- a/plugins/android-compiler-plugin/testData/codegen/android/multiFile/0.kt +++ b/plugins/android-compiler-plugin/testData/codegen/android/multiFile/0.kt @@ -8,7 +8,7 @@ import kotlinx.android.synthetic.layout1.* class R { class id { - default object { + companion object { val item_detail_container = 0 val textView1 = 1 val password = 2 diff --git a/plugins/android-compiler-plugin/testData/codegen/android/multiFile/1.kt b/plugins/android-compiler-plugin/testData/codegen/android/multiFile/1.kt index c430f310b0e..8d106bf25a7 100644 --- a/plugins/android-compiler-plugin/testData/codegen/android/multiFile/1.kt +++ b/plugins/android-compiler-plugin/testData/codegen/android/multiFile/1.kt @@ -8,7 +8,7 @@ import kotlinx.android.synthetic.layout1.* class R { class id { - default object { + companion object { val item_detail_container = 0 val textView1 = 1 val password = 2 diff --git a/plugins/android-compiler-plugin/testData/codegen/android/singleFile/0.kt b/plugins/android-compiler-plugin/testData/codegen/android/singleFile/0.kt index 6d6fd901ace..7b42897ea77 100644 --- a/plugins/android-compiler-plugin/testData/codegen/android/singleFile/0.kt +++ b/plugins/android-compiler-plugin/testData/codegen/android/singleFile/0.kt @@ -7,7 +7,7 @@ import kotlinx.android.synthetic.layout.* class R { class id { - default object { + companion object { val item_detail_container = 0 val textView1 = 1 val password = 2 diff --git a/plugins/android-compiler-plugin/testData/codegen/android/singleFile/1.kt b/plugins/android-compiler-plugin/testData/codegen/android/singleFile/1.kt index 2480549d517..c09b727e11e 100644 --- a/plugins/android-compiler-plugin/testData/codegen/android/singleFile/1.kt +++ b/plugins/android-compiler-plugin/testData/codegen/android/singleFile/1.kt @@ -7,7 +7,7 @@ import kotlinx.android.synthetic.layout.* class R { class id { - default object { + companion object { val item_detail_container = 0 val textView1 = 1 val password = 2 diff --git a/spec-docs/jvm-native-flag-support.md b/spec-docs/jvm-native-flag-support.md index 073eef81870..8220d20ad74 100644 --- a/spec-docs/jvm-native-flag-support.md +++ b/spec-docs/jvm-native-flag-support.md @@ -38,7 +38,7 @@ Intuition: a JVM method whose source declaration is native is marked with the `A A native member of an object marked `native` and `platformStatic` is translated in a straightforward way: there is only one JVM method corresponding to it, and it is marked as `ACC_NATIVE`. -A member of a default object of class `C` marked `native` and `platformStatic` yields two JVM methods: +A member of a companion object of class `C` marked `native` and `platformStatic` yields two JVM methods: - static member of `C` that is marked `ACC_NATIVE`; - instance member of `C$object` that is not marked `ACC_NATIVE` and its body delegates to the native static method.