From d6a942a574fc0860b4b76e236b82126f24750a8f Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 17 Feb 2015 18:00:26 +0300 Subject: [PATCH] Remove all deprecated OBJECT$ usages from project code --- .../org/jetbrains/kotlin/codegen/MemberCodegen.java | 2 +- .../jvm/compiler/CliLightClassGenerationSupport.java | 2 +- .../load/java/structure/impl/JavaAnnotationImpl.java | 2 +- .../impl/JavaElementCollectionFromPsiArrayUtil.java | 2 +- .../impl/JavaPropertyInitializerEvaluatorImpl.java | 2 +- .../java/structure/impl/annotationArgumentsImpl.kt | 2 +- .../kotlin/load/kotlin/KotlinBinaryClassCache.java | 2 +- .../kotlin/load/kotlin/VirtualFileKotlinClass.kt | 2 +- .../JetControlFlowInstructionsGenerator.java | 8 ++++---- .../instructions/eval/accessInstructions.kt | 2 +- .../instructions/eval/operationInstructions.kt | 6 +++--- .../org/jetbrains/kotlin/kdoc/lexer/KDocTokens.java | 2 +- .../jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt | 3 ++- .../kotlin/psi/JetNameReferenceExpression.java | 6 +++--- .../jetbrains/kotlin/psi/JetSimpleNameExpression.kt | 2 +- .../jetbrains/kotlin/resolve/AnnotationResolver.java | 2 +- .../kotlin/resolve/CompileTimeConstantUtils.java | 2 +- .../jetbrains/kotlin/resolve/DescriptorResolver.java | 2 +- .../kotlin/resolve/calls/ArgumentTypeResolver.java | 2 +- .../kotlin/resolve/calls/CallExpressionResolver.java | 2 +- .../constants/evaluate/ConstantExpressionEvaluator.kt | 5 +++-- .../jetbrains/kotlin/resolve/lazy/LazyFileScope.kt | 2 +- .../jetbrains/kotlin/resolve/lazy/ScopeProvider.java | 2 +- .../expressions/BasicExpressionTypingVisitor.java | 11 ++++++----- .../kotlin/types/expressions/DataFlowUtils.java | 2 +- .../types/expressions/ExpressionTypingServices.java | 2 +- .../kotlin/asJava/KotlinLightClassForPackage.kt | 2 +- .../idea/actions/internal/KotlinInternalMode.kt | 2 +- .../resolve/IDELightClassGenerationSupport.java | 7 +++---- .../kotlin/idea/caches/resolve/KotlinCacheService.kt | 3 ++- .../idea/configuration/JetModuleTypeManager.java | 2 +- .../kotlin/idea/configuration/ModuleTypeCache.kt | 3 ++- .../kotlin/idea/highlighter/DebugInfoAnnotator.java | 2 +- .../idea/highlighter/TypeKindHighlightingVisitor.java | 2 +- .../kotlin/idea/quickfix/QuickFixRegistrar.java | 2 +- .../KotlinIntroduceVariableHandler.java | 2 +- .../kotlin/checkers/AbstractJetPsiCheckerTest.java | 4 ++-- .../idea/JetLightCodeInsightFixtureTestCase.java | 6 +++--- .../kotlin/js/translate/utils/AnnotationsUtils.java | 2 +- 39 files changed, 61 insertions(+), 57 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 3717df9057b..d94fee65dcf 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -365,7 +365,7 @@ public abstract class MemberCodegen initializerValue; if (property.isVar() && initializer != null) { BindingTrace tempTrace = TemporaryBindingTrace.create(state.getBindingTrace(), "property initializer"); - initializerValue = ConstantExpressionEvaluator.OBJECT$.evaluate(initializer, tempTrace, propertyDescriptor.getType()); + initializerValue = ConstantExpressionEvaluator.evaluate(initializer, tempTrace, propertyDescriptor.getType()); } else { initializerValue = propertyDescriptor.getCompileTimeInitializer(); diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java index e7d9f2cd809..6ec3ae65f2b 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java @@ -203,7 +203,7 @@ public class CliLightClassGenerationSupport extends LightClassGenerationSupport if (PackagePartClassUtils.getPackageFilesWithCallables(filesInPackage).isEmpty()) return Collections.emptyList(); //noinspection RedundantTypeArguments - return UtilsPackage.emptyOrSingletonList(KotlinLightClassForPackage.OBJECT$.create(psiManager, packageFqName, scope, filesInPackage)); + return UtilsPackage.emptyOrSingletonList(KotlinLightClassForPackage.Factory.create(psiManager, packageFqName, scope, filesInPackage)); } @NotNull diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaAnnotationImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaAnnotationImpl.java index 05d4edee46c..0fed93054f2 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaAnnotationImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaAnnotationImpl.java @@ -39,7 +39,7 @@ public class JavaAnnotationImpl extends JavaElementImpl implement @Nullable public JavaAnnotationArgument findArgument(@NotNull Name name) { PsiAnnotationMemberValue attribute = getPsi().findAttributeValue(name.asString()); - return attribute == null ? null : JavaAnnotationArgumentImpl.OBJECT$.create(attribute, name); + return attribute == null ? null : JavaAnnotationArgumentImpl.Factory.create(attribute, name); } @Override diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java index 02db4767d67..4b418f75dc7 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java @@ -120,7 +120,7 @@ public class JavaElementCollectionFromPsiArrayUtil { String name = psiNameValuePair.getName(); PsiAnnotationMemberValue value = psiNameValuePair.getValue(); assert value != null : "Annotation argument value cannot be null: " + name; - return JavaAnnotationArgumentImpl.OBJECT$.create(value, name == null ? null : Name.identifier(name)); + return JavaAnnotationArgumentImpl.Factory.create(value, name == null ? null : Name.identifier(name)); } }; } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java index 47c16744f6b..09f05f5d778 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java @@ -37,7 +37,7 @@ public class JavaPropertyInitializerEvaluatorImpl implements JavaPropertyInitial if (evaluatedExpression != null) { return ConstantsPackage.createCompileTimeConstant( evaluatedExpression, - ConstantExpressionEvaluator.OBJECT$.isPropertyCompileTimeConstant(descriptor), + ConstantExpressionEvaluator.isPropertyCompileTimeConstant(descriptor), false, true, descriptor.getType()); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.kt index 27fdf2a2c6e..dc9eba066cc 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.Name abstract class JavaAnnotationArgumentImpl( override val name: Name? ) : JavaAnnotationArgument { - class object { + class object Factory { fun create(argument: PsiAnnotationMemberValue, name: Name?): JavaAnnotationArgument { val value = JavaPsiFacade.getInstance(argument.getProject()).getConstantEvaluationHelper().computeConstantExpression(argument) if (value is Enum<*>) { diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinBinaryClassCache.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinBinaryClassCache.java index 72cf47e91d4..4441b879218 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinBinaryClassCache.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinBinaryClassCache.java @@ -63,7 +63,7 @@ public final class KotlinBinaryClassCache implements Disposable { @Override public VirtualFileKotlinClass compute() { //noinspection deprecation - return VirtualFileKotlinClass.OBJECT$.create(file); + return VirtualFileKotlinClass.Factory.create(file); } }); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt index e65fc51777e..fee43349908 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt @@ -46,7 +46,7 @@ public class VirtualFileKotlinClass private( override fun hashCode() = file.hashCode() override fun toString() = "${javaClass.getSimpleName()}: $file" - class object { + class object Factory { private val LOG = Logger.getInstance(javaClass()) deprecated("Use KotlinBinaryClassCache") diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java index e0584b4df82..5247db75b17 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java @@ -446,7 +446,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd @NotNull Map expectedTypes, @NotNull MagicKind kind ) { - MagicInstruction instruction = MagicInstruction.OBJECT$.create( + MagicInstruction instruction = MagicInstruction.Factory.create( instructionElement, valueElement, getCurrentScope(), inputValues, expectedTypes, kind, valueFactory ); add(instruction); @@ -456,7 +456,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.Factory.create(expression, getCurrentScope(), inputValues, valueFactory); add(instruction); return instruction; } @@ -480,7 +480,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd @NotNull Map arguments ) { JetType returnType = resolvedCall.getResultingDescriptor().getReturnType(); - CallInstruction instruction = CallInstruction.OBJECT$.create( + CallInstruction instruction = CallInstruction.Factory.create( valueElement, getCurrentScope(), resolvedCall, @@ -537,7 +537,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd @NotNull Map receiverValues ) { AccessTarget accessTarget = resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.INSTANCE$; - ReadValueInstruction instruction = ReadValueInstruction.OBJECT$.create( + ReadValueInstruction instruction = ReadValueInstruction.Factory.create( expression, getCurrentScope(), accessTarget, receiverValues, valueFactory ); add(instruction); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt index 6c7a259d10a..5414451dea3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt @@ -75,7 +75,7 @@ public class ReadValueInstruction private ( override fun createCopy(): InstructionImpl = ReadValueInstruction(element, lexicalScope, target, receiverValues, outputValue) - class object { + class object Factory { public fun create ( element: JetElement, lexicalScope: LexicalScope, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt index caf5ccfc22a..b3123b175b5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt @@ -79,7 +79,7 @@ public class CallInstruction private( override fun toString() = renderInstruction("call", "${render(element)}, ${resolvedCall.getResultingDescriptor()!!.getName()}") - class object { + class object Factory { fun create ( element: JetElement, lexicalScope: LexicalScope, @@ -115,7 +115,7 @@ public class MagicInstruction( override fun toString() = renderInstruction("magic[$kind]", render(element)) - class object { + class object Factory { fun create( element: JetElement, valueElement: JetElement?, @@ -165,7 +165,7 @@ class MergeInstruction private( override fun toString() = renderInstruction("merge", render(element)) - class object { + class object Factory { fun create( element: JetElement, lexicalScope: LexicalScope, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDocTokens.java b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDocTokens.java index a56759e7b92..b24eeb09cf1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDocTokens.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDocTokens.java @@ -60,7 +60,7 @@ public interface KDocTokens { ILazyParseableElementType MARKDOWN_LINK = new ILazyParseableElementType("KDOC_MARKDOWN_LINK", JetLanguage.INSTANCE) { @Override public ASTNode parseContents(ASTNode chameleon) { - return KDocLinkParser.OBJECT$.parseMarkdownLink(this, chameleon); + return KDocLinkParser.parseMarkdownLink(this, chameleon); } }; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt index 73e7fa58396..0d2b9d16820 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt @@ -23,13 +23,14 @@ import com.intellij.lang.ASTNode import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.lexer.JetLexer import com.intellij.lang.PsiBuilderFactory +import kotlin.platform.* /** * Parses the contents of a Markdown link in KDoc. Uses the standard Kotlin lexer. */ class KDocLinkParser(): PsiParser { class object { - public fun parseMarkdownLink(root: IElementType, chameleon: ASTNode): ASTNode { + platformStatic public fun parseMarkdownLink(root: IElementType, chameleon: ASTNode): ASTNode { val parentElement = chameleon.getTreeParent().getPsi() val project = parentElement.getProject() val builder = PsiBuilderFactory.getInstance().createBuilder(project, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNameReferenceExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNameReferenceExpression.java index 7980cb51f8f..9f7cdf5ac33 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNameReferenceExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNameReferenceExpression.java @@ -48,13 +48,13 @@ public class JetNameReferenceExpression extends JetExpressionImplStub constant = ConstantExpressionEvaluator.OBJECT$.evaluate(argumentExpression, trace, expectedType); + CompileTimeConstant constant = ConstantExpressionEvaluator.evaluate(argumentExpression, trace, expectedType); if (constant instanceof IntegerValueTypeConstant) { JetType defaultType = ((IntegerValueTypeConstant) constant).getType(expectedType); SimpleResolutionContext context = diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java index 89e9c223775..fa0104d4042 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java @@ -130,7 +130,7 @@ public class CompileTimeConstantUtils { ) { if (expression == null) return false; CompileTimeConstant compileTimeConstant = - ConstantExpressionEvaluator.OBJECT$.evaluate(expression, trace, KotlinBuiltIns.getInstance().getBooleanType()); + ConstantExpressionEvaluator.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/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index b1271ea6491..cc46e16b79f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -1095,7 +1095,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.evaluate(initializer, trace, initializerType); if (constant instanceof IntegerValueTypeConstant) { return EvaluatePackage.createCompileTimeConstantWithType((IntegerValueTypeConstant) constant, initializerType); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java index 172103410e8..148c88742c2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java @@ -298,6 +298,6 @@ public class ArgumentTypeResolver { return; } - ConstantExpressionEvaluator.OBJECT$.evaluate(expression, context.trace, numberType); + ConstantExpressionEvaluator.evaluate(expression, context.trace, numberType); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java index 4b2e6757d6b..457230f18f4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java @@ -294,7 +294,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.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/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt index e4c197b8585..2dc05d2e89f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt @@ -34,16 +34,17 @@ import java.math.BigInteger import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType +import kotlin.platform.platformStatic public class ConstantExpressionEvaluator private (val trace: BindingTrace) : JetVisitor, JetType>() { class object { - public fun evaluate(expression: JetExpression, trace: BindingTrace, expectedType: JetType? = TypeUtils.NO_EXPECTED_TYPE): CompileTimeConstant<*>? { + platformStatic public fun evaluate(expression: JetExpression, trace: BindingTrace, expectedType: JetType? = TypeUtils.NO_EXPECTED_TYPE): CompileTimeConstant<*>? { val evaluator = ConstantExpressionEvaluator(trace) return evaluator.evaluate(expression, expectedType) } - public fun isPropertyCompileTimeConstant(descriptor: VariableDescriptor): Boolean { + platformStatic public fun isPropertyCompileTimeConstant(descriptor: VariableDescriptor): Boolean { if (descriptor.isVar()) { return false } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt index ebc6b0195ee..37f6dc46ebe 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt @@ -55,7 +55,7 @@ class LazyFileScope private( } } - class object { + class object Factory { public fun create( resolveSession: ResolveSession, file: JetFile, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java index 0292b09d4fa..3f177d4bbdd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java @@ -100,7 +100,7 @@ public class ScopeProvider implements DeclarationScopeProvider, FileScopeProvide private LazyFileScope createFileScope(@NotNull JetFile file) { TemporaryBindingTrace tempTrace = TemporaryBindingTrace.create(resolveSession.getTrace(), "Transient trace for default imports lazy resolve"); - return LazyFileScope.OBJECT$.create( + return LazyFileScope.Factory.create( resolveSession, file, defaultImports.invoke(), 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 e93ddc18136..d5a0f816a30 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -120,7 +120,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.evaluate(expression, context.trace, context.expectedType); if (!(value instanceof IntegerValueTypeConstant)) { CompileTimeConstantChecker compileTimeConstantChecker = context.getCompileTimeConstantChecker(); @@ -747,7 +747,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { result = returnType; } - CompileTimeConstant value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, contextWithExpectedType.trace, + CompileTimeConstant value = ConstantExpressionEvaluator.evaluate(expression, contextWithExpectedType.trace, contextWithExpectedType.expectedType); if (value != null) { return createCompileTimeConstantTypeInfo(value, expression, contextWithExpectedType); @@ -923,8 +923,9 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { context.trace.report(UNSUPPORTED.on(operationSign, "Unknown operation")); result = JetTypeInfo.create(null, context.dataFlowInfo); } - CompileTimeConstant value = ConstantExpressionEvaluator.OBJECT$. - evaluate(expression, contextWithExpectedType.trace, contextWithExpectedType.expectedType); + CompileTimeConstant value = ConstantExpressionEvaluator.evaluate( + expression, contextWithExpectedType.trace, contextWithExpectedType.expectedType + ); if (value != null) { return createCompileTimeConstantTypeInfo(value, expression, contextWithExpectedType); } @@ -1267,7 +1268,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { } }); } - ConstantExpressionEvaluator.OBJECT$.evaluate(expression, context.trace, contextWithExpectedType.expectedType); + ConstantExpressionEvaluator.evaluate(expression, context.trace, contextWithExpectedType.expectedType); return DataFlowUtils.checkType(components.builtIns.getStringType(), expression, contextWithExpectedType, dataFlowInfo[0]); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java index afd1da8866b..5f09778bb5c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java @@ -182,7 +182,7 @@ public class DataFlowUtils { } if (expression instanceof JetConstantExpression) { - CompileTimeConstant value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, c.trace, c.expectedType); + CompileTimeConstant value = ConstantExpressionEvaluator.evaluate(expression, c.trace, c.expectedType); if (value instanceof IntegerValueTypeConstant) { value = EvaluatePackage.createCompileTimeConstantWithType((IntegerValueTypeConstant) value, c.expectedType); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java index 584943223f2..bbfd825ab10 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java @@ -392,7 +392,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.evaluate(defaultValue, trace, valueParameterDescriptor.getType()); } } } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt index ad3303776ef..465b4257a52 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt @@ -214,7 +214,7 @@ public class KotlinLightClassForPackage private( } } - class object { + class object Factory { public fun create( manager: PsiManager, qualifiedName: FqName, diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalMode.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalMode.kt index 6866ad5cc5e..dfb6c805f4b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalMode.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalMode.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.actions.internal import com.intellij.ide.util.PropertiesComponent public class KotlinInternalMode { - public class object { + public class object Instance { val INTERNAL_MODE_PROPERTY = "kotlin.internal.mode.enabled" public var enabled: Boolean diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java index 592b0933d03..f34b9169693 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java @@ -90,7 +90,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport Collections.sort(sortedFiles, jetFileComparator); JetFile file = sortedFiles.get(0); - ResolveSessionForBodies session = KotlinCacheService.OBJECT$.getInstance(file.getProject()).getLazyResolveSession(file); + ResolveSessionForBodies session = KotlinCacheService.getInstance(file.getProject()).getLazyResolveSession(file); forceResolvePackageDeclarations(files, session); return new LightClassConstructionContext(session.getBindingContext(), session.getModuleDescriptor()); } @@ -98,8 +98,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport @NotNull @Override public LightClassConstructionContext getContextForClassOrObject(@NotNull JetClassOrObject classOrObject) { - ResolveSessionForBodies session = - KotlinCacheService.OBJECT$.getInstance(classOrObject.getProject()).getLazyResolveSession(classOrObject); + ResolveSessionForBodies session = KotlinCacheService.getInstance(classOrObject.getProject()).getLazyResolveSession(classOrObject); if (classOrObject.isLocal()) { BindingContext bindingContext = session.resolveToElement(classOrObject, BodyResolveMode.FULL); @@ -278,7 +277,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport IdeaModuleInfo moduleInfo = info.getModuleInfo(); if (moduleInfo instanceof ModuleSourceInfo) { KotlinLightClassForPackage lightClass = - KotlinLightClassForPackage.OBJECT$.create(psiManager, packageFqName, moduleInfo.contentScope(), files); + KotlinLightClassForPackage.Factory.create(psiManager, packageFqName, moduleInfo.contentScope(), files); if (lightClass == null) continue; result.add(lightClass); diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt index bf82ae989f3..7cae15078c1 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt @@ -40,12 +40,13 @@ import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.scopes.JetScope +import kotlin.platform.platformStatic private val LOG = Logger.getInstance(javaClass()) public class KotlinCacheService(val project: Project) { class object { - public fun getInstance(project: Project): KotlinCacheService = ServiceManager.getService(project, javaClass())!! + platformStatic public fun getInstance(project: Project): KotlinCacheService = ServiceManager.getService(project, javaClass())!! } public fun getResolutionFacade(elements: List): ResolutionFacade { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/JetModuleTypeManager.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/JetModuleTypeManager.java index 6a392b2863b..a2b92e5f3a7 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/JetModuleTypeManager.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/JetModuleTypeManager.java @@ -27,6 +27,6 @@ public abstract class JetModuleTypeManager { public abstract boolean isAndroidGradleModule(@NotNull Module module); public boolean isGradleModule(@NotNull Module module) { - return ModuleTypeCacheManager.OBJECT$.geInstance(module.getProject()).isGradleModule(module); + return ModuleTypeCacheManager.getInstance(module.getProject()).isGradleModule(module); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt index ae873a6cb98..263b6a296a3 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt @@ -29,10 +29,11 @@ import com.intellij.openapi.vfs.VirtualFileMoveEvent import com.intellij.openapi.vfs.VirtualFileCopyEvent import com.intellij.openapi.vfs.VirtualFilePropertyEvent import com.intellij.openapi.util.SimpleModificationTracker +import kotlin.platform.platformStatic class ModuleTypeCacheManager private (project: Project) { class object { - fun geInstance(project: Project) = ServiceManager.getService(project, javaClass()) + platformStatic fun getInstance(project: Project) = ServiceManager.getService(project, javaClass()) } private val vfsModificationTracker = VfsModificationTracker(project) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java index a879de63d9b..cb23150f65f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.resolve.BindingContext; public class DebugInfoAnnotator implements Annotator { public static boolean isDebugInfoEnabled() { - return KotlinInternalMode.OBJECT$.getEnabled(); + return KotlinInternalMode.Instance.getEnabled(); } @Override diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java index 70d3636198e..255b9f3a542 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java @@ -34,7 +34,7 @@ class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor { public void visitSimpleNameExpression(@NotNull JetSimpleNameExpression expression) { PsiReference ref = expression.getReference(); if (ref == null) return; - if (JetPsiChecker.OBJECT$.getNamesHighlightingEnabled()) { + if (JetPsiChecker.Default.getNamesHighlightingEnabled()) { DeclarationDescriptor referenceTarget = bindingContext.get(BindingContext.REFERENCE_TARGET, expression); if (referenceTarget instanceof ConstructorDescriptor) { referenceTarget = referenceTarget.getContainingDeclaration(); diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java index 2a1081f9449..839ee4ce8d1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java @@ -122,7 +122,7 @@ public class QuickFixRegistrar { QuickFixes.factories.put(NO_BACKING_FIELD_CUSTOM_ACCESSORS, changeToPropertyNameFactory); QuickFixes.factories.put(INACCESSIBLE_BACKING_FIELD, changeToPropertyNameFactory); - JetSingleIntentionActionFactory unresolvedReferenceFactory = AutoImportFix.OBJECT$.createFactory(); + JetSingleIntentionActionFactory unresolvedReferenceFactory = AutoImportFix.Default.createFactory(); QuickFixes.factories.put(UNRESOLVED_REFERENCE, unresolvedReferenceFactory); QuickFixes.factories.put(UNRESOLVED_REFERENCE_WRONG_RECEIVER, unresolvedReferenceFactory); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index 6db92b0bd44..eed475221bb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -263,7 +263,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { final JetExpression originalBody = originalDeclaration.getBodyExpression(); assert originalBody != null : "Original body is not found: " + originalDeclaration; - JetDeclarationWithBody newDeclaration = ConvertToBlockBodyAction.OBJECT$.convert(originalDeclaration); + JetDeclarationWithBody newDeclaration = ConvertToBlockBodyAction.Default.convert(originalDeclaration); JetBlockExpression newCommonContainer = (JetBlockExpression) newDeclaration.getBodyExpression(); assert newCommonContainer != null : "New body is not found: " + newDeclaration; diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java index 204faa3584f..b1848904674 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java @@ -38,11 +38,11 @@ public abstract class AbstractJetPsiCheckerTest extends JetLightCodeInsightFixtu //noinspection unchecked myFixture.enableInspections(SpellCheckingInspection.class); - JetPsiChecker.OBJECT$.setNamesHighlightingEnabled(false); + JetPsiChecker.Default.setNamesHighlightingEnabled(false); checkHighlighting(true, true, false); } finally { - JetPsiChecker.OBJECT$.setNamesHighlightingEnabled(true); + JetPsiChecker.Default.setNamesHighlightingEnabled(true); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java index 7e7b1dd49f9..d5772947f75 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java @@ -52,13 +52,13 @@ public abstract class JetLightCodeInsightFixtureTestCase extends LightCodeInsigh ((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities(); VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()); - kotlinInternalModeOriginalValue = KotlinInternalMode.OBJECT$.getEnabled(); - KotlinInternalMode.OBJECT$.setEnabled(true); + kotlinInternalModeOriginalValue = KotlinInternalMode.Instance.getEnabled(); + KotlinInternalMode.Instance.setEnabled(true); } @Override protected void tearDown() throws Exception { - KotlinInternalMode.OBJECT$.setEnabled(kotlinInternalModeOriginalValue); + KotlinInternalMode.Instance.setEnabled(kotlinInternalModeOriginalValue); VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()); Set builtInsSources = getProject().getComponent(BuiltInsReferenceResolver.class).getBuiltInsSources(); diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java b/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java index 2c4b8d5c07a..439d7e28b21 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java @@ -94,7 +94,7 @@ public final class AnnotationsUtils { } for (DeclarationDescriptor descriptor : descriptors) { - for (PredefinedAnnotation annotation : PredefinedAnnotation.OBJECT$.getWITH_CUSTOM_NAME()) { + for (PredefinedAnnotation annotation : PredefinedAnnotation.Default.getWITH_CUSTOM_NAME()) { if (!hasAnnotationOrInsideAnnotatedClass(descriptor, annotation)) { continue; }