diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt index 8330c006e06..e367710abfd 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt @@ -76,7 +76,7 @@ class PlatformStaticGenerator( ) } - class object { + default object { [platformStatic] public fun createStaticFunctionDescriptor(descriptor: FunctionDescriptor): FunctionDescriptor { val memberDescriptor = if (descriptor is PropertyAccessorDescriptor) descriptor.getCorrespondingProperty() else descriptor diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt index 8fda325e04a..823a7649862 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.resolve.* public trait ExpressionCodegenExtension { - class object : ProjectExtensionDescriptor("org.jetbrains.kotlin.expressionCodegenExtension", javaClass()) + default object : ProjectExtensionDescriptor("org.jetbrains.kotlin.expressionCodegenExtension", javaClass()) public class Context( public val typeMapper: JetTypeMapper, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt index 1f3fd198b38..d26d572f93f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils public class ReifiedTypeInliner(private val parametersMapping: ReifiedTypeParameterMappings?) { - class object { + default object { public val NEW_ARRAY_MARKER_METHOD_NAME: String = "reifyNewArray" public val CHECKCAST_MARKER_METHOD_NAME: String = "reifyCheckcast" public val INSTANCEOF_MARKER_METHOD_NAME: String = "reifyInstanceof" 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 dc9eba066cc..bfa1db4b5db 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 Factory { + default 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/VirtualFileKotlinClass.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt index 1bd817427e9..5ab495d6c01 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 @@ -47,7 +47,7 @@ public class VirtualFileKotlinClass private( override fun hashCode() = file.hashCode() override fun toString() = "${javaClass.getSimpleName()}: $file" - class object Factory { + default object Factory { private val LOG = Logger.getInstance(javaClass()) deprecated("Use KotlinBinaryClassCache") diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt index 275abfaff3b..1c0f24ee8c4 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt @@ -47,7 +47,7 @@ public class JvmDeclarationOrigin( public val element: PsiElement?, public val descriptor: DeclarationDescriptor? ) { - class object { + default object { public val NO_ORIGIN: JvmDeclarationOrigin = JvmDeclarationOrigin(OTHER, null, null) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt index 09eb88563ab..2e6b270f5fb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt @@ -39,7 +39,7 @@ public data open class AnalysisResult protected ( private class Error(bindingContext: BindingContext, val exception: Throwable) : AnalysisResult(bindingContext, ErrorUtils.getErrorModule()) - class object { + default object { public val EMPTY: AnalysisResult = success(BindingContext.EMPTY, ErrorUtils.getErrorModule()) platformStatic public fun success(bindingContext: BindingContext, module: ModuleDescriptor): AnalysisResult { 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 5414451dea3..d554ce6b554 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 Factory { + default 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 b3123b175b5..b5cb5281ac5 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 Factory { + default 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 Factory { + default object Factory { fun create( element: JetElement, valueElement: JetElement?, @@ -165,7 +165,7 @@ class MergeInstruction private( override fun toString() = renderInstruction("merge", render(element)) - class object Factory { + default object Factory { fun create( element: JetElement, lexicalScope: LexicalScope, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt index 0afb5d46da1..34647cb56c4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.psi.JetFile public trait ExternalDeclarationsProvider { - class object : ProjectExtensionDescriptor( + default object : ProjectExtensionDescriptor( "org.jetbrains.kotlin.externalDeclarationsProvider", javaClass() ) 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 0d2b9d16820..dce30134c1c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt @@ -29,7 +29,7 @@ import kotlin.platform.* * Parses the contents of a Markdown link in KDoc. Uses the standard Kotlin lexer. */ class KDocLinkParser(): PsiParser { - class object { + default object { platformStatic public fun parseMarkdownLink(root: IElementType, chameleon: ASTNode): ASTNode { val parentElement = chameleon.getTreeParent().getPsi() val project = parentElement.getProject() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt index 5e82ddb1628..7d14723f3bf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt @@ -147,7 +147,7 @@ public abstract class JetCodeFragment( } } - class object { + default object { public val IMPORT_SEPARATOR: String = "," public val RUNTIME_TYPE_EVALUATOR: Key> = Key.create("RUNTIME_TYPE_EVALUATOR") } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt index 7416bae2fa1..1cf0508baea 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt @@ -50,7 +50,7 @@ abstract class JetSimpleNameExpressionImpl(node: ASTNode) : JetExpressionImpl(no override fun getReferencedName() = getReferencedNameImpl() //NOTE: an unfortunate way to share an implementation between stubbed and not stubbed tree - class object Helper { + default object Helper { fun JetSimpleNameExpression.getReferencedNameElementTypeImpl(): IElementType { return this.getReferencedNameElement().getNode()!!.getElementType()!! diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt index c126647fd95..5d83f3f2130 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt @@ -73,7 +73,7 @@ public open class KotlinStubBaseImpl>(parent: StubElem return methodName } - class object { + default object { private val LOGGER: Logger = Logger.getInstance(javaClass>>()) private val BASE_STUB_INTERFACES = listOf(javaClass>(), javaClass>(), javaClass>()) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt index cde3f0392eb..9ad2c3221b6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt @@ -25,7 +25,7 @@ public trait CodeAnalyzerInitializer { public fun initialize(trace: BindingTrace, module: ModuleDescriptor, codeAnalyzer: KotlinCodeAnalyzer?) public fun createTrace(): BindingTrace - class object { + default object { public fun getInstance(project: Project): CodeAnalyzerInitializer = ServiceManager.getService(project, javaClass())!! } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt index ec63b349312..d6fe69c8152 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt @@ -28,7 +28,7 @@ public class CompositeBindingContext private ( private val delegates: List ) : BindingContext { - class object { + default object { public fun create(delegates: List): BindingContext { if (delegates.isEmpty()) return BindingContext.EMPTY if (delegates.size() == 1) return delegates.first() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt index bef31c129d3..ba62f2e27e1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt @@ -25,7 +25,7 @@ public open class StatementFilter { public open val filter: ((JetElement) -> Boolean)? get() = null - class object { + default object { public val NONE: StatementFilter = StatementFilter() } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index 7c30329da55..e9ff79af968 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -306,7 +306,7 @@ public class TypeResolver( return classifierDescriptor } - class object { + default object { [platformStatic] public fun resolveProjectionKind(projectionKind: JetProjectionKind): Variance { return when (projectionKind) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt index d0004ab72a0..4417530ed83 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt @@ -79,7 +79,7 @@ class VarianceChecker(private val trace: BindingTrace) { val occurrencePosition: Variance ) - class object { + default object { platformStatic fun recordPrivateToThisIfNeeded(trace: BindingTrace, descriptor: CallableMemberDescriptor) { if (isIrrelevant(descriptor) || descriptor.getVisibility() != Visibilities.PRIVATE) return diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt index 0dab7a9f754..434b7531302 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt @@ -47,8 +47,8 @@ public class CallableDescriptorCollectors(val collectors Iterable> { override fun iterator(): Iterator> = collectors.iterator() - [suppress("UNCHECKED_CAST")] - class object { + [suppress("UNCHECKED_CAST")] default + object { public val FUNCTIONS_AND_VARIABLES: CallableDescriptorCollectors = CallableDescriptorCollectors(listOf( FUNCTIONS_COLLECTOR as CallableDescriptorCollector, 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 27c6ea20cba..0fa8d2e99a9 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 @@ -38,7 +38,7 @@ import kotlin.platform.platformStatic public class ConstantExpressionEvaluator private (val trace: BindingTrace) : JetVisitor, JetType>() { - class object { + default object { platformStatic public fun evaluate(expression: JetExpression, trace: BindingTrace, expectedType: JetType? = TypeUtils.NO_EXPECTED_TYPE): CompileTimeConstant<*>? { val evaluator = ConstantExpressionEvaluator(trace) return evaluator.evaluate(expression, expectedType) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/Diagnostics.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/Diagnostics.kt index 036c7e25500..f3c72757f11 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/Diagnostics.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/Diagnostics.kt @@ -36,7 +36,7 @@ public trait Diagnostics : Iterable { override fun iterator() = all().iterator() - class object { + default object { public val EMPTY: Diagnostics = object : Diagnostics { override fun noSuppression(): Diagnostics = this override val modificationTracker: ModificationTracker = ModificationTracker.NEVER_CHANGED 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 37f6dc46ebe..ce16a5ca5c6 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 Factory { + default object Factory { public fun create( resolveSession: ResolveSession, file: JetFile, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt index 30eeb4108c2..51e41802629 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt @@ -35,7 +35,7 @@ public abstract class DeclarationProviderFactoryService { filesScope: GlobalSearchScope ): DeclarationProviderFactory - class object { + default object { public platformStatic fun createDeclarationProviderFactory( project: Project, storageManager: StorageManager, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt index 7b98808e8b5..cf266c19411 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -298,7 +298,7 @@ public open class LazyClassMemberScope( // Do not add details here, they may compromise the laziness during debugging override fun toString() = "lazy scope for class ${thisDescriptor.getName()}" - class object { + default object { private val GENERATE_CONSTRUCTORS_FOR = setOf(ClassKind.CLASS, ClassKind.ANNOTATION_CLASS, ClassKind.OBJECT, diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt index e84cefac0af..f6d04081f96 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt @@ -87,7 +87,7 @@ public class KotlinCodeBlockModificationListener(modificationTracker: PsiModific } } - class object { + default object { private val LOG = Logger.getInstance("#org.jetbrains.kotlin.asJava.JetCodeBlockModificationListener") private fun containsClassesInside(element: PsiElement?): Boolean { 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 465b4257a52..cdc514763af 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt @@ -65,7 +65,7 @@ public class KotlinLightClassForPackage private( } } - class object { + default object { public fun getInstance(project: Project): FileStubCache { return ServiceManager.getService(project, javaClass()) } @@ -214,7 +214,7 @@ public class KotlinLightClassForPackage private( } } - class object Factory { + default object Factory { public fun create( manager: PsiManager, qualifiedName: FqName, diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt index e33137f2f90..8c8427365d5 100644 --- a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt +++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.config.CompilerConfigurationKey import org.jetbrains.kotlin.config.CompilerConfiguration public trait ComponentRegistrar { - class object { + default object { public val PLUGIN_COMPONENT_REGISTRARS: CompilerConfigurationKey> = CompilerConfigurationKey.create("plugin component registrars") } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index da2cc9316c2..6093105d20f 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -165,7 +165,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() { ) } - class object { + default object { val PATH_TO_TEST_ROOT_DIR = "compiler/testData/multiModule/java/custom" } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt index f113a73afc5..94dd36a0d9c 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt @@ -108,7 +108,7 @@ public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescrip } } - class object { + default object { val pattern = Pattern.compile(".+(?=:)") } } diff --git a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt index 81f30f87707..841d8a0b1b1 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.config import java.util.HashMap public class Services private(private val map: Map, Any>) { - class object { + default object { public val EMPTY: Services = Builder().build() } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt index 98402b0d574..ccaf1a8ad81 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.Name // The purpose of this class is to hold a unique signature of either a method or a field, so that annotations on a member can be put // into a map indexed by these signatures data class MemberSignature private(private val signature: String) { - class object { + default object { platformStatic public fun fromMethodNameAndDesc(nameAndDesc: String): MemberSignature { return MemberSignature(nameAndDesc) } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt index 66e92a84753..088b0ede47f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt @@ -26,7 +26,7 @@ public trait Annotations : Iterable { public fun findAnnotation(fqName: FqName): AnnotationDescriptor? - class object { + default object { public val EMPTY: Annotations = object : Annotations { override fun isEmpty() = true diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt index 2aa6f5b011b..070f119d887 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt @@ -76,7 +76,7 @@ public trait JetScope { } } - class object { + default object { public val ALL_NAME_FILTER: (Name) -> Boolean = { true } } } @@ -141,7 +141,7 @@ public class DescriptorKindFilter( } } - class object { + default object { public val NON_SINGLETON_CLASSIFIERS_MASK: Int = 0x01 public val SINGLETON_CLASSIFIERS_MASK: Int = 0x02 public val PACKAGES_MASK: Int = 0x04 diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt index 4e10c7c353b..b98372f28ad 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt @@ -33,7 +33,7 @@ public trait FlexibleTypeCapabilities { } public trait Flexibility : TypeCapability, SubtypingRepresentatives { - class object { + default object { // This is a "magic" classifier: when type resolver sees it in the code, e.g. ft, instead of creating a normal type, // it creates a flexible type, e.g. (Foo..Foo?). // This is used in tests and Evaluate Expression to have flexible types in the code, @@ -145,7 +145,7 @@ public open class DelegatingFlexibleType protected ( override val upperBound: JetType, override val extraCapabilities: FlexibleTypeCapabilities ) : DelegatingType(), NullAwareness, Flexibility, FlexibleTypeDelegation, Approximation { - class object { + default object { platformStatic fun create(lowerBound: JetType, upperBound: JetType, extraCapabilities: FlexibleTypeCapabilities): JetType { if (lowerBound == upperBound) return lowerBound return DelegatingFlexibleType(lowerBound, upperBound, extraCapabilities) diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/common.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/common.kt index 9ddaa55085e..045d76f197d 100644 --- a/generators/src/org/jetbrains/kotlin/generators/builtins/common.kt +++ b/generators/src/org/jetbrains/kotlin/generators/builtins/common.kt @@ -30,7 +30,7 @@ enum class PrimitiveType { BOOLEAN val capitalized: String get() = name().toLowerCase().capitalize() - class object { + default object { val exceptBoolean: Iterable by Delegates.lazy { PrimitiveType.values().filterNot { it == BOOLEAN } } } } diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt index 92a63aadcd9..a48ffc3b78c 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt @@ -48,7 +48,7 @@ public class ReferenceVariantsHelper( public val receivers: Collection, public val callType: CallType ) { - class object { + default object { val Empty = ReceiversData(listOf(), CallType.NORMAL) } } @@ -216,7 +216,7 @@ public class ReferenceVariantsHelper( return resolutionScope.getDescriptorsFiltered(DescriptorKindFilter.PACKAGES, nameFilter).filter(visibilityFilter) } - class object { + default object { public fun getExplicitReceiverData(expression: JetSimpleNameExpression): Pair? { val receiverExpression = expression.getReceiverExpression() ?: return null val parent = expression.getParent() diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt index 14896ff3136..b6881939ed3 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt @@ -469,7 +469,7 @@ class PartialBodyResolveFilter( NEED_COMPLETION } - class object { + default object { private fun JetElement.blocks(): Collection { val result = ArrayList(1) this.accept(object : JetVisitorVoid() { 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 dfb6c805f4b..048c2de865a 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 Instance { + public default 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/JetShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt index abe3bd07595..73313740e0c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.stubindex.JetFunctionShortNameIndex // used in Upsource, what's why in idea-analysis module public class JetShortNamesCache(private val project: com.intellij.openapi.project.Project) : com.intellij.psi.search.PsiShortNamesCache() { - class object { + default object { public fun getKotlinInstance(project: com.intellij.openapi.project.Project): org.jetbrains.kotlin.idea.caches.JetShortNamesCache = com.intellij.openapi.extensions.Extensions.getArea(project).getExtensionPoint(com.intellij.psi.search.PsiShortNamesCache.EP_NAME).getExtensions() .firstIsInstance() 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 898cc630a1e..a63f7625a59 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 @@ -45,7 +45,7 @@ import kotlin.platform.platformStatic private val LOG = Logger.getInstance(javaClass()) public class KotlinCacheService(val project: Project) { - class object { + default object { platformStatic public fun getInstance(project: Project): KotlinCacheService = ServiceManager.getService(project, javaClass())!! } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt index da5d259c204..1532136080e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt @@ -31,7 +31,7 @@ import com.intellij.codeInsight.ExternalAnnotationsListener import com.intellij.psi.PsiModifierListOwner class LibraryModificationTracker(project: Project) : SimpleModificationTracker() { - class object { + default object { platformStatic fun getInstance(project: Project) = ServiceManager.getService(project, javaClass())!! } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt index 44f73ee1758..c9de31164e5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt @@ -43,7 +43,7 @@ private class ExceptionTrackerWithProcessCanceledReport() : ExceptionTracker() { } - class object { + default object { val LOG = Logger.getInstance(javaClass()) } } 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 263b6a296a3..27ab7fff12c 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 @@ -32,7 +32,7 @@ import com.intellij.openapi.util.SimpleModificationTracker import kotlin.platform.platformStatic class ModuleTypeCacheManager private (project: Project) { - class object { + default object { platformStatic fun getInstance(project: Project) = ServiceManager.getService(project, javaClass()) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt index fa8b85926f8..8d8feb83d89 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt @@ -87,7 +87,7 @@ public class KotlinClsStubBuilder : ClsStubBuilder() { return ClsStubBuilderComponents(classDataFinder, annotationLoader) } - class object { + default object { val LOG = Logger.getInstance(javaClass()) } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompiler.kt index 4397d443d21..b79d25fd0f4 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompiler.kt @@ -113,7 +113,7 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di return MutablePackageFragmentDescriptor(moduleDescriptor, fqName) } - class object { + default object { private val LOG = Logger.getInstance(javaClass()) } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt index d25e5d0d923..dca50773db4 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt @@ -218,7 +218,7 @@ public open class JetPsiChecker : Annotator, HighlightRangeExtension { } } - class object { + default object { var namesHighlightingEnabled = true [TestOnly] set diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt index 91dac12e458..807995aca26 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.idea.caches.resolve.analyze public class OperatorToFunctionIntention : JetSelfTargetingIntention("operator.to.function", javaClass()) { - class object { + default object { private fun isApplicablePrefix(element: JetPrefixExpression): Boolean { return when (element.getOperationReference().getReferencedNameElementType()) { JetTokens.PLUS, JetTokens.MINUS, JetTokens.PLUSPLUS, JetTokens.MINUSMINUS, JetTokens.EXCL -> true diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt index e4af8106997..e5fa6ad58cb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt @@ -41,7 +41,7 @@ public class JetForLoopInReference(element: JetForExpression) : JetMultiReferenc return LOOP_RANGE_KEYS.map { key -> context.get(key, loopRange)?.getCandidateDescriptor() }.filterNotNull() } - class object { + default object { private val LOOP_RANGE_KEYS = array( BindingContext.LOOP_RANGE_ITERATOR_RESOLVED_CALL, BindingContext.LOOP_RANGE_NEXT_RESOLVED_CALL, diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt index c3b2f2caded..fb0ba28cf9c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt @@ -57,7 +57,7 @@ public data class UsagesSearchLocation( val inStrings: Boolean = false, val inPlainText: Boolean = true ) { - class object { + default object { public val DEFAULT: UsagesSearchLocation = UsagesSearchLocation() public val EVERYWHERE: UsagesSearchLocation = UsagesSearchLocation(true, true, true, true) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt index 7d3781d407f..894b8974ddb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt @@ -78,7 +78,7 @@ public class SubpackagesIndexService(private val project: Project) { } } - class object { + default object { public fun getInstance(project: Project): SubpackagesIndex { return ServiceManager.getService(project, javaClass())!!.cachedValue.getValue()!! } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt index 7d0116175fc..c4b8cfbbd9e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt @@ -44,7 +44,7 @@ public abstract class ImportInsertHelper { public abstract fun importDescriptor(file: JetFile, descriptor: DeclarationDescriptor): ImportDescriptorResult - class object { + default object { [platformStatic] public fun getInstance(project: Project): ImportInsertHelper = ServiceManager.getService(project, javaClass()) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt index a2a63d9168a..8272e40b65d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt @@ -46,12 +46,12 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options. val removeThisLabels: Boolean = false, val removeThis: Boolean = false ) { - class object { + default object { val DEFAULT = Options() } } - class object { + default object { val DEFAULT = ShortenReferences() private fun DeclarationDescriptor.asString() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt index 595199cfd3b..f5bdee1f94c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetPsiFactory public trait SimpleNameReferenceExtension { - class object { + default object { public val EP_NAME: ExtensionPointName = ExtensionPointName.create("org.jetbrains.kotlin.simpleNameReferenceExtension")!! } diff --git a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index f1b5b37929e..89f4275c450 100644 --- a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -21,7 +21,7 @@ public class CompilerSettings { public var copyJsLibraryFiles: Boolean = true public var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY - class object { + default object { private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" private val DEFAULT_OUTPUT_DIRECTORY = "lib" } diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt index b2f456b547b..ad3622c3684 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt @@ -154,7 +154,7 @@ public class JetAddImportAction( JBPopupFactory.getInstance().createListPopup(getImportSelectionPopup()).showInBestPositionFor(editor) } - class object { + default object { protected fun addImport(element: PsiElement, project: Project, selectedVariant: Variant) { PsiDocumentManager.getInstance(project).commitAllDocuments() diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt index 1c8bf39859d..d5950db844e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt @@ -73,7 +73,7 @@ public class KotlinReferenceData( } } - class object { + default object { public val dataFlavor: DataFlavor? by Delegates.lazy { try { DataFlavor(DataFlavor.javaJVMLocalObjectMimeType + ";class=" + javaClass().getName(), "KotlinReferenceData") diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt b/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt index c2e16abfa1a..d8d547fea5f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt @@ -52,7 +52,7 @@ public class DeclarationDescriptorLookupObject( return descriptorsEqualWithSubstitution(descriptor, lookupObject.descriptor) } - class object { + default object { private val LOG = Logger.getInstance("#" + javaClass().getName()) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt index 958a5b3b062..88bbad05ee7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetFunctionLiteral public class KotlinCompletionCharFilter() : CharFilter() { - class object { + default object { public val ACCEPT_OPENING_BRACE: Key = Key("KotlinCompletionCharFilter.ACCEPT_OPENNING_BRACE") public val JUST_TYPING_PREFIX: Key = Key("KotlinCompletionCharFilter.JUST_TYPING_PREFIX") diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/LeafElementFilter.kt b/idea/src/org/jetbrains/kotlin/idea/completion/LeafElementFilter.kt index fb55ed942d3..596052ca374 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/LeafElementFilter.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/LeafElementFilter.kt @@ -30,7 +30,7 @@ public class LeafElementFilter(private val elementType: IElementType) : ElementF override fun isClassAcceptable(hintClass: Class<*>) = LEAF_CLASS_FILTER.isClassAcceptable(hintClass) - class object { + default object { private val LEAF_CLASS_FILTER = ClassFilter(javaClass()) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt index 9d9da8d25f6..eb782e8191c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt @@ -255,7 +255,7 @@ public class LookupElementFactory( } } - class object { + default object { public fun getDefaultInsertHandler(descriptor: DeclarationDescriptor): InsertHandler { return when (descriptor) { is FunctionDescriptor -> { diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt index c86ef9779dc..837a05880c1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt @@ -217,7 +217,7 @@ public class KotlinFunctionInsertHandler(val caretPosition : CaretPosition, val return caretPosition == CaretPosition.IN_BRACKETS } - class object { + default object { public val NO_PARAMETERS_HANDLER: KotlinFunctionInsertHandler = KotlinFunctionInsertHandler(CaretPosition.AFTER_BRACKETS, null) public val WITH_PARAMETERS_HANDLER: KotlinFunctionInsertHandler = KotlinFunctionInsertHandler(CaretPosition.IN_BRACKETS, null) diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/WithTailInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/WithTailInsertHandler.kt index 777d550e1ed..41c952e7465 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/WithTailInsertHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/WithTailInsertHandler.kt @@ -85,7 +85,7 @@ class WithTailInsertHandler(val tailText: String, } } - class object { + default object { fun commaTail() = WithTailInsertHandler(",", spaceBefore = false, spaceAfter = true /*TODO: use code style option*/) fun rparenthTail() = WithTailInsertHandler(")", spaceBefore = false, spaceAfter = false) fun elseTail() = WithTailInsertHandler("else", spaceBefore = true, spaceAfter = true) diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt index 738d9efeeb5..474ad4d2544 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt @@ -473,7 +473,7 @@ class SmartCompletion( } } - class object { + default object { public val OLD_ARGUMENTS_REPLACEMENT_OFFSET: OffsetKey = OffsetKey.create("nonFunctionReplacementOffset") public val MULTIPLE_ARGUMENTS_REPLACEMENT_OFFSET: OffsetKey = OffsetKey.create("multipleArgumentsReplacementOffset") diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt index 2b935755f51..9a8cccc3340 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt @@ -104,7 +104,7 @@ fun LookupElement.addTailAndNameSimilarity(matchedExpectedInfos: Collection(), "class: ConvertJavaCopyPastePostProcessor") } } diff --git a/idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt b/idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt index db17335db0f..5d063ff39cf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt +++ b/idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt @@ -116,7 +116,7 @@ public class KotlinCoverageExtension(): JavaCoverageEngineExtension() { return false } - class object { + default object { private val LOG = Logger.getInstance(javaClass()) fun collectGeneratedClassQualifiedNames(outputRoot: VirtualFile?, file: JetFile): List? { diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt index 2db9f037303..2eef93c91cf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt @@ -218,7 +218,7 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Posi myTypeMappers.put(key, value) } - class object { + default object { public fun createTypeMapper(file: JetFile, moduleInfo: IdeaModuleInfo): JetTypeMapper { val project = file.getProject() val packageFacadeScope = moduleInfo.contentScope() diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt index 3c76c3a8839..6f9a252a715 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt @@ -34,7 +34,7 @@ public class KotlinDebuggerSettings : XDebuggerSettings( public var DEBUG_DISABLE_KOTLIN_INTERNAL_CLASSES: Boolean = true public var DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED: Boolean = false - class object { + default object { public fun getInstance(): KotlinDebuggerSettings { return XDebuggerUtil.getInstance()?.getDebuggerSettings(javaClass())!! } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt index bbfda77cd21..ef56ebe90a3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt @@ -52,7 +52,7 @@ class KotlinEditorTextProvider : EditorTextProvider { return Pair(expression, expression.getTextRange()) } - class object { + default object { fun findExpressionInner(element: PsiElement, allowMethodCalls: Boolean): JetExpression? { if (PsiTreeUtil.getParentOfType(element, javaClass(), javaClass(), javaClass()) != null) { return null diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt index d1c004033d7..daca5930d78 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt @@ -95,7 +95,7 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() { override fun getEvaluatorBuilder() = KotlinEvaluationBuilder - class object { + default object { fun getContextElement(elementAt: PsiElement?): PsiElement? { if (elementAt == null) return null diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt index a1a6d67830b..0a5f5c9ae49 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt @@ -40,7 +40,7 @@ class KotlinEvaluateExpressionCache(val project: Project) { MultiMap.create(), PsiModificationTracker.MODIFICATION_COUNT) }, false) - class object { + default object { private val LOG = Logger.getLogger(javaClass())!! fun getInstance(project: Project) = ServiceManager.getService(project, javaClass())!! diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt index ccc54ee75f0..59c9daf444d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -149,7 +149,7 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment, return null } - class object { + default object { private fun extractAndCompile(codeFragment: JetCodeFragment, sourcePosition: SourcePosition, context: EvaluationContextImpl): CompiledDataDescriptor { codeFragment.checkForErrors() diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt index c850c2c2fc3..cca0bf975e7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt @@ -80,7 +80,7 @@ public abstract class KotlinRuntimeTypeEvaluator( throw EvaluateExceptionUtil.createEvaluateException(DebuggerBundle.message("evaluation.error.surrounded.expression.null")) } - class object { + default object { private fun getCastableRuntimeType(project: Project, value: Value): JetType? { val myValue = value.asValue() var psiClass = myValue.asmType.getClassDescriptor(project) diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt index f8909810a7f..36b82362e2f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt @@ -36,7 +36,7 @@ import com.intellij.psi.tree.TokenSet import com.intellij.psi.PsiWhiteSpace public class KotlinEnterHandler: EnterHandlerDelegateAdapter() { - class object { + default object { private val LOG = Logger.getInstance(javaClass()) private val FORCE_INDENT_IN_LAMBDA_AFTER = TokenSet.create(JetTokens.ARROW, JetTokens.LBRACE) } diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinListSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinListSelectioner.kt index 58e2c2e9f70..9c57b7db249 100644 --- a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinListSelectioner.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinListSelectioner.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.lexer.JetTokens import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase public class KotlinListSelectioner : ExtendWordSelectionHandlerBase() { - class object { + default object { fun canSelect(e: PsiElement) = e is JetParameterList || e is JetValueArgumentList || e is JetTypeParameterList || e is JetTypeArgumentList } diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt index 4c3d1c4f527..09dfd4dcf44 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.JetIcons import org.jetbrains.kotlin.idea.project.TargetPlatform public class KotlinTemplatesFactory : ProjectTemplatesFactory() { - class object { + default object { public val KOTLIN_GROUP_NAME: String = "Kotlin" } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index 6cbbeaac531..9336ea0a435 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -72,7 +72,7 @@ import java.awt.GridBagLayout import javax.swing.JPanel public class UnusedSymbolInspection : AbstractKotlinInspection() { - class object { + default object { private val javaInspection = UnusedDeclarationInspection() public fun isEntryPoint(declaration: JetNamedDeclaration): Boolean { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt index 8cbae453018..0c7d9c4a790 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt @@ -64,7 +64,7 @@ import org.jetbrains.kotlin.idea.util.ShortenReferences public class ConvertFunctionToPropertyIntention : JetSelfTargetingIntention( "convert.function.to.property.intention", javaClass() ) { - class object { + default object { private var JetNamedFunction.typeFqNameToAdd: String? by UserDataProperty(Key.create("TYPE_FQ_NAME_TO_ADD")) } diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyAction.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyAction.kt index b100e5bb86d..dbeb44d1894 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyAction.kt @@ -37,7 +37,7 @@ public class ConvertToBlockBodyAction : PsiElementBaseIntentionAction() { convert(findDeclaration(element)!!) } - class object { + default object { fun convert(declaration: JetDeclarationWithBody): JetDeclarationWithBody { val body = declaration.getBodyExpression()!! diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt index b2180a220c2..f9df1a05490 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt @@ -59,7 +59,7 @@ public class InsertExplicitTypeArguments : JetSelfTargetingIntention( "remove.unnecessary.curly.brackets.from.string.template", javaClass()) { - class object { + default object { val INSTANCE = RemoveCurlyBracesFromTemplateIntention() val pattern = Pattern.compile("[a-zA-Z0-9_].*") } diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt index 642e0f47a1b..aff18cf42f9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt @@ -68,7 +68,7 @@ public class ReplaceItWithExplicitFunctionLiteralParamIntention() : PsiElementBa return JetBundle.message("replace.it.with.explicit.function.literal.param.family") } - class object { + default object { fun isAutoCreatedIt(simpleNameExpression: JetSimpleNameExpression): Boolean { if (simpleNameExpression.getReferencedName() != "it") { return false diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt index 05c19d773f7..68947b92aa4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions public class SwapBinaryExpression : JetSelfTargetingIntention( "swap.binary.expression", javaClass() ) { - class object { + default object { val SUPPORTED_OPERATIONS = setOf(PLUS, MUL, OROR, ANDAND, EQEQ, EXCLEQ, EQEQEQ, EXCLEQEQEQ, GT, LT, GTEQ, LTEQ) val SUPPORTED_OPERATION_NAMES = SUPPORTED_OPERATIONS.map { OperatorConventions.BINARY_OPERATION_NAMES[it]?.asString() }.toSet().filterNotNull() + diff --git a/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt b/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt index 43a9e1f08a2..83380cffe9b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt +++ b/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt @@ -40,7 +40,7 @@ import com.intellij.util.WaitForProgressToShow import com.intellij.openapi.application.ApplicationManager public class CreateIncrementalCompilationBackup: AnAction("Create backup for debugging Kotlin incremental compilation") { - class object { + default object { val BACKUP_DIR_NAME = ".backup" val PATCHES_TO_CREATE = 5 diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt index dc6123198f3..dc2de915eab 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt @@ -164,7 +164,7 @@ public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction) { assert(outputValues.size() <= 3, "At most 3 output values are supported") } - class object { + default object { private val selectors = array("first", "second", "third") } @@ -330,7 +330,7 @@ enum class ExtractionTarget(val name: String) { abstract fun isAvailable(descriptor: ExtractableCodeDescriptor): Boolean - class object { + default object { fun checkNotTrait(descriptor: ExtractableCodeDescriptor): Boolean { val parent = descriptor.extractionData.targetSibling.getStrictParentOfType() return !(parent is JetClass && parent.isTrait()) @@ -365,7 +365,7 @@ data class ExtractionGeneratorOptions( val target: ExtractionTarget = ExtractionTarget.FUNCTION, val flexibleTypesAllowed: Boolean = false ) { - class object { + default object { val DEFAULT = ExtractionGeneratorOptions() } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt index 6a8abf49abf..243e323cbf3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt @@ -49,7 +49,7 @@ data class ExtractionOptions( val extractAsProperty: Boolean = false, val allowSpecialClassNames: Boolean = false ) { - class object { + default object { val DEFAULT = ExtractionOptions() } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt index c137aaa474c..593d4c63c9d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt @@ -50,7 +50,7 @@ public open class ExtractionEngineHelper { continuation(ExtractionGeneratorConfiguration(descriptorWithConflicts.descriptor, ExtractionGeneratorOptions.DEFAULT)) } - class object { + default object { public val DEFAULT: ExtractionEngineHelper = ExtractionEngineHelper() } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index 32ad133f687..ffdab1e4e7e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -96,7 +96,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor( val project: Project, val options: MoveKotlinTopLevelDeclarationsOptions, val mover: Mover = Mover.Default) : BaseRefactoringProcessor(project) { - class object { + default object { private val LOG: Logger = Logger.getInstance(javaClass()) private val REFACTORING_NAME: String = JetRefactoringBundle.message("refactoring.move.top.level.declarations") diff --git a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt index 84e982162d3..52387c642b8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt @@ -132,7 +132,7 @@ public class JetPsiUnifier( parameters: Collection = Collections.emptySet(), val allowWeakMatches: Boolean = false ) { - class object { + default object { val DEFAULT = JetPsiUnifier() } diff --git a/idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt b/idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt index babfc90e9f6..1fa256326f7 100644 --- a/idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt +++ b/idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import com.intellij.find.findUsages.FindUsagesHandler public trait KotlinFindUsagesHandlerDecorator { - class object { + default object { public val EP_NAME: ExtensionPointName = ExtensionPointName.create("org.jetbrains.kotlin.findUsagesHandlerDecorator")!! } diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt index da3c1b209ac..73fecd8c699 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt @@ -25,7 +25,7 @@ import org.junit.Assert import junit.framework.AssertionFailedError public abstract class AbstractReferenceResolveInLibrarySourcesTest : JetLightCodeInsightFixtureTestCase() { - class object { + default object { private val REF_CARET_MARKER = "" } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt index 1510803ee31..e234a9dd6b6 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt @@ -57,7 +57,7 @@ class Converter private( public val specialContext: PsiElement? = personalState.specialContext - class object { + default object { public fun create(elementToConvert: PsiElement, settings: ConverterSettings, conversionScope: ConversionScope, referenceSearcher: ReferenceSearcher, resolverForConverter: ResolverForConverter, postProcessor: PostProcessor?, usageProcessingsCollector: (UsageProcessing) -> Unit): Converter { diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ConverterSettings.kt b/j2k/src/org/jetbrains/kotlin/j2k/ConverterSettings.kt index 5e1071fe213..4e3ce8824bc 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ConverterSettings.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ConverterSettings.kt @@ -23,7 +23,7 @@ public data class ConverterSettings( var openByDefault: Boolean ) { - class object { + default object { public val defaultSettings: ConverterSettings = ConverterSettings( forceNotNullTypes = true, specifyLocalVariableTypeByDefault = false, diff --git a/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt index cf3b5a1faf5..653f5712d33 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt @@ -94,7 +94,7 @@ object DocCommentConverter { private class HtmlToMarkdownConverter() : XmlRecursiveElementVisitor() { private enum class ListType { Ordered; Unordered } data class MarkdownSpan(val prefix: String, val suffix: String) { - class object { + default object { val Empty = MarkdownSpan("", "") fun wrap(text: String) = MarkdownSpan(text, text) diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt index 74fe63292e8..08cc7ff9fa7 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt @@ -489,7 +489,7 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter { return "" } - class object { + default object { private val needQualifierNameSet = setOf("java.lang.Byte", "java.lang.Double", "java.lang.Float", "java.lang.Long", "java.lang.Short") } } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt index 81616c7fd7f..ace0b52d77c 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt @@ -410,7 +410,7 @@ class TypeConverter(val converter: Converter) { } } - class object { + default object { private val boxingTypes: Set = setOf( CommonClassNames.JAVA_LANG_BYTE, CommonClassNames.JAVA_LANG_CHARACTER, diff --git a/j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt b/j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt index bd336a26358..509184c1a34 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt @@ -115,7 +115,7 @@ class TypeVisitor( return VarArgType(typeConverter.convertType(ellipsisType.getComponentType())) } - class object { + default object { private val toKotlinTypesMap: Map = mapOf( CommonClassNames.JAVA_LANG_OBJECT to "kotlin.Any", CommonClassNames.JAVA_LANG_BYTE to "kotlin.Byte", diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt index a932e537ec0..cb60142c430 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt @@ -64,7 +64,7 @@ class Annotations(val annotations: List) : Element() { fun plus(other: Annotations) = Annotations(annotations + other.annotations).assignNoPrototype() - class object { + default object { val Empty = Annotations(listOf()) } } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Block.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Block.kt index 6eda4e4277f..38b8fe26344 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Block.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Block.kt @@ -31,7 +31,7 @@ class Block(val statements: List, val lBrace: LBrace, val rBrace: RBr builder.append(lBrace).append(statements, "\n", "\n", "\n").append(rBrace) } - class object { + default object { val Empty = Block(listOf(), LBrace(), RBrace()) } } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt index 5faf82dfddc..7e2a9f3ae34 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt @@ -88,7 +88,7 @@ abstract class Element { override val isEmpty: Boolean get() = true } - class object { + default object { var saveCreationStacktraces = false } } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Identifier.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Identifier.kt index d3ed47069b6..fcfa3894d4f 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Identifier.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Identifier.kt @@ -51,7 +51,7 @@ class Identifier( override fun toString() = if (isNullable) "$name?" else name - class object { + default object { val Empty = Identifier("") private val KEYWORDS = JetTokens.KEYWORDS.getTypes().map { (it as JetKeywordToken).getValue() }.toSet() diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/MethodCallExpression.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/MethodCallExpression.kt index b57bffbafad..b2b5f664e95 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/MethodCallExpression.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/MethodCallExpression.kt @@ -36,7 +36,7 @@ class MethodCallExpression( } } - class object { + default object { public fun buildNotNull(receiver: Expression?, methodName: String, arguments: List = listOf(), diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt index 16ce9361a57..bbc26bb797a 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt @@ -59,7 +59,7 @@ class Modifiers(modifiers: Collection) : Element() { fun accessModifier(): Modifier? = modifiers.firstOrNull { it in ACCESS_MODIFIERS } - class object { + default object { val Empty = Modifiers(listOf()) } } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt index d7ee697bc9d..d254ff5257b 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt @@ -54,7 +54,7 @@ class TypeParameterList(val parameters: List) : Element() { private fun hasWhere(): Boolean = parameters.any { it.hasWhere() } - class object { + default object { val Empty = TypeParameterList(listOf()) } } diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 6266658a7fa..fcd05b867a6 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -70,7 +70,7 @@ import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { - class object { + default object { public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" private val LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession") diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 953d3f8a2a4..123058f6aa5 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -55,7 +55,7 @@ private val CACHE_DIRECTORY_NAME = "kotlin" class CacheFormatVersion(targetDataRoot: File) { - class object { + default object { // Change this when incremental cache format changes private val INCREMENTAL_CACHE_OWN_VERSION = 2 private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION @@ -82,7 +82,7 @@ class CacheFormatVersion(targetDataRoot: File) { } public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, IncrementalCache { - class object { + default object { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" val INLINE_FUNCTIONS = "inline-functions.tab" diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index 202f0ce01fa..a57a9c1902b 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -29,7 +29,7 @@ class LocalFileKotlinClass private( innerClasses: FileBasedKotlinClass.InnerClassesInfo ) : FileBasedKotlinClass(className, classHeader, innerClasses) { - class object { + default object { fun create(file: File): LocalFileKotlinClass? { val fileContents = file.readBytes() return FileBasedKotlinClass.create(fileContents) { diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 61f75320692..f9620793a9a 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -51,7 +51,7 @@ import org.jetbrains.jps.api.CanceledStatus import org.jetbrains.jps.builders.java.dependencyView.Callbacks public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { - class object { + default object { val COMPILATION_FAILED = "COMPILATION FAILED" // change to "/tmp" or anything when default is too long (for easier debugging) diff --git a/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 7652295c2f9..495ade9943c 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.utils.PathUtil * with a "newer" version in sources, and check that this class resolves to the one from sources by calling a method absent in the runtime */ public class ClasspathOrderTest : TestCaseWithTmpdir() { - class object { + default object { val sourceDir = File(JetTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile() } diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt index 59cd3ccec16..f407e8a4342 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt @@ -80,7 +80,7 @@ public class JsFunctionScope(parent: JsScope, description: String) : JsScope(par || getParent()?.hasOwnName(name) ?: false } - class object { + default object { public val RESERVED_WORDS: Set = setOf( // keywords "await", "break", "case", "catch", "continue", "debugger", "default", "delete", "do", "else", "finally", "for", "function", "if", diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt index 0294226b61c..0252530f8fa 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt @@ -28,7 +28,7 @@ public enum class PredefinedAnnotation(fqName: String) { public val fqName: FqName = FqName(fqName) - class object { + default object { // TODO: replace with straight assignment when KT-5761 will be fixed val WITH_CUSTOM_NAME by Delegates.lazy { setOf(LIBRARY, NATIVE) } } diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt index bd97068d04c..dce697c5517 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt @@ -28,7 +28,7 @@ public class JsAnalysisResult( moduleDescriptor: ModuleDescriptor ) : AnalysisResult(bindingTrace.getBindingContext(), moduleDescriptor) { - class object { + default object { platformStatic public fun success(trace: BindingTrace, module: ModuleDescriptor): JsAnalysisResult { return JsAnalysisResult(trace, module) } diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt index 3cfc0adce75..d2d198707da 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt @@ -50,7 +50,7 @@ import org.jetbrains.kotlin.resolve.TemporaryBindingTrace public class JsCallChecker : CallChecker { - class object { + default object { private val JS_PATTERN: DescriptorPredicate = PatternBuilder.pattern("kotlin.js.js(String)") platformStatic diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt index ccf15875156..94ec36cbbc8 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/InlineMetadata.kt @@ -31,7 +31,7 @@ public class InlineMetadata( val function: JsFunction, val endTag: JsStringLiteral ) { - class object { + default object { platformStatic fun compose(function: JsFunction, descriptor: CallableDescriptor): InlineMetadata { val program = function.getScope().getProgram() diff --git a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt index 33994a2b3f4..7295b695582 100644 --- a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt +++ b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt @@ -61,7 +61,7 @@ public object AndroidConfigurationKeys { } public class AndroidCommandLineProcessor : CommandLineProcessor { - class object { + default object { public val ANDROID_COMPILER_PLUGIN_ID: String = "org.jetbrains.kotlin.android" public val RESOURCE_PATH_OPTION: CliOption = CliOption("androidRes", "", "Android resources path") @@ -89,7 +89,7 @@ public class CliAndroidDeclarationsProvider(private val project: Project) : Exte } public class AndroidExpressionCodegen : ExpressionCodegenExtension { - class object { + default object { private val PROPERTY_NAME = "_\$_findViewCache" private val METHOD_NAME = "_\$_findCachedViewById" }