diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index f13d380a1d5..0f39e73f9ff 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -265,7 +265,7 @@ public class ClosureCodegen extends MemberCodegen { } } - return Unit.INSTANCE$; + return Unit.INSTANCE; } } ); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 41ccbc864dc..f5fbbe1d210 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -480,7 +480,7 @@ public class ExpressionCodegen extends KtVisitor impleme markLineNumber(expression, isStatement); v.mark(end); - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } @@ -1294,7 +1294,7 @@ public class ExpressionCodegen extends KtVisitor impleme } } v.invokevirtual("java/lang/StringBuilder", "toString", "()Ljava/lang/String;", false); - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } @@ -1433,7 +1433,7 @@ public class ExpressionCodegen extends KtVisitor impleme JvmMethodSignature constructor = typeMapper.mapSignature(SamCodegenUtil.resolveSamAdapter(constructorDescriptor)); v.invokespecial(type.getInternalName(), "", constructor.getAsmMethod().getDescriptor(), false); - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } @@ -1551,7 +1551,7 @@ public class ExpressionCodegen extends KtVisitor impleme for (Function task : Lists.reverse(leaveTasks)) { task.fun(value); } - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } @@ -2789,7 +2789,7 @@ public class ExpressionCodegen extends KtVisitor impleme putJavaLangClassInstance(v, classAsmType); wrapJavaClassIntoKClass(v); - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } @@ -3248,7 +3248,7 @@ public class ExpressionCodegen extends KtVisitor impleme } value.store(StackValue.onStack(storeType), v, true); - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } @@ -3373,7 +3373,7 @@ public class ExpressionCodegen extends KtVisitor impleme CallableMethod method = typeMapper.mapToCallableMethod(constructor, false); invokeMethodWithArguments(method, resolvedCall, StackValue.none()); - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } @@ -3389,7 +3389,7 @@ public class ExpressionCodegen extends KtVisitor impleme public Unit invoke(InstructionAdapter v) { gen(sizeExpression, Type.INT_TYPE); newArrayInstruction(arrayType); - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } @@ -3628,7 +3628,7 @@ The "returned" value of try expression with no finally is either the last expres if (finallyBlock != null) { blockStackElements.pop(); } - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } @@ -3692,7 +3692,7 @@ The "returned" value of try expression with no finally is either the last expres } generateCheckCastInstruction(rightType, opToken == KtTokens.AS_SAFE); - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } @@ -3808,7 +3808,7 @@ The "returned" value of try expression with no finally is either the last expres SwitchCodegenUtil.buildAppropriateSwitchCodegenIfPossible(expression, isStatement, ExpressionCodegen.this); if (switchCodegen != null) { switchCodegen.generate(); - return Unit.INSTANCE$; + return Unit.INSTANCE; } int subjectLocal = expr != null ? myFrameMap.enterTemp(subjectType) : -1; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java index 5e56b62c58f..2afc070dc2b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java @@ -40,7 +40,7 @@ public class JvmRuntimeTypes { public JvmRuntimeTypes() { ModuleDescriptorImpl module = TargetPlatformKt.createModule( - JvmPlatform.INSTANCE$, + JvmPlatform.INSTANCE, Name.special(""), LockBasedStorageManager.NO_LOCKS ); diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java index f5d7d3f4390..bf435dc60a7 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java @@ -135,7 +135,7 @@ public class K2JSCompiler extends CLICompiler { @Override public Unit invoke(String message) { messageSeverityCollector.report(CompilerMessageSeverity.ERROR, message, CompilerMessageLocation.NO_LOCATION); - return Unit.INSTANCE$; + return Unit.INSTANCE; } })) { return COMPILATION_ERROR; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java index ec1781ae3d1..88c12469328 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -175,7 +175,7 @@ public class CompileEnvironmentUtil { } } } - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java index 07365e2cda8..cd599ed00f9 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java @@ -161,9 +161,9 @@ public enum TopDownAnalyzerFacadeForJVM { @NotNull public static MutableModuleContext createContextWithSealedModule(@NotNull Project project, @NotNull String moduleName) { MutableModuleContext context = ContextKt.ContextForNewModule( - project, Name.special("<" + moduleName + ">"), JvmPlatform.INSTANCE$ + project, Name.special("<" + moduleName + ">"), JvmPlatform.INSTANCE ); - context.setDependencies(context.getModule(), JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsModule()); + context.setDependencies(context.getModule(), JvmPlatform.INSTANCE.getBuiltIns().getBuiltInsModule()); return context; } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.java index 3cacd7166c9..3c9316c39e7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.java @@ -986,7 +986,7 @@ public class ControlFlowInformationProvider { @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); @@ -996,7 +996,7 @@ public class ControlFlowInformationProvider { @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/kotlin/cfg/ControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowProcessor.java index 94e521e0e97..54ab5813f8b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowProcessor.java @@ -271,7 +271,7 @@ public class ControlFlowProcessor { @NotNull private AccessTarget getResolvedCallAccessTarget(KtElement element) { ResolvedCall resolvedCall = CallUtilKt.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 @@ -279,7 +279,7 @@ public class ControlFlowProcessor { 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 @@ -465,7 +465,7 @@ public class ControlFlowProcessor { } Map receiverValues = SmartFMap.emptyMap(); - AccessTarget accessTarget = AccessTarget.BlackBox.INSTANCE$; + AccessTarget accessTarget = AccessTarget.BlackBox.INSTANCE; if (left instanceof KtSimpleNameExpression || left instanceof KtQualifiedExpression) { accessTarget = getResolvedCallAccessTarget(KtPsiUtilKt.getQualifiedElementSelector(left)); if (accessTarget instanceof AccessTarget.Call) { @@ -476,7 +476,7 @@ public class ControlFlowProcessor { accessTarget = getDeclarationAccessTarget(left); } - if (accessTarget == AccessTarget.BlackBox.INSTANCE$ && !(left instanceof KtProperty)) { + if (accessTarget == AccessTarget.BlackBox.INSTANCE && !(left instanceof KtProperty)) { generateInstructions(left); createSyntheticValue(left, MagicKind.VALUE_CONSUMER, left); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/ControlFlowInstructionsGenerator.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/ControlFlowInstructionsGenerator.java index a1372405e9d..9899374869e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/ControlFlowInstructionsGenerator.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/ControlFlowInstructionsGenerator.java @@ -519,7 +519,7 @@ public class ControlFlowInstructionsGenerator extends ControlFlowBuilderAdapter @Nullable ResolvedCall resolvedCall, @NotNull Map receiverValues ) { - AccessTarget accessTarget = resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.INSTANCE$; + AccessTarget accessTarget = resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.INSTANCE; ReadValueInstruction instruction = new ReadValueInstruction( expression, getCurrentScope(), accessTarget, receiverValues, valueFactory ); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index afc752469fe..570f82ce5f2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -102,7 +102,7 @@ public class DefaultErrorMessages { options.setWithoutTypeParameters(false); options.setReceiverAfterName(false); options.setRenderAccessors(true); - return Unit.INSTANCE$; + return Unit.INSTANCE; } } ); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java index 1bbf30ec3ba..1787f36ed2e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java @@ -358,8 +358,8 @@ import static org.jetbrains.kotlin.lexer.KtTokens.*; protected static void closeDeclarationWithCommentBinders(@NotNull PsiBuilder.Marker marker, @NotNull IElementType elementType, boolean precedingNonDocComments) { marker.done(elementType); - marker.setCustomEdgeTokenBinders(precedingNonDocComments ? PrecedingCommentsBinder.INSTANCE$ : PrecedingDocCommentsBinder.INSTANCE$, - TrailingCommentsBinder.INSTANCE$); + marker.setCustomEdgeTokenBinders(precedingNonDocComments ? PrecedingCommentsBinder.INSTANCE : PrecedingDocCommentsBinder.INSTANCE, + TrailingCommentsBinder.INSTANCE); } protected abstract KotlinParsing create(SemanticWhitespaceAwarePsiBuilder builder); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java index 63b7dbec116..901c23c54ed 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java @@ -217,7 +217,7 @@ public class KotlinParsing extends AbstractKotlinParsing { packageDirective = mark(); packageDirective.done(PACKAGE_DIRECTIVE); // this is necessary to allow comments at the start of the file to be bound to the first declaration - packageDirective.setCustomEdgeTokenBinders(DoNotBindAnything.INSTANCE$, null); + packageDirective.setCustomEdgeTokenBinders(DoNotBindAnything.INSTANCE, null); } parseImportDirectives(); @@ -347,7 +347,7 @@ public class KotlinParsing extends AbstractKotlinParsing { } consumeIf(SEMICOLON); importDirective.done(IMPORT_DIRECTIVE); - importDirective.setCustomEdgeTokenBinders(null, TrailingCommentsBinder.INSTANCE$); + importDirective.setCustomEdgeTokenBinders(null, TrailingCommentsBinder.INSTANCE); } private boolean closeImportWithErrorIfNewline(PsiBuilder.Marker importDirective, String errorMessage) { @@ -363,7 +363,7 @@ public class KotlinParsing extends AbstractKotlinParsing { PsiBuilder.Marker importList = mark(); if (!at(IMPORT_KEYWORD)) { // this is necessary to allow comments at the start of the file to be bound to the first declaration - importList.setCustomEdgeTokenBinders(DoNotBindAnything.INSTANCE$, null); + importList.setCustomEdgeTokenBinders(DoNotBindAnything.INSTANCE, null); } while (at(IMPORT_KEYWORD)) { parseImportDirective(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtDotQualifiedExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtDotQualifiedExpression.java index 21c3761736e..69827fa7615 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtDotQualifiedExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtDotQualifiedExpression.java @@ -54,7 +54,7 @@ public class KtDotQualifiedExpression extends KtExpressionImplStub implements MutableRe if (ArgumentMappingKt.isReallySuccess(this)) { LOG.error("ArgumentUnmapped for " + valueArgument + " in successfully resolved call: " + call.getCallElement().getText()); } - return ArgumentUnmapped.INSTANCE$; + return ArgumentUnmapped.INSTANCE; } return argumentMatch; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java index 20da5e1912c..8f28d55b51b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -580,7 +580,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes @Override public Unit invoke(@NotNull Supertypes supertypes) { findAndDisconnectLoopsInTypeHierarchy(supertypes.trueSupertypes); - return Unit.INSTANCE$; + return Unit.INSTANCE; } } ); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/ScopeUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/ScopeUtils.java index 8e9a0b054ac..a3462291ca7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/ScopeUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/ScopeUtils.java @@ -51,7 +51,7 @@ public final class ScopeUtils { for (TypeParameterDescriptor typeParameterDescriptor : propertyDescriptor.getTypeParameters()) { handler.addClassifierDescriptor(typeParameterDescriptor); } - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java index 1289add204b..7ce0d8aaaab 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -979,7 +979,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { KtSimpleNameExpression labelExpression = expression.getTargetLabel(); if (labelExpression != null) { PsiElement labelIdentifier = labelExpression.getIdentifier(); - UnderscoreChecker.INSTANCE$.checkIdentifier(labelIdentifier, context.trace); + UnderscoreChecker.INSTANCE.checkIdentifier(labelIdentifier, context.trace); } KtExpression baseExpression = expression.getBaseExpression(); if (baseExpression == null) return TypeInfoFactoryKt.noTypeInfo(context); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java index 90285f8920b..4c7fb59f2d6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java @@ -481,7 +481,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { components.identifierChecker.checkDeclaration(catchParameter, context.trace); ModifiersChecker.ModifiersCheckingProcedure modifiersChecking = components.modifiersChecker.withTrace(context.trace); modifiersChecking.checkParameterHasNoValOrVar(catchParameter, VAL_OR_VAR_ON_CATCH_PARAMETER); - ModifierCheckerCore.INSTANCE$.check(catchParameter, context.trace, null); + ModifierCheckerCore.INSTANCE.check(catchParameter, context.trace, null); VariableDescriptor variableDescriptor = components.descriptorResolver.resolveLocalVariableDescriptor( context.scope, catchParameter, context.trace); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java index 9c7cb0767a0..dadb1e6329c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java @@ -37,7 +37,7 @@ public class ExpressionTypingContext extends ResolutionContext declarations = lightClassGenerationSupport.findClassOrObjectDeclarationsInPackage(packageFQN, scope); for (KtClassOrObject declaration : declarations) { - PsiClass aClass = LightClassUtil.INSTANCE$.getPsiClass(declaration); + PsiClass aClass = LightClassUtil.INSTANCE.getPsiClass(declaration); if (aClass != null) { answer.add(aClass); } diff --git a/compiler/testData/codegen/boxWithJava/deprecatedFieldForObject/B.java b/compiler/testData/codegen/boxWithJava/deprecatedFieldForObject/B.java index 8709504a80d..5fd876495ec 100644 --- a/compiler/testData/codegen/boxWithJava/deprecatedFieldForObject/B.java +++ b/compiler/testData/codegen/boxWithJava/deprecatedFieldForObject/B.java @@ -1,4 +1,4 @@ public class B { - public static int a = A.INSTANCE$.getC(); - public static int b = A.INSTANCE$.foo(); + public static int a = A.INSTANCE.getC(); + public static int b = A.INSTANCE.foo(); } \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java index 038aebdc867..55aa74652b0 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java @@ -351,12 +351,12 @@ public abstract class AbstractDiagnosticsTest extends BaseDiagnosticsTest { @NotNull protected TargetPlatform getPlatform() { - return JvmPlatform.INSTANCE$; + return JvmPlatform.INSTANCE; } @NotNull protected ModuleDescriptorImpl createModule(@NotNull String moduleName, @NotNull StorageManager storageManager) { - return TargetPlatformKt.createModule(JvmPlatform.INSTANCE$, Name.special(moduleName), storageManager); + return TargetPlatformKt.createModule(JvmPlatform.INSTANCE, Name.special(moduleName), storageManager); } @NotNull diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java index b31b9eb8e68..127d0fce8b9 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java @@ -76,7 +76,7 @@ public abstract class AbstractDiagnosticsTestWithJsStdLib extends AbstractDiagno @NotNull @Override protected ModuleDescriptorImpl createModule(@NotNull String moduleName, @NotNull StorageManager storageManager) { - return TargetPlatformKt.createModule(JsPlatform.INSTANCE$, Name.special(moduleName), storageManager); + return TargetPlatformKt.createModule(JsPlatform.INSTANCE, Name.special(moduleName), storageManager); } @NotNull @@ -104,6 +104,6 @@ public abstract class AbstractDiagnosticsTestWithJsStdLib extends AbstractDiagno @NotNull @Override protected TargetPlatform getPlatform() { - return JsPlatform.INSTANCE$; + return JsPlatform.INSTANCE; } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 861d4d6e5bd..b0129ea0e7c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -131,7 +131,7 @@ public class CodegenTestFiles { Object value; KotlinType jetType; - KotlinBuiltIns builtIns = JvmPlatform.INSTANCE$.getBuiltIns(); + KotlinBuiltIns builtIns = JvmPlatform.INSTANCE.getBuiltIns(); if (type.equals("kotlin.String")) { value = valueString; jetType = builtIns.getStringType(); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java index 7b78b065ad5..57c7f57ac4f 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java @@ -37,7 +37,7 @@ public class ScriptGenTest extends CodegenTestCase { private static final KotlinScriptDefinition FIB_SCRIPT_DEFINITION = new TestScriptDefinition( ".lang.kt", - singletonList(new ScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType())) + singletonList(new ScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE.getBuiltIns().getIntType())) ); private static final KotlinScriptDefinition NO_PARAM_SCRIPT_DEFINITION = new TestScriptDefinition( diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java index 7bd3f85f7e4..9b224a821f9 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java @@ -58,7 +58,7 @@ public abstract class AbstractCompileJavaAgainstKotlinTest extends TestCaseWithT options.setVerbose(true); options.setExcludedAnnotationClasses(Collections.singleton(new FqName(Retention.class.getName()))); options.setModifiers(DescriptorRendererModifier.ALL); - return Unit.INSTANCE$; + return Unit.INSTANCE; } } ) diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java index 88cb0b71adb..f16974b542f 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java @@ -145,7 +145,7 @@ public abstract class ExpectedResolveData { } public final void checkResult(BindingContext bindingContext) { - KotlinBuiltIns builtIns = JvmPlatform.INSTANCE$.getBuiltIns(); + KotlinBuiltIns builtIns = JvmPlatform.INSTANCE.getBuiltIns(); Set unresolvedReferences = Sets.newHashSet(); for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java b/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java index 36eba05ebbe..453bcbd55ae 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java @@ -54,7 +54,7 @@ public class ExpectedResolveDataUtil { } public static Map prepareDefaultNameToDescriptors(Project project, KotlinCoreEnvironment environment) { - KotlinBuiltIns builtIns = JvmPlatform.INSTANCE$.getBuiltIns(); + KotlinBuiltIns builtIns = JvmPlatform.INSTANCE.getBuiltIns(); Map nameToDescriptor = new HashMap(); nameToDescriptor.put("kotlin::Int.plus(Int)", standardFunction(builtIns.getInt(), "plus", project, builtIns.getIntType())); @@ -135,7 +135,7 @@ public class ExpectedResolveDataUtil { ModuleDescriptorImpl emptyModule = KotlinTestUtils.createEmptyModule(); ContainerForTests container = InjectionKt.createContainerForTests(project, emptyModule); emptyModule.setDependencies(emptyModule); - emptyModule.initialize(PackageFragmentProvider.Empty.INSTANCE$); + emptyModule.initialize(PackageFragmentProvider.Empty.INSTANCE); LexicalScopeImpl lexicalScope = new LexicalScopeImpl(ImportingScope.Empty.INSTANCE, classDescriptor, false, classDescriptor.getThisAsReceiverParameter(), diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index 9a57526e828..ff00325f268 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -63,7 +63,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinLite options.setVerbose(true); options.setNameShortness(NameShortness.SHORT); options.setModifiers(DescriptorRendererModifier.ALL); - return Unit.INSTANCE$; + return Unit.INSTANCE; } } ); diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index 05392a4e5cd..8a56cbe871f 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -74,7 +74,7 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment { options.setVerbose(true); options.setPrettyFunctionTypes(false); options.setModifiers(DescriptorRendererModifier.ALL); - return Unit.INSTANCE$; + return Unit.INSTANCE; } } ) @@ -104,13 +104,13 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment { private static PackageFragmentDescriptor createBuiltInsPackageFragment() { LockBasedStorageManager storageManager = new LockBasedStorageManager(); ModuleDescriptorImpl builtInsModule = new ModuleDescriptorImpl( - Name.special(""), storageManager, ModuleParameters.Empty.INSTANCE$, DefaultBuiltIns.getInstance() + Name.special(""), storageManager, ModuleParameters.Empty.INSTANCE, DefaultBuiltIns.getInstance() ); PackageFragmentProvider packageFragmentProvider = createBuiltInPackageFragmentProvider( storageManager, builtInsModule, BUILT_INS_PACKAGE_FQ_NAMES, new BuiltInFictitiousFunctionClassFactory(storageManager, builtInsModule), - AdditionalSupertypes.None.INSTANCE$, + AdditionalSupertypes.None.INSTANCE, new Function1() { @Override public InputStream invoke(String path) { diff --git a/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java b/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java index 408873d1cf0..e69e882cc84 100644 --- a/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java +++ b/compiler/tests/org/jetbrains/kotlin/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/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index 3731e20caf6..3f5e968e42b 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -930,7 +930,7 @@ public class KotlinTestUtils { @NotNull public static ModuleDescriptorImpl createEmptyModule(@NotNull String name) { - return createEmptyModule(name, JvmPlatform.INSTANCE$); + return createEmptyModule(name, JvmPlatform.INSTANCE); } @NotNull diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java index 3f48999889a..91e8aed67d3 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java @@ -57,7 +57,7 @@ public class RecursiveDescriptorComparator { options.setNameShortness(NameShortness.FULLY_QUALIFIED); options.setVerbose(true); options.setModifiers(DescriptorRendererModifier.ALL); - return Unit.INSTANCE$; + return Unit.INSTANCE; } } ); diff --git a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java index e365a1a5a07..eb370340937 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java @@ -110,7 +110,7 @@ public class DefaultModalityModifiersTest extends KotlinLiteFixture { new FileBasedDeclarationProviderFactory(moduleContext.getStorageManager(), Collections.singleton(aClass.getContainingKtFile())), new BindingTraceContext(), - TargetPlatform.Default.INSTANCE$ + TargetPlatform.Default.INSTANCE ); return (ClassDescriptorWithResolutionScopes) resolveSession.getClassDescriptor(aClass, NoLookupLocation.FROM_TEST); diff --git a/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java b/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java index 861f0f4c99f..22550109235 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java @@ -172,7 +172,7 @@ public class KotlinOverloadTest extends KotlinLiteFixture { private FunctionDescriptor makeFunction(String funDecl) { KtNamedFunction function = KtPsiFactoryKt.KtPsiFactory(getProject()).createFunction(funDecl); - LexicalScope scope = TypeTestUtilsKt.builtInPackageAsLexicalScope(JvmPlatform.INSTANCE$.getBuiltIns()); + LexicalScope scope = TypeTestUtilsKt.builtInPackageAsLexicalScope(JvmPlatform.INSTANCE.getBuiltIns()); return functionDescriptorResolver.resolveFunctionDescriptor(root, scope, function, KotlinTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY); } } diff --git a/compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java b/compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java index c2426202ddc..0bead1377fd 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java @@ -76,7 +76,7 @@ public class KotlinTypeCheckerTest extends KotlinLiteFixture { builtIns = module.getBuiltIns(); ContainerForTests container = InjectionKt.createContainerForTests(getProject(), module); module.setDependencies(Collections.singletonList(module)); - module.initialize(PackageFragmentProvider.Empty.INSTANCE$); + module.initialize(PackageFragmentProvider.Empty.INSTANCE); typeResolver = container.getTypeResolver(); expressionTypingServices = container.getExpressionTypingServices(); diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java index 1966d02d6fc..737c3ac1cd4 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java @@ -56,7 +56,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/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java index 5ec1fed9ff2..e38258aa173 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java @@ -87,7 +87,7 @@ public class JavaMethodDescriptor extends SimpleFunctionDescriptorImpl implement SimpleFunctionDescriptorImpl descriptor = super.initialize( receiverParameterType, dispatchReceiverParameter, typeParameters, unsubstitutedValueParameters, unsubstitutedReturnType, modality, visibility); - setOperator(OperatorChecks.INSTANCE$.canBeOperator(descriptor)); + setOperator(OperatorChecks.INSTANCE.canBeOperator(descriptor)); return descriptor; } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index aa66ece87de..0f97c6a2cdb 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -70,7 +70,7 @@ public abstract class KotlinBuiltIns { protected KotlinBuiltIns() { LockBasedStorageManager storageManager = new LockBasedStorageManager(); builtInsModule = new ModuleDescriptorImpl( - Name.special(""), storageManager, ModuleParameters.Empty.INSTANCE$, this + Name.special(""), storageManager, ModuleParameters.Empty.INSTANCE, this ); PackageFragmentProvider packageFragmentProvider = BuiltInsPackageFragmentProviderKt.createBuiltInPackageFragmentProvider( @@ -101,7 +101,7 @@ public abstract class KotlinBuiltIns { @NotNull protected AdditionalSupertypes getAdditionalSupertypesProvider() { - return AdditionalSupertypes.None.INSTANCE$; + return AdditionalSupertypes.None.INSTANCE; } private void makePrimitive(@NotNull PrimitiveType primitiveType) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java index 96d75545743..c2ae63e6592 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java @@ -294,6 +294,6 @@ public class Visibilities { static { Iterator iterator = ServiceLoader.load(ModuleVisibilityHelper.class, ModuleVisibilityHelper.class.getClassLoader()).iterator(); - MODULE_VISIBILITY_HELPER = iterator.hasNext() ? iterator.next() : ModuleVisibilityHelper.EMPTY.INSTANCE$; + MODULE_VISIBILITY_HELPER = iterator.hasNext() ? iterator.next() : ModuleVisibilityHelper.EMPTY.INSTANCE; } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java index 76a1c2f8cab..f85ca02c524 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java @@ -40,7 +40,7 @@ public class MemberComparator implements Comparator { options.setWithDefinedIn(false); options.setVerbose(true); options.setModifiers(DescriptorRendererModifier.ALL); - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractKotlinType.java b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractKotlinType.java index 542db19ca2e..38fd11582e7 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractKotlinType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractKotlinType.java @@ -35,7 +35,7 @@ public abstract class AbstractKotlinType implements KotlinType { @NotNull @Override public TypeCapabilities getCapabilities() { - return TypeCapabilities.NONE.INSTANCE$; + return TypeCapabilities.NONE.INSTANCE; } @Override diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java index f3cb5219cdf..c4fd611d012 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java @@ -239,7 +239,7 @@ public class SourceNavigationHelper { @NotNull Project project ) { - TargetPlatform platform = TargetPlatform.Default.INSTANCE$; + TargetPlatform platform = TargetPlatform.Default.INSTANCE; MutableModuleContext newModuleContext = ContextKt.ContextForNewModule( project, Name.special(""), ModuleDescriptorKt.ModuleParameters( @@ -375,13 +375,13 @@ public class SourceNavigationHelper { ); } } - return LightClassUtil.INSTANCE$.getPsiClass(classOrObject); + return LightClassUtil.INSTANCE.getPsiClass(classOrObject); } @Nullable public static PsiClass getOriginalClass(@NotNull KtClassOrObject classOrObject) { // Copied from JavaPsiImplementationHelperImpl:getOriginalClass() - String internalName = PsiCodegenPredictor.getPredefinedJvmInternalName(classOrObject, NoResolveFileClassesProvider.INSTANCE$); + String internalName = PsiCodegenPredictor.getPredefinedJvmInternalName(classOrObject, NoResolveFileClassesProvider.INSTANCE); if (internalName == null) { return null; } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java index 9546670d744..7ee3475dc85 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java @@ -40,7 +40,7 @@ public class DuplicateJvmSignatureAnnotator implements Annotator { if (!ProjectRootsUtil.isInProjectSource(element)) return; PsiFile file = element.getContainingFile(); - if (!(file instanceof KtFile) || TargetPlatformDetector.getPlatform((KtFile) file) != JvmPlatform.INSTANCE$) return; + if (!(file instanceof KtFile) || TargetPlatformDetector.getPlatform((KtFile) file) != JvmPlatform.INSTANCE) return; Diagnostics otherDiagnostics = ResolutionUtils.analyzeFully((KtElement) element).getDiagnostics(); GlobalSearchScope moduleScope = GetModuleInfoKt.getModuleInfo(element).contentScope(); diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java index 1be6402d8c5..8b90e923ec5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java @@ -210,7 +210,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { options.setModifiers(Collections.emptySet()); options.setValueParametersHandler(VALUE_PARAMETERS_HANDLER); options.setTextFormat(RenderingFormat.HTML); - return Unit.INSTANCE$; + return Unit.INSTANCE; } }); diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java index 541fd90ec76..6bc96579aab 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java @@ -155,8 +155,8 @@ public class IdeErrorMessages { "", HTML_THROWABLE); - MAP.put(ErrorsJs.JSCODE_ERROR, "JavaScript: {0}", JsCallDataHtmlRenderer.INSTANCE$); - MAP.put(ErrorsJs.JSCODE_WARNING, "JavaScript: {0}", JsCallDataHtmlRenderer.INSTANCE$); + MAP.put(ErrorsJs.JSCODE_ERROR, "JavaScript: {0}", JsCallDataHtmlRenderer.INSTANCE); + MAP.put(ErrorsJs.JSCODE_WARNING, "JavaScript: {0}", JsCallDataHtmlRenderer.INSTANCE); MAP.setImmutable(); } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java index 65312035e0d..d03bc2b0465 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java @@ -50,14 +50,14 @@ public class TargetPlatformDetector { @NotNull public static TargetPlatform getPlatform(@NotNull Module module) { if (ProjectStructureUtil.isJsKotlinModule(module)) { - return JsPlatform.INSTANCE$; + return JsPlatform.INSTANCE; } - return JvmPlatform.INSTANCE$; + return JvmPlatform.INSTANCE; } @NotNull public static TargetPlatform getDefaultPlatform() { LOG.info("Using default platform"); - return JvmPlatform.INSTANCE$; + return JvmPlatform.INSTANCE; } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJSBasicCompletionTest.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJSBasicCompletionTest.java index 9041c2ae15d..4f796e1a207 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJSBasicCompletionTest.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJSBasicCompletionTest.java @@ -33,7 +33,7 @@ public abstract class AbstractJSBasicCompletionTest extends KotlinFixtureComplet @NotNull @Override public TargetPlatform getPlatform() { - return JsPlatform.INSTANCE$; + return JsPlatform.INSTANCE; } @NotNull diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java index 3fd1f95dae6..840e7d3a1a4 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java @@ -33,7 +33,7 @@ public abstract class AbstractJvmBasicCompletionTest extends KotlinFixtureComple @NotNull @Override public TargetPlatform getPlatform() { - return JvmPlatform.INSTANCE$; + return JvmPlatform.INSTANCE; } @NotNull diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java index 29a82d6ffd4..17795968d0e 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java @@ -33,7 +33,7 @@ public abstract class AbstractJvmSmartCompletionTest extends KotlinFixtureComple @NotNull @Override public TargetPlatform getPlatform() { - return JvmPlatform.INSTANCE$; + return JvmPlatform.INSTANCE; } @NotNull diff --git a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java index 92a44d0e5b6..6b5f29e925f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java +++ b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java @@ -52,8 +52,8 @@ public class PluginStartupComponent implements ApplicationComponent { public void initComponent() { registerPathVariable(); - JarUserDataManager.INSTANCE$.register(KotlinJavaScriptLibraryDetectionUtil.HasKotlinJSMetadataInJar.INSTANCE$); - JarUserDataManager.INSTANCE$.register(HasCompiledKotlinInJar.INSTANCE$); + JarUserDataManager.INSTANCE.register(KotlinJavaScriptLibraryDetectionUtil.HasKotlinJSMetadataInJar.INSTANCE); + JarUserDataManager.INSTANCE.register(HasCompiledKotlinInJar.INSTANCE); DebuggerFiltersUtilKt.addKotlinStdlibDebugFilterIfNeeded(); diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.java b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.java index dfce6eaa3e5..80200b7f264 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.java @@ -86,7 +86,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/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java index fcb4415e32b..e718aecffe6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java @@ -38,7 +38,7 @@ public class KotlinAndroidGradleModuleConfigurator extends KotlinWithGradleConfi @NotNull @Override public TargetPlatform getTargetPlatform() { - return JvmPlatform.INSTANCE$; + return JvmPlatform.INSTANCE; } @NotNull diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java index fa7934171d8..86d31f0a1ea 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java @@ -38,7 +38,7 @@ public class KotlinGradleModuleConfigurator extends KotlinWithGradleConfigurator @NotNull @Override public TargetPlatform getTargetPlatform() { - return JvmPlatform.INSTANCE$; + return JvmPlatform.INSTANCE; } @NotNull diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java index e249f03c0cc..2d39e081d01 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java @@ -47,6 +47,6 @@ public class KotlinJavaMavenConfigurator extends KotlinMavenConfigurator { @NotNull @Override public TargetPlatform getTargetPlatform() { - return JvmPlatform.INSTANCE$; + return JvmPlatform.INSTANCE; } } diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java index ff9e83da792..9e09ba74d93 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java @@ -79,7 +79,7 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator @NotNull @Override public TargetPlatform getTargetPlatform() { - return JvmPlatform.INSTANCE$; + return JvmPlatform.INSTANCE; } @NotNull diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java index 8bcb50e0a6a..796e9d149ce 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java @@ -62,6 +62,6 @@ public class KotlinJavascriptMavenConfigurator extends KotlinMavenConfigurator { @NotNull @Override public TargetPlatform getTargetPlatform() { - return JsPlatform.INSTANCE$; + return JsPlatform.INSTANCE; } } diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java index 9406401accf..8da37c95a67 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java @@ -42,7 +42,7 @@ public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator { @NotNull @Override public TargetPlatform getTargetPlatform() { - return JsPlatform.INSTANCE$; + return JsPlatform.INSTANCE; } @NotNull diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java index fc99436b72c..016e6fda1a3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java @@ -62,7 +62,7 @@ public class KotlinFindClassUsagesDialog extends FindClassUsagesDialog { @NotNull private static PsiClass getRepresentingPsiClass(@NotNull KtClassOrObject classOrObject) { - PsiClass lightClass = LightClassUtil.INSTANCE$.getPsiClass(classOrObject); + PsiClass lightClass = LightClassUtil.INSTANCE.getPsiClass(classOrObject); if (lightClass != null) return lightClass; // TODO: Remove this code when light classes are generated for builtins diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.java b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.java index 068d27c572b..9dcad285982 100644 --- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.java +++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.java @@ -264,7 +264,7 @@ public class KotlinBlock extends AbstractBlock { } } - return WrappingStrategy.NoWrapping.INSTANCE$; + return WrappingStrategy.NoWrapping.INSTANCE; } private NodeAlignmentStrategy getChildrenAlignmentStrategy() { diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java index 743b17b899a..5598639f036 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java @@ -100,15 +100,15 @@ public class KotlinModuleSettingStep extends ModuleWizardStep { @NotNull protected String getLibraryLabelText() { - if (targetPlatform == JvmPlatform.INSTANCE$) return "\u001BKotlin runtime:"; - if (targetPlatform == JsPlatform.INSTANCE$) return "\u001BKotlin JS library:"; + if (targetPlatform == JvmPlatform.INSTANCE) return "\u001BKotlin runtime:"; + if (targetPlatform == JsPlatform.INSTANCE) return "\u001BKotlin JS library:"; throw new IllegalStateException("Only JS and JVM target are supported"); } @NotNull protected CustomLibraryDescription getCustomLibraryDescription(@Nullable Project project) { - if (targetPlatform == JvmPlatform.INSTANCE$) return new JavaRuntimeLibraryDescription(project); - if (targetPlatform == JsPlatform.INSTANCE$) return new JSLibraryStdDescription(project); + if (targetPlatform == JvmPlatform.INSTANCE) return new JavaRuntimeLibraryDescription(project); + if (targetPlatform == JsPlatform.INSTANCE) return new JSLibraryStdDescription(project); throw new IllegalStateException("Only JS and JVM target are supported"); } diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java index 0a65b14e5b9..48bd54a52b8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java @@ -92,17 +92,17 @@ public abstract class KotlinCallTreeStructure extends HierarchyTreeStructure { } if (element instanceof KtNamedFunction || element instanceof KtSecondaryConstructor) { - return LightClassUtil.INSTANCE$.getLightClassMethod((KtFunction) element); + return LightClassUtil.INSTANCE.getLightClassMethod((KtFunction) element); } if (element instanceof KtProperty) { LightClassUtil.PropertyAccessorsPsiMethods propertyMethods = - LightClassUtil.INSTANCE$.getLightClassPropertyMethods((KtProperty) element); + LightClassUtil.INSTANCE.getLightClassPropertyMethods((KtProperty) element); return (propertyMethods.getGetter() != null) ? propertyMethods.getGetter() : propertyMethods.getSetter(); } if (element instanceof KtClassOrObject) { - PsiClass psiClass = LightClassUtil.INSTANCE$.getPsiClass((KtClassOrObject) element); + PsiClass psiClass = LightClassUtil.INSTANCE.getPsiClass((KtClassOrObject) element); if (psiClass == null) return null; PsiMethod[] constructors = psiClass.getConstructors(); diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java index d6791bb1360..09fe53af2bc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java @@ -104,18 +104,18 @@ public class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStructure { ); } if (element instanceof KtNamedFunction || element instanceof KtSecondaryConstructor) { - Collection lightMethods = LightClassUtil.INSTANCE$.getLightClassMethods((KtFunction) element); + Collection lightMethods = LightClassUtil.INSTANCE.getLightClassMethods((KtFunction) element); processPsiMethodCallers(lightMethods, descriptor, methodToDescriptorMap, searchScope, false); } if (element instanceof KtProperty) { LightClassUtil.PropertyAccessorsPsiMethods propertyMethods = - LightClassUtil.INSTANCE$.getLightClassPropertyMethods((KtProperty) element); + LightClassUtil.INSTANCE.getLightClassPropertyMethods((KtProperty) element); processPsiMethodCallers(propertyMethods, descriptor, methodToDescriptorMap, searchScope, false); } if (element instanceof KtClassOrObject) { KtPrimaryConstructor constructor = ((KtClassOrObject) element).getPrimaryConstructor(); if (constructor != null) { - PsiMethod lightMethod = LightClassUtil.INSTANCE$.getLightClassMethod(constructor); + PsiMethod lightMethod = LightClassUtil.INSTANCE.getLightClassMethod(constructor); processPsiMethodCallers(Collections.singleton(lightMethod), descriptor, methodToDescriptorMap, searchScope, false); } else { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java index eac75f1122f..061672691ce 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java @@ -117,7 +117,7 @@ public class KotlinRefactoringUtil { Project project = declaration.getProject(); Map overriddenElementsToDescriptor = new HashMap(); for (CallableDescriptor overriddenDescriptor : DescriptorUtils.getAllOverriddenDescriptors(declarationDescriptor)) { - PsiElement overriddenDeclaration = DescriptorToSourceUtilsIde.INSTANCE$.getAnyDeclaration(project, overriddenDescriptor); + PsiElement overriddenDeclaration = DescriptorToSourceUtilsIde.INSTANCE.getAnyDeclaration(project, overriddenDescriptor); if (PsiTreeUtil.instanceOf(overriddenDeclaration, KtNamedFunction.class, KtProperty.class, PsiMethod.class)) { overriddenElementsToDescriptor.put(overriddenDeclaration, overriddenDescriptor); } diff --git a/idea/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java b/idea/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java index 5c4c8fb5997..b435f87211a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java +++ b/idea/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java @@ -83,7 +83,7 @@ public class KotlinTestNgConfigurationProducer extends TestNGConfigurationProduc KtElement owner = PsiTreeUtil.getParentOfType(function, KtFunction.class, KtClass.class); if (owner instanceof KtClass) { - PsiClass delegate = LightClassUtil.INSTANCE$.getPsiClass((KtClass) owner); + PsiClass delegate = LightClassUtil.INSTANCE.getPsiClass((KtClass) owner); if (delegate != null) { for (PsiMethod method : delegate.getMethods()) { if (method.getNavigationElement() == function) { @@ -98,7 +98,7 @@ public class KotlinTestNgConfigurationProducer extends TestNGConfigurationProduc } if (declarationToRun instanceof KtClass) { - PsiClass delegate = LightClassUtil.INSTANCE$.getPsiClass((KtClassOrObject) declarationToRun); + PsiClass delegate = LightClassUtil.INSTANCE.getPsiClass((KtClassOrObject) declarationToRun); if (!isTestNGClass(delegate)) { return false; } diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.java b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.java index b0ab06d8c14..8d17de0f902 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.java +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.java @@ -86,7 +86,7 @@ public class KotlinDefinitionsSearcher implements QueryExecutor() { @Override public PsiClass compute() { - return LightClassUtil.INSTANCE$.getPsiClass(klass); + return LightClassUtil.INSTANCE.getPsiClass(klass); } }); if (psiClass != null) { @@ -99,7 +99,7 @@ public class KotlinDefinitionsSearcher implements QueryExecutor() { @Override public PsiMethod compute() { - return LightClassUtil.INSTANCE$.getLightClassMethod(function); + return LightClassUtil.INSTANCE.getLightClassMethod(function); } }); @@ -115,7 +115,7 @@ public class KotlinDefinitionsSearcher implements QueryExecutor() { @Override public LightClassUtil.PropertyAccessorsPsiMethods compute() { - return LightClassUtil.INSTANCE$.getLightClassPropertyMethods(parameter); + return LightClassUtil.INSTANCE.getLightClassPropertyMethods(parameter); } }); @@ -127,7 +127,7 @@ public class KotlinDefinitionsSearcher implements QueryExecutor() { @Override public LightClassUtil.PropertyAccessorsPsiMethods compute() { - return LightClassUtil.INSTANCE$.getLightClassPropertyMethods(property); + return LightClassUtil.INSTANCE.getLightClassPropertyMethods(property); } }); diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java index 1ec4ab7cec6..68ac47593ee 100644 --- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java @@ -67,7 +67,7 @@ public class KotlinRuntimeLibraryUtil { @NotNull public static Collection getLibraryRootsWithAbiIncompatibleKotlinClasses(@NotNull Project project) { return getLibraryRootsWithAbiIncompatibleVersion( - project, KotlinAbiVersionIndex.INSTANCE$, + project, KotlinAbiVersionIndex.INSTANCE, new Function1() { @Override public Boolean invoke(@Nullable Module module) { @@ -85,7 +85,7 @@ public class KotlinRuntimeLibraryUtil { @NotNull public static Collection getLibraryRootsWithAbiIncompatibleForKotlinJs(@NotNull Project project) { return getLibraryRootsWithAbiIncompatibleVersion( - project, KotlinJavaScriptAbiVersionIndex.INSTANCE$, + project, KotlinJavaScriptAbiVersionIndex.INSTANCE, new Function1() { @Override public Boolean invoke(@Nullable Module module) { diff --git a/idea/testData/quickfix/migration/deprecatedObjectInstanceField/staticImport.before.Main.java b/idea/testData/quickfix/migration/deprecatedObjectInstanceField/staticImport.before.Main.java index bdf53ad11a0..c6ca488f3ad 100644 --- a/idea/testData/quickfix/migration/deprecatedObjectInstanceField/staticImport.before.Main.java +++ b/idea/testData/quickfix/migration/deprecatedObjectInstanceField/staticImport.before.Main.java @@ -1,5 +1,5 @@ // "Replace with reference to 'INSTANCE' field" "true" -import static a.A.INSTANCE$; +import static a.A.INSTANCE; class B { void bar() { diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractPsiCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractPsiCheckerTest.java index 368fc61b927..3a44f6e7030 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractPsiCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractPsiCheckerTest.java @@ -38,11 +38,11 @@ public abstract class AbstractPsiCheckerTest extends KotlinLightCodeInsightFixtu //noinspection unchecked myFixture.enableInspections(SpellCheckingInspection.class); - NameHighlighter.INSTANCE$.setNamesHighlightingEnabled(false); + NameHighlighter.INSTANCE.setNamesHighlightingEnabled(false); checkHighlighting(true, true, false); } finally { - NameHighlighter.INSTANCE$.setNamesHighlightingEnabled(true); + NameHighlighter.INSTANCE.setNamesHighlightingEnabled(true); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java index 6c6efc3cb7a..5c684310f1e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java @@ -123,13 +123,13 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase { } if (getFile() instanceof KtFile && !InTextDirectivesUtils.isDirectiveDefined(fileText, "// SKIP_ERRORS_BEFORE")) { - DirectiveBasedActionUtils.INSTANCE$.checkForUnexpectedErrors((KtFile) getFile()); + DirectiveBasedActionUtils.INSTANCE.checkForUnexpectedErrors((KtFile) getFile()); } doTestFor(pathToFile, intentionAction, fileText); if (getFile() instanceof KtFile && !InTextDirectivesUtils.isDirectiveDefined(fileText, "// SKIP_ERRORS_AFTER")) { - DirectiveBasedActionUtils.INSTANCE$.checkForUnexpectedErrors((KtFile) getFile()); + DirectiveBasedActionUtils.INSTANCE.checkForUnexpectedErrors((KtFile) getFile()); } } finally { diff --git a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java index ff809f7e673..271b2b78827 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java @@ -212,7 +212,7 @@ public class KotlinJavaFacadeTest extends KotlinLightCodeInsightFixtureTestCase assertInstanceOf(element, KtClass.class); KtClass aClass = (KtClass) element; - PsiClass createdByWrapDelegate = LightClassUtil.INSTANCE$.getPsiClass(aClass); + PsiClass createdByWrapDelegate = LightClassUtil.INSTANCE.getPsiClass(aClass); assertNull(createdByWrapDelegate); } @@ -220,7 +220,7 @@ public class KotlinJavaFacadeTest extends KotlinLightCodeInsightFixtureTestCase KtNamedFunction jetFunction = getPreparedElement(KtNamedFunction.class); // Should not fail! - PsiMethod psiMethod = LightClassUtil.INSTANCE$.getLightClassMethod(jetFunction); + PsiMethod psiMethod = LightClassUtil.INSTANCE.getLightClassMethod(jetFunction); checkDeclarationMethodWrapped(shouldBeWrapped, jetFunction, psiMethod); } @@ -229,7 +229,7 @@ public class KotlinJavaFacadeTest extends KotlinLightCodeInsightFixtureTestCase KtParameter jetParameter = getPreparedElement(KtParameter.class); // Should not fail! - LightClassUtil.PropertyAccessorsPsiMethods propertyAccessors = LightClassUtil.INSTANCE$.getLightClassPropertyMethods(jetParameter); + LightClassUtil.PropertyAccessorsPsiMethods propertyAccessors = LightClassUtil.INSTANCE.getLightClassPropertyMethods(jetParameter); checkDeclarationMethodWrapped(shouldWrapGetter, jetParameter, propertyAccessors.getGetter()); checkDeclarationMethodWrapped(shouldWrapSetter, jetParameter, propertyAccessors.getSetter()); @@ -239,7 +239,7 @@ public class KotlinJavaFacadeTest extends KotlinLightCodeInsightFixtureTestCase KtProperty jetProperty = getPreparedElement(KtProperty.class); // Should not fail! - LightClassUtil.PropertyAccessorsPsiMethods propertyAccessors = LightClassUtil.INSTANCE$.getLightClassPropertyMethods(jetProperty); + LightClassUtil.PropertyAccessorsPsiMethods propertyAccessors = LightClassUtil.INSTANCE.getLightClassPropertyMethods(jetProperty); checkDeclarationMethodWrapped(shouldWrapGetter, jetProperty, propertyAccessors.getGetter()); checkDeclarationMethodWrapped(shouldWrapSetter, jetProperty, propertyAccessors.getSetter()); @@ -249,7 +249,7 @@ public class KotlinJavaFacadeTest extends KotlinLightCodeInsightFixtureTestCase KtPropertyAccessor jetPropertyAccessor = getPreparedElement(KtPropertyAccessor.class); // Should not fail! - PsiMethod propertyAccessors = LightClassUtil.INSTANCE$.getLightClassAccessorMethod(jetPropertyAccessor); + PsiMethod propertyAccessors = LightClassUtil.INSTANCE.getLightClassAccessorMethod(jetPropertyAccessor); checkDeclarationMethodWrapped(shouldWrapAccessor, PsiTreeUtil.getParentOfType(jetPropertyAccessor, KtProperty.class), propertyAccessors); @@ -296,7 +296,7 @@ public class KotlinJavaFacadeTest extends KotlinLightCodeInsightFixtureTestCase assertNotNull("Caret should be placed to class definition", ktClass); // Should not fail! - KtLightClass lightClass = (KtLightClass) LightClassUtil.INSTANCE$.getPsiClass(ktClass); + KtLightClass lightClass = (KtLightClass) LightClassUtil.INSTANCE.getPsiClass(ktClass); assertNotNull(String.format("Failed to wrap jetClass '%s' to class", ktClass.getText()), lightClass); diff --git a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java index 89087531475..af8429011d5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java @@ -58,8 +58,8 @@ public class LightClassEqualsTest extends KotlinLightCodeInsightFixtureTestCase private static void doTestEquals(@Nullable KtClassOrObject origin) { assertNotNull(origin); - PsiClass lightClass1 = LightClassUtil.INSTANCE$.getPsiClass(origin); - PsiClass lightClass2 = LightClassUtil.INSTANCE$.getPsiClass(origin); + PsiClass lightClass1 = LightClassUtil.INSTANCE.getPsiClass(origin); + PsiClass lightClass2 = LightClassUtil.INSTANCE.getPsiClass(origin); assertNotNull(lightClass1); assertNotNull(lightClass2); diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java index 4e84aca34a8..fa0084421cf 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java @@ -180,7 +180,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer boolean actionShouldBeAvailable = pair.getSecond(); if (psiFile instanceof KtFile) { - DirectiveBasedActionUtils.INSTANCE$.checkForUnexpectedErrors((KtFile) psiFile); + DirectiveBasedActionUtils.INSTANCE.checkForUnexpectedErrors((KtFile) psiFile); } doAction(text, actionShouldBeAvailable, getTestName(false)); @@ -270,7 +270,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer boolean actionShouldBeAvailable = pair.getSecond(); if (psiFile instanceof KtFile) { - DirectiveBasedActionUtils.INSTANCE$.checkForUnexpectedErrors((KtFile) psiFile); + DirectiveBasedActionUtils.INSTANCE.checkForUnexpectedErrors((KtFile) psiFile); } doAction(text, actionShouldBeAvailable, beforeFileName); @@ -341,7 +341,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer "Infos:" + infos); } else { - DirectiveBasedActionUtils.INSTANCE$.checkAvailableActionsAreExpected(getFile(), availableActions); + DirectiveBasedActionUtils.INSTANCE.checkAvailableActionsAreExpected(getFile(), availableActions); } } else { diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java index 3005e850398..12d93d10b5b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java @@ -42,13 +42,13 @@ public abstract class AbstractMultiFileHighlightingTest extends CompletionTestCa 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/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java index 75eea8f874b..55869244682 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java @@ -43,13 +43,13 @@ public abstract class AbstractResolveByStubTest extends KotlinCodeInsightTestCas configureByFile(path); TestUtilsKt.configureAs(getModule(), KotlinWithJdkAndRuntimeLightProjectDescriptor.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; } } ); diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsEmptyExpression.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsEmptyExpression.java index 6285b06f08c..c99964222f7 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsEmptyExpression.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsEmptyExpression.java @@ -26,7 +26,7 @@ public class JsEmptyExpression extends JsExpressionImpl { @Override @NotNull public JsStatement makeStmt() { - return JsEmpty.INSTANCE$; + return JsEmpty.INSTANCE; } @Override diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java index ff13e7059f5..cdaba055acb 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java @@ -48,7 +48,7 @@ public final class TopDownAnalyzerFacadeForJS { BindingTrace trace = new BindingTraceContext(); MutableModuleContext newModuleContext = ContextKt.ContextForNewModule( - config.getProject(), Name.special("<" + config.getModuleId() + ">"), JsPlatform.INSTANCE$ + config.getProject(), Name.special("<" + config.getModuleId() + ">"), JsPlatform.INSTANCE ); newModuleContext.setDependencies(computeDependencies(newModuleContext.getModule(), config)); return analyzeFilesWithGivenTrace(files, trace, newModuleContext, config); @@ -59,7 +59,7 @@ public final class TopDownAnalyzerFacadeForJS { List allDependencies = new ArrayList(); allDependencies.add(module); allDependencies.addAll(config.getModuleDescriptors()); - allDependencies.add(JsPlatform.INSTANCE$.getBuiltIns().getBuiltInsModule()); + allDependencies.add(JsPlatform.INSTANCE.getBuiltIns().getBuiltInsModule()); return allDependencies; } diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java index 50344f5c627..4972b435284 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java @@ -160,19 +160,19 @@ public abstract class Config { ", but metadata.abiVersion = " + metadata.getAbiVersion(); ModuleDescriptorImpl moduleDescriptor = TargetPlatformKt.createModule( - JsPlatform.INSTANCE$, Name.special("<" + metadata.getModuleName() + ">"), storageManager + JsPlatform.INSTANCE, Name.special("<" + metadata.getModuleName() + ">"), storageManager ); PackageFragmentProvider provider = KotlinJavascriptSerializationUtil.createPackageFragmentProvider(moduleDescriptor, metadata.getBody(), storageManager); - moduleDescriptor.initialize(provider != null ? provider : PackageFragmentProvider.Empty.INSTANCE$); + moduleDescriptor.initialize(provider != null ? provider : PackageFragmentProvider.Empty.INSTANCE); return moduleDescriptor; } private static void setDependencies(ModuleDescriptorImpl module, List modules) { - module.setDependencies(CollectionsKt.plus(modules, JsPlatform.INSTANCE$.getBuiltIns().getBuiltInsModule())); + module.setDependencies(CollectionsKt.plus(modules, JsPlatform.INSTANCE.getBuiltIns().getBuiltInsModule())); } @NotNull diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java index 67d35a82e45..530632361e1 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java @@ -114,7 +114,7 @@ public class LibrarySourcesConfig extends Config { metadata.addAll(KotlinJavascriptMetadataUtils.loadMetadata(libraryPath)); } - return Unit.INSTANCE$; + return Unit.INSTANCE; } }; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java index 651b56d16c5..f0cd041bf5b 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java @@ -37,8 +37,8 @@ public interface ErrorsJs { DiagnosticFactory0 NATIVE_GETTER_RETURN_TYPE_SHOULD_BE_NULLABLE = DiagnosticFactory0.create(ERROR, DECLARATION_RETURN_TYPE); DiagnosticFactory0 NATIVE_SETTER_WRONG_RETURN_TYPE = DiagnosticFactory0.create(ERROR, DECLARATION_RETURN_TYPE); DiagnosticFactory2 NATIVE_INDEXER_WRONG_PARAMETER_COUNT = DiagnosticFactory2.create(ERROR, DECLARATION_SIGNATURE_OR_DEFAULT); - DiagnosticFactory1 JSCODE_ERROR = DiagnosticFactory1.create(ERROR, JsCodePositioningStrategy.INSTANCE$); - DiagnosticFactory1 JSCODE_WARNING = DiagnosticFactory1.create(WARNING, JsCodePositioningStrategy.INSTANCE$); + DiagnosticFactory1 JSCODE_ERROR = DiagnosticFactory1.create(ERROR, JsCodePositioningStrategy.INSTANCE); + DiagnosticFactory1 JSCODE_WARNING = DiagnosticFactory1.create(WARNING, JsCodePositioningStrategy.INSTANCE); DiagnosticFactory0 JSCODE_ARGUMENT_SHOULD_BE_CONSTANT = DiagnosticFactory0.create(ERROR, DEFAULT); DiagnosticFactory1 NOT_SUPPORTED = DiagnosticFactory1.create(ERROR, DEFAULT); DiagnosticFactory1 REFERENCE_TO_BUILTIN_MEMBERS_NOT_SUPPORTED = DiagnosticFactory1.create(ERROR, DEFAULT); diff --git a/js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java b/js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java index 2fd43d32a6f..fb2b010a60d 100644 --- a/js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java +++ b/js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java @@ -517,7 +517,7 @@ public class JsAstMapper { toForIn.setBody(bodyStmt); } else { - toForIn.setBody(JsEmpty.INSTANCE$); + toForIn.setBody(JsEmpty.INSTANCE); } return toForIn; @@ -545,7 +545,7 @@ public class JsAstMapper { toFor.setBody(bodyStmt); } else { - toFor.setBody(JsEmpty.INSTANCE$); + toFor.setBody(JsEmpty.INSTANCE); } return toFor; } @@ -892,7 +892,7 @@ public class JsAstMapper { else { // When map() returns null, we return an empty statement. // - return JsEmpty.INSTANCE$; + return JsEmpty.INSTANCE; } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java index 1ac567cf9a0..9498d723463 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java @@ -46,8 +46,8 @@ public final class Namer { public static final JsNameRef KOTLIN_OBJECT_REF = new JsNameRef(KOTLIN_NAME); public static final JsNameRef KOTLIN_LONG_NAME_REF = new JsNameRef("Long", KOTLIN_OBJECT_REF); - public static final String EQUALS_METHOD_NAME = getStableMangledNameForDescriptor(JsPlatform.INSTANCE$.getBuiltIns().getAny(), "equals"); - public static final String COMPARE_TO_METHOD_NAME = getStableMangledNameForDescriptor(JsPlatform.INSTANCE$.getBuiltIns().getComparable(), "compareTo"); + public static final String EQUALS_METHOD_NAME = getStableMangledNameForDescriptor(JsPlatform.INSTANCE.getBuiltIns().getAny(), "equals"); + public static final String COMPARE_TO_METHOD_NAME = getStableMangledNameForDescriptor(JsPlatform.INSTANCE.getBuiltIns().getComparable(), "compareTo"); public static final String NUMBER_RANGE = "NumberRange"; public static final String CHAR_RANGE = "CharRange"; public static final String LONG_FROM_NUMBER = "fromNumber"; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java index 9f9d43a102d..0190dea9e8f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java @@ -243,7 +243,7 @@ public final class StaticContext { public JsName apply(@NotNull DeclarationDescriptor descriptor) { if (isDynamic(descriptor)) { String name = descriptor.getName().asString(); - return JsDynamicScope.INSTANCE$.declareName(name); + return JsDynamicScope.INSTANCE.declareName(name); } return null; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java index 6b29738eaca..e205ae49f64 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java @@ -159,7 +159,7 @@ public final class ExpressionVisitor extends TranslatorVisitor { if (expressionInside != null) { return Translation.translateExpression(expressionInside, context); } - return JsEmpty.INSTANCE$; + return JsEmpty.INSTANCE; } @Override @@ -191,7 +191,7 @@ public final class ExpressionVisitor extends TranslatorVisitor { @Override @NotNull public JsNode visitCallableReferenceExpression(@NotNull KtCallableReferenceExpression expression, @NotNull TranslationContext context) { - return CallableReferenceTranslator.INSTANCE$.translate(expression, context); + return CallableReferenceTranslator.INSTANCE.translate(expression, context); } @Override diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java index 410a749670f..52cc92ef0a0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.java @@ -63,7 +63,7 @@ public final class WhenTranslator extends AbstractTranslator { private JsStatement translate() { if (expressionToMatch != null && JsAstUtils.isEmptyExpression(expressionToMatch)) { - return JsEmpty.INSTANCE$; + return JsEmpty.INSTANCE; } JsIf currentIf = null; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java index 602d94d4d54..398064ec7a3 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java @@ -232,6 +232,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/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.java index 3869906c93e..c38c7095fc4 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.java @@ -40,13 +40,13 @@ public final class FunctionIntrinsics { } private void registerFactories() { - register(LongOperationFIF.INSTANCE$); + register(LongOperationFIF.INSTANCE); register(PrimitiveUnaryOperationFIF.INSTANCE); register(PrimitiveBinaryOperationFIF.INSTANCE); register(StringOperationFIF.INSTANCE); register(ArrayFIF.INSTANCE); register(TopLevelFIF.INSTANCE); - register(NumberAndCharConversionFIF.INSTANCE$); + register(NumberAndCharConversionFIF.INSTANCE); register(ProgressionCompanionFIF.INSTANCE); } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java index 8cca1c54ec8..7cfdf5a43a8 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java @@ -200,7 +200,7 @@ public final class TopLevelFIF extends CompositeFIF { } } - String mangledName = getStableMangledNameForDescriptor(JsPlatform.INSTANCE$.getBuiltIns().getMutableMap(), operationName()); + String mangledName = getStableMangledNameForDescriptor(JsPlatform.INSTANCE.getBuiltIns().getMutableMap(), operationName()); return new JsInvocation(new JsNameRef(mangledName, thisOrReceiver), arguments); } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java index c03a2756577..edf05eff073 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java @@ -131,6 +131,6 @@ public final class CallExpressionTranslator extends AbstractCallExpressionTransl assert currentScope instanceof JsFunctionScope : "Usage of js outside of function is unexpected"; JsScope temporaryRootScope = new JsRootScope(new JsProgram("")); JsScope scope = new DelegatingJsFunctionScopeWithTemporaryParent((JsFunctionScope) currentScope, temporaryRootScope); - return ParserUtilsKt.parse(jsCode, ThrowExceptionOnErrorReporter.INSTANCE$, scope); + return ParserUtilsKt.parse(jsCode, ThrowExceptionOnErrorReporter.INSTANCE, scope); } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java index 54ec96273c0..c5677fa7a9c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/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/kotlin/js/translate/test/JSTestGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java index 7c62530044a..9d93d92ce81 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/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);