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

idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java

@@ -96,7 +96,7 @@ public class JetPluginUtil {
     }
 
     public static boolean isGradleModule(@NotNull Module module) {
-        return ModuleTypeCacheManager.object$.geInstance(module.getProject()).isGradleModule(module);
+        return ModuleTypeCacheManager.OBJECT$.geInstance(module.getProject()).isGradleModule(module);
     }
 
     public static boolean isMavenModule(@NotNull Module module) {

idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java

@@ -53,10 +53,10 @@ public class JavaToKotlinAction extends AnAction {
             return;
         }
 
-        final Converter converter = Converter.object$.create(project,
+        final Converter converter = Converter.OBJECT$.create(project,
                                                              ConverterSettings.defaultSettings,
                                                              new FilesConversionScope(selectedJavaFiles),
-                                                             J2kPostProcessor.instance$);
+                                                             J2kPostProcessor.INSTANCE$);
         CommandProcessor.getInstance().executeCommand(
                 project,
                 new Runnable() {

idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java

@@ -107,7 +107,7 @@ public class JetAddFunctionToClassifierAction implements QuestionAction {
                         PsiElement anchor = body.getRBrace();
                         JetNamedFunction insertedFunctionElement = (JetNamedFunction) body.addBefore(functionElement, anchor);
 
-                        ShortenReferences.instance$.process(insertedFunctionElement);
+                        ShortenReferences.INSTANCE$.process(insertedFunctionElement);
                     }
                 });
             }

idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java

@@ -152,7 +152,7 @@ public class JetChangeFunctionSignatureAction implements QuestionAction {
                             newElement = psiFactory.createFunction(signatureString);
                         }
                         newElement = (JetNamedFunction) element.replace(newElement);
-                        ShortenReferences.instance$.process(newElement);
+                        ShortenReferences.INSTANCE$.process(newElement);
                     }
                 });
             }

idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java

@@ -101,7 +101,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
             elementsToCompact.add((JetElement) added);
         }
 
-        ShortenReferences.instance$.process(elementsToCompact);
+        ShortenReferences.INSTANCE$.process(elementsToCompact);
     }
 
     @Nullable

idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java

@@ -86,7 +86,7 @@ public class MoveDeclarationsOutHelper {
             dummyFirstStatement.delete();
         }
 
-        ShortenReferences.instance$.process(propertiesDeclarations);
+        ShortenReferences.INSTANCE$.process(propertiesDeclarations);
 
         return PsiUtilCore.toPsiElementArray(resultStatements);
     }

idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java

@@ -53,7 +53,7 @@ public class JetClassInsertHandler implements InsertHandler<LookupElement> {
                         psiDocumentManager.commitAllDocuments();
                         RangeMarker rangeMarker = document.createRangeMarker(classNameEnd, classNameEnd + tempSuffix.length());
 
-                        ShortenReferences.instance$.process((JetFile) context.getFile(), startOffset, classNameEnd);
+                        ShortenReferences.INSTANCE$.process((JetFile) context.getFile(), startOffset, classNameEnd);
                         psiDocumentManager.commitAllDocuments();
                         psiDocumentManager.doPostponedOperationsAndUnblockDocument(document);
 

idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java

@@ -94,7 +94,7 @@ public class ConfigureKotlinInProjectUtils {
     }
 
     private static void showConfigureKotlinNotification(@NotNull Project project) {
-        ConfigureKotlinNotificationManager.instance$.notify(project);
+        ConfigureKotlinNotificationManager.INSTANCE$.notify(project);
     }
 
     @NotNull

idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java

@@ -110,7 +110,7 @@ public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent {
                     public void run() {
                         Collection<Sdk> sdks = collectSdksWithoutAnnotations();
                         if (!sdks.isEmpty()) {
-                            AbsentSdkAnnotationsNotificationManager.instance$.notify(myProject, sdks);
+                            AbsentSdkAnnotationsNotificationManager.INSTANCE$.notify(myProject, sdks);
                         }
                     }
                 });

idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java

@@ -154,7 +154,7 @@ public abstract class KotlinFindMemberUsagesHandler<T extends JetNamedDeclaratio
                         UsagesSearchRequest request =
                                 getSearchHelper(kotlinOptions).newRequest(FindUsagesPackage.toSearchTarget(options, (T) element, true));
 
-                        for (PsiReference ref : UsagesSearch.instance$.search(request)) {
+                        for (PsiReference ref : UsagesSearch.INSTANCE$.search(request)) {
                             processUsage(processor, ref);
                         }
 

idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java

@@ -47,7 +47,7 @@ public class ReconstructTypeInCastOrIsAction extends PsiElementBaseIntentionActi
         JetType type = getReconstructedType(typeRef);
         JetTypeReference newType = JetPsiFactory(typeRef).createType(DescriptorRenderer.SOURCE_CODE.renderType(type));
         JetTypeReference replaced = (JetTypeReference) typeRef.replace(newType);
-        ShortenReferences.instance$.process(replaced);
+        ShortenReferences.INSTANCE$.process(replaced);
     }
 
     @Override

idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java

@@ -260,7 +260,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
         manager.startTemplate(editor, builder.buildInlineTemplate(), new TemplateEditingAdapter() {
             @Override
             public void templateFinished(Template template, boolean brokenOff) {
-                ShortenReferences.instance$.process(getTypeRef(namedDeclaration));
+                ShortenReferences.INSTANCE$.process(getTypeRef(namedDeclaration));
             }
         });
     }

idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java

@@ -125,7 +125,7 @@ public class DeclarationUtils {
         );
 
         if (inferredType != null) {
-            ShortenReferences.instance$.process(property.getTypeRef());
+            ShortenReferences.INSTANCE$.process(property.getTypeRef());
         }
 
         return newInitializer;

idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java

@@ -169,7 +169,7 @@ public class KotlinSignatureAnnotationIntention extends BaseIntentionAction impl
     @NotNull
     private static String getDefaultSignature(@NotNull Project project, @NotNull PsiMember psiMember) {
         BindingContext bindingContext = ResolvePackage.getLazyResolveSession(project, TargetPlatform.JVM).getBindingContext();
-        JavaDescriptorResolver javaDescriptorResolver = JavaResolveExtension.instance$.get(project);
+        JavaDescriptorResolver javaDescriptorResolver = JavaResolveExtension.INSTANCE$.get(project);
 
         PsiClass containingClass = psiMember.getContainingClass();
         assert containingClass != null;

idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java

@@ -95,7 +95,7 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
 
         BindingContext bindingContext = ResolvePackage.getLazyResolveSession(project, TargetPlatform.JVM).getBindingContext();
 
-        JavaDescriptorResolver javaDescriptorResolver = JavaResolveExtension.instance$.get(project);
+        JavaDescriptorResolver javaDescriptorResolver = JavaResolveExtension.INSTANCE$.get(project);
 
         for (PsiElement element : elements) {
             if (!(element instanceof PsiMember)) {

idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java

@@ -248,15 +248,15 @@ public class QuickFixes {
 
         factories.put(MANY_CLASSES_IN_SUPERTYPE_LIST, RemoveSupertypeFix.createFactory());
 
-        factories.put(NO_GET_METHOD, CreateFunctionFromUsageFix.object$.createCreateGetFunctionFromUsageFactory());
-        factories.put(NO_SET_METHOD, CreateFunctionFromUsageFix.object$.createCreateSetFunctionFromUsageFactory());
-        JetSingleIntentionActionFactory createHasNextFromUsageFactory = CreateFunctionFromUsageFix.object$.createCreateHasNextFunctionFromUsageFactory();
+        factories.put(NO_GET_METHOD, CreateFunctionFromUsageFix.OBJECT$.createCreateGetFunctionFromUsageFactory());
+        factories.put(NO_SET_METHOD, CreateFunctionFromUsageFix.OBJECT$.createCreateSetFunctionFromUsageFactory());
+        JetSingleIntentionActionFactory createHasNextFromUsageFactory = CreateFunctionFromUsageFix.OBJECT$.createCreateHasNextFunctionFromUsageFactory();
         factories.put(HAS_NEXT_MISSING, createHasNextFromUsageFactory);
         factories.put(HAS_NEXT_FUNCTION_NONE_APPLICABLE, createHasNextFromUsageFactory);
-        JetSingleIntentionActionFactory createNextFromUsageFactory = CreateFunctionFromUsageFix.object$.createCreateNextFunctionFromUsageFactory();
+        JetSingleIntentionActionFactory createNextFromUsageFactory = CreateFunctionFromUsageFix.OBJECT$.createCreateNextFunctionFromUsageFactory();
         factories.put(NEXT_MISSING, createNextFromUsageFactory);
         factories.put(NEXT_NONE_APPLICABLE, createNextFromUsageFactory);
-        factories.put(ITERATOR_MISSING, CreateFunctionFromUsageFix.object$.createCreateIteratorFunctionFromUsageFactory());
-        factories.put(COMPONENT_FUNCTION_MISSING, CreateFunctionFromUsageFix.object$.createCreateComponentFunctionFromUsageFactory());
+        factories.put(ITERATOR_MISSING, CreateFunctionFromUsageFix.OBJECT$.createCreateIteratorFunctionFromUsageFactory());
+        factories.put(COMPONENT_FUNCTION_MISSING, CreateFunctionFromUsageFix.OBJECT$.createCreateComponentFunctionFromUsageFactory());
     }
 }

idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java

@@ -295,7 +295,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
                     functionLiteral.addAfter(whitespaceToAdd, openBraceElement);
                 }
             }
-            ShortenReferences.instance$.process(functionLiteralExpression.getValueParameters());
+            ShortenReferences.INSTANCE$.process(functionLiteralExpression.getValueParameters());
         }
     }
 
@@ -337,7 +337,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
         JetPsiFactory psiFactory = JetPsiFactory(containingFile);
         for (JetCallExpression call : callsToAddArguments) {
             call.addAfter(psiFactory.createTypeArguments("<" + typeArguments + ">"), call.getCalleeExpression());
-            ShortenReferences.instance$.process(call.getTypeArgumentList());
+            ShortenReferences.INSTANCE$.process(call.getTypeArgumentList());
         }
     }
 

idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java

@@ -413,7 +413,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
                 }
                 propertyRef.set(property);
                 if (noTypeInference) {
-                    ShortenReferences.instance$.process(property);
+                    ShortenReferences.INSTANCE$.process(property);
                 }
             }
         };