Replace object$ -> OBJECT$, instance$ -> INSTANCE$ in the project

js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java

@@ -136,7 +136,7 @@ public final class AnalyzerFacadeForJS {
             @NotNull Config config
     ) {
         GlobalContextImpl globalContext = ContextPackage.GlobalContext();
-        DeclarationProviderFactory declarationProviderFactory = DeclarationProviderFactoryService.object$
+        DeclarationProviderFactory declarationProviderFactory = DeclarationProviderFactoryService.OBJECT$
                 .createDeclarationProviderFactory(
                         config.getProject(),
                         globalContext.getStorageManager(),

js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java

@@ -141,7 +141,7 @@ public final class PropertyTranslator extends AbstractTranslator {
         JsExpression value;
         ResolvedCall<FunctionDescriptor> delegatedCall = bindingContext().get(BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL, getterDescriptor);
         if (delegatedCall != null) {
-            value = CallTranslator.instance$.translate(context(), delegatedCall, getDelegateNameRef(getPropertyName()));
+            value = CallTranslator.INSTANCE$.translate(context(), delegatedCall, getDelegateNameRef(getPropertyName()));
         } else {
             value = backingFieldReference(context(), this.descriptor);
         }
@@ -171,7 +171,7 @@ public final class PropertyTranslator extends AbstractTranslator {
         ResolvedCall<FunctionDescriptor> delegatedCall = bindingContext().get(BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL,
                                                                               setterDescriptor);
         if (delegatedCall != null) {
-            setExpression = CallTranslator.instance$.translate(contextWithAliased, delegatedCall, getDelegateNameRef(getPropertyName()));
+            setExpression = CallTranslator.INSTANCE$.translate(contextWithAliased, delegatedCall, getDelegateNameRef(getPropertyName()));
         } else {
             setExpression = assignmentToBackingField(contextWithAliased, descriptor, defaultParameterRef);
         }

js/js.translator/src/org/jetbrains/k2js/translate/expression/MultiDeclarationTranslator.java

@@ -78,7 +78,7 @@ public class MultiDeclarationTranslator extends AbstractTranslator {
         for (JetMultiDeclarationEntry entry : multiDeclaration.getEntries()) {
             ResolvedCall<FunctionDescriptor> entryInitCall =  context().bindingContext().get(BindingContext.COMPONENT_RESOLVED_CALL, entry);
             assert entryInitCall != null : "Entry init call must be not null";
-            JsExpression entryInitializer = CallTranslator.instance$.translate(context(), entryInitCall, multiObjNameRef);
+            JsExpression entryInitializer = CallTranslator.INSTANCE$.translate(context(), entryInitCall, multiObjNameRef);
 
             VariableDescriptor descriptor = BindingContextUtils.getNotNull( context().bindingContext(), BindingContext.VARIABLE, entry);
             JsName name =  context().getNameForDescriptor(descriptor);

js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/IteratorForTranslator.java

@@ -73,6 +73,6 @@ public final class IteratorForTranslator extends ForTranslator {
     @NotNull
     private JsExpression translateMethodInvocation(@Nullable JsExpression receiver,
             @NotNull ResolvedCall<FunctionDescriptor> resolvedCall) {
-        return CallTranslator.instance$.translate(context(), resolvedCall, receiver);
+        return CallTranslator.INSTANCE$.translate(context(), resolvedCall, receiver);
     }
 }

js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java

@@ -177,6 +177,6 @@ public final class Translation {
         }
         FunctionDescriptor functionDescriptor = getFunctionDescriptor(context.bindingContext(), mainFunction);
         JsArrayLiteral argument = new JsArrayLiteral(toStringLiteralList(arguments, context.program()));
-        return CallTranslator.instance$.buildCall(context, functionDescriptor, Collections.singletonList(argument), null).makeStmt();
+        return CallTranslator.INSTANCE$.buildCall(context, functionDescriptor, Collections.singletonList(argument), null).makeStmt();
     }
 }

js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java

@@ -155,7 +155,7 @@ public final class BinaryOperationTranslator extends AbstractTranslator {
     @NotNull
     private JsExpression translateAsOverloadedBinaryOperation() {
         ResolvedCall<? extends FunctionDescriptor> resolvedCall = getFunctionResolvedCallWithAssert(expression, bindingContext());
-        JsExpression result = CallTranslator.instance$.translate(context(), resolvedCall, getReceiver());
+        JsExpression result = CallTranslator.INSTANCE$.translate(context(), resolvedCall, getReceiver());
         return mayBeWrapWithNegation(result);
     }
 

js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java

@@ -57,6 +57,6 @@ public final class OverloadedAssignmentTranslator extends AssignmentTranslator {
 
     @NotNull
     private JsExpression overloadedMethodInvocation() {
-        return CallTranslator.instance$.translate(context(), resolvedCall, accessTranslator.translateAsGet());
+        return CallTranslator.INSTANCE$.translate(context(), resolvedCall, accessTranslator.translateAsGet());
     }
 }

js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java

@@ -42,7 +42,7 @@ public final class OverloadedIncrementTranslator extends IncrementTranslator {
     @Override
     @NotNull
     protected JsExpression operationExpression(@NotNull JsExpression receiver) {
-        return CallTranslator.instance$.translate(context(), resolvedCall, receiver);
+        return CallTranslator.INSTANCE$.translate(context(), resolvedCall, receiver);
     }
 
 }

js/js.translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java

@@ -65,7 +65,7 @@ public final class UnaryOperationTranslator {
         }
 
         ResolvedCall<? extends FunctionDescriptor> resolvedCall = getFunctionResolvedCallWithAssert(expression, context.bindingContext());
-        return CallTranslator.instance$.translate(context, resolvedCall, baseExpression);
+        return CallTranslator.INSTANCE$.translate(context, resolvedCall, baseExpression);
     }
 
     private static boolean isExclForBinaryEqualLikeExpr(@NotNull JetUnaryExpression expression, @NotNull JsExpression baseExpression) {

js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java

@@ -82,7 +82,7 @@ public class ArrayAccessTranslator extends AbstractTranslator implements AccessT
         if (!isGetter) {
             context = contextWithValueParameterAliasInArrayGetAccess(toSetTo);
         }
-        return CallTranslator.instance$.translate(context, resolvedCall, arrayExpression);
+        return CallTranslator.INSTANCE$.translate(context, resolvedCall, arrayExpression);
     }
 
     @NotNull

js/js.translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java

@@ -47,6 +47,6 @@ public final class CallExpressionTranslator extends AbstractCallExpressionTransl
 
     @NotNull
     private JsExpression translate() {
-        return CallTranslator.instance$.translate(context(), resolvedCall, receiver);
+        return CallTranslator.INSTANCE$.translate(context(), resolvedCall, receiver);
     }
 }

js/js.translator/src/org/jetbrains/k2js/translate/reference/VariableAccessTranslator.java

@@ -63,13 +63,13 @@ public class VariableAccessTranslator extends AbstractTranslator implements Acce
     @NotNull
     @Override
     public JsExpression translateAsGet() {
-        return CallTranslator.instance$.translateGet(context(), resolvedCall, receiver);
+        return CallTranslator.INSTANCE$.translateGet(context(), resolvedCall, receiver);
     }
 
     @NotNull
     @Override
     public JsExpression translateAsSet(@NotNull JsExpression setTo) {
-        return CallTranslator.instance$.translateSet(context(), resolvedCall, setTo, receiver);
+        return CallTranslator.INSTANCE$.translateSet(context(), resolvedCall, setTo, receiver);
     }
 
     @NotNull

js/js.translator/src/org/jetbrains/k2js/translate/test/JSTestGenerator.java

@@ -60,7 +60,7 @@ public final class JSTestGenerator {
             @NotNull ClassDescriptor classDescriptor, @NotNull JSTester tester) {
         JsExpression expression = ReferenceTranslator.translateAsFQReference(classDescriptor, context);
         JsNew testClass = new JsNew(expression);
-        JsExpression functionToTestCall = CallTranslator.instance$.buildCall(context, functionDescriptor,
+        JsExpression functionToTestCall = CallTranslator.INSTANCE$.buildCall(context, functionDescriptor,
                                                                              Collections.<JsExpression>emptyList(), testClass);
         JsStringLiteral testName = context.program().getStringLiteral(classDescriptor.getName() + "." + functionDescriptor.getName());
         tester.constructTestMethodInvocation(functionToTestCall, testName);