From a4018d9eae9860b28559bc5a365c3452bade9d29 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 31 Mar 2015 12:22:34 +0300 Subject: [PATCH] Run "Add 'init' keyword in whole project" quickfix --- .../codegen/inline/CoveringTryCatchNodeProcessor.kt | 2 +- .../src/org/jetbrains/kotlin/codegen/inline/SMAP.kt | 5 +++-- .../incremental/IncrementalPackageFragmentProvider.kt | 2 +- .../special/VariableDeclarationInstruction.kt | 2 +- .../src/org/jetbrains/kotlin/psi/JetCodeFragment.kt | 4 ++-- .../src/org/jetbrains/kotlin/psi/JetPsiFactory.kt | 2 +- .../kotlin/psi/stubs/impl/KotlinFunctionStubImpl.kt | 2 +- .../kotlin/psi/stubs/impl/KotlinPropertyStubImpl.kt | 2 +- .../jetbrains/kotlin/psi/stubs/impl/ModifierMaskUtils.kt | 2 +- .../kotlin/resolve/MutablePackageFragmentProvider.kt | 2 +- .../resolve/calls/util/FakeCallableDescriptorForObject.kt | 2 +- .../kotlin/resolve/lazy/descriptors/LazyAnnotations.kt | 2 +- .../resolve/lazy/descriptors/LazyScriptDescriptor.kt | 2 +- .../jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt | 2 +- .../jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt | 2 +- .../jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt | 2 +- .../jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt | 2 +- .../resolve/constraintSystem/ConstraintSystemTestData.kt | 2 +- .../util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt | 4 ++-- .../load/java/lazy/descriptors/LazyJavaClassDescriptor.kt | 4 ++-- .../load/kotlin/DeserializationComponentsForJava.kt | 4 ++-- .../kotlin/load/kotlin/header/KotlinClassHeader.kt | 4 ++-- .../kotlin/descriptors/impl/ModuleDescriptorImpl.kt | 2 +- .../resolve/calls/inference/CapturedTypeConstructor.kt | 2 +- .../src/org/jetbrains/kotlin/types/flexibleTypes.kt | 2 +- .../src/org/jetbrains/kotlin/idea/util/FuzzyType.kt | 2 +- .../kotlin/resolve/lazy/PartialBodyResolveFilter.kt | 4 ++-- .../idea/caches/resolve/LibraryDependenciesCache.kt | 5 +++-- .../idea/caches/resolve/LibraryModificationTracker.kt | 2 +- .../kotlin/idea/configuration/ModuleTypeCache.kt | 2 +- .../decompiler/textBuilder/DeserializerForDecompiler.kt | 2 +- .../idea/decompiler/textBuilder/missingDependencies.kt | 2 +- .../highlighter/KotlinSuppressableWarningProblemGroup.kt | 2 +- .../search/declarationsSearch/declarationSearchUtil.kt | 2 +- .../kotlin/idea/search/usagesSearch/usagesSearch.kt | 2 +- .../kotlin/idea/stubindex/SubpackagesIndexService.kt | 4 ++-- .../org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt | 2 +- .../jetbrains/kotlin/idea/completion/CompletionSession.kt | 4 ++-- .../jetbrains/kotlin/idea/completion/CompletionSorting.kt | 2 +- .../kotlin/idea/completion/HeuristicSignatures.kt | 2 +- .../jetbrains/kotlin/idea/completion/KeywordCompletion.kt | 2 +- .../kotlin/idea/completion/KotlinCompletionContributor.kt | 2 +- .../kotlin/idea/completion/ToFromOriginalFileMapper.kt | 3 ++- .../completion/handlers/KotlinCallableInsertHandler.kt | 2 +- .../kotlin/idea/editor/KotlinSmartEnterHandler.kt | 2 +- .../findUsages/handlers/KotlinFindClassUsagesHandler.kt | 2 +- .../hierarchy/overrides/KotlinOverrideTreeStructure.kt | 4 ++-- .../ErrorDuringFileAnalyzeNotificationProvider.kt | 2 +- .../kotlin/idea/imports/KotlinImportOptimizer.kt | 2 +- .../kotlin/idea/kdoc/KDocCompletionContributor.kt | 2 +- .../createFromUsage/callableBuilder/CallableBuilder.kt | 8 ++++---- .../callableBuilder/templateExpressions.kt | 2 +- .../refactoring/changeSignature/JetChangeSignatureData.kt | 2 +- .../idea/refactoring/introduce/AbstractIntroduceAction.kt | 2 +- .../extractionEngine/ExtractableCodeDescriptor.kt | 2 +- .../introduceProperty/KotlinInplacePropertyIntroducer.kt | 2 +- .../org/jetbrains/kotlin/idea/util/DialogWithEditor.kt | 2 +- .../kotlin/idea/refactoring/InplaceRenameTest.kt | 2 +- j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt | 2 +- j2k/src/org/jetbrains/kotlin/j2k/ast/Expressions.kt | 2 +- .../com/google/dart/compiler/backend/js/ast/jsScopes.kt | 2 +- .../src/org/jetbrains/kotlin/js/inline/FunctionReader.kt | 4 ++-- .../js/translate/declaration/DelegationTranslator.kt | 4 ++-- .../functions/factories/NumberAndCharConversionFIF.kt | 2 +- .../kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt | 4 ++-- 65 files changed, 85 insertions(+), 82 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt index 79e4fc658ca..30219e7cf90 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/CoveringTryCatchNodeProcessor.kt @@ -115,7 +115,7 @@ public abstract class CoveringTryCatchNodeProcessor() { public class DefaultProcessor(val node: MethodNode) : CoveringTryCatchNodeProcessor() { - { + init { node.tryCatchBlocks.forEach { addNode(it) } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt index 2ddb23f7b80..43349267ed0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt @@ -194,8 +194,9 @@ public open class DefaultSourceMapper(val sourceInfo: SourceInfo, override val p var fileMappings: LinkedHashMap = linkedMapOf() - protected var origin: RawFileMapping by Delegates.notNull(); - { + protected var origin: RawFileMapping by Delegates.notNull() + + init { visitSource(sourceInfo.source, sourceInfo.pathOrCleanFQN) //map interval (1..maxUsedValue).forEach {origin.mapLine(it, it - 1, true) } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt index 717a31ec2a5..80c28183333 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt @@ -52,7 +52,7 @@ public class IncrementalPackageFragmentProvider( val fqNameToPackageFragment = HashMap() val fqNamesToLoad: Set - ;{ + init { fun createPackageFragment(fqName: FqName) { if (fqNameToPackageFragment.containsKey(fqName)) { return diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt index efd98fc78a2..8d0a485665d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/special/VariableDeclarationInstruction.kt @@ -29,7 +29,7 @@ public class VariableDeclarationInstruction( element: JetDeclaration, lexicalScope: LexicalScope ) : InstructionWithNext(element, lexicalScope) { - { + init { assert(element is JetVariableDeclaration || element is JetParameter) { "Invalid element: ${render(element)}}" } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt index 6442232bbbe..348e07ce078 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt @@ -41,9 +41,9 @@ public abstract class JetCodeFragment( ): JetFile((PsiManager.getInstance(_project) as PsiManagerEx).getFileManager().createFileViewProvider(LightVirtualFile(name, JetFileType.INSTANCE, text), true), false), JavaCodeFragment { private var viewProvider = super.getViewProvider() as SingleRootFileViewProvider - private var myImports = LinkedHashSet(); + private var myImports = LinkedHashSet() - { + init { getViewProvider().forceCachedPsi(this) init(TokenType.CODE_FRAGMENT, elementType) if (context != null) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt index a83c1c4156c..3ae27fba819 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt @@ -490,7 +490,7 @@ public class JetPsiFactory(private val project: Project) { return createExpression(sb.toString()) as JetWhenExpression } - { + init { if (subjectText != null) { sb.append("(").append(subjectText).append(") ") } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFunctionStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFunctionStubImpl.kt index eccdd9fdaa5..de579030695 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFunctionStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFunctionStubImpl.kt @@ -35,7 +35,7 @@ public class KotlinFunctionStubImpl( private val hasTypeParameterListBeforeFunctionName: Boolean, private val isProbablyNothingType: Boolean ) : KotlinStubBaseImpl(parent, JetStubElementTypes.FUNCTION), KotlinFunctionStub { - { + init { if (isTopLevel && fqName == null) { throw IllegalArgumentException("fqName shouldn't be null for top level functions") } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyStubImpl.kt index a8977edd350..9fe5bbf2da7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyStubImpl.kt @@ -38,7 +38,7 @@ public class KotlinPropertyStubImpl( private val fqName: FqName? ) : KotlinStubBaseImpl(parent, JetStubElementTypes.PROPERTY), KotlinPropertyStub { - { + init { if (isTopLevel && fqName == null) { throw IllegalArgumentException("fqName shouldn't be null for top level properties") } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/ModifierMaskUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/ModifierMaskUtils.kt index cfae6a82f0d..eb52ee99178 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/ModifierMaskUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/ModifierMaskUtils.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.lexer.JetModifierKeywordToken import kotlin.platform.platformStatic public object ModifierMaskUtils { - { + init { assert(MODIFIER_KEYWORDS_ARRAY.size() <= 32, "Current implementation depends on the ability to represent modifier list as bit mask") } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/MutablePackageFragmentProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/MutablePackageFragmentProvider.kt index 48aebb2891f..36178acf58f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/MutablePackageFragmentProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/MutablePackageFragmentProvider.kt @@ -31,7 +31,7 @@ public class MutablePackageFragmentProvider(public val module: ModuleDescriptor) private val fqNameToPackage = HashMap() private val subPackages = MultiMap.create() - ;{ + init { fqNameToPackage.put(FqName.ROOT, MutablePackageFragmentDescriptor(module, FqName.ROOT)) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt index 88bdd23d12f..0d0208e7d96 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt @@ -33,7 +33,7 @@ public class FakeCallableDescriptorForObject( public val classDescriptor: ClassDescriptor ) : DeclarationDescriptorWithVisibility by classDescriptor.getClassObjectReferenceTarget(), VariableDescriptor { - { + init { assert(classDescriptor.getClassObjectType() != null) { "FakeCallableDescriptorForObject can be created only for objects, classes with companion object or enum entries: $classDescriptor" } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt index abb486df1d4..77dc34b4224 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt @@ -90,7 +90,7 @@ public class LazyAnnotationDescriptor( val annotationEntry: JetAnnotationEntry ) : AnnotationDescriptor, LazyEntity { - { + init { c.trace.record(BindingContext.ANNOTATION, annotationEntry, this) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt index 09f5d6cdc82..4d49e66fa37 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt @@ -56,7 +56,7 @@ public class LazyScriptDescriptor( ScriptDescriptor.NAME, jetScript.toSourceElement() ) { - { + init { resolveSession.getTrace().record(BindingContext.SCRIPT, jetScript, this) } 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 3c97fbdd532..da15a23c072 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt @@ -72,7 +72,7 @@ public class KotlinLightClassForPackage private( } } - { + init { assert(!files.isEmpty()) { "No files for package " + packageFqName } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index c865bd47c0a..b4f8eba9b3e 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -178,7 +178,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi private class SyntheticPackageViewForTest(private val module: ModuleDescriptor) : PackageViewDescriptor { private val scope = WritableScopeImpl(JetScope.Empty, this, RedeclarationHandler.THROW_EXCEPTION, "runtime descriptor loader test") - ;{ + init { scope.changeLockLevel(WritableScope.LockLevel.BOTH) } diff --git a/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt b/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt index f9e78ab4e3f..ec86f13e84c 100644 --- a/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt @@ -34,7 +34,7 @@ private val INCOMPLETE_PATTERN = Pattern.compile("\\.\\.\\.( *)(.*)$") private val INCOMPLETE_LINE_MESSAGE = "incomplete line" public abstract class AbstractReplInterpreterTest : UsefulTestCase() { - { + init { System.setProperty("java.awt.headless", "true") } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt index d8f1bc60c0d..807f40a447a 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt @@ -132,7 +132,7 @@ class MutableDiagnosticsTest : KotlinTestWithEnvironment() { private inner class DummyDiagnostic : Diagnostic { val dummyElement = JetPsiFactory(getEnvironment().project).createType("Int") - ;{ + init { dummyElement.getContainingJetFile().doNotAnalyze = null } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt index 4800095880f..c47ab6ae95b 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt @@ -37,7 +37,7 @@ public class ConstraintSystemTestData( private val functionFoo: FunctionDescriptor private val scopeToResolveTypeParameters: JetScope - { + init { val functions = context.getSliceContents(BindingContext.FUNCTION) functionFoo = findFunctionByName(functions.values(), "foo") val function = DescriptorToSourceUtils.descriptorToDeclaration(functionFoo) as JetFunction diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt index 8d7eafc0eec..1ec7c01630f 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt @@ -37,9 +37,9 @@ public object LibraryUtils { private val METAINF = "META-INF/" private val MANIFEST_PATH = "${METAINF}MANIFEST.MF" private val METAINF_RESOURCES = "${METAINF}resources/" - private val KOTLIN_JS_MODULE_ATTRIBUTE_NAME = Attributes.Name(KOTLIN_JS_MODULE_NAME); + private val KOTLIN_JS_MODULE_ATTRIBUTE_NAME = Attributes.Name(KOTLIN_JS_MODULE_NAME) - { + init { var jsStdLib = "" var jsLib = "" diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt index a6e7956aebc..3c8ca289b54 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt @@ -46,9 +46,9 @@ class LazyJavaClassDescriptor( ) : ClassDescriptorBase(outerC.storageManager, containingDeclaration, fqName.shortName(), outerC.sourceElementFactory.source(jClass)), JavaClassDescriptor { - private val c: LazyJavaResolverContext = outerC.child(this, jClass); + private val c: LazyJavaResolverContext = outerC.child(this, jClass) - { + init { c.javaResolverCache.recordClass(jClass, this) } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt index 590e7f6f345..5f65ed25db5 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt @@ -31,9 +31,9 @@ public class DeserializationComponentsForJava( annotationAndConstantLoader: BinaryClassAnnotationAndConstantLoaderImpl, packageFragmentProvider: LazyJavaPackageFragmentProvider ) { - val components: DeserializationComponents; + val components: DeserializationComponents - { + init { val localClassResolver = LocalClassResolverImpl() components = DeserializationComponents( storageManager, moduleDescriptor, classDataFinder, annotationAndConstantLoader, packageFragmentProvider, diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt index 9f8f5942b85..dc279ba27d5 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt @@ -27,9 +27,9 @@ public class KotlinClassHeader( public val classKind: KotlinClass.Kind?, public val syntheticClassKind: KotlinSyntheticClass.Kind? ) { - public val isCompatibleAbiVersion: Boolean get() = AbiVersionUtil.isAbiVersionCompatible(version); + public val isCompatibleAbiVersion: Boolean get() = AbiVersionUtil.isAbiVersionCompatible(version) - { + init { if (isCompatibleAbiVersion) { assert((annotationData == null) == (kind != Kind.CLASS && kind != Kind.PACKAGE_FACADE)) { "Annotation data should be not null only for CLASS and PACKAGE_FACADE (kind=$kind)" diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt index 093800521da..74f7a8a83e4 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt @@ -32,7 +32,7 @@ public class ModuleDescriptorImpl( override val defaultImports: List, override val platformToKotlinClassMap: PlatformToKotlinClassMap ) : DeclarationDescriptorImpl(Annotations.EMPTY, moduleName), ModuleDescriptor { - { + init { if (!moduleName.isSpecial()) { throw IllegalArgumentException("Module name must be special: $moduleName") } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/CapturedTypeConstructor.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/CapturedTypeConstructor.kt index e856e763d38..5c90ad0e594 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/CapturedTypeConstructor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/CapturedTypeConstructor.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns public class CapturedTypeConstructor( public val typeProjection: TypeProjection ): TypeConstructor { - { + init { assert(typeProjection.getProjectionKind() != Variance.INVARIANT) { "Only nontrivial projections can be captured, not: $typeProjection" } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt index 9562ca3506e..cc5812900a1 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt @@ -152,7 +152,7 @@ public open class DelegatingFlexibleType protected ( } } - { + init { assert (!lowerBound.isFlexible()) { "Lower bound of a flexible type can not be flexible: $lowerBound" } assert (!upperBound.isFlexible()) { "Upper bound of a flexible type can not be flexible: $upperBound" } assert (lowerBound != upperBound) { "Lower and upper bounds are equal: $lowerBound == $upperBound" } diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt index 686cbd9260c..d0750c1ad25 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt @@ -50,7 +50,7 @@ class FuzzyType( private val usedTypeParameters: HashSet? public val freeParameters: Set - ;{ + init { if (freeParameters.isNotEmpty()) { usedTypeParameters = HashSet() usedTypeParameters!!.addUsedTypeParameters(type) 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 2ac4e876a59..5378caece94 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 @@ -46,7 +46,7 @@ class PartialBodyResolveFilter( override val filter: ((JetElement) -> Boolean)? = { it is JetExpression && statementMarks.statementMark(it) != MarkLevel.SKIP } - ;{ + init { assert(declaration.isAncestor(elementToResolve)) assert(!JetPsiUtil.isLocal(declaration), "Should never be invoked on local declaration otherwise we may miss some local declarations with type Nothing") @@ -383,7 +383,7 @@ class PartialBodyResolveFilter( private val receiverName: SmartCastName?, private val selectorName: String? /* null means "this" (and receiverName should be null */ ) { - { + init { if (selectorName == null) { assert(receiverName == null, "selectorName is allowed to be null only when receiverName is also null (which means 'this')") } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryDependenciesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryDependenciesCache.kt index bb3253c1754..7fc3334da6a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryDependenciesCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryDependenciesCache.kt @@ -87,8 +87,9 @@ public class LibraryDependenciesCache(private val project: Project) { } private inner class LibraryUsageIndex { - val modulesLibraryIsUsedIn: MultiMap = MultiMap.createSet(); - { + val modulesLibraryIsUsedIn: MultiMap = MultiMap.createSet() + + init { ModuleManager.getInstance(project).getModules().forEach { module -> ModuleRootManager.getInstance(module).getOrderEntries().forEach { 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 995ef565967..c28b803c5cb 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 @@ -35,7 +35,7 @@ class LibraryModificationTracker(project: Project) : SimpleModificationTracker() platformStatic fun getInstance(project: Project) = ServiceManager.getService(project, javaClass())!! } - { + init { val connection = project.getMessageBus().connect() connection.subscribe(VirtualFileManager.VFS_CHANGES, BulkVirtualFileListenerAdapter( object : VirtualFileAdapter() { 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 304607bc51d..39f62fe9afe 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 @@ -52,7 +52,7 @@ class ModuleTypeCacheManager private (project: Project) { } private class VfsModificationTracker(project: Project): SimpleModificationTracker() { - { + init { val connection = project.getMessageBus().connect(); connection.subscribe(VirtualFileManager.VFS_CHANGES, BulkVirtualFileListenerAdapter( object : VirtualFileAdapter() { 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 cdb621ae323..280863cfc1c 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 @@ -90,7 +90,7 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di } } - { + init { moduleDescriptor.initialize(packageFragmentProvider) moduleDescriptor.addDependencyOnModule(moduleDescriptor) moduleDescriptor.addDependencyOnModule(KotlinBuiltIns.getInstance().getBuiltInsModule()) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt index a196b6f74b2..cef52d9312f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt @@ -68,7 +68,7 @@ private class MissingDependencyErrorClassDescriptor( private val scope = ScopeWithMissingDependencies(fullFqName, this) - ;{ + init { val emptyConstructor = ConstructorDescriptorImpl.create(this, Annotations.EMPTY, true, SourceElement.NO_SOURCE) emptyConstructor.initialize(listOf(), listOf(), Visibilities.INTERNAL) emptyConstructor.setReturnType(createErrorType("")) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt index 0d9b5098338..7212b49c771 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt @@ -31,7 +31,7 @@ class KotlinSuppressableWarningProblemGroup( private val diagnosticFactory: DiagnosticFactory<*> ) : SuppressableProblemGroup { - { + init { assert (diagnosticFactory.getSeverity() == Severity.WARNING) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt index fbe54ee483a..1c254eab709 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt @@ -40,7 +40,7 @@ public trait SearchRequestWithElement : DeclarationSearchRequest } abstract class DeclarationsSearch>: QueryFactory() { - { + init { registerExecutor( object : QueryExecutorBase(true) { override fun processQuery(queryParameters: R, consumer: Processor) { 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 1ffe98db487..292919bf1ad 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 @@ -161,7 +161,7 @@ public class KotlinPsiSearchHelper(private val project: Project): PsiSearchHelpe } public object UsagesSearch: QueryFactory() { - { + init { val executorImpl = object : QueryExecutorBase() { override fun processQuery(request: UsagesSearchRequest, consumer: Processor) { val searchHelper = KotlinPsiSearchHelper(request.project) 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 0c3a335d09c..5da45903c66 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 @@ -40,9 +40,9 @@ public class SubpackagesIndexService(private val project: Project) { public inner class SubpackagesIndex(allPackageFqNames: Collection) { // a map from any existing package (in kotlin) to a set of subpackages (not necessarily direct) containing files - private val fqNameByPrefix = MultiMap.createSet(); + private val fqNameByPrefix = MultiMap.createSet() - { + init { for (fqNameAsString in allPackageFqNames) { val fqName = FqName(fqNameAsString) var prefix = fqName diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt index 8ff99f7c01f..178478fe8a7 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt @@ -28,7 +28,7 @@ public object JetPsiPrecedences { private val LOG = Logger.getInstance(javaClass()) private val precedence: Map - { + init { val builder = HashMap() for ((i, record) in JetExpressionParsing.Precedence.values().withIndices()) { for (elementType in record.getOperations().getTypes()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt index fc5d7791066..32e7f5561ea 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt @@ -72,7 +72,7 @@ abstract class CompletionSessionBase(protected val configuration: CompletionSess protected val reference: JetSimpleNameReference? protected val expression: JetExpression? - ;{ + init { val reference = position.getParent()?.getReferences()?.firstIsInstanceOrNull() if (reference != null) { if (reference.expression is JetLabelReferenceExpression) { @@ -104,7 +104,7 @@ abstract class CompletionSessionBase(protected val configuration: CompletionSess private val kotlinIdentifierStartPattern: ElementPattern private val kotlinIdentifierPartPattern: ElementPattern - ;{ + init { val includeDollar = position.prevLeaf()?.getNode()?.getElementType() != JetTokens.SHORT_TEMPLATE_ENTRY_START if (includeDollar) { kotlinIdentifierStartPattern = StandardPatterns.character().javaIdentifierStart() diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt index 13ebc1549b8..87f898b1747 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt @@ -174,7 +174,7 @@ private class JetDeclarationRemotenessWeigher(private val file: JetFile) : Looku private val preciseImportPackages = HashSet() private val allUnderImports = HashSet() - ;{ + init { for (import in file.getImportDirectives()) { val importPath = import.getImportPath() ?: continue val fqName = importPath.fqnPart() diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/HeuristicSignatures.kt b/idea/src/org/jetbrains/kotlin/idea/completion/HeuristicSignatures.kt index 0536690d953..b1efe7a6b1a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/HeuristicSignatures.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/HeuristicSignatures.kt @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.types.TypeUtils public object HeuristicSignatures { private val signatures = HashMap, List>() - ;{ + init { registerSignature("kotlin.Collection", "contains", "E") registerSignature("kotlin.Collection", "containsAll", "kotlin.Collection") registerSignature("kotlin.MutableCollection", "remove", "E") diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt index 36d1e04b45b..9c7bcbb00bc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt @@ -87,7 +87,7 @@ object KeywordCompletion { } private class ParentFilter(filter : ElementFilter) : PositionElementFilter() { - { + init { setFilter(filter) } diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt index cb62862e2c2..3708fcf4f72 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt @@ -52,7 +52,7 @@ public class KotlinCompletionContributor : CompletionContributor() { private val DEFAULT_DUMMY_IDENTIFIER = CompletionUtilCore.DUMMY_IDENTIFIER_TRIMMED + "$" // add '$' to ignore context after the caret - ;{ + init { val provider = object : CompletionProvider() { override fun addCompletions(parameters: CompletionParameters, context: ProcessingContext, result: CompletionResultSet) { performCompletion(parameters, result) diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt b/idea/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt index e9a1486b1f0..131d5216640 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt @@ -31,7 +31,8 @@ class ToFromOriginalFileMapper( private val shift: Int //TODO: lazy initialization? - ;{ + + init { val originalText = originalFile.getText() val syntheticText = syntheticFile.getText() assert(originalText.subSequence(0, completionOffset) == syntheticText.subSequence(0, completionOffset)) //TODO: drop it 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 3ab3425edc7..c0d16cfa652 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt @@ -96,7 +96,7 @@ public enum class CaretPosition { public data class GenerateLambdaInfo(val lambdaType: JetType, val explicitParameters: Boolean) public class KotlinFunctionInsertHandler(val caretPosition : CaretPosition, val lambdaInfo: GenerateLambdaInfo?) : KotlinCallableInsertHandler() { - { + init { if (caretPosition == CaretPosition.AFTER_BRACKETS && lambdaInfo != null) { throw IllegalArgumentException("CaretPosition.AFTER_BRACKETS with lambdaInfo != null combination is not supported") } diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt index 1c49cf847c8..10951f1fcbb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class KotlinSmartEnterHandler: SmartEnterProcessorWithFixers() { - { + init { addFixers( KotlinIfConditionFixer(), KotlinMissingIfBranchFixer(), diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt index 37933bbd722..bd5bd223d75 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt @@ -116,7 +116,7 @@ public class KotlinFindClassUsagesHandler( // todo: Use JavaFindUsagesHelper.getElementNames() when it becomes public in IDEA var stringsToSearch: Collection object: JavaFindUsagesHandler(psiClass, JavaFindUsagesHandlerFactory.getInstance(element.getProject())) { - { + init { stringsToSearch = getStringsToSearch(psiClass) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideTreeStructure.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideTreeStructure.kt index f6a37fb221f..88ddbd8e630 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideTreeStructure.kt +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideTreeStructure.kt @@ -27,9 +27,9 @@ import org.jetbrains.kotlin.asJava.toLightMethods import com.intellij.util.containers.ContainerUtil class KotlinOverrideTreeStructure(project: Project, val element: PsiElement) : HierarchyTreeStructure(project, null) { - val javaTreeStructures = element.toLightMethods().map { method -> MethodHierarchyTreeStructure(project, method) }; + val javaTreeStructures = element.toLightMethods().map { method -> MethodHierarchyTreeStructure(project, method) } - { + init { setBaseElement(javaTreeStructures.first().getBaseDescriptor()!!) } diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt index ac40ceca3fc..9d4947f33c6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt @@ -45,7 +45,7 @@ fun updateHighlightingResult(file: JetFile, hasErrors: Boolean) { public class ErrorDuringFileAnalyzeNotificationProvider(val project: Project) : EditorNotifications.Provider() { private class HighlightingErrorNotificationPanel : EditorNotificationPanel() { - { + init { setText("Kotlin internal error occurred in this file. Highlighting may be inadequate.") myLabel.setIcon(AllIcons.General.Error) createActionLabel("Open Event Log", ActivateToolWindowAction.getActionIdForToolWindow(EventLog.LOG_TOOL_WINDOW_ID)) diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt index 8a69e92c852..da53497a31e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt @@ -55,7 +55,7 @@ public class KotlinImportOptimizer() : ImportOptimizer { private val codeStyleSettings = JetCodeStyleSettings.getInstance(file.getProject()) private val aliasImports: Map - ;{ + init { val imports = file.getImportDirectives() val aliasImports = HashMap() for (import in imports) { diff --git a/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocCompletionContributor.kt b/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocCompletionContributor.kt index 93d14d27986..4469499b900 100644 --- a/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocCompletionContributor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocCompletionContributor.kt @@ -43,7 +43,7 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.patterns.StandardPatterns class KDocCompletionContributor(): CompletionContributor() { - { + init { extend(CompletionType.BASIC, psiElement().inside(javaClass()), KDocNameCompletionProvider) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index 8a82843ab51..bd42f57f513 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -90,7 +90,7 @@ class TypeCandidate(val theType: JetType, scope: JetScope? = null) { } } - { + init { val typeParametersInType = theType.getTypeParameters() if (scope == null) { typeParameters = typeParametersInType.copyToArray() @@ -133,9 +133,9 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { val currentFileContext: BindingContext val currentFileModule: ModuleDescriptor - private val typeCandidates = HashMap>(); + private val typeCandidates = HashMap>() - { + init { val result = config.currentFile.analyzeFullyAndGetResult() currentFileContext = result.bindingContext currentFileModule = result.moduleDescriptor @@ -217,7 +217,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { val substitutions: List var released: Boolean = false - { + init { // gather relevant information val placement = placement diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt index 777fbf801e6..0c63526a83c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType private class ParameterNameExpression( private val names: Array, private val parameterTypeToNamesMap: Map>) : Expression() { - { + init { assert(names all { it.isNotEmpty() }) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt index 8672d5c22f9..33eda202d2d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt @@ -46,7 +46,7 @@ public class JetChangeSignatureData( private val parameters: List override val receiver: JetParameterInfo? - ;{ + init { $receiver = createReceiverInfoIfNeeded() val valueParameters = when { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractIntroduceAction.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractIntroduceAction.kt index a7887b0dfd7..13665c440aa 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractIntroduceAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractIntroduceAction.kt @@ -21,7 +21,7 @@ import com.intellij.psi.* import org.jetbrains.kotlin.psi.* public abstract class AbstractIntroduceAction : BasePlatformRefactoringAction() { - { + init { setInjectedContext(true) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt index 6012fe8930b..48fd770cce5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt @@ -179,7 +179,7 @@ abstract class OutputValueBoxer(val outputValues: List) { outputValues: List, val module: ModuleDescriptor ) : OutputValueBoxer(outputValues) { - { + init { assert(outputValues.size() <= 3, "At most 3 output values are supported") } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt index 09155c2a8ba..852e9339bb0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt @@ -45,7 +45,7 @@ public class KotlinInplacePropertyIntroducer( ): KotlinInplaceVariableIntroducer( property, editor, project, title, JetExpression.EMPTY_ARRAY, null, false, property, false, doNotChangeVar, exprType, false ) { - { + init { assert(availableTargets.isNotEmpty(), "No targets available: ${JetPsiUtil.getElementTextWithContext(property)}") } diff --git a/idea/src/org/jetbrains/kotlin/idea/util/DialogWithEditor.kt b/idea/src/org/jetbrains/kotlin/idea/util/DialogWithEditor.kt index 871c046162e..c6c159e3a38 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/DialogWithEditor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/DialogWithEditor.kt @@ -37,7 +37,7 @@ public open class DialogWithEditor( ) : DialogWrapper(project, true) { val editor: Editor = createEditor() - ;{ + init { init() setTitle(title) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt index b8ab30abb64..df1fcf42303 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt @@ -30,7 +30,7 @@ import com.intellij.codeInsight.template.TemplateManager import com.intellij.openapi.command.WriteCommandAction public class InplaceRenameTest : LightPlatformCodeInsightTestCase() { - { + init { System.setProperty("idea.platform.prefix", "Idea") } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt index 747c5966385..5b0f1ccbb8d 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt @@ -101,7 +101,7 @@ class DeferredElement( private var result: TResult? = null - { + init { assignNoPrototype() } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Expressions.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Expressions.kt index eff97616513..cc0ee51aa2f 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Expressions.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Expressions.kt @@ -125,7 +125,7 @@ class PolyadicExpression(val expressions: List, val token: String) : } class LambdaExpression(val arguments: String?, val block: Block) : Expression() { - { + init { assignPrototypesFrom(block) } 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 aca9ef13242..38e2b461ec0 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 @@ -55,7 +55,7 @@ public open class JsFunctionScope(parent: JsScope, description: String) : JsScop private inner class LabelScope(parent: LabelScope?, val ident: String) : JsScope(parent, "Label scope for $ident", null) { val labelName: JsName - { + init { val freshIdent = when { ident in RESERVED_WORDS -> getFreshIdent(ident) parent != null -> parent.getFreshIdent(ident) diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt index 888eb327d97..5ac38650cb2 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt @@ -70,9 +70,9 @@ public class FunctionReader(private val context: TranslationContext) { * Maps moduleName to kotlin object variable. * The default variable is Kotlin, but it can be renamed by minifier. */ - private val moduleKotlinVariable = hashMapOf(); + private val moduleKotlinVariable = hashMapOf() - { + init { val config = context.getConfig() as LibrarySourcesConfig val libs = config.getLibraries().map { File(it) } val files = LibraryUtils.readJsFiles(libs.map { it.getPath() }.toList()) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt index a3d83e2fe5d..f36878c4802 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt @@ -50,9 +50,9 @@ public class DelegationTranslator( classDeclaration.getDelegationSpecifiers().filterIsInstance(); private class Field (val name: String, val generateField: Boolean) - private val fields = HashMap(); + private val fields = HashMap() - { + init { for (specifier in delegationBySpecifiers) { val expression = specifier.getDelegateExpression() ?: throw IllegalArgumentException("delegate expression should not be null: ${specifier.getText()}") diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt index c8cd6dd86d6..abe057d367c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/NumberAndCharConversionFIF.kt @@ -70,7 +70,7 @@ public object NumberAndCharConversionFIF : CompositeFIF() { } } - { + init { add(USE_AS_IS!!, ConversionUnaryIntrinsic(ID)) for((stringPattern, intrinsic) in convertOperations) { add(pattern(stringPattern), intrinsic) diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt index 2c6407edc2a..50596ad8841 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt @@ -186,7 +186,7 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs val sourcesInfo: List - ;{ + init { val normalizedSourceDirs: List = sourceDirs.map { file -> file.getCanonicalPath() } @@ -214,7 +214,7 @@ class KModel(val context: BindingContext, val config: KDocConfig, val sourceDirs fun sourceInfoByFile(file: JetFile) = sourceInfoByFile.get(file)!! - ;{ + init { /** Loads the model from the given set of source files */ val allPackageFragments = HashSet() for (source in sources) {