From de0f75120790a6c4cd8da5fe6cf944fcbb0ab187 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 26 Jul 2014 00:21:05 +0400 Subject: [PATCH] Replace object$ -> OBJECT$, instance$ -> INSTANCE$ in the project --- .../jet/codegen/ImplementationBodyCodegen.java | 2 +- .../jvm/compiler/CompileEnvironmentUtil.java | 6 +++--- .../cli/jvm/compiler/JetCoreEnvironment.java | 2 +- .../compiler/KotlinToJVMBytecodeCompiler.java | 4 ++-- .../resolve/java/AnalyzerFacadeForJVM.java | 2 +- .../JavaPropertyInitializerEvaluatorImpl.java | 2 +- .../jet/lang/cfg/JetControlFlowProcessor.java | 12 ++++++------ .../lang/cfg/JetFlowInformationProvider.java | 4 ++-- .../jet/lang/cfg/PseudocodeVariablesData.java | 2 +- .../JetControlFlowInstructionsGenerator.java | 14 +++++++------- .../lang/psi/JetDotQualifiedExpression.java | 8 ++++---- .../lang/psi/JetNameReferenceExpression.java | 6 +++--- .../lang/psi/JetSafeQualifiedExpression.java | 8 ++++---- .../stubs/elements/JetClassElementType.java | 2 +- .../stubs/elements/JetObjectElementType.java | 2 +- .../jet/lang/resolve/AnnotationResolver.java | 2 +- .../lang/resolve/CompileTimeConstantUtils.java | 2 +- .../jet/lang/resolve/DescriptorResolver.java | 2 +- .../jet/lang/resolve/OverrideResolver.java | 8 ++++---- .../resolve/calls/ArgumentTypeResolver.java | 2 +- .../resolve/calls/CallExpressionResolver.java | 2 +- .../resolve/calls/model/ResolvedCallImpl.java | 2 +- .../lazy/descriptors/LazyClassDescriptor.java | 2 +- .../BasicExpressionTypingVisitor.java | 8 ++++---- .../lang/types/expressions/DataFlowUtils.java | 2 +- .../expressions/ExpressionTypingServices.java | 2 +- .../ClassObjectField.java | 2 +- .../TraitClassObjectField.java | 2 +- .../class/ClassObject.java | 18 +++++++++--------- .../specialNames/classObject.kt | 2 +- .../classObjectCopiedFieldObject.kt | 4 ++-- .../specialNames/instance.kt | 2 +- .../jet/storage/StorageManagerTest.java | 10 +++++----- .../java/resolver/DescriptorResolverUtils.java | 2 +- .../jetbrains/jet/plugin/JetPluginUtil.java | 2 +- .../jet/plugin/actions/JavaToKotlinAction.java | 4 ++-- .../JetAddFunctionToClassifierAction.java | 2 +- .../JetChangeFunctionSignatureAction.java | 2 +- .../OverrideImplementMethodsHandler.java | 2 +- .../MoveDeclarationsOutHelper.java | 2 +- .../handlers/JetClassInsertHandler.java | 2 +- .../ConfigureKotlinInProjectUtils.java | 2 +- .../ui/AbsentJdkAnnotationsComponent.java | 2 +- .../KotlinFindMemberUsagesHandler.java | 2 +- .../ReconstructTypeInCastOrIsAction.java | 2 +- .../SpecifyTypeExplicitlyAction.java | 2 +- .../declarations/DeclarationUtils.java | 2 +- .../KotlinSignatureAnnotationIntention.java | 2 +- .../KotlinSignatureInJavaMarkerProvider.java | 2 +- .../jet/plugin/quickfix/QuickFixes.java | 12 ++++++------ .../inline/KotlinInlineValHandler.java | 4 ++-- .../KotlinIntroduceVariableHandler.java | 2 +- .../fields/classObjectCopiedFieldObject.kt | 4 ++-- .../completion/injava/ClassObject.java | 2 +- .../injava/NestedObjectInstance.java | 2 +- .../completion/injava/ObjectInstance.java | 2 +- .../findObjectUsages/javaObjectUsages.1.java | 2 +- .../javaObjectUsages.results.txt | 2 +- .../javaClassObjectPropertyUsages.1.java | 4 ++-- .../javaClassObjectPropertyUsages.results.txt | 4 ++-- .../kotlinAndJavaChecker/ClassObjects.java | 16 ++++++++-------- .../moveObjectToFile/after/a/noImports.java | 2 +- .../moveObjectToFile/after/b/noImports.java | 2 +- .../after/b/onDemandImport.java | 2 +- .../after/b/specificImports.java | 2 +- .../moveObjectToFile/after/c/noImports.java | 2 +- .../after/c/onDemandImport.java | 2 +- .../after/c/specificImports.java | 2 +- .../moveObjectToFile/before/a/noImports.java | 2 +- .../moveObjectToFile/before/b/noImports.java | 2 +- .../before/b/onDemandImport.java | 2 +- .../before/b/specificImports.java | 2 +- .../moveObjectToFile/before/c/noImports.java | 2 +- .../before/c/onDemandImport.java | 2 +- .../before/c/specificImports.java | 2 +- .../moveObjectToPackage/after/a/noImports.java | 2 +- .../moveObjectToPackage/after/b/noImports.java | 2 +- .../after/b/onDemandImport.java | 2 +- .../after/b/specificImports.java | 2 +- .../moveObjectToPackage/after/c/noImports.java | 2 +- .../after/c/onDemandImport.java | 2 +- .../after/c/specificImports.java | 2 +- .../before/a/noImports.java | 2 +- .../before/b/noImports.java | 2 +- .../before/b/onDemandImport.java | 2 +- .../before/b/specificImports.java | 2 +- .../before/c/noImports.java | 2 +- .../before/c/onDemandImport.java | 2 +- .../before/c/specificImports.java | 2 +- .../after/a/noImports.java | 2 +- .../before/a/noImports.java | 2 +- ...bstractMultiFileJvmBasicCompletionTest.java | 4 ++-- .../stubs/AbstractLazyResolveByStubTest.java | 6 +++--- .../AbstractMultiFileHighlightingTest.java | 4 ++-- .../kotlinApiAccess/ClassObjectMembers.java | 4 ++-- .../CorrectNullabilityDetected.java | 8 ++++---- .../ast/kotlinApiAccess/ObjectMembers.java | 10 +++++----- .../k2js/analyze/AnalyzerFacadeForJS.java | 2 +- .../declaration/PropertyTranslator.java | 4 ++-- .../expression/MultiDeclarationTranslator.java | 2 +- .../foreach/IteratorForTranslator.java | 2 +- .../k2js/translate/general/Translation.java | 2 +- .../operation/BinaryOperationTranslator.java | 2 +- .../OverloadedAssignmentTranslator.java | 2 +- .../OverloadedIncrementTranslator.java | 2 +- .../operation/UnaryOperationTranslator.java | 2 +- .../reference/ArrayAccessTranslator.java | 2 +- .../reference/CallExpressionTranslator.java | 2 +- .../reference/VariableAccessTranslator.java | 4 ++-- .../k2js/translate/test/JSTestGenerator.java | 2 +- 110 files changed, 183 insertions(+), 183 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index 16991bbb30f..cf183bfe4d4 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -1235,7 +1235,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { boolean generateInitializerInOuter = isClassObjectWithBackingFieldsInOuter(descriptor); if (generateInitializerInOuter) { final ImplementationBodyCodegen parentCodegen = getParentBodyCodegen(this); - //generate object$ + //generate OBJECT$ parentCodegen.genInitSingleton(descriptor, StackValue.singleton(descriptor, typeMapper)); generateInitializers(new Function0() { @Override diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java index 70f9b0f1d5b..cbf07049bdf 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -158,8 +158,8 @@ public class CompileEnvironmentUtil { method.setAccessible(true); method.invoke(null); - ArrayList answer = new ArrayList(AllModules.instance$.get()); - AllModules.instance$.get().clear(); + ArrayList answer = new ArrayList(AllModules.INSTANCE$.get()); + AllModules.INSTANCE$.get().clear(); return answer; } catch (Exception e) { @@ -303,7 +303,7 @@ public class CompileEnvironmentUtil { } } } - return Unit.instance$; + return Unit.INSTANCE$; } }); } diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java index 78a1501aad8..84d2f0d144b 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java @@ -209,7 +209,7 @@ public class JetCoreEnvironment { @Override public Unit invoke(String s) { report(ERROR, s); - return Unit.instance$; + return Unit.INSTANCE$; } })); JetScriptDefinitionProvider.getInstance(project).addScriptDefinitions( diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index 7cb86b43fd8..96c165f2c94 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -293,7 +293,7 @@ public class KotlinToJVMBytecodeCompiler { BindingTrace sharedTrace = support.getTrace(); ModuleDescriptorImpl sharedModule = support.getModule(); - IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.object$.getInstance(); + IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.OBJECT$.getInstance(); File incrementalCacheBaseDir = environment.getConfiguration().get(JVMConfigurationKeys.INCREMENTAL_CACHE_BASE_DIR); final IncrementalCache incrementalCache; if (incrementalCacheProvider != null && incrementalCacheBaseDir != null) { @@ -345,7 +345,7 @@ public class KotlinToJVMBytecodeCompiler { ) { CompilerConfiguration configuration = environment.getConfiguration(); File incrementalCacheDir = configuration.get(JVMConfigurationKeys.INCREMENTAL_CACHE_BASE_DIR); - IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.object$.getInstance(); + IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.OBJECT$.getInstance(); Collection packagesWithRemovedFiles; if (incrementalCacheDir == null || moduleId == null || incrementalCacheProvider == null) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java index 486944cd4b6..bc84d9d9c2a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java @@ -119,7 +119,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { ) { GlobalContextImpl globalContext = ContextPackage.GlobalContext(); - DeclarationProviderFactory declarationProviderFactory = DeclarationProviderFactoryService.object$ + DeclarationProviderFactory declarationProviderFactory = DeclarationProviderFactoryService.OBJECT$ .createDeclarationProviderFactory(project, globalContext.getStorageManager(), syntheticFiles, filesScope); InjectorForLazyResolveWithJava resolveWithJava = new InjectorForLazyResolveWithJava( diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java index bfe6d1706fe..3e82ac19226 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java @@ -36,7 +36,7 @@ public class JavaPropertyInitializerEvaluatorImpl implements JavaPropertyInitial if (evaluatedExpression != null) { return ConstantsPackage.createCompileTimeConstant( evaluatedExpression, - ConstantExpressionEvaluator.object$.isPropertyCompileTimeConstant(descriptor), + ConstantExpressionEvaluator.OBJECT$.isPropertyCompileTimeConstant(descriptor), false, true, descriptor.getType()); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java index 6fb23c16a83..535be19add1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -216,7 +216,7 @@ public class JetControlFlowProcessor { @NotNull private Map defaultTypeMap(List values) { - return PseudocodePackage.expectedTypeFor(AllTypes.instance$, values); + return PseudocodePackage.expectedTypeFor(AllTypes.INSTANCE$, values); } private void mergeValues(@NotNull List from, @NotNull JetExpression to) { @@ -268,7 +268,7 @@ public class JetControlFlowProcessor { @NotNull private AccessTarget getResolvedCallAccessTarget(JetElement element) { ResolvedCall resolvedCall = getResolvedCall(element, trace.getBindingContext()); - return resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.instance$; + return resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.INSTANCE$; } @NotNull @@ -276,7 +276,7 @@ public class JetControlFlowProcessor { DeclarationDescriptor descriptor = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element); return descriptor instanceof VariableDescriptor ? new AccessTarget.Declaration((VariableDescriptor) descriptor) - : AccessTarget.BlackBox.instance$; + : AccessTarget.BlackBox.INSTANCE$; } @Override @@ -457,7 +457,7 @@ public class JetControlFlowProcessor { } Map receiverValues = SmartFMap.emptyMap(); - AccessTarget accessTarget = AccessTarget.BlackBox.instance$; + AccessTarget accessTarget = AccessTarget.BlackBox.INSTANCE$; boolean unsupported = false; if (left instanceof JetSimpleNameExpression || left instanceof JetQualifiedExpression) { accessTarget = getResolvedCallAccessTarget(PsiUtilPackage.getQualifiedElementSelector(left)); @@ -892,7 +892,7 @@ public class JetControlFlowProcessor { JetMultiDeclaration multiDeclaration = expression.getMultiParameter(); JetExpression loopRange = expression.getLoopRange(); - TypePredicate loopRangeTypePredicate = AllTypes.instance$; + TypePredicate loopRangeTypePredicate = AllTypes.INSTANCE$; ResolvedCall iteratorResolvedCall = trace.get(BindingContext.LOOP_RANGE_ITERATOR_RESOLVED_CALL, loopRange); if (iteratorResolvedCall != null) { ReceiverValue iteratorReceiver = getExplicitReceiverValue(iteratorResolvedCall); @@ -1400,7 +1400,7 @@ public class JetControlFlowProcessor { TypePredicate expectedTypePredicate = PseudocodePackage.getSubtypesPredicate(trace.get(BindingContext.TYPE, specifier.getTypeReference())); if (expectedTypePredicate == null) { - expectedTypePredicate = AllTypes.instance$; + expectedTypePredicate = AllTypes.INSTANCE$; } builder.magic(specifier, specifier, arguments, PseudocodePackage.expectedTypeFor(expectedTypePredicate, arguments), MagicKind.VALUE_CONSUMER); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java index 59b97bdcf50..6a54b885532 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java @@ -957,7 +957,7 @@ public class JetFlowInformationProvider { @Override public Unit invoke(Instruction instruction, D enterData, D exitData) { execute(instruction, enterData, exitData); - return Unit.instance$; + return Unit.INSTANCE$; } public abstract void execute(Instruction instruction, D enterData, D exitData); @@ -967,7 +967,7 @@ public class JetFlowInformationProvider { @Override public Unit invoke(P p) { execute(p); - return Unit.instance$; + return Unit.INSTANCE$; } public abstract void execute(P p); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java index 70100e4a23f..93f31de42c1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java @@ -85,7 +85,7 @@ public class PseudocodeVariablesData { if (variableDescriptor != null) { result.add(variableDescriptor); } - return Unit.instance$; + return Unit.INSTANCE$; } }); usedVariables = Collections.unmodifiableSet(result); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java index 2d4062b1d6a..a1615bb2f81 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java @@ -418,7 +418,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd @Override public InstructionWithValue loadStringTemplate(@NotNull JetStringTemplateExpression expression, @NotNull List inputValues) { if (inputValues.isEmpty()) return read(expression); - Map predicate = PseudocodePackage.expectedTypeFor(AllTypes.instance$, inputValues); + Map predicate = PseudocodePackage.expectedTypeFor(AllTypes.INSTANCE$, inputValues); return magic(expression, expression, inputValues, predicate, MagicKind.STRING_TEMPLATE); } @@ -431,7 +431,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd @NotNull Map expectedTypes, @NotNull MagicKind kind ) { - MagicInstruction instruction = MagicInstruction.object$.create( + MagicInstruction instruction = MagicInstruction.OBJECT$.create( instructionElement, valueElement, getCurrentScope(), inputValues, expectedTypes, kind, valueFactory ); add(instruction); @@ -441,7 +441,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd @NotNull @Override public MergeInstruction merge(@NotNull JetExpression expression, @NotNull List inputValues) { - MergeInstruction instruction = MergeInstruction.object$.create(expression, getCurrentScope(), inputValues, valueFactory); + MergeInstruction instruction = MergeInstruction.OBJECT$.create(expression, getCurrentScope(), inputValues, valueFactory); add(instruction); return instruction; } @@ -465,7 +465,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd @NotNull Map arguments ) { JetType returnType = resolvedCall.getResultingDescriptor().getReturnType(); - CallInstruction instruction = CallInstruction.object$.create( + CallInstruction instruction = CallInstruction.OBJECT$.create( valueElement, getCurrentScope(), resolvedCall, @@ -492,7 +492,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd expectedTypes = PseudocodePackage.expectedTypeFor(onlyBoolean, inputValues); break; case NOT_NULL_ASSERTION: - expectedTypes = PseudocodePackage.expectedTypeFor(AllTypes.instance$, inputValues); + expectedTypes = PseudocodePackage.expectedTypeFor(AllTypes.INSTANCE$, inputValues); break; default: throw new IllegalArgumentException("Invalid operation: " + operation); @@ -526,8 +526,8 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd @Nullable ResolvedCall resolvedCall, @NotNull Map receiverValues ) { - AccessTarget accessTarget = resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.instance$; - ReadValueInstruction instruction = ReadValueInstruction.object$.create( + AccessTarget accessTarget = resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.INSTANCE$; + ReadValueInstruction instruction = ReadValueInstruction.OBJECT$.create( expression, getCurrentScope(), accessTarget, receiverValues, valueFactory ); add(instruction); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java index 7d632b17711..4940dcf891b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java @@ -54,7 +54,7 @@ public class JetDotQualifiedExpression extends JetExpressionImplStub superNames = PsiUtilPackage.getSuperNames(psi); return new PsiJetClassStubImpl( getStubType(isEnumEntry), parentStub, StringRef.fromString(fqName != null ? fqName.asString() : null), - StringRef.fromString(psi.getName()), Utils.instance$.wrapStrings(superNames), psi.isTrait(), isEnumEntry, + StringRef.fromString(psi.getName()), Utils.INSTANCE$.wrapStrings(superNames), psi.isTrait(), isEnumEntry, psi.isLocal(), psi.isTopLevel()); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java index 361c5d44033..fb4f2bdd241 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java @@ -47,7 +47,7 @@ public class JetObjectElementType extends JetStubElementType superNames = PsiUtilPackage.getSuperNames(psi); - return new PsiJetObjectStubImpl(parentStub, StringRef.fromString(name), fqName, Utils.instance$.wrapStrings(superNames), + return new PsiJetObjectStubImpl(parentStub, StringRef.fromString(name), fqName, Utils.INSTANCE$.wrapStrings(superNames), psi.isTopLevel(), isClassObject(psi), psi.isLocal(), psi.isObjectLiteral()); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java index 31289173b2d..a5cd40b51f8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -361,7 +361,7 @@ public class AnnotationResolver { for (ValueArgument argument : resolvedValueArgument.getArguments()) { JetExpression argumentExpression = argument.getArgumentExpression(); if (argumentExpression != null) { - CompileTimeConstant constant = ConstantExpressionEvaluator.object$.evaluate(argumentExpression, trace, expectedType); + CompileTimeConstant constant = ConstantExpressionEvaluator.OBJECT$.evaluate(argumentExpression, trace, expectedType); if (constant instanceof IntegerValueTypeConstant) { JetType defaultType = ((IntegerValueTypeConstant) constant).getType(expectedType); ArgumentTypeResolver.updateNumberType(defaultType, argumentExpression, trace); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java index 8cb6b4ff9e0..1a8c525a9c3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java @@ -129,7 +129,7 @@ public class CompileTimeConstantUtils { ) { if (expression == null) return false; CompileTimeConstant compileTimeConstant = - ConstantExpressionEvaluator.object$.evaluate(expression, trace, KotlinBuiltIns.getInstance().getBooleanType()); + ConstantExpressionEvaluator.OBJECT$.evaluate(expression, trace, KotlinBuiltIns.getInstance().getBooleanType()); if (!(compileTimeConstant instanceof BooleanValue) || compileTimeConstant.usesVariableAsConstant()) return false; Boolean value = ((BooleanValue) compileTimeConstant).getValue(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index ceecda06f6a..119783f181b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -1078,7 +1078,7 @@ public class DescriptorResolver { public CompileTimeConstant invoke() { JetExpression initializer = variable.getInitializer(); JetType initializerType = expressionTypingServices.safeGetType(scope, initializer, variableType, dataFlowInfo, trace); - CompileTimeConstant constant = ConstantExpressionEvaluator.object$.evaluate(initializer, trace, initializerType); + CompileTimeConstant constant = ConstantExpressionEvaluator.OBJECT$.evaluate(initializer, trace, initializerType); if (constant instanceof IntegerValueTypeConstant) { return EvaluatePackage.createCompileTimeConstantWithType((IntegerValueTypeConstant) constant, initializerType); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index 0d01d58fa50..cd377154725 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -192,7 +192,7 @@ public class OverrideResolver { if (element instanceof JetDeclaration) { trace.report(CANNOT_INFER_VISIBILITY.on((JetDeclaration) element, descriptor)); } - return Unit.instance$; + return Unit.INSTANCE$; } }; } @@ -247,7 +247,7 @@ public class OverrideResolver { public boolean isEqual(D d1, D d2) { CallableDescriptor f = transform.fun(d1); CallableDescriptor g = transform.fun(d2); - return DescriptorEquivalenceForOverrides.instance$.areEquivalent(f.getOriginal(), g.getOriginal()); + return DescriptorEquivalenceForOverrides.INSTANCE$.areEquivalent(f.getOriginal(), g.getOriginal()); } }); @@ -294,10 +294,10 @@ public class OverrideResolver { // when B is defined in modules m1 and m2, and C (indirectly) inherits from both versions, // we'll be getting sets of members that do not override each other, but are structurally equivalent. // As other code relies on no equal descriptors passed here, we guard against f == g, but this may not be necessary - if (!f.equals(g) && DescriptorEquivalenceForOverrides.instance$.areEquivalent(f.getOriginal(), g.getOriginal())) return true; + if (!f.equals(g) && DescriptorEquivalenceForOverrides.INSTANCE$.areEquivalent(f.getOriginal(), g.getOriginal())) return true; CallableDescriptor originalG = g.getOriginal(); for (D overriddenFunction : getAllOverriddenDescriptors(f)) { - if (DescriptorEquivalenceForOverrides.instance$.areEquivalent(originalG, overriddenFunction.getOriginal())) return true; + if (DescriptorEquivalenceForOverrides.INSTANCE$.areEquivalent(originalG, overriddenFunction.getOriginal())) return true; } return false; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java index 4bf742e62d6..b2f13630672 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java @@ -290,6 +290,6 @@ public class ArgumentTypeResolver { return; } - ConstantExpressionEvaluator.object$.evaluate(expression, trace, numberType); + ConstantExpressionEvaluator.OBJECT$.evaluate(expression, trace, numberType); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java index c39ada023e2..20ac1cb968b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java @@ -467,7 +467,7 @@ public class CallExpressionResolver { context.trace.record(BindingContext.EXPRESSION_TYPE, selectorExpression, selectorReturnType); } - CompileTimeConstant value = ConstantExpressionEvaluator.object$.evaluate(expression, context.trace, context.expectedType); + CompileTimeConstant value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, context.trace, context.expectedType); if (value instanceof IntegerValueConstant && ((IntegerValueConstant) value).isPure()) { return BasicExpressionTypingVisitor.createCompileTimeConstantTypeInfo(value, expression, context); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java index 7098fb4a239..ce18c818c54 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java @@ -272,7 +272,7 @@ public class ResolvedCallImpl implements MutableRe public ArgumentMapping getArgumentMapping(@NotNull ValueArgument valueArgument) { ArgumentMatch argumentMatch = argumentToParameterMap.get(valueArgument); if (argumentMatch == null) { - return ArgumentUnmapped.instance$; + return ArgumentUnmapped.INSTANCE$; } return argumentMatch; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java index 8c0fde8914b..82abd68fe41 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -515,7 +515,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes @Override public Unit invoke(@NotNull Supertypes supertypes) { findAndDisconnectLoopsInTypeHierarchy(supertypes); - return Unit.instance$; + return Unit.INSTANCE$; } } ); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index d035549505b..3fcc6b357cb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -118,7 +118,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { @Override public JetTypeInfo visitConstantExpression(@NotNull JetConstantExpression expression, ExpressionTypingContext context) { - CompileTimeConstant value = ConstantExpressionEvaluator.object$.evaluate(expression, context.trace, context.expectedType); + CompileTimeConstant value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, context.trace, context.expectedType); if (!(value instanceof IntegerValueTypeConstant)) { CompileTimeConstantChecker compileTimeConstantChecker = context.getCompileTimeConstantChecker(); @@ -752,7 +752,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { result = returnType; } - CompileTimeConstant value = ConstantExpressionEvaluator.object$.evaluate(expression, contextWithExpectedType.trace, + CompileTimeConstant value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, contextWithExpectedType.trace, contextWithExpectedType.expectedType); if (value != null) { return createCompileTimeConstantTypeInfo(value, expression, contextWithExpectedType); @@ -917,7 +917,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { context.trace.report(UNSUPPORTED.on(operationSign, "Unknown operation")); result = JetTypeInfo.create(null, context.dataFlowInfo); } - CompileTimeConstant value = ConstantExpressionEvaluator.object$. + CompileTimeConstant value = ConstantExpressionEvaluator.OBJECT$. evaluate(expression, contextWithExpectedType.trace, contextWithExpectedType.expectedType); if (value != null) { return createCompileTimeConstantTypeInfo(value, expression, contextWithExpectedType); @@ -1257,7 +1257,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { } }); } - ConstantExpressionEvaluator.object$.evaluate(expression, context.trace, contextWithExpectedType.expectedType); + ConstantExpressionEvaluator.OBJECT$.evaluate(expression, context.trace, contextWithExpectedType.expectedType); return DataFlowUtils.checkType(KotlinBuiltIns.getInstance().getStringType(), expression, contextWithExpectedType, dataFlowInfo[0]); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java index f88cdcb6c94..ba0ed7dae19 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java @@ -170,7 +170,7 @@ public class DataFlowUtils { } if (expression instanceof JetConstantExpression) { - CompileTimeConstant value = ConstantExpressionEvaluator.object$.evaluate(expression, trace, expectedType); + CompileTimeConstant value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, trace, expectedType); if (value instanceof IntegerValueTypeConstant) { value = EvaluatePackage.createCompileTimeConstantWithType((IntegerValueTypeConstant) value, expectedType); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java index 9d53a508a8b..82530b21fca 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java @@ -396,7 +396,7 @@ public class ExpressionTypingServices { if (defaultValue != null) { getType(declaringScope, defaultValue, valueParameterDescriptor.getType(), dataFlowInfo, trace); if (DescriptorUtils.isAnnotationClass(DescriptorResolver.getContainingClass(declaringScope))) { - ConstantExpressionEvaluator.object$.evaluate(defaultValue, trace, valueParameterDescriptor.getType()); + ConstantExpressionEvaluator.OBJECT$.evaluate(defaultValue, trace, valueParameterDescriptor.getType()); } } } diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java index 4de2e6cccee..e9e8f6be3c3 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java @@ -2,7 +2,7 @@ public final class ClassObjectField implements kotlin.jvm.internal.KObject { @org.jetbrains.annotations.Nullable public static final java.lang.String x = ""; private static final java.lang.String y = ""; - public static final ClassObjectField.object object$; + public static final ClassObjectField.object OBJECT$; public ClassObjectField() { /* compiled code */ } diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java index b089bc0e449..fe882578e11 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java @@ -1,5 +1,5 @@ public interface TraitClassObjectField extends kotlin.jvm.internal.KObject { - TraitClassObjectField.object object$; + TraitClassObjectField.object OBJECT$; @org.jetbrains.annotations.Nullable java.lang.String x = ""; diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java index f05326e2ad4..8e7892fb6c0 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java +++ b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java @@ -2,18 +2,18 @@ package test; class ClassObject { void accessToClassObject() { - WithClassObject.object$.foo(); - WithClassObject.object$.getValue(); - WithClassObject.object$.getValueWithGetter(); - WithClassObject.object$.getVariable(); - WithClassObject.object$.setVariable(0); - WithClassObject.object$.getVariableWithAccessors(); - WithClassObject.object$.setVariableWithAccessors(0); + WithClassObject.OBJECT$.foo(); + WithClassObject.OBJECT$.getValue(); + WithClassObject.OBJECT$.getValueWithGetter(); + WithClassObject.OBJECT$.getVariable(); + WithClassObject.OBJECT$.setVariable(0); + WithClassObject.OBJECT$.getVariableWithAccessors(); + WithClassObject.OBJECT$.setVariableWithAccessors(0); } void accessToPackageObject() { - PackageInner.instance$.foo(); - PackageInner.instance$.getValue(); + PackageInner.INSTANCE$.foo(); + PackageInner.INSTANCE$.getValue(); } void accessToInnerClass() { diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt index bd23c7ffa4d..938d52795bb 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt @@ -1,5 +1,5 @@ class C { class object {} - val `object$` = C + val `OBJECT$` = C } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt index e1a933b160c..6d38590ee26 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt @@ -1,7 +1,7 @@ class C { class object { - val `object$` = this + val `OBJECT$` = this } - val `object$` = C + val `OBJECT$` = C } \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt index d90d6c1d37f..4c2c268fa6f 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt @@ -1,3 +1,3 @@ object O { - val `instance$`: O = null!! + val `INSTANCE$`: O = null!! } \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java b/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java index b953ea659cc..525eb57cf5d 100644 --- a/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java +++ b/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java @@ -281,7 +281,7 @@ public class StorageManagerTest extends TestCase { new Function1() { @Override public Unit invoke(String s) { - return Unit.instance$; + return Unit.INSTANCE$; } } ); @@ -317,7 +317,7 @@ public class StorageManagerTest extends TestCase { public Unit invoke(String s) { counter.inc(); assertEquals("tolerant", s); - return Unit.instance$; + return Unit.INSTANCE$; } } ); @@ -346,7 +346,7 @@ public class StorageManagerTest extends TestCase { public Unit invoke(Collection strings) { counter.inc(); strings.add("postComputed"); - return Unit.instance$; + return Unit.INSTANCE$; } } ); @@ -372,7 +372,7 @@ public class StorageManagerTest extends TestCase { public Unit invoke(Collection strings) { counter.inc(); strings.add("postComputed"); - return Unit.instance$; + return Unit.INSTANCE$; } } ); @@ -405,7 +405,7 @@ public class StorageManagerTest extends TestCase { @Override public Unit invoke(String s) { fail("Recursion-tolerating value should not be post computed"); - return Unit.instance$; + return Unit.INSTANCE$; } } ); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java index cd229240b44..5da167163b9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java @@ -60,7 +60,7 @@ public final class DescriptorResolverUtils { @Override public Unit invoke(@NotNull CallableMemberDescriptor descriptor) { errorReporter.reportCannotInferVisibility(descriptor); - return Unit.instance$; + return Unit.INSTANCE$; } }); result.add((D) fakeOverride); diff --git a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java b/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java index 87c0aeff0ab..20367e7c616 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java +++ b/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) { diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java index 67573acee62..97bd22449d1 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java +++ b/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() { diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java index 959acc4a3db..368fceabe8a 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java +++ b/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); } }); } diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java index d4168b88b86..4c80322ddad 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java +++ b/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); } }); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java index ccf3faf2acc..142103d0ba2 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java +++ b/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 diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java index 2fa8279db5a..a1daa99d211 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java +++ b/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); } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java index 54654516c67..da741ff7142 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java @@ -53,7 +53,7 @@ public class JetClassInsertHandler implements InsertHandler { 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); diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java b/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java index 6ffee7ba104..4bcdc73f774 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java +++ b/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 diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java b/idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java index 8562a2a9aa5..90133035125 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java @@ -110,7 +110,7 @@ public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent { public void run() { Collection sdks = collectSdksWithoutAnnotations(); if (!sdks.isEmpty()) { - AbsentSdkAnnotationsNotificationManager.instance$.notify(myProject, sdks); + AbsentSdkAnnotationsNotificationManager.INSTANCE$.notify(myProject, sdks); } } }); diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java index ab67b4c1a23..f1a04e67be3 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java @@ -154,7 +154,7 @@ public abstract class KotlinFindMemberUsagesHandler"), call.getCalleeExpression()); - ShortenReferences.instance$.process(call.getTypeArgumentList()); + ShortenReferences.INSTANCE$.process(call.getTypeArgumentList()); } } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index 954dd7dd62a..239d62eadcd 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/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); } } }; diff --git a/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt b/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt index e7a6c422fa7..b8d0e4f9a95 100644 --- a/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt +++ b/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt @@ -1,7 +1,7 @@ class C { class object { - val `object$` = this + val `OBJECT$` = this } - val `object$` = C + val `OBJECT$` = C } \ No newline at end of file diff --git a/idea/testData/completion/injava/ClassObject.java b/idea/testData/completion/injava/ClassObject.java index 5a3509692a3..4c0c7b014cb 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.object$. + mockLib.foo.LibClass.OBJECT$. } } diff --git a/idea/testData/completion/injava/NestedObjectInstance.java b/idea/testData/completion/injava/NestedObjectInstance.java index 40193306262..8d460fec507 100644 --- a/idea/testData/completion/injava/NestedObjectInstance.java +++ b/idea/testData/completion/injava/NestedObjectInstance.java @@ -4,4 +4,4 @@ public class Testing { } } -// EXIST: instance$ +// EXIST: INSTANCE$ diff --git a/idea/testData/completion/injava/ObjectInstance.java b/idea/testData/completion/injava/ObjectInstance.java index 046e6bc9f34..4a3b19a2edb 100644 --- a/idea/testData/completion/injava/ObjectInstance.java +++ b/idea/testData/completion/injava/ObjectInstance.java @@ -4,4 +4,4 @@ public class Testing { } } -// EXIST: instance$ +// EXIST: INSTANCE$ diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.1.java b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.1.java index b896d9becc3..3d0267aa0d7 100644 --- a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.1.java +++ b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.1.java @@ -4,6 +4,6 @@ import server.O class Client { fun fooBar() { - println("foo = " + O.instance$.getFoo()) + println("foo = " + O.INSTANCE$.getFoo()) } } \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt index e73d8bd4760..d258cc9bfeb 100644 --- a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt +++ b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt @@ -1,2 +1,2 @@ -Class static member access (7: 28) println("foo = " + O.instance$.getFoo()) +Class static member access (7: 28) println("foo = " + O.INSTANCE$.getFoo()) Usage in import (3: 15) import server.O \ No newline at end of file diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.1.java b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.1.java index c64c7e1c2bc..016e1204296 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 { fun fooBar() { - A.object$.setFoo("a"); + A.OBJECT$.setFoo("a"); A.foo = "a"; - println("a.foo = " + A.object$.getFoo()); + println("a.foo = " + A.OBJECT$.getFoo()); 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 bd873eac76b..d852fdd3ca2 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: 32) println("a.foo = " + A.foo); -Unclassified usage (7: 19) A.object$.setFoo("a"); +Unclassified usage (7: 19) A.OBJECT$.setFoo("a"); Unclassified usage (8: 11) A.foo = "a"; -Unclassified usage (9: 40) println("a.foo = " + A.object$.getFoo()); \ No newline at end of file +Unclassified usage (9: 40) println("a.foo = " + A.OBJECT$.getFoo()); \ No newline at end of file diff --git a/idea/testData/kotlinAndJavaChecker/ClassObjects.java b/idea/testData/kotlinAndJavaChecker/ClassObjects.java index 258ec8324d7..1c93e18d219 100644 --- a/idea/testData/kotlinAndJavaChecker/ClassObjects.java +++ b/idea/testData/kotlinAndJavaChecker/ClassObjects.java @@ -1,12 +1,12 @@ class ClassObject { void foo() { - WithClassObject.object$.getValue(); - WithClassObject.object$.getValue(); - WithClassObject.object$.foo(); - WithClassObject.object$.getValueWithGetter(); - WithClassObject.object$.getVariable(); - WithClassObject.object$.setVariable(0); - WithClassObject.object$.getVariableWithAccessors(); - WithClassObject.object$.setVariableWithAccessors(0); + WithClassObject.OBJECT$.getValue(); + WithClassObject.OBJECT$.getValue(); + WithClassObject.OBJECT$.foo(); + WithClassObject.OBJECT$.getValueWithGetter(); + WithClassObject.OBJECT$.getVariable(); + WithClassObject.OBJECT$.setVariable(0); + WithClassObject.OBJECT$.getVariableWithAccessors(); + WithClassObject.OBJECT$.setVariableWithAccessors(0); } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java index 0f8ae714797..d3c03c8ec1b 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java @@ -4,6 +4,6 @@ import b.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java index 3816fb0abda..2a62cb08978 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java index 3816fb0abda..2a62cb08978 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java index 3816fb0abda..2a62cb08978 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java index c43110bdc42..8706448245c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java @@ -4,6 +4,6 @@ import b.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java index c43110bdc42..8706448245c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java @@ -4,6 +4,6 @@ import b.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java index c43110bdc42..8706448245c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java @@ -4,6 +4,6 @@ import b.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java index c4f7954ce65..f42e6345ac7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java index 62dcb8f569a..a67feda7d61 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - a.Test t = a.Test.instance$; + a.Test t = a.Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java index 8df3f06fe1e..764b8c117f8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java index 34f22f3c1f3..64e6b3e27e2 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java @@ -4,6 +4,6 @@ import a.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java index 14242cda197..7a57ba590f1 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java @@ -2,6 +2,6 @@ package c; class J { void bar() { - a.Test t = a.Test.instance$; + a.Test t = a.Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java index 7cd99b52387..7340301d6ab 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java index 57185c2d145..e2f052d412a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java @@ -4,6 +4,6 @@ import a.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/a/noImports.java index 0f8ae714797..d3c03c8ec1b 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/a/noImports.java @@ -4,6 +4,6 @@ import b.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/noImports.java index 3816fb0abda..2a62cb08978 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.java index 3816fb0abda..2a62cb08978 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.java index 3816fb0abda..2a62cb08978 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/noImports.java index c43110bdc42..8706448245c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/noImports.java @@ -4,6 +4,6 @@ import b.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.java index c43110bdc42..8706448245c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.java @@ -4,6 +4,6 @@ import b.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/specificImports.java index c43110bdc42..8706448245c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/specificImports.java @@ -4,6 +4,6 @@ import b.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/a/noImports.java index c4f7954ce65..f42e6345ac7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/a/noImports.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/noImports.java index 62dcb8f569a..a67feda7d61 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - a.Test t = a.Test.instance$; + a.Test t = a.Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/onDemandImport.java index 8df3f06fe1e..764b8c117f8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/specificImports.java index 34f22f3c1f3..64e6b3e27e2 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/specificImports.java @@ -4,6 +4,6 @@ import a.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/noImports.java index 14242cda197..7a57ba590f1 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/noImports.java @@ -2,6 +2,6 @@ package c; class J { void bar() { - a.Test t = a.Test.instance$; + a.Test t = a.Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/onDemandImport.java index 7cd99b52387..7340301d6ab 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/specificImports.java index 57185c2d145..e2f052d412a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/specificImports.java @@ -4,6 +4,6 @@ import a.Test; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java index c4f7954ce65..f42e6345ac7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.java index c4f7954ce65..f42e6345ac7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.java @@ -2,6 +2,6 @@ package a; class J { void bar() { - Test t = Test.instance$; + Test t = Test.INSTANCE$; } } diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.java index f44e74018ba..9912dfab390 100644 --- a/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.java +++ b/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.java @@ -31,7 +31,7 @@ public abstract class AbstractMultiFileJvmBasicCompletionTest extends KotlinComp protected void doTest(@NotNull String testPath) throws Exception { configureByFile(getTestName(false) + ".kt", ""); boolean shouldFail = testPath.contains("NoSpecifiedType"); - AstAccessControl.instance$.testWithControlledAccessToAst( + AstAccessControl.INSTANCE$.testWithControlledAccessToAst( shouldFail, getFile().getVirtualFile(), getProject(), getTestRootDisposable(), new Function0() { @Override @@ -43,7 +43,7 @@ public abstract class AbstractMultiFileJvmBasicCompletionTest extends KotlinComp return myItems; } }); - return Unit.instance$; + return Unit.INSTANCE$; } } ); diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java index caa3333e606..5ede246328e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java @@ -57,13 +57,13 @@ public abstract class AbstractLazyResolveByStubTest extends KotlinCodeInsightTes configureByFile(path); configureModule(getModule(), JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE); boolean shouldFail = getTestName(false).equals("ClassWithConstVal"); - AstAccessControl.instance$.testWithControlledAccessToAst( + AstAccessControl.INSTANCE$.testWithControlledAccessToAst( shouldFail, getProject(), getTestRootDisposable(), new Function0() { @Override public Unit invoke() { performTest(path, checkPrimaryConstructors, checkPropertyAccessors); - return Unit.instance$; + return Unit.INSTANCE$; } } ); @@ -71,7 +71,7 @@ public abstract class AbstractLazyResolveByStubTest extends KotlinCodeInsightTes private void performTest(@NotNull String path, boolean checkPrimaryConstructors, boolean checkPropertyAccessors) { ResolveSessionForBodies resolveSession = - KotlinCacheService.object$.getInstance(getFile().getProject()).getLazyResolveSession((JetFile) getFile()); + KotlinCacheService.OBJECT$.getInstance(getFile().getProject()).getLazyResolveSession((JetFile) getFile()); ModuleDescriptor module = resolveSession.getModuleDescriptor(); PackageViewDescriptor packageViewDescriptor = module.getPackage(new FqName("test")); Assert.assertNotNull(packageViewDescriptor); diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java index ee49eebeb6f..b54254db32a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java @@ -41,13 +41,13 @@ public abstract class AbstractMultiFileHighlightingTest extends KotlinCompletion public void doTest(@NotNull String filePath) throws Exception { configureByFile(new File(filePath).getName(), ""); boolean shouldFail = getName().contains("UnspecifiedType"); - AstAccessControl.instance$.testWithControlledAccessToAst( + AstAccessControl.INSTANCE$.testWithControlledAccessToAst( shouldFail, getFile().getVirtualFile(), getProject(), getTestRootDisposable(), new Function0() { @Override public Unit invoke() { checkHighlighting(myEditor, true, false); - return Unit.instance$; + return Unit.INSTANCE$; } } ); diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.java b/j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.java index d7b2a8ed1fe..f01d208bda8 100644 --- a/j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.java +++ b/j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.java @@ -4,7 +4,7 @@ import kotlinApi.KotlinClass; class C { int foo() { KotlinClass.staticVar = KotlinClass.staticVar * 2; - KotlinClass.object$.setStaticProperty(KotlinClass.object$.getStaticVar() + KotlinClass.object$.getStaticProperty()); - return KotlinClass.object$.staticFun(1); + KotlinClass.OBJECT$.setStaticProperty(KotlinClass.OBJECT$.getStaticVar() + KotlinClass.OBJECT$.getStaticProperty()); + return KotlinClass.OBJECT$.staticFun(1); } } diff --git a/j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.java b/j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.java index c49f0fbe036..c34afad318a 100644 --- a/j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.java +++ b/j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.java @@ -5,10 +5,10 @@ class A { int foo(KotlinClass c) { return c.getNullableProperty().length() + c.getProperty().length() - + KotlinClass.object$.getNullableStaticVar() - + KotlinClass.object$.getStaticVar() - + KotlinClass.object$.nullableStaticFun(1) - + KotlinClass.object$.staticFun(1) + + KotlinClass.OBJECT$.getNullableStaticVar() + + KotlinClass.OBJECT$.getStaticVar() + + KotlinClass.OBJECT$.nullableStaticFun(1) + + KotlinClass.OBJECT$.staticFun(1) + KotlinApiPackage.nullableGlobalFunction("").length() + KotlinApiPackage.globalFunction("").length(); } diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.java b/j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.java index 459d3229e2e..9075660c73e 100644 --- a/j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.java +++ b/j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.java @@ -3,10 +3,10 @@ import kotlinApi.KotlinObject; class C { int foo() { - KotlinObject.instance$.setProperty1(1); - KotlinObject.instance$.setProperty2(2); - return KotlinObject.instance$.foo() + - KotlinObject.instance$.getProperty1() + - KotlinObject.instance$.getProperty2(); + KotlinObject.INSTANCE$.setProperty1(1); + KotlinObject.INSTANCE$.setProperty2(2); + return KotlinObject.INSTANCE$.foo() + + KotlinObject.INSTANCE$.getProperty1() + + KotlinObject.INSTANCE$.getProperty2(); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java index 21b5a728f68..44501640908 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java +++ b/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(), diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java index 98a6bd924c1..d66b8d6a0c1 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java @@ -141,7 +141,7 @@ public final class PropertyTranslator extends AbstractTranslator { JsExpression value; ResolvedCall 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 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); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/MultiDeclarationTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/MultiDeclarationTranslator.java index 4d06cd6f4a9..f8a2ece2303 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/MultiDeclarationTranslator.java +++ b/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 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); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/IteratorForTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/IteratorForTranslator.java index e3b78041f20..6ad85a71283 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/expression/foreach/IteratorForTranslator.java +++ b/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 resolvedCall) { - return CallTranslator.instance$.translate(context(), resolvedCall, receiver); + return CallTranslator.INSTANCE$.translate(context(), resolvedCall, receiver); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java b/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java index 6f73befeb99..8ca4cf7e573 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java +++ b/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(); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java index 8be8fa32245..b75e292dec8 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java +++ b/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 resolvedCall = getFunctionResolvedCallWithAssert(expression, bindingContext()); - JsExpression result = CallTranslator.instance$.translate(context(), resolvedCall, getReceiver()); + JsExpression result = CallTranslator.INSTANCE$.translate(context(), resolvedCall, getReceiver()); return mayBeWrapWithNegation(result); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java index a4e04581db6..4ad17ad6b41 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedAssignmentTranslator.java +++ b/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()); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java index be7e59ce2cf..c2904a0d4f6 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java +++ b/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); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java index 93a25ad7ce4..94d89aa2624 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java @@ -65,7 +65,7 @@ public final class UnaryOperationTranslator { } ResolvedCall 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) { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java index d9acb7b9326..c68cfb132d8 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/ArrayAccessTranslator.java +++ b/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 diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java index 4b0e05f0606..a42e19dbeca 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/CallExpressionTranslator.java +++ b/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); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/VariableAccessTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/VariableAccessTranslator.java index 2661ca588c6..952b5e069b8 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/VariableAccessTranslator.java +++ b/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 diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/test/JSTestGenerator.java b/js/js.translator/src/org/jetbrains/k2js/translate/test/JSTestGenerator.java index d2c359f9e98..70f2efb0e74 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/test/JSTestGenerator.java +++ b/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.emptyList(), testClass); JsStringLiteral testName = context.program().getStringLiteral(classDescriptor.getName() + "." + functionDescriptor.getName()); tester.constructTestMethodInvocation(functionToTestCall, testName);