From eb7114bd5378c39b71781fe057fd16cfaa2e1a03 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 10 Jun 2015 12:45:27 +0300 Subject: [PATCH] Add 'constructor' keyword in whole project where needed --- .../codegen/intrinsics/MonitorInstruction.kt | 2 +- .../cli/jvm/compiler/KotlinCoreEnvironment.kt | 2 +- .../load/kotlin/VirtualFileKotlinClass.kt | 2 +- .../instructions/eval/accessInstructions.kt | 4 ++-- .../eval/operationInstructions.kt | 6 ++--- .../kotlin/resolve/CompositeBindingContext.kt | 2 +- .../evaluate/ConstantExpressionEvaluator.kt | 2 +- ...leBasedPackageMemberDeclarationProvider.kt | 2 +- .../descriptors/AbstractLazyMemberScope.kt | 6 +++-- .../descriptors/LazyScriptClassMemberScope.kt | 2 +- .../kotlin/util/MappedExtensionProvider.kt | 6 ++++- .../asJava/KotlinLightClassForPackage.kt | 2 +- .../org/jetbrains/kotlin/config/Services.kt | 2 +- .../kotlin/load/kotlin/MemberSignature.kt | 2 +- .../load/kotlin/reflect/ReflectKotlinClass.kt | 2 +- .../load/kotlin/reflect/RuntimeModuleData.kt | 2 +- .../descriptors/DeserializedMemberScope.kt | 2 +- .../jvm/internal/DescriptorBasedProperty.kt | 2 +- .../kotlin/resolve/lazy/ElementResolver.kt | 2 +- .../idea/configuration/ModuleTypeCache.kt | 2 +- ...etTopLevelExtensionsByReceiverTypeIndex.kt | 2 +- .../kotlin/idea/completion/smart/Utils.kt | 6 ++++- .../idea/conversion/copy/DataForConversion.kt | 2 +- .../quickfix/JetWholeProjectModalAction.kt | 2 +- .../kotlin/idea/quickfix/ReplaceCallFix.kt | 2 +- .../KotlinIntroduceParameterDialog.kt | 2 +- j2k/src/org/jetbrains/kotlin/j2k/Converter.kt | 2 +- .../jps/incremental/LocalFileKotlinClass.kt | 2 +- .../kotlin/js/inline/ExpressionDecomposer.kt | 2 +- .../kotlin/js/inline/FunctionInlineMutator.kt | 6 ++++- .../kotlin/js/facade/TranslationResult.kt | 2 +- .../reference/CallArgumentTranslator.kt | 2 +- .../stdlib/src/kotlin/collections/Sequence.kt | 22 +++++++++---------- .../stdlib/src/kotlin/text/regex/RegexJVM.kt | 2 +- 34 files changed, 62 insertions(+), 48 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.kt index 2414c898c6e..8e655b60df3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.kt @@ -23,7 +23,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter -public class MonitorInstruction private (private val opcode: Int) : IntrinsicMethod() { +public class MonitorInstruction private constructor(private val opcode: Int) : IntrinsicMethod() { companion object { public val MONITOR_ENTER: MonitorInstruction = MonitorInstruction(Opcodes.MONITORENTER) public val MONITOR_EXIT: MonitorInstruction = MonitorInstruction(Opcodes.MONITOREXIT) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index d3384797a7f..5f78fdf1f86 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -90,7 +90,7 @@ import java.util.Comparator import kotlin.platform.platformStatic import kotlin.properties.Delegates -public class KotlinCoreEnvironment private( +public class KotlinCoreEnvironment private constructor( parentDisposable: Disposable, applicationEnvironment: JavaCoreApplicationEnvironment, configuration: CompilerConfiguration 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 be8195dc15a..ea3226f0f8a 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 @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.utils.rethrow import java.io.FileNotFoundException import java.io.IOException -public class VirtualFileKotlinClass private( +public class VirtualFileKotlinClass private constructor( public val file: VirtualFile, className: ClassId, classHeader: KotlinClassHeader, 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 1e25f3be7e2..db5d57a1c1b 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 @@ -35,14 +35,14 @@ public trait AccessTarget { public object BlackBox: AccessTarget } -public abstract class AccessValueInstruction protected ( +public abstract class AccessValueInstruction protected constructor( element: JetElement, lexicalScope: LexicalScope, public val target: AccessTarget, override val receiverValues: Map ) : InstructionWithNext(element, lexicalScope), InstructionWithReceivers -public class ReadValueInstruction private ( +public class ReadValueInstruction private constructor( element: JetElement, lexicalScope: LexicalScope, target: AccessTarget, 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 5b98ad46e4a..79e834e0443 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 @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate -public abstract class OperationInstruction protected( +public abstract class OperationInstruction protected constructor( element: JetElement, lexicalScope: LexicalScope, override val inputValues: List @@ -58,7 +58,7 @@ trait StrictlyValuedOperationInstruction: OperationInstruction { get() = resultValue!! } -public class CallInstruction private( +public class CallInstruction private constructor( element: JetElement, lexicalScope: LexicalScope, val resolvedCall: ResolvedCall<*>, @@ -152,7 +152,7 @@ public enum class MagicKind(val sideEffectFree: Boolean = false) { } // Merges values produced by alternative control-flow paths (such as 'if' branches) -class MergeInstruction private( +class MergeInstruction private constructor( element: JetElement, lexicalScope: LexicalScope, inputValues: List diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt index 155c823c775..3470b40b4e4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.types.JetType -public class CompositeBindingContext private ( +public class CompositeBindingContext private constructor( private val delegates: List ) : BindingContext { override fun getType(expression: JetExpression): JetType? { 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 d2caa382bd7..a5e4178acd9 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 @@ -39,7 +39,7 @@ 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>() { +public class ConstantExpressionEvaluator private constructor(val trace: BindingTrace) : JetVisitor, JetType>() { companion object { platformStatic public fun evaluate(expression: JetExpression, trace: BindingTrace, expectedType: JetType? = TypeUtils.NO_EXPECTED_TYPE): CompileTimeConstant<*>? { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt index 62d92360602..e2b899946bf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.storage.StorageManager -public class FileBasedPackageMemberDeclarationProvider internal( +public class FileBasedPackageMemberDeclarationProvider internal constructor( storageManager: StorageManager, private val fqName: FqName, private val factory: FileBasedDeclarationProviderFactory, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index b98188e1477..976be2eabbc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -36,11 +36,13 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.LazyClassContext -public abstract class AbstractLazyMemberScope protected( +public abstract class AbstractLazyMemberScope +protected constructor( protected val c: LazyClassContext, protected val declarationProvider: DP, protected val thisDescriptor: D, - protected val trace: BindingTrace) : JetScope { + protected val trace: BindingTrace +) : JetScope { protected val storageManager: StorageManager = c.storageManager private val classDescriptors: MemoizedFunctionToNotNull> = storageManager.createMemoizedFunction { resolveClassDescriptor(it) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt index 3970448fbe2..00eb512b7f3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt @@ -31,7 +31,7 @@ import java.util.Collections import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl // SCRIPT: Members of a script class -public class LazyScriptClassMemberScope protected( +public class LazyScriptClassMemberScope protected constructor( private val resolveSession: ResolveSession, declarationProvider: ClassMemberDeclarationProvider, thisClass: LazyClassDescriptor, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt index 1680eaec558..7cb1cfb51d8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/MappedExtensionProvider.kt @@ -22,7 +22,11 @@ import com.intellij.openapi.extensions.ExtensionPointName import java.lang.ref.WeakReference import kotlin.platform.platformStatic -public open class MappedExtensionProvider protected (private val epName: ExtensionPointName, private val map: (List) -> R) { +public open class MappedExtensionProvider +protected constructor( + private val epName: ExtensionPointName, + private val map: (List) -> R +) { private var cached = WeakReference>(null) public fun get(): R { 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 2cb3958c093..1313aac6f6d 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.JetFile import javax.swing.* import org.jetbrains.kotlin.psi.JetClassOrObject -public class KotlinLightClassForPackage private( +public class KotlinLightClassForPackage private constructor( manager: PsiManager, private val packageFqName: FqName, private val searchScope: GlobalSearchScope, diff --git a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt index 9af4a3152ae..70976807196 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.config import java.util.HashMap -public class Services private(private val map: Map, Any>) { +public class Services private constructor(private val map: Map, Any>) { companion 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 24e8c7e06ef..52f9052b313 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 @@ -21,7 +21,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) { +data class MemberSignature private constructor(private val signature: String) { companion object { platformStatic public fun fromMethodNameAndDesc(nameAndDesc: String): MemberSignature { return MemberSignature(nameAndDesc) diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt index a648ee33cda..cb5afe6dace 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt @@ -39,7 +39,7 @@ private val TYPES_ELIGIBLE_FOR_SIMPLE_VISIT = setOf( javaClass>(), javaClass() ) -public class ReflectKotlinClass private( +public class ReflectKotlinClass private constructor( private val klass: Class<*>, private val classHeader: KotlinClassHeader ) : KotlinJvmBinaryClass { diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt index d80a656d1fa..9e902dc67eb 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.serialization.deserialization.LocalClassResolver import org.jetbrains.kotlin.storage.LockBasedStorageManager -public class RuntimeModuleData private(private val injector: InjectorForRuntimeDescriptorLoader) { +public class RuntimeModuleData private constructor(private val injector: InjectorForRuntimeDescriptorLoader) { public val module: ModuleDescriptor get() = injector.getModuleDescriptor() public val localClassResolver: LocalClassResolver get() = injector.getDeserializationComponentsForJava().components.localClassResolver diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt index fa2fdf48a6a..688aee37174 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext import java.util.* -public abstract class DeserializedMemberScope protected( +public abstract class DeserializedMemberScope protected constructor( protected val c: DeserializationContext, membersList: Collection ) : JetScope { diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/DescriptorBasedProperty.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/DescriptorBasedProperty.kt index f624b4d7f99..67593fce130 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/DescriptorBasedProperty.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/DescriptorBasedProperty.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf import java.lang.reflect.Field import java.lang.reflect.Method -abstract class DescriptorBasedProperty private( +abstract class DescriptorBasedProperty private constructor( container: KCallableContainerImpl, name: String, receiverParameterDesc: String?, diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt index 0a90ee66234..a6759c51444 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull -public abstract class ElementResolver protected( +public abstract class ElementResolver protected constructor( public val resolveSession: ResolveSession ) { 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 861f295684e..770c29e7eea 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 @@ -31,7 +31,7 @@ import com.intellij.openapi.vfs.VirtualFilePropertyEvent import com.intellij.openapi.util.SimpleModificationTracker import kotlin.platform.platformStatic -class ModuleTypeCacheManager private (project: Project) { +class ModuleTypeCacheManager private constructor(project: Project) { companion object { platformStatic fun getInstance(project: Project) = ServiceManager.getService(project, javaClass()) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelExtensionsByReceiverTypeIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelExtensionsByReceiverTypeIndex.kt index 6799eea11fa..27d46061d80 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelExtensionsByReceiverTypeIndex.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelExtensionsByReceiverTypeIndex.kt @@ -22,7 +22,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension import com.intellij.psi.stubs.StubIndexKey import org.jetbrains.kotlin.psi.JetCallableDeclaration -public class JetTopLevelExtensionsByReceiverTypeIndex private() : StringStubIndexExtension() { +public class JetTopLevelExtensionsByReceiverTypeIndex private constructor() : StringStubIndexExtension() { override fun getKey() = KEY diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt index 00087b11dac..2dd8fac6a4f 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt @@ -115,7 +115,11 @@ fun LookupElement.addTailAndNameSimilarity( return lookupElement } -class ExpectedInfoClassification private(val substitutor: TypeSubstitutor?, val makeNotNullable: Boolean) { +class ExpectedInfoClassification +private constructor( + val substitutor: TypeSubstitutor?, + val makeNotNullable: Boolean +) { companion object { val notMatches = ExpectedInfoClassification(null, false) fun matches(substitutor: TypeSubstitutor) = ExpectedInfoClassification(substitutor, false) diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/DataForConversion.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/DataForConversion.kt index 2e69c170aa4..0fd90b94a5d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/DataForConversion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/DataForConversion.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.psi.psiUtil.* import java.util.ArrayList -data class DataForConversion private( +data class DataForConversion private constructor( val elementsAndTexts: Collection /* list consisting of PsiElement's to convert and plain String's */, val importsAndPackage: String ) { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt index a9970c226de..66b1ab0c2ac 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt @@ -112,7 +112,7 @@ public abstract class JetWholeProjectModalByCollectionAction(modalT abstract fun collectTasksForFile(project: Project, file: JetFile, accumulator: MutableCollection) } -class JetWholeProjectForEachElementOfTypeFix private ( +class JetWholeProjectForEachElementOfTypeFix private constructor( private val collectingVisitorFactory: (MutableCollection) -> JetVisitorVoid, private val tasksProcessor: (Collection) -> Unit, private val name: String, diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.kt index 9f166884ff4..57b82c0def6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.idea.JetBundle import org.jetbrains.kotlin.psi.* -public abstract class ReplaceCallFix protected (val psiElement: PsiElement) : IntentionAction { +public abstract class ReplaceCallFix protected constructor(val psiElement: PsiElement) : IntentionAction { override fun getFamilyName(): String = getText() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt index 154e75cbfe9..69b6d26ea27 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterDialog.kt @@ -46,7 +46,7 @@ import javax.swing.JComponent import javax.swing.JLabel import javax.swing.JPanel -public class KotlinIntroduceParameterDialog private ( +public class KotlinIntroduceParameterDialog private constructor( project: Project, val editor: Editor, val descriptor: IntroduceParameterDescriptor, diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt index ff6f88539f5..33652d8e338 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions.* import java.util.ArrayList import java.util.HashMap -class Converter private( +class Converter private constructor( private val elementToConvert: PsiElement, val settings: ConverterSettings, val inConversionScope: (PsiElement) -> Boolean, 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 2665cd67063..038d44dce2b 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.name.ClassId import java.io.File -class LocalFileKotlinClass private( +class LocalFileKotlinClass private constructor( private val file: File, private val fileContents: ByteArray, className: ClassId, diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt index 279c7c4dde2..c32c8037caf 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt @@ -50,7 +50,7 @@ import org.jetbrains.kotlin.js.translate.context.Namer * It's desirable to create temporary var only if node can have side effect, * and precedes inline call (in JavaScript evaluation order). */ -class ExpressionDecomposer private ( +class ExpressionDecomposer private constructor( private val scope: JsScope, private val containsExtractable: Set, private val containsNodeWithSideEffect: Set diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt index aee884d8712..23504491288 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt @@ -29,7 +29,11 @@ import org.jetbrains.kotlin.js.translate.utils.jsAstUtils.* import kotlin.platform.platformStatic -class FunctionInlineMutator private (private val call: JsInvocation, private val inliningContext: InliningContext) { +class FunctionInlineMutator +private constructor( + private val call: JsInvocation, + private val inliningContext: InliningContext +) { private val invokedFunction: JsFunction private val isResultNeeded: Boolean private val namingContext: NamingContext diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt b/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt index 36b3718b398..ea12b79bd33 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationResult.kt @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.utils.fileUtils.readTextOrEmpty import java.io.File import java.util.ArrayList -public abstract class TranslationResult protected (public val diagnostics: Diagnostics) { +public abstract class TranslationResult protected constructor(public val diagnostics: Diagnostics) { public class Fail(diagnostics: Diagnostics) : TranslationResult(diagnostics) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt index 68463032558..35932a4f309 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.kt @@ -38,7 +38,7 @@ import java.util.ArrayList import java.util.Collections import kotlin.platform.platformStatic -public class CallArgumentTranslator private ( +public class CallArgumentTranslator private constructor( private val resolvedCall: ResolvedCall<*>, private val receiver: JsExpression?, context: TranslationContext diff --git a/libraries/stdlib/src/kotlin/collections/Sequence.kt b/libraries/stdlib/src/kotlin/collections/Sequence.kt index 0cd77f967fa..9ca2c35c5ce 100644 --- a/libraries/stdlib/src/kotlin/collections/Sequence.kt +++ b/libraries/stdlib/src/kotlin/collections/Sequence.kt @@ -141,7 +141,7 @@ public class TransformingStream(stream: Stream, transformer: (T) -> R) deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.map() instead.") public class TransformingSequence deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.map(transformer)")) -(private val sequence: Sequence, private val transformer: (T) -> R) : Sequence { +constructor(private val sequence: Sequence, private val transformer: (T) -> R) : Sequence { override fun iterator(): Iterator = object : Iterator { val iterator = sequence.iterator() override fun next(): R { @@ -166,7 +166,7 @@ public class TransformingIndexedStream(stream: Stream, transformer: (In deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.mapIndexed() instead.") public class TransformingIndexedSequence deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.mapIndexed(transformer)")) -(private val sequence: Sequence, private val transformer: (Int, T) -> R) : Sequence { +constructor(private val sequence: Sequence, private val transformer: (Int, T) -> R) : Sequence { override fun iterator(): Iterator = object : Iterator { val iterator = sequence.iterator() var index = 0 @@ -191,7 +191,7 @@ public class IndexingStream(stream: Stream) deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.withIndex() instead.") public class IndexingSequence deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.withIndex()")) -(private val sequence: Sequence) : Sequence> { +constructor(private val sequence: Sequence) : Sequence> { override fun iterator(): Iterator> = object : Iterator> { val iterator = sequence.iterator() var index = 0 @@ -217,7 +217,7 @@ public class MergingStream(stream1: Stream, stream2: Stream, deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.merge() instead.") public class MergingSequence deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence1.merge(sequence2, transform)")) - (private val sequence1: Sequence, + constructor(private val sequence1: Sequence, private val sequence2: Sequence, private val transform: (T1, T2) -> V ) : Sequence { @@ -241,7 +241,7 @@ public class FlatteningStream(stream: Stream, transformer: (T) -> Strea deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.flatMap() instead.") public class FlatteningSequence deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.flatMap(transformer)")) - (private val sequence: Sequence, + constructor(private val sequence: Sequence, private val transformer: (T) -> Sequence ) : Sequence { override fun iterator(): Iterator = object : Iterator { @@ -286,7 +286,7 @@ public class Multistream(stream: Stream>) deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.flatten() instead.") public class MultiSequence deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.flatten()")) -(private val sequence: Sequence>) : Sequence { +constructor(private val sequence: Sequence>) : Sequence { override fun iterator(): Iterator = object : Iterator { val iterator = sequence.iterator() var itemIterator: Iterator? = null @@ -333,7 +333,7 @@ public class TakeStream(stream: Stream, count: Int) deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.take() instead.") public class TakeSequence deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.take(count)")) - (private val sequence: Sequence, + constructor(private val sequence: Sequence, private val count: Int ) : Sequence { init { @@ -367,7 +367,7 @@ public class TakeWhileStream(stream: Stream, predicate: (T) -> Boolean) : deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.takeWhile() instead.") public class TakeWhileSequence deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.takeWhile(predicate)")) - (private val sequence: Sequence, + constructor(private val sequence: Sequence, private val predicate: (T) -> Boolean ) : Sequence { override fun iterator(): Iterator = object : Iterator { @@ -419,7 +419,7 @@ public class DropStream(stream: Stream, count: Int) deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.drop() instead.") public class DropSequence deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.drop(count)")) - (private val sequence: Sequence, + constructor(private val sequence: Sequence, private val count: Int ) : Sequence { init { @@ -460,7 +460,7 @@ public class DropWhileStream(stream: Stream, predicate: (T) -> Boolean) : deprecated("This class is an implementation detail and shall be made internal soon. Use sequence.dropWhile() instead.") public class DropWhileSequence deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence.dropWhile(predicate)")) - (private val sequence: Sequence, + constructor(private val sequence: Sequence, private val predicate: (T) -> Boolean ) : Sequence { @@ -535,7 +535,7 @@ private class DistinctIterator(private val source : Iterator, private v deprecated("This class is an implementation detail and shall be made internal soon. Use function sequence(nextFunction: () -> T?) instead.") public class FunctionSequence deprecated("This class is an implementation detail and shall be made internal soon.", ReplaceWith("sequence(producer)")) -(private val producer: () -> T?) : Sequence { +constructor(private val producer: () -> T?) : Sequence { override fun iterator(): Iterator = object : Iterator { var nextState: Int = -1 // -1 for unknown, 0 for done, 1 for continue var nextItem: T? = null diff --git a/libraries/stdlib/src/kotlin/text/regex/RegexJVM.kt b/libraries/stdlib/src/kotlin/text/regex/RegexJVM.kt index 594aaa23a48..6b0f1304b47 100644 --- a/libraries/stdlib/src/kotlin/text/regex/RegexJVM.kt +++ b/libraries/stdlib/src/kotlin/text/regex/RegexJVM.kt @@ -88,7 +88,7 @@ public data class MatchGroup(public val value: String, public val range: IntRang * * For pattern syntax reference see [java.util.regex.Pattern] */ -public class Regex internal (private val nativePattern: Pattern) { +public class Regex internal constructor(private val nativePattern: Pattern) { /** Creates a regular expression from the specified [pattern] string and the default options. */