Rename: isObject -> isNonDefaultObject

compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java

@@ -728,7 +728,7 @@ public class AsmUtil {
             return false;
         }
 
-        return isObject(propertyDescriptor.getContainingDeclaration()) || isPropertyWithBackingFieldInOuterClass(propertyDescriptor);
+        return isNonDefaultObject(propertyDescriptor.getContainingDeclaration()) || isPropertyWithBackingFieldInOuterClass(propertyDescriptor);
     }
 
     public static boolean isPropertyWithBackingFieldInOuterClass(@NotNull PropertyDescriptor propertyDescriptor) {

compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java

@@ -976,7 +976,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
     private void generateFieldForSingleton() {
         if (isEnumEntry(descriptor) || isDefaultObject(descriptor)) return;
 
-        if (isObject(descriptor)) {
+        if (isNonDefaultObject(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);
 
@@ -1125,7 +1125,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
             generateDelegatorToConstructorCall(iv, codegen, constructorDescriptor);
         }
 
-        if (isObject(descriptor)) {
+        if (isNonDefaultObject(descriptor)) {
             StackValue.singleton(descriptor, typeMapper).store(StackValue.LOCAL_0, iv);
         }
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java

@@ -243,7 +243,7 @@ public class ModifiersChecker {
         if (DescriptorUtils.isTrait(containingDeclaration)) {
             return InnerModifierCheckResult.IN_TRAIT;
         }
-        else if (DescriptorUtils.isDefaultObject(containingDeclaration) || DescriptorUtils.isObject(containingDeclaration)) {
+        else if (DescriptorUtils.isDefaultObject(containingDeclaration) || DescriptorUtils.isNonDefaultObject(containingDeclaration)) {
             return InnerModifierCheckResult.IN_OBJECT;
         }
         else {

compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt

@@ -48,7 +48,7 @@ public class ConstantExpressionEvaluator private (val trace: BindingTrace) : Jet
             if (descriptor.isVar()) {
                 return false
             }
-            if (DescriptorUtils.isObject(descriptor.getContainingDeclaration()) ||
+            if (DescriptorUtils.isNonDefaultObject(descriptor.getContainingDeclaration()) ||
                 DescriptorUtils.isDefaultObject(descriptor.getContainingDeclaration()) ||
                 DescriptorUtils.isStaticDeclaration(descriptor)) {
                 val returnType = descriptor.getType()

compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java

@@ -48,7 +48,7 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.ZipOutputStream;
 
-import static org.jetbrains.kotlin.resolve.DescriptorUtils.isObject;
+import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonDefaultObject;
 import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile;
 
 public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
@@ -144,7 +144,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
         assertEquals(allDescriptors.toString(), 2, allDescriptors.size());
         for (DeclarationDescriptor descriptor : allDescriptors) {
             assertTrue("Wrong name: " + descriptor, descriptor.getName().asString().equals("Lol"));
-            assertTrue("Should be an object: " + descriptor, isObject(descriptor));
+            assertTrue("Should be an object: " + descriptor, isNonDefaultObject(descriptor));
         }
     }
 

core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java

@@ -248,7 +248,7 @@ public class DescriptorUtils {
         return isClass(descriptor) && descriptor.getName().equals(SpecialNames.NO_NAME_PROVIDED);
     }
 
-    public static boolean isObject(@NotNull DeclarationDescriptor descriptor) {
+    public static boolean isNonDefaultObject(@NotNull DeclarationDescriptor descriptor) {
         return isKindOf(descriptor, ClassKind.OBJECT);
     }
 

idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt

@@ -94,7 +94,7 @@ class StaticMembers(
 
         var members = classDescriptor.getDefaultType().getMemberScope().getAllDescriptors()
         if (classDescriptor.getKind() != ClassKind.ENUM_CLASS) {
-            members = members.filter { DescriptorUtils.isObject(it) }
+            members = members.filter { DescriptorUtils.isNonDefaultObject(it) }
         }
         members.forEach(::processMember)
     }

js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/DefaultObjectAccessTranslator.java

@@ -35,7 +35,7 @@ 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.isObject;
+import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonDefaultObject;
 
 public class DefaultObjectAccessTranslator extends AbstractTranslator implements CachedAccessTranslator {
     @NotNull
@@ -74,7 +74,7 @@ public class DefaultObjectAccessTranslator extends AbstractTranslator implements
         }
 
         JsExpression fqReference = translateAsFQReference(descriptor, context);
-        if (isObject(descriptor) || isEnumEntry(descriptor)) {
+        if (isNonDefaultObject(descriptor) || isEnumEntry(descriptor)) {
             return fqReference;
         }