diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt index 76070aa3c9f..a17b1a5be4f 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt @@ -67,7 +67,7 @@ public object CodegenUtilKt { } else null } - assert(actualDelegates.size() <= 1) { "Many delegates found for $delegatingMember: $actualDelegates" } + assert(actualDelegates.size <= 1) { "Many delegates found for $delegatingMember: $actualDelegates" } actualDelegates.firstOrNull() } diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt index d81f02fd050..f3de897f053 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt @@ -109,7 +109,7 @@ public fun findConcreteSuperDeclaration(function: Fu result.removeAll(toRemove) val concreteRelevantDeclarations = result.filter { !it.isAbstract } - if (concreteRelevantDeclarations.size() != 1) { + if (concreteRelevantDeclarations.size != 1) { error("Concrete fake override $function should have exactly one concrete super-declaration: $concreteRelevantDeclarations") } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.kt index ecf3bc09faa..b508f58f33e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ArgumentGenerator.kt @@ -32,8 +32,8 @@ abstract class ArgumentGenerator { * @see kotlin.reflect.jvm.internal.KCallableImpl.callBy */ open fun generate(valueArgumentsByIndex: List, actualArgs: List): DefaultCallMask { - assert(valueArgumentsByIndex.size() == actualArgs.size()) { - "Value arguments collection should have same size, but ${valueArgumentsByIndex.size()} != ${actualArgs.size()}" + assert(valueArgumentsByIndex.size == actualArgs.size) { + "Value arguments collection should have same size, but ${valueArgumentsByIndex.size} != ${actualArgs.size}" } val arg2Index = valueArgumentsByIndex.mapToIndex() @@ -48,7 +48,7 @@ abstract class ArgumentGenerator { } } - val masks = DefaultCallMask(valueArgumentsByIndex.size()) + val masks = DefaultCallMask(valueArgumentsByIndex.size) for (argumentWithDeclIndex in actualArgsWithDeclIndex) { val argument = argumentWithDeclIndex.arg diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt index 49a3e9d752c..599fb9fcf0c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt @@ -214,7 +214,7 @@ class CollectionStubMethodGenerator( private fun Collection.findMostSpecificTypeForClass(klass: ClassDescriptor): KotlinType { val types = this.filter { it.getConstructor().getDeclarationDescriptor() == klass } if (types.isEmpty()) error("No supertype of $klass in $this") - if (types.size() == 1) return types.first() + if (types.size == 1) return types.first() // Find the first type in the list such that it's a subtype of every other type in that list return types.first { type -> types.all { other -> KotlinTypeChecker.DEFAULT.isSubtypeOf(type, other) } @@ -227,7 +227,7 @@ class CollectionStubMethodGenerator( child.setModality(Modality.FINAL) child.setVisibility(Visibilities.PUBLIC) val typeParameters = descriptor.getTypeConstructor().getParameters() - val newTypeParameters = ArrayList(typeParameters.size()) + val newTypeParameters = ArrayList(typeParameters.size) DescriptorSubstitutor.substituteTypeParameters(typeParameters, TypeSubstitution.EMPTY, child, newTypeParameters) child.setTypeParameterDescriptors(typeParameters) return Pair(child, newTypeParameters) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/InlineCycleReporter.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/InlineCycleReporter.kt index ffe1036ff5f..2376dd54a68 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/InlineCycleReporter.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/InlineCycleReporter.kt @@ -32,9 +32,9 @@ public class InlineCycleReporter(val diagnostics: DiagnosticSink) { if (call != null) { val callElement = call.getCall().getCallElement() if (processingFunctions.contains(callElement)) { - val cycle = processingFunctions.asSequence().dropWhile { it.getKey() != callElement } + val cycle = processingFunctions.asSequence().dropWhile { it.key != callElement } cycle.forEach { - diagnostics.report(Errors.INLINE_CALL_CYCLE.on(it.getKey(), it.getValue())) + diagnostics.report(Errors.INLINE_CALL_CYCLE.on(it.key, it.value)) } return false } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt index 7ad4621d55c..6b6fbd5173a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt @@ -123,7 +123,7 @@ public class InterfaceImplBodyCodegen( val myParameters = signature.getValueParameters() val calleeParameters = method.getValueParameters() - if (myParameters.size() != calleeParameters.size()) { + if (myParameters.size != calleeParameters.size) { throw AssertionError( "Method from super interface has a different signature.\n" + "This method:\n%s\n%s\n%s\nSuper method:\n%s\n%s\n%s".format( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt index 6c931e151dd..2afcd3da12e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt @@ -312,7 +312,7 @@ public class MultifileClassCodegen( fragments.add(fragment) } } - if (fragments.size() > 1) { + if (fragments.size > 1) { throw IllegalStateException("More than one package fragment, files: $files | fragments: $fragments") } return fragments.firstOrNull() diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt index ce94f5505f5..fcebf8f9d41 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt @@ -67,7 +67,7 @@ public abstract class SignatureCollectingClassBuilderFactory( override fun done() { for ((signature, elementsAndDescriptors) in signatures.entrySet()) { - if (elementsAndDescriptors.size() == 1) continue // no clash + if (elementsAndDescriptors.size == 1) continue // no clash handleClashingSignatures(ConflictingJvmDeclarationsData( classInternalName, classCreatedFor, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt index f409a45afcc..ed7f2432226 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt @@ -47,7 +47,7 @@ private fun List.addCompiledParts(state: GenerationState): List> { val accessors = super.getAccessors() val alreadyExistKeys = accessors.map ({ Pair(it.calleeDescriptor, it.superCallTarget) }) - val filtered = interfaceContext.accessors.toMap ({ Pair(it.calleeDescriptor, it.superCallTarget) }, {it}) - alreadyExistKeys + val filtered = interfaceContext.accessors.toMapBy({ Pair(it.calleeDescriptor, it.superCallTarget) }, { it }) - alreadyExistKeys return accessors + filtered.values } } \ No newline at end of file diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/Parameters.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/Parameters.kt index 73d8e1e2977..e9572e62db9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/Parameters.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/Parameters.kt @@ -54,10 +54,10 @@ internal class Parameters(val real: List, val captured: List { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParametersBuilder.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParametersBuilder.kt index 44d2ffb5f54..976b4f371e2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParametersBuilder.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParametersBuilder.kt @@ -35,18 +35,18 @@ internal class ParametersBuilder private constructor(){ private var nextCaptured = 0 fun addThis(type: Type, skipped: Boolean): ParameterInfo { - val info = ParameterInfo(type, skipped, nextValueParameterIndex, -1, valueAndHiddenParams.size()) + val info = ParameterInfo(type, skipped, nextValueParameterIndex, -1, valueAndHiddenParams.size) addParameter(info) return info } fun addNextParameter(type: Type, skipped: Boolean, remapValue: StackValue?): ParameterInfo { - return addParameter(ParameterInfo(type, skipped, nextValueParameterIndex, remapValue, valueAndHiddenParams.size())) + return addParameter(ParameterInfo(type, skipped, nextValueParameterIndex, remapValue, valueAndHiddenParams.size)) } fun addNextValueParameter(type: Type, skipped: Boolean, remapValue: StackValue?, parameterIndex: Int): ParameterInfo { return addParameter(ParameterInfo(type, skipped, nextValueParameterIndex, remapValue, - if (parameterIndex == -1) valueAndHiddenParams.size() else { parameterIndex + valueParamStart })) + if (parameterIndex == -1) valueAndHiddenParams.size else { parameterIndex + valueParamStart })) } fun addCapturedParam( @@ -102,7 +102,7 @@ internal class ParametersBuilder private constructor(){ } fun markValueParametesStart(){ - this.valueParamStart = valueAndHiddenParams.size() + this.valueParamStart = valueAndHiddenParams.size } fun listCaptured(): List { 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 efb201ce18e..d1636e7b94c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt @@ -202,7 +202,7 @@ public open class DefaultSourceMapper(val sourceInfo: SourceInfo, override val p private fun createKey(name: String, path: String) = "$name#$path" override val resultMappings: List - get() = fileMappings.values().map { it.toFileMapping() } + get() = fileMappings.values.map { it.toFileMapping() } override fun visitSource(name: String, path: String) { lastVisited = fileMappings.getOrPut(createKey(name, path), { RawFileMapping(name, path) }) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAPParser.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAPParser.kt index b5c192b428b..7878ae59e1d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAPParser.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAPParser.kt @@ -44,7 +44,7 @@ object SMAPParser { public fun parse(mappingInfo: String): SMAP { val fileMappings = linkedMapOf() - val fileSectionStart = mappingInfo.indexOf(SMAP.FILE_SECTION) + SMAP.FILE_SECTION.length() + val fileSectionStart = mappingInfo.indexOf(SMAP.FILE_SECTION) + SMAP.FILE_SECTION.length val lineSectionAnchor = mappingInfo.indexOf(SMAP.LINE_SECTION) val files = mappingInfo.substring(fileSectionStart, lineSectionAnchor) @@ -63,7 +63,7 @@ object SMAPParser { } - val lines = mappingInfo.substring(lineSectionAnchor + SMAP.LINE_SECTION.length(), mappingInfo.indexOf(SMAP.END)).trim().split('\n') + val lines = mappingInfo.substring(lineSectionAnchor + SMAP.LINE_SECTION.length, mappingInfo.indexOf(SMAP.END)).trim().split('\n') for (lineMapping in lines) { /*only simple mapping now*/ val targetSplit = lineMapping.indexOf(':') @@ -79,6 +79,6 @@ object SMAPParser { fileMappings[fileIndex]!!.addRangeMapping(RangeMapping(originalIndex, targetIndex, range)) } - return SMAP(fileMappings.values().toList()) + return SMAP(fileMappings.values.toList()) } } \ No newline at end of file diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt index 3583370ee85..462f770ada9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/TryBlockClustering.kt @@ -97,5 +97,5 @@ fun doClustering(blocks: List): List, codegen: ExpressionCodegen): Callable { val javaClass = resolvedCall.getResultingDescriptor().getReturnType()!!.getArguments().first().getType() - return object : IntrinsicCallable(getType(javaClass>()), listOf(), null, null) { + return object : IntrinsicCallable(getType(Class::class.java), listOf(), null, null) { override fun invokeIntrinsic(v: InstructionAdapter) { codegen.putReifiedOperationMarkerIfTypeIsReifiedParameter(javaClass, ReifiedTypeInliner.OperationKind.JAVA_CLASS) putJavaLangClassInstance(v, codegen.getState().typeMapper.mapType(javaClass)) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.kt index e127b3913ac..dd4fb6b76be 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.kt @@ -54,12 +54,12 @@ public class JavaClassProperty : IntrinsicPropertyGetter() { v.invokevirtual("java/lang/Object", "getClass", "()Ljava/lang/Class;", false) } - return getType(javaClass>()) + return getType(Class::class.java) } override fun toCallable(fd: FunctionDescriptor, isSuper: Boolean, resolvedCall: ResolvedCall<*>, codegen: ExpressionCodegen): Callable { val classType = codegen.getState().typeMapper.mapType(resolvedCall.getCall().getDispatchReceiver()!!.getType()) - return object : IntrinsicCallable(getType(javaClass>()), listOf(), classType, null) { + return object : IntrinsicCallable(getType(Class::class.java), listOf(), classType, null) { override fun invokeIntrinsic(v: InstructionAdapter) { if (isPrimitive(classType)) { v.getstatic(boxType(classType).getInternalName(), "TYPE", "Ljava/lang/Class;") diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt index c8b3c317cc8..1a6cd5f70c1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt @@ -110,10 +110,10 @@ public open class MethodAnalyzer( } catch (e: AnalyzerException) { - throw AnalyzerException(e.node, "Error at instruction " + insn + ": " + e.getMessage(), e) + throw AnalyzerException(e.node, "Error at instruction " + insn + ": " + e.message, e) } catch (e: Exception) { - throw AnalyzerException(insnNode, "Error at instruction " + insn + ": " + e.getMessage(), e) + throw AnalyzerException(insnNode, "Error at instruction " + insn + ": " + e.message, e) } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/AnalyzeTryCatchBlocks.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/AnalyzeTryCatchBlocks.kt index 84be4f1bccf..145fb558909 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/AnalyzeTryCatchBlocks.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/AnalyzeTryCatchBlocks.kt @@ -71,7 +71,7 @@ private fun insertSaveRestoreStackMarkers( val doneTryStartLabels = hashSetOf() val doneHandlerLabels = hashSetOf() - for (decompiledTryDescriptor in decompiledTryDescriptorForStart.values()) { + for (decompiledTryDescriptor in decompiledTryDescriptorForStart.values) { with(decompiledTryDescriptor) { if (!doneTryStartLabels.contains(tryStartLabel)) { doneTryStartLabels.add(tryStartLabel) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackAnalyzer.kt index 792fe3597a6..e8d00217541 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackAnalyzer.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackAnalyzer.kt @@ -96,7 +96,7 @@ internal class FixStackAnalyzer( } else { extraStack.add(value) - maxExtraStackSize = Math.max(maxExtraStackSize, extraStack.size()) + maxExtraStackSize = Math.max(maxExtraStackSize, extraStack.size) } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackContext.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackContext.kt index 3d2f37abd5c..4ca75d2a542 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackContext.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackContext.kt @@ -107,7 +107,7 @@ internal class FixStackContext(val methodNode: MethodNode) { if (saveNodes.isEmpty()) { throw AssertionError("${indexOf(insnNode)}: in handler ${indexOf(restoreLabel)} restore is not matched with save") } - else if (saveNodes.size() > 1) { + else if (saveNodes.size > 1) { throw AssertionError("${indexOf(insnNode)}: in handler ${indexOf(restoreLabel)} restore is matched with several saves") } val saveNode = saveNodes.first() diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/LocalVariablesManager.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/LocalVariablesManager.kt index d109fbc9933..009a5740125 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/LocalVariablesManager.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/LocalVariablesManager.kt @@ -39,7 +39,7 @@ internal class LocalVariablesManager(val context: FixStackContext, val methodNod } fun allocateVariablesForSaveStackMarker(saveStackMarker: AbstractInsnNode, savedStackValues: List): SavedStackDescriptor { - val numRestoreStackMarkers = context.restoreStackMarkersForSaveMarker[saveStackMarker]!!.size() + val numRestoreStackMarkers = context.restoreStackMarkersForSaveMarker[saveStackMarker]!!.size return allocateNewHandle(numRestoreStackMarkers, saveStackMarker, savedStackValues) } @@ -58,7 +58,7 @@ internal class LocalVariablesManager(val context: FixStackContext, val methodNod } private fun getFirstUnusedLocalVariableIndex(): Int = - allocatedHandles.values().fold(initialMaxLocals) { + allocatedHandles.values.fold(initialMaxLocals) { index, handle -> Math.max(index, handle.savedStackDescriptor.firstUnusedLocalVarIndex) } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt index 774c57da095..10d631de03e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt @@ -38,7 +38,7 @@ class JvmStringTable(private val typeMapper: JetTypeMapper) : StringTable { override fun getStringIndex(string: String): Int = map.getOrPut(string) { - strings.size().apply { + strings.size.apply { strings.add(string) val lastRecord = records.lastOrNull() @@ -78,7 +78,7 @@ class JvmStringTable(private val typeMapper: JetTypeMapper) : StringTable { } } - val index = strings.size() + val index = strings.size if (classId.isLocal) { localNames.add(index) } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/typeMappingUtil.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/typeMappingUtil.kt index 562a8434228..0ed334e6c0d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/typeMappingUtil.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/typeMappingUtil.kt @@ -76,7 +76,7 @@ val CallableDescriptor?.isMethodWithDeclarationSiteWildcards: Boolean get() { if (this !is CallableMemberDescriptor) return false return firstOverridden { - METHODS_WITH_DECLARATION_SITE_WILDCARDS.containsRaw(it.propertyIfAccessor.fqNameOrNull()) + METHODS_WITH_DECLARATION_SITE_WILDCARDS.contains(it.propertyIfAccessor.fqNameOrNull()) } != null } diff --git a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt index 6dc5d110868..1b36669c74c 100644 --- a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt +++ b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt @@ -41,7 +41,7 @@ public object Main { classpath.add(".") var i = 0 - while (i < args.size()) { + while (i < args.size) { val arg = args[i] if (collectingArguments) { arguments.add(arg) @@ -50,7 +50,7 @@ public object Main { } fun next(): String { - if (++i == args.size()) { + if (++i == args.size) { throw RunnerException("argument expected to $arg") } return args[i] @@ -105,7 +105,7 @@ public object Main { run(args) } catch (e: RunnerException) { - System.err.println("error: " + e.getMessage()) + System.err.println("error: " + e.message) System.exit(1) } } diff --git a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/runners.kt b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/runners.kt index 6f4cd310219..c565aa2ca52 100644 --- a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/runners.kt +++ b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/runners.kt @@ -85,7 +85,7 @@ class JarRunner(private val path: String) : AbstractRunner() { } } catch (e: IOException) { - throw RunnerException("could not read manifest from " + path + ": " + e.getMessage()) + throw RunnerException("could not read manifest from " + path + ": " + e.message) } ?: throw RunnerException("no Main-Class entry found in manifest in $path") diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index 6d584bfcd8e..5fa3854b827 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -61,11 +61,11 @@ public open class K2JVMCompiler : CLICompiler() { configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageSeverityCollector) if (IncrementalCompilation.isEnabled()) { - val incrementalCompilationComponents = services.get(javaClass()) + val incrementalCompilationComponents = services.get(IncrementalCompilationComponents::class.java) configuration.put(JVMConfigurationKeys.INCREMENTAL_COMPILATION_COMPONENTS, incrementalCompilationComponents) } - val locator = services.get(javaClass()) + val locator = services.get(CompilerJarLocator::class.java) configuration.put(JVMConfigurationKeys.COMPILER_JAR_LOCATOR, locator) try { @@ -83,12 +83,12 @@ public open class K2JVMCompiler : CLICompiler() { PluginCliParser.loadPlugins(arguments, configuration) } catch (e: PluginCliOptionProcessingException) { - val message = e.getMessage() + "\n\n" + cliPluginUsageString(e.pluginId, e.options) + val message = e.message + "\n\n" + cliPluginUsageString(e.pluginId, e.options) messageSeverityCollector.report(CompilerMessageSeverity.ERROR, message, CompilerMessageLocation.NO_LOCATION) return INTERNAL_ERROR } catch (e: CliOptionProcessingException) { - messageSeverityCollector.report(CompilerMessageSeverity.ERROR, e.getMessage()!!, CompilerMessageLocation.NO_LOCATION) + messageSeverityCollector.report(CompilerMessageSeverity.ERROR, e.message!!, CompilerMessageLocation.NO_LOCATION) return INTERNAL_ERROR } catch (t: Throwable) { @@ -169,7 +169,7 @@ public open class K2JVMCompiler : CLICompiler() { KotlinToJVMBytecodeCompiler.compileModules(environment, configuration, moduleScript.getModules(), directory, jar, friendPaths, arguments.includeRuntime) } else if (arguments.script) { - val scriptArgs = arguments.freeArgs.subList(1, arguments.freeArgs.size()) + val scriptArgs = arguments.freeArgs.subList(1, arguments.freeArgs.size) environment = createCoreEnvironment(rootDisposable, configuration) if (messageSeverityCollector.anyReported(CompilerMessageSeverity.ERROR)) return COMPILATION_ERROR diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt index 2dc6ad8bd73..02c4bbabdaf 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt @@ -38,7 +38,7 @@ public object PluginCliParser { javaClass.getClassLoader() ) - val componentRegistrars = ServiceLoader.load(javaClass(), classLoader).toArrayList() + val componentRegistrars = ServiceLoader.load(ComponentRegistrar::class.java, classLoader).toArrayList() componentRegistrars.addAll(BundledCompilerPlugins.componentRegistrars) configuration.addAll(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, componentRegistrars) @@ -55,7 +55,7 @@ public object PluginCliParser { it.pluginId } ?: mapOf() - val commandLineProcessors = ServiceLoader.load(javaClass(), classLoader).toArrayList() + val commandLineProcessors = ServiceLoader.load(CommandLineProcessor::class.java, classLoader).toArrayList() commandLineProcessors.addAll(BundledCompilerPlugins.commandLineProcessors) for (processor in commandLineProcessors) { @@ -78,7 +78,7 @@ public object PluginCliParser { processor.pluginOptions, "Required plugin option not present: ${processor.pluginId}:${option.name}") } - if (!option.allowMultipleOccurrences && values.size() > 1) { + if (!option.allowMultipleOccurrences && values.size > 1) { throw PluginCliOptionProcessingException( processor.pluginId, processor.pluginOptions, 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 2614c3fe52c..89422cce182 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 @@ -119,14 +119,14 @@ public class KotlinCoreEnvironment private constructor( init { val project = projectEnvironment.getProject() - project.registerService(javaClass(), CliDeclarationProviderFactoryService(sourceFiles)) + project.registerService(DeclarationProviderFactoryService::class.java, CliDeclarationProviderFactoryService(sourceFiles)) project.registerService(ModuleVisibilityManager::class.java, CliModuleVisibilityManagerImpl()) registerProjectServicesForCLI(projectEnvironment) registerProjectServices(projectEnvironment) fillClasspath(configuration) - val fileManager = ServiceManager.getService(project, javaClass()) + val fileManager = ServiceManager.getService(project, CoreJavaFileManager::class.java) val index = JvmDependenciesIndex(javaRoots) (fileManager as KotlinCliJavaFileManagerImpl).initIndex(index) @@ -142,7 +142,7 @@ public class KotlinCoreEnvironment private constructor( KotlinScriptDefinitionProvider.getInstance(project).setScriptDefinitions(configuration.getList(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY)) - project.registerService(javaClass(), JvmCliVirtualFileFinderFactory(index)) + project.registerService(JvmVirtualFileFinderFactory::class.java, JvmCliVirtualFileFinderFactory(index)) ExternalDeclarationsProvider.registerExtensionPoint(project) ExpressionCodegenExtension.registerExtensionPoint(project) @@ -342,16 +342,16 @@ public class KotlinCoreEnvironment private constructor( } private fun registerAppExtensionPoints() { - CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), BinaryFileStubBuilders.EP_NAME, javaClass>()) - CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), FileContextProvider.EP_NAME, javaClass()) + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), BinaryFileStubBuilders.EP_NAME, FileTypeExtensionPoint::class.java) + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), FileContextProvider.EP_NAME, FileContextProvider::class.java) // - CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), MetaDataContributor.EP_NAME, javaClass()) - CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), PsiAugmentProvider.EP_NAME, javaClass()) - CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), JavaMainMethodProvider.EP_NAME, javaClass()) + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), MetaDataContributor.EP_NAME, MetaDataContributor::class.java) + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), PsiAugmentProvider.EP_NAME, PsiAugmentProvider::class.java) + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), JavaMainMethodProvider.EP_NAME, JavaMainMethodProvider::class.java) // - CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ContainerProvider.EP_NAME, javaClass()) - CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ClsCustomNavigationPolicy.EP_NAME, javaClass()) - CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ClassFileDecompilers.EP_NAME, javaClass()) + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ContainerProvider.EP_NAME, ContainerProvider::class.java) + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ClsCustomNavigationPolicy.EP_NAME, ClsCustomNavigationPolicy::class.java) + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ClassFileDecompilers.EP_NAME, ClassFileDecompilers.Decompiler::class.java) } private fun registerApplicationExtensionPointsAndExtensionsFrom(configuration: CompilerConfiguration, configFilePath: String) { @@ -384,40 +384,40 @@ public class KotlinCoreEnvironment private constructor( registerFileType(KotlinFileType.INSTANCE, "kt") registerFileType(KotlinFileType.INSTANCE, KotlinParserDefinition.STD_SCRIPT_SUFFIX) registerParserDefinition(KotlinParserDefinition()) - getApplication().registerService(javaClass(), KotlinBinaryClassCache()) - getApplication().registerService(javaClass(), javaClass()) + getApplication().registerService(KotlinBinaryClassCache::class.java, KotlinBinaryClassCache()) + getApplication().registerService(JavaClassSupers::class.java, JavaClassSupersImpl::class.java) } } private fun registerProjectExtensionPoints(area: ExtensionsArea) { - CoreApplicationEnvironment.registerExtensionPoint(area, PsiTreeChangePreprocessor.EP_NAME, javaClass()) - CoreApplicationEnvironment.registerExtensionPoint(area, PsiElementFinder.EP_NAME, javaClass()) + CoreApplicationEnvironment.registerExtensionPoint(area, PsiTreeChangePreprocessor.EP_NAME, PsiTreeChangePreprocessor::class.java) + CoreApplicationEnvironment.registerExtensionPoint(area, PsiElementFinder.EP_NAME, PsiElementFinder::class.java) } // made public for Upsource @JvmStatic public fun registerProjectServices(projectEnvironment: JavaCoreProjectEnvironment) { with (projectEnvironment.getProject()) { - registerService(javaClass(), KotlinScriptDefinitionProvider()) - registerService(javaClass(), KotlinJavaPsiFacade(this)) - registerService(javaClass(), KtLightClassForFacade.FacadeStubCache(this)) + registerService(KotlinScriptDefinitionProvider::class.java, KotlinScriptDefinitionProvider()) + registerService(KotlinJavaPsiFacade::class.java, KotlinJavaPsiFacade(this)) + registerService(KtLightClassForFacade.FacadeStubCache::class.java, KtLightClassForFacade.FacadeStubCache(this)) } } private fun registerProjectServicesForCLI(projectEnvironment: JavaCoreProjectEnvironment) { with (projectEnvironment.getProject()) { - registerService(javaClass(), ServiceManager.getService(this, javaClass()) as CoreJavaFileManager) + registerService(CoreJavaFileManager::class.java, ServiceManager.getService(this, JavaFileManager::class.java) as CoreJavaFileManager) val cliLightClassGenerationSupport = CliLightClassGenerationSupport(this) - registerService(javaClass(), cliLightClassGenerationSupport) - registerService(javaClass(), cliLightClassGenerationSupport) - registerService(javaClass(), cliLightClassGenerationSupport) + registerService(LightClassGenerationSupport::class.java, cliLightClassGenerationSupport) + registerService(CliLightClassGenerationSupport::class.java, cliLightClassGenerationSupport) + registerService(CodeAnalyzerInitializer::class.java, cliLightClassGenerationSupport) val area = Extensions.getArea(this) area.getExtensionPoint(PsiElementFinder.EP_NAME).registerExtension(JavaElementFinder(this, cliLightClassGenerationSupport)) area.getExtensionPoint(PsiElementFinder.EP_NAME).registerExtension( - PsiElementFinderImpl(this, ServiceManager.getService(this, javaClass()))) + PsiElementFinderImpl(this, ServiceManager.getService(this, JavaFileManager::class.java))) } } } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/messages/ReplSystemInWrapper.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/messages/ReplSystemInWrapper.kt index 5efd5358e4c..636d7fab2cd 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/messages/ReplSystemInWrapper.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/messages/ReplSystemInWrapper.kt @@ -31,7 +31,7 @@ public class ReplSystemInWrapper( private var inputByteArray = byteArrayOf() private val isAtBufferEnd: Boolean - get() = curBytePos == inputByteArray.size() + get() = curBytePos == inputByteArray.size @Volatile var isReplScriptExecuting = false diff --git a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Modifications.kt b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Modifications.kt index 8d379a74106..228fb457875 100644 --- a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Modifications.kt +++ b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Modifications.kt @@ -25,7 +25,7 @@ data class Modification(val range: TextRange, val apply: (String) -> String) class CollectModificationsVisitor(evaluators: List) : KtTreeVisitorVoid() { val elementModifications: Map> = - evaluators.toMap(selector = { it }, transform = { arrayListOf() }) + evaluators.toMapBy(selector = { it }, transform = { arrayListOf() }) override fun visitDeclaration(declaration: KtDeclaration) { super.visitDeclaration(declaration) @@ -40,10 +40,10 @@ class CollectModificationsVisitor(evaluators: List) : KtTreeVisitorVo if (!conditionalResult) modifications.add(Modification(declaration.textRange) { rangeText -> - StringBuilder { + buildString { append("/* Not available on $evaluator */") repeat(StringUtil.getLineBreakCount(rangeText)) { append("\n") } - }.toString() + } }) else { val targetName = annotations.filterIsInstance().singleOrNull() @@ -60,13 +60,13 @@ class CollectModificationsVisitor(evaluators: List) : KtTreeVisitorVo } fun List.applyTo(sourceText: String): String { - return StringBuilder { + return buildString { var prevIndex = 0 for ((range, transform) in this@applyTo) { append(sourceText, prevIndex, range.startOffset) append(transform(range.substring(sourceText))) prevIndex = range.endOffset } - append(sourceText, prevIndex, sourceText.length()) - }.toString() + append(sourceText, prevIndex, sourceText.length) + } } \ No newline at end of file diff --git a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Preprocessor.kt b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Preprocessor.kt index 34a515d24a9..467950d092c 100644 --- a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Preprocessor.kt +++ b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Preprocessor.kt @@ -36,10 +36,10 @@ public fun createJvmProfile(targetRoot: File, version: Int): Profile = Profile(" public fun createJsProfile(targetRoot: File): Profile = Profile("JS", JsPlatformEvaluator(), File(targetRoot, "js")) public val profileEvaluators: Map Evaluator> = - listOf(6, 7, 8).toMap({ version -> "JVM$version" }, { version -> { JvmPlatformEvaluator(version) } }) + ("JS" to { JsPlatformEvaluator() }) + listOf(6, 7, 8).toMapBy({ version -> "JVM$version" }, { version -> { JvmPlatformEvaluator(version) } }) + ("JS" to { JsPlatformEvaluator() }) public fun createProfile(name: String, targetRoot: File): Profile { - val (profileName, evaluator) = profileEvaluators.entrySet().firstOrNull { it.key.equals(name, ignoreCase = true) } ?: throw IllegalArgumentException("Profile with name '$name' is not supported") + val (profileName, evaluator) = profileEvaluators.entries.firstOrNull { it.key.equals(name, ignoreCase = true) } ?: throw IllegalArgumentException("Profile with name '$name' is not supported") return Profile(profileName, evaluator(), targetRoot) } @@ -64,7 +64,7 @@ public class Preprocessor(val logger: Logger = SystemOutLogger) { class Modify(val sourceText: String, val modifications: List) : FileProcessingResult() { fun getModifiedText(): String = modifications.applyTo(sourceText) - override fun toString(): String = "Modify(${modifications.size()})" + override fun toString(): String = "Modify(${modifications.size})" } override fun toString() = this.javaClass.simpleName @@ -89,7 +89,7 @@ public class Preprocessor(val logger: Logger = SystemOutLogger) { val visitor = CollectModificationsVisitor(listOf(evaluator)) psiFile.accept(visitor) - val list = visitor.elementModifications.values().single() + val list = visitor.elementModifications.values.single() return if (list.isNotEmpty()) FileProcessingResult.Modify(sourceText, list) else @@ -150,7 +150,7 @@ fun String.convertLineSeparators(): String = StringUtil.convertLineSeparators(th fun File.isTextEqualTo(content: String): Boolean = readText().lines() == content.lines() -fun File.makeRelativeTo(from: File, to: File) = File(to, relativeTo(from)) +fun File.makeRelativeTo(from: File, to: File) = File(to, toRelativeString(from)) fun File.mkdirsOrFail() { if (!mkdirs() && !exists()) { diff --git a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/PreprocessorCLI.kt b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/PreprocessorCLI.kt index 391a908635a..b49863d0c22 100644 --- a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/PreprocessorCLI.kt +++ b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/PreprocessorCLI.kt @@ -21,7 +21,7 @@ import java.util.concurrent.Executors import java.util.concurrent.TimeUnit fun main(args: Array) { - if (args.size() != 3) { + if (args.size != 3) { println("Usage: ") System.exit(1) } diff --git a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/logging.kt b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/logging.kt index 25067bfd85d..c4a38f4ebd3 100644 --- a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/logging.kt +++ b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/logging.kt @@ -38,7 +38,7 @@ public object SystemOutLogger : Logger { public fun Logger.withPrefix(prefix: String): Logger = PrefixedLogger(prefix, this) public class PrefixedLogger(val prefix: String, val logger: Logger) : Logger { - private fun prefix(msg: CharSequence): CharSequence = StringBuilder { + private fun prefix(msg: CharSequence): CharSequence = StringBuilder().apply { append(prefix) append(": ") append(msg) diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Cache.kt b/compiler/container/src/org/jetbrains/kotlin/container/Cache.kt index bd8d2422fd4..4aef34a7eaf 100644 --- a/compiler/container/src/org/jetbrains/kotlin/container/Cache.kt +++ b/compiler/container/src/org/jetbrains/kotlin/container/Cache.kt @@ -63,7 +63,7 @@ private fun getSetterInfos(c: Class<*>): List { val setterInfos = ArrayList() for (method in c.getMethods()) { for (annotation in method.getDeclaredAnnotations()) { - if (annotation.annotationType().getName().endsWith(".Inject")) { + if (annotation.annotationClass.java.getName().endsWith(".Inject")) { setterInfos.add(SetterInfo(method, method.getGenericParameterTypes().toList())) } } @@ -114,6 +114,6 @@ private fun getRegistrations(klass: Class<*>): List { val interfaces = LinkedHashSet() superClasses.forEach { collectInterfacesRecursive(it, interfaces) } registrations.addAll(interfaces) - registrations.remove(javaClass()) + registrations.remove(Any::class.java) return registrations } \ No newline at end of file diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Container.kt b/compiler/container/src/org/jetbrains/kotlin/container/Container.kt index 2f2be6d33cf..764fca5fb84 100644 --- a/compiler/container/src/org/jetbrains/kotlin/container/Container.kt +++ b/compiler/container/src/org/jetbrains/kotlin/container/Container.kt @@ -70,14 +70,14 @@ public class StorageComponentContainer(id: String) : ComponentContainer, Compone private fun resolveIterable(request: Type, context: ValueResolveContext): ValueDescriptor? { if (request !is ParameterizedType) return null val rawType = request.getRawType() - if (rawType != javaClass>()) return null + if (rawType != Iterable::class.java) return null val typeArguments = request.getActualTypeArguments() - if (typeArguments.size() != 1) return null + if (typeArguments.size != 1) return null val iterableTypeArgument = typeArguments[0] val iterableType = when (iterableTypeArgument) { is WildcardType -> { val upperBounds = iterableTypeArgument.getUpperBounds() - if (upperBounds.size() != 1) return null + if (upperBounds.size != 1) return null upperBounds[0] } is Class<*> -> iterableTypeArgument @@ -112,9 +112,9 @@ public fun StorageComponentContainer.registerInstance(instance: Any): StorageCom } public inline fun StorageComponentContainer.resolve(context: ValueResolveContext = unknownContext): ValueDescriptor? { - return resolve(javaClass(), context) + return resolve(T::class.java, context) } public inline fun StorageComponentContainer.resolveMultiple(context: ValueResolveContext = unknownContext): Iterable { - return resolveMultiple(javaClass(), context) + return resolveMultiple(T::class.java, context) } diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Resolve.kt b/compiler/container/src/org/jetbrains/kotlin/container/Resolve.kt index 4daa750f7ae..d6fd73e6d20 100644 --- a/compiler/container/src/org/jetbrains/kotlin/container/Resolve.kt +++ b/compiler/container/src/org/jetbrains/kotlin/container/Resolve.kt @@ -58,7 +58,7 @@ fun Method.bindToMethod(context: ValueResolveContext): MethodBinding { } private fun Member.bindArguments(parameters: List, context: ValueResolveContext): List { - val bound = ArrayList(parameters.size()) + val bound = ArrayList(parameters.size) var unsatisfied: MutableList? = null for (parameter in parameters) { diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt b/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt index f2b7023a862..10caf0b28e6 100644 --- a/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt +++ b/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt @@ -49,7 +49,7 @@ public class ComponentStorage(val myId: String) : ValueResolver { if (entry.isNotEmpty()) { registerDependency(request, context) - if (entry.size() > 1) + if (entry.size > 1) throw InvalidCardinalityException("Request $request cannot be satisfied because there is more than one type registered", entry) return entry.singleOrNull() } @@ -68,7 +68,7 @@ public class ComponentStorage(val myId: String) : ValueResolver { public fun dump(printer: PrintStream): Unit = with (printer) { val heading = "Container: $myId" println(heading) - println("=".repeat(heading.length())) + println("=".repeat(heading.length)) println() getDescriptorsInDisposeOrder().forEach { descriptor -> println(descriptor) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt index a3a2d1605e5..3e918c83653 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt @@ -67,7 +67,7 @@ public object SamConversionResolverImpl : SamConversionResolver { } private fun findFunctionWithMostSpecificReturnType(supertypes: Set): SimpleFunctionDescriptor { - val candidates = ArrayList(supertypes.size()) + val candidates = ArrayList(supertypes.size) for (supertype in supertypes) { val abstractMembers = SingleAbstractMethodUtils.getAbstractMembers(supertype) if (!abstractMembers.isEmpty()) { diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaAnnotationCallChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaAnnotationCallChecker.kt index ea97fa63d56..f8670e2d617 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaAnnotationCallChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaAnnotationCallChecker.kt @@ -73,7 +73,7 @@ public class JavaAnnotationCallChecker : CallChecker { argument: Map.Entry, diagnostic: DiagnosticFactory0 ) { - argument.getValue().getArguments().forEach { + argument.value.getArguments().forEach { if (it.getArgumentExpression() != null) { context.trace.report( diagnostic.on( diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinder.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinder.kt index 90171fec7a1..1ad9fe83160 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinder.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinder.kt @@ -24,6 +24,6 @@ public interface JvmVirtualFileFinder : VirtualFileFinder, KotlinClassFinder { public object SERVICE { @JvmStatic public fun getInstance(project: Project): JvmVirtualFileFinder = - ServiceManager.getService(project, javaClass()).create(GlobalSearchScope.allScope(project)) + ServiceManager.getService(project, JvmVirtualFileFinderFactory::class.java).create(GlobalSearchScope.allScope(project)) } } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinderFactory.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinderFactory.kt index cb053601aa8..b51dabe9bcc 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinderFactory.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinderFactory.kt @@ -26,6 +26,6 @@ public interface JvmVirtualFileFinderFactory : VirtualFileFinderFactory { public object SERVICE { @JvmStatic public fun getInstance(project: Project): JvmVirtualFileFinderFactory = - ServiceManager.getService(project, javaClass()) + ServiceManager.getService(project, JvmVirtualFileFinderFactory::class.java) } } 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 f6d223241ac..00af70bbd02 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 @@ -50,7 +50,7 @@ public class VirtualFileKotlinClass private constructor( override fun toString() = "${javaClass.getSimpleName()}: $file" companion object Factory { - private val LOG = Logger.getInstance(javaClass()) + private val LOG = Logger.getInstance(VirtualFileKotlinClass::class.java) private val perfCounter = PerformanceCounter.create("Binary class from Kotlin file") @Deprecated("Use KotlinBinaryClassCache") diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/TraitDefaultMethodCallChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/TraitDefaultMethodCallChecker.kt index f14f6d51d48..bc77f2088ce 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/TraitDefaultMethodCallChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/TraitDefaultMethodCallChecker.kt @@ -38,12 +38,12 @@ public class TraitDefaultMethodCallChecker : CallChecker { if (containerDescriptor is JavaClassDescriptor && DescriptorUtils.isInterface(containerDescriptor)) { //is java interface default method called from trait - val classifier = DescriptorUtils.getParentOfType(context.scope.ownerDescriptor, javaClass()) + val classifier = DescriptorUtils.getParentOfType(context.scope.ownerDescriptor, ClassifierDescriptor::class.java) if (classifier != null && DescriptorUtils.isInterface(classifier)) { context.trace.report( ErrorsJvm.INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER.on( - PsiTreeUtil.getParentOfType(resolvedCall.getCall().getCallElement(), javaClass()) + PsiTreeUtil.getParentOfType(resolvedCall.getCall().getCallElement(), KtExpression::class.java) ) ) } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/extensions/AnalysisCompletedHandlerExtension.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/extensions/AnalysisCompletedHandlerExtension.kt index 51d36968be5..c44f7ce8dc6 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/extensions/AnalysisCompletedHandlerExtension.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/extensions/AnalysisCompletedHandlerExtension.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.BindingContext public interface AnalysisCompletedHandlerExtension { companion object : ProjectExtensionDescriptor( "org.jetbrains.kotlin.analyzeCompleteHandlerExtension", - javaClass() + AnalysisCompletedHandlerExtension::class.java ) public fun analysisCompleted( diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/KotlinToJvmSignatureMapper.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/KotlinToJvmSignatureMapper.kt index 4151400dfbb..159ad3ab83b 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/KotlinToJvmSignatureMapper.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/KotlinToJvmSignatureMapper.kt @@ -26,7 +26,7 @@ fun erasedSignaturesEqualIgnoringReturnTypes(subFunction: JvmMethodSignature, su val subParams = subFunction.getValueParameters() val superParams = superFunction.getValueParameters() - if (subParams.size() != superParams.size()) return false + if (subParams.size != superParams.size) return false return subParams.zip(superParams).all { p -> val (subParam, superParam) = p diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JavaGenericVarianceViolationTypeChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JavaGenericVarianceViolationTypeChecker.kt index 7adaa4bdeb1..2ed6a718bd0 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JavaGenericVarianceViolationTypeChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JavaGenericVarianceViolationTypeChecker.kt @@ -59,14 +59,14 @@ public object JavaGenericVarianceViolationTypeChecker : AdditionalTypeChecker { val correspondingSubType = TypeCheckingProcedure.findCorrespondingSupertype(expressionTypeWithSmartCast, lowerBound) ?: return - assert(lowerBound.arguments.size() == upperBound.arguments.size()) { + assert(lowerBound.arguments.size == upperBound.arguments.size) { "Different arguments count in flexible bounds: " + - "($lowerBound(${lowerBound.arguments.size()})..$upperBound(${upperBound.arguments.size()})" + "($lowerBound(${lowerBound.arguments.size})..$upperBound(${upperBound.arguments.size})" } - assert(lowerBound.arguments.size() == correspondingSubType.arguments.size()) { + assert(lowerBound.arguments.size == correspondingSubType.arguments.size) { "Different arguments count in corresponding subtype and supertype: " + - "($lowerBound(${lowerBound.arguments.size()})..$correspondingSubType(${correspondingSubType.arguments.size()})" + "($lowerBound(${lowerBound.arguments.size})..$correspondingSubType(${correspondingSubType.arguments.size})" } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt index 65632ac336e..8eb07b5ef0c 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt @@ -169,13 +169,13 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l override fun getSyntheticExtensionProperties(receiverTypes: Collection, name: Name, location: LookupLocation): Collection { var result: SmartList? = null - val processedTypes: MutableSet? = if (receiverTypes.size() > 1) HashSet() else null + val processedTypes: MutableSet? = if (receiverTypes.size > 1) HashSet() else null for (type in receiverTypes) { result = collectSyntheticPropertiesByName(result, type.constructor, name, processedTypes, location) } return when { result == null -> emptyList() - result.size() > 1 -> result.toSet() + result.size > 1 -> result.toSet() else -> result } } @@ -304,7 +304,7 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l descriptor.setMethod = setMethod val classTypeParams = ownerClass.typeConstructor.parameters - val typeParameters = ArrayList(classTypeParams.size()) + val typeParameters = ArrayList(classTypeParams.size) val typeSubstitutor = DescriptorSubstitutor.substituteTypeParameters(classTypeParams, TypeSubstitution.EMPTY, descriptor, typeParameters) val propertyType = typeSubstitutor.safeSubstitute(type, Variance.INVARIANT) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SamAdapterFunctionsScope.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SamAdapterFunctionsScope.kt index 7f2653c6e96..9a8bdbe6cc6 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SamAdapterFunctionsScope.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/SamAdapterFunctionsScope.kt @@ -67,7 +67,7 @@ class SamAdapterFunctionsScope(storageManager: StorageManager) : SyntheticScope } return when { result == null -> emptyList() - result.size() > 1 -> result.toSet() + result.size > 1 -> result.toSet() else -> result } } @@ -118,7 +118,7 @@ class SamAdapterFunctionsScope(storageManager: StorageManager) : SyntheticScope } //TODO: duplicated parameter names - val typeParameters = ArrayList(sourceTypeParams.size()) + val typeParameters = ArrayList(sourceTypeParams.size) val typeSubstitutor = DescriptorSubstitutor.substituteTypeParameters(sourceTypeParams, TypeSubstitution.EMPTY, descriptor, typeParameters) descriptor.toSourceFunctionTypeParameters = typeParameters.zip(sourceTypeParams).toMap() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt index 80fd2e7cdb1..d2a0a4bf680 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/UnreachableCode.kt @@ -58,7 +58,7 @@ class UnreachableCodeImpl( acceptChildren(object : PsiElementVisitor() { override fun visitElement(element: PsiElement) { val isReachable = element is KtElement && reachableElements.contains(element) && !element.hasChildrenInSet(unreachableElements) - if (isReachable || element.getChildren().size() == 0) { + if (isReachable || element.getChildren().size == 0) { children.add(element) } else { @@ -77,7 +77,7 @@ class UnreachableCodeImpl( val childrenToRemove = HashSet() fun collectSiblingsIfMeaningless(elementIndex: Int, direction: Int) { val index = elementIndex + direction - if (index !in 0..(size() - 1)) return + if (index !in 0..(size - 1)) return val element = this[index] if (element.isMeaningless()) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt index 18bac802570..f3b169b15fd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt @@ -58,14 +58,14 @@ public object AllTypes : TypePredicate { // todo: simplify computed type predicate when possible public fun and(predicates: Collection): TypePredicate = - when (predicates.size()) { + when (predicates.size) { 0 -> AllTypes 1 -> predicates.first() else -> ForAllTypes(predicates.toList()) } public fun or(predicates: Collection): TypePredicate? = - when (predicates.size()) { + when (predicates.size) { 0 -> null 1 -> predicates.first() else -> ForSomeType(predicates.toList()) 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 2361352ceaa..029ae655c85 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 @@ -64,7 +64,7 @@ public class ReadValueInstruction private constructor( } override val inputValues: List - get() = receiverValues.keySet().toList() + get() = receiverValues.keys.toList() override val outputValue: PseudoValue get() = _outputValue!! @@ -78,7 +78,7 @@ public class ReadValueInstruction private constructor( } override fun toString(): String { - val inVal = if (receiverValues.isEmpty()) "" else "|${receiverValues.keySet().joinToString()}" + val inVal = if (receiverValues.isEmpty()) "" else "|${receiverValues.keys.joinToString()}" val targetName = when (target) { is AccessTarget.Declaration -> target.descriptor is AccessTarget.Call -> target.resolvedCall.getResultingDescriptor() @@ -104,7 +104,7 @@ public class WriteValueInstruction( ) : AccessValueInstruction(assignment, lexicalScope, target, receiverValues) { override val inputValues: List // as is necessary: see KT-10384 - get() = (receiverValues.keySet() as Collection) + rValue + get() = (receiverValues.keys as Collection) + rValue override fun accept(visitor: InstructionVisitor) { visitor.visitWriteValue(this) 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 4f05546a035..2735de394fe 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 @@ -59,7 +59,7 @@ public class CallInstruction private constructor( val resolvedCall: ResolvedCall<*>, override val receiverValues: Map, public val arguments: Map -) : OperationInstruction(element, lexicalScope, (receiverValues.keySet() as Collection) + arguments.keySet()), InstructionWithReceivers { +) : OperationInstruction(element, lexicalScope, (receiverValues.keys as Collection) + arguments.keys), InstructionWithReceivers { // as is necessary above: see KT-10384 public constructor ( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt index 1befe2a8963..49736d4a331 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt @@ -54,7 +54,7 @@ public class NondeterministicJumpInstruction( override val nextInstructions: Collection get() { - val targetInstructions = Lists.newArrayList(resolvedTargets.values()) + val targetInstructions = Lists.newArrayList(resolvedTargets.values) targetInstructions.add(next) return targetInstructions } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt index 5dd63815e38..dd2bd4f4963 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtils.kt @@ -123,7 +123,7 @@ public fun getExpectedTypePredicate( val candidateArgumentMap = candidateCall.getValueArguments() val callArguments = call.getValueArguments() val i = inputValueIndex - argValueOffset - if (i < 0 || i >= callArguments.size()) continue + if (i < 0 || i >= callArguments.size) continue val mapping = candidateCall.getArgumentMapping(callArguments.get(i)) if (mapping !is ArgumentMatch) continue @@ -288,7 +288,7 @@ fun Pseudocode.getElementValuesRecursively(element: KtElement): List(), javaClass(), javaClass()) + PsiTreeUtil.getParentOfType(this, KtDeclarationWithBody::class.java, KtClassOrObject::class.java, KtScript::class.java) ?: getNonStrictParentOfType() ?: return null diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt index 486afb3a1c8..6906950b9be 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt @@ -52,7 +52,7 @@ import java.io.StringWriter public object Renderers { - private val LOG = Logger.getInstance(javaClass()) + private val LOG = Logger.getInstance(Renderers::class.java) @JvmField public val TO_STRING: Renderer = Renderer { @@ -129,7 +129,7 @@ public object Renderers { @JvmStatic public fun commaSeparated(itemRenderer: Renderer): Renderer> = Renderer { collection -> - StringBuilder { + buildString { val iterator = collection.iterator() while (iterator.hasNext()) { val next = iterator.next() @@ -138,7 +138,7 @@ public object Renderers { append(", ") } } - }.toString() + } } @JvmField @@ -201,7 +201,7 @@ public object Renderers { val parameterTypes = Lists.newArrayList() for (valueParameterDescriptor in substitutedDescriptor.getValueParameters()) { parameterTypes.add(valueParameterDescriptor.getType()) - if (valueParameterDescriptor.index >= inferenceErrorData.valueArgumentsTypes.size()) continue + if (valueParameterDescriptor.index >= inferenceErrorData.valueArgumentsTypes.size) continue val actualType = inferenceErrorData.valueArgumentsTypes.get(valueParameterDescriptor.index) if (!KotlinTypeChecker.DEFAULT.isSubtypeOf(actualType, valueParameterDescriptor.getType())) { errorPositions.add(VALUE_PARAMETER_POSITION.position(valueParameterDescriptor.index)) @@ -360,19 +360,19 @@ public object Renderers { @JvmField public val CLASSES_OR_SEPARATED: Renderer> = Renderer { descriptors -> - StringBuilder { + buildString { var index = 0 for (descriptor in descriptors) { append(DescriptorUtils.getFqName(descriptor).asString()) index++ - if (index <= descriptors.size() - 2) { + if (index <= descriptors.size - 2) { append(", ") } - else if (index == descriptors.size() - 1) { + else if (index == descriptors.size - 1) { append(" or ") } } - }.toString() + } } private fun renderTypes(types: Collection) = StringUtil.join(types, { RENDER_TYPE.render(it) }, ", ") @@ -417,7 +417,7 @@ public object Renderers { @JvmField public val RENDER_TYPE_BOUNDS_SHORT: Renderer = Renderer { renderTypeBounds(it, short = true) } - private fun renderDebugMessage(message: String, inferenceErrorData: InferenceErrorData) = StringBuilder { + private fun renderDebugMessage(message: String, inferenceErrorData: InferenceErrorData) = buildString { append(message) append("\nConstraint system: \n") append(RENDER_CONSTRAINT_SYSTEM.render(inferenceErrorData.constraintSystem)) @@ -435,5 +435,5 @@ public object Renderers { append(RENDER_TYPE.render(inferenceErrorData.receiverArgumentType)).append(".") } append("(").append(renderTypes(inferenceErrorData.valueArgumentsTypes)).append(")") - }.toString() + } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt index 15dddabe7d7..2eb1fb3f052 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.KtFile public interface ExternalDeclarationsProvider { companion object : ProjectExtensionDescriptor( "org.jetbrains.kotlin.externalDeclarationsProvider", - javaClass() + ExternalDeclarationsProvider::class.java ) public fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection diff --git a/compiler/frontend/src/org/jetbrains/kotlin/extensions/StorageComponentContainerContributor.kt b/compiler/frontend/src/org/jetbrains/kotlin/extensions/StorageComponentContainerContributor.kt index 286b045b736..3dbda257c80 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/extensions/StorageComponentContainerContributor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/extensions/StorageComponentContainerContributor.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.resolve.TargetPlatform public interface StorageComponentContainerContributor { companion object : ProjectExtensionDescriptor( - "org.jetbrains.kotlin.storageComponentContainerContributor", javaClass() + "org.jetbrains.kotlin.storageComponentContainerContributor", StorageComponentContainerContributor::class.java ) public fun addDeclarations(container: StorageComponentContainer, platform: TargetPlatform) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocImpl.kt index d2d7902aec2..31254284680 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocImpl.kt @@ -45,10 +45,10 @@ public class KDocImpl(buffer: CharSequence?) : LazyParseablePsiElement(KDocToken getChildrenOfType().firstOrNull { it.getName() == name } override fun findSectionByTag(tag: KDocKnownTag): KDocSection? = - findSectionByName(tag.name().toLowerCase()) + findSectionByName(tag.name.toLowerCase()) override fun findSectionByTag(tag: KDocKnownTag, subjectName: String): KDocSection? = getChildrenOfType().firstOrNull { - it.getName() == tag.name().toLowerCase() && it.getSubjectName() == subjectName + it.getName() == tag.name.toLowerCase() && it.getSubjectName() == subjectName } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocLink.kt b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocLink.kt index 6265e2d08fe..2edd9861393 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocLink.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocLink.kt @@ -30,9 +30,9 @@ public class KDocLink(node: ASTNode) : KtElementImpl(node) { public fun getLinkTextRange(): TextRange { val text = getText() if (text.startsWith('[') && text.endsWith(']')) { - return TextRange(1, text.length() - 1) + return TextRange(1, text.length - 1) } - return TextRange(0, text.length()) + return TextRange(0, text.length) } /** diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt b/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt index 4c01d933753..0843dc1d78a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt @@ -32,7 +32,7 @@ object PrecedingCommentsBinder : WhitespacesAndCommentsBinder { } // 2. bind plain comments - var result = tokens.size() + var result = tokens.size tokens@ for (idx in tokens.indices.reversed()) { val tokenType = tokens[idx] when (tokenType) { @@ -61,7 +61,7 @@ object PrecedingDocCommentsBinder : WhitespacesAndCommentsBinder { if (tokens[idx] == KtTokens.DOC_COMMENT) return idx } - return tokens.size() + return tokens.size } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt index 15ce6477a0d..b86eb0bab94 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt @@ -194,7 +194,7 @@ private object DebugTextBuildingVisitor : KtVisitor() { } override fun visitPropertyAccessor(accessor: KtPropertyAccessor, data: Unit?): String? { - val containingProperty = KtStubbedPsiUtil.getContainingDeclaration(accessor, javaClass()) + val containingProperty = KtStubbedPsiUtil.getContainingDeclaration(accessor, KtProperty::class.java) val what = (if (accessor.isGetter()) "getter" else "setter") return what + " for " + (if (containingProperty != null) containingProperty.getDebugText() else "...") } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/EditCommaSeparatedListHelper.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/EditCommaSeparatedListHelper.kt index 0bd0b748150..ac1c8bb9660 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/EditCommaSeparatedListHelper.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/EditCommaSeparatedListHelper.kt @@ -62,7 +62,7 @@ object EditCommaSeparatedListHelper { anchorAfter = if (index > 0) allItems.get(index - 1) else null } else { - anchorAfter = allItems.get(allItems.size() - 1) + anchorAfter = allItems.get(allItems.size - 1) } } return addItemAfter(list, allItems, item, anchorAfter) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KotlinStringLiteralTextEscaper.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KotlinStringLiteralTextEscaper.kt index b3a0d09cdf7..c5dbd624b02 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KotlinStringLiteralTextEscaper.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KotlinStringLiteralTextEscaper.kt @@ -52,7 +52,7 @@ public class KotlinStringLiteralTextEscaper(host: KtStringTemplateExpression): L } val unescaped = child.getUnescapedValue() outChars.append(unescaped) - repeat(unescaped.length()) { + repeat(unescaped.length) { sourceOffsetsList.add(sourceOffset) } sourceOffset += child.getTextLength() @@ -67,7 +67,7 @@ public class KotlinStringLiteralTextEscaper(host: KtStringTemplateExpression): L override fun getOffsetInHost(offsetInDecoded: Int, rangeInsideHost: TextRange): Int { val offsets = sourceOffsets - if (offsets == null || offsetInDecoded >= offsets.size()) return -1 + if (offsets == null || offsetInDecoded >= offsets.size) return -1 return Math.min(offsets[offsetInDecoded], rangeInsideHost.getLength()) + rangeInsideHost.getStartOffset() } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockCodeFragment.kt index 0cec2747b03..0903a38d7c5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtBlockCodeFragment.kt @@ -28,6 +28,6 @@ public class KtBlockCodeFragment( context: PsiElement? ) : KtCodeFragment(project, name, text, imports, KtNodeTypes.BLOCK_CODE_FRAGMENT, context) { - override fun getContentElement() = findChildByClass(javaClass()) + override fun getContentElement() = findChildByClass(KtBlockExpression::class.java) ?: throw IllegalStateException("Block expression should be parsed for BlockCodeFragment") } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClass.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClass.kt index f526810106c..f2e895c87a3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClass.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClass.kt @@ -72,7 +72,7 @@ public open class KtClass : KtClassOrObject { var current: KtClassOrObject? = this while (current != null) { parts.add(current.getName()!!) - current = PsiTreeUtil.getParentOfType(current, javaClass()) + current = PsiTreeUtil.getParentOfType(current, KtClassOrObject::class.java) } val file = getContainingFile() if (file !is KtFile) return null diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt index 0aba01a5d46..f042fff4579 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt @@ -51,7 +51,7 @@ abstract public class KtClassOrObject : val specifierList = getSuperTypeList() ?: return assert(superTypeListEntry.getParent() === specifierList) - if (specifierList.getEntries().size() > 1) { + if (specifierList.getEntries().size > 1) { EditCommaSeparatedListHelper.removeItem(superTypeListEntry) } else { @@ -65,7 +65,7 @@ abstract public class KtClassOrObject : public fun addDeclaration(declaration: KtDeclaration): KtDeclaration { val body = getOrCreateBody() - val anchor = PsiTreeUtil.skipSiblingsBackward(body.rBrace ?: body.getLastChild()!!, javaClass()) + val anchor = PsiTreeUtil.skipSiblingsBackward(body.rBrace ?: body.getLastChild()!!, PsiWhiteSpace::class.java) return body.addAfter(declaration, anchor) as KtDeclaration } @@ -106,7 +106,7 @@ abstract public class KtClassOrObject : CheckUtil.checkWritable(this); val file = getContainingKtFile(); - if (!isTopLevel() || file.getDeclarations().size() > 1) { + if (!isTopLevel() || file.getDeclarations().size > 1) { super.delete() } else { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionCodeFragment.kt index 0ce01f8084f..006d16091fe 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionCodeFragment.kt @@ -28,5 +28,5 @@ public class KtExpressionCodeFragment( context: PsiElement? ) : KtCodeFragment(project, name, text, imports, KtNodeTypes.EXPRESSION_CODE_FRAGMENT, context) { - override fun getContentElement() = findChildByClass(javaClass()) + override fun getContentElement() = findChildByClass(KtExpression::class.java) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionImpl.kt index 9861a35a8f3..0256219d3eb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtExpressionImpl.kt @@ -26,7 +26,7 @@ public abstract class KtExpressionImpl(node: ASTNode) : KtElementImpl(node), KtE protected fun findExpressionUnder(type: KtNodeType): KtExpression? { val containerNode = findChildByType(type) ?: return null - return containerNode.findChildByClass(javaClass()) + return containerNode.findChildByClass(KtExpression::class.java) } override fun replace(newElement: PsiElement): PsiElement { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt index c92d8c70f2a..537e4593aff 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt @@ -224,7 +224,7 @@ public class KtPsiFactory(private val project: Project) { public fun createDeclaration(text: String): TDeclaration { val file = createFile(text) val declarations = file.getDeclarations() - assert(declarations.size() == 1) { "${declarations.size()} declarations in $text" } + assert(declarations.size == 1) { "${declarations.size} declarations in $text" } @Suppress("UNCHECKED_CAST") val result = declarations.first() as TDeclaration return result @@ -305,7 +305,7 @@ public class KtPsiFactory(private val project: Project) { public fun createWhenEntry(entryText: String): KtWhenEntry { val function = createFunction("fun foo() { when(12) { " + entryText + " } }") - val whenEntry = PsiTreeUtil.findChildOfType(function, javaClass()) + val whenEntry = PsiTreeUtil.findChildOfType(function, KtWhenEntry::class.java) assert(whenEntry != null) { "Couldn't generate when entry" } assert(entryText == whenEntry!!.text) { "Generate when entry text differs from the given text" } @@ -453,7 +453,7 @@ public class KtPsiFactory(private val project: Project) { private fun placeKeyword() { assert(state == State.MODIFIERS) - if (sb.length() != 0) { + if (sb.length != 0) { sb.append(" ") } val keyword = when (target) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtSecondaryConstructor.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtSecondaryConstructor.kt index 983aa1ed61b..71aa759e587 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtSecondaryConstructor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtSecondaryConstructor.kt @@ -29,11 +29,11 @@ public class KtSecondaryConstructor : KtConstructor { override fun getContainingClassOrObject() = getParent().getParent() as KtClassOrObject - override fun getBodyExpression() = findChildByClass(javaClass()) + override fun getBodyExpression() = findChildByClass(KtBlockExpression::class.java) override fun getConstructorKeyword() = notNullChild(super.getConstructorKeyword()) - public fun getDelegationCall(): KtConstructorDelegationCall = findNotNullChildByClass(javaClass()) + public fun getDelegationCall(): KtConstructorDelegationCall = findNotNullChildByClass(KtConstructorDelegationCall::class.java) public fun hasImplicitDelegationCall(): Boolean = getDelegationCall().isImplicit() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt index 0206fa02e1a..2a0ad2244e4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt @@ -59,7 +59,7 @@ private class PsiElementArgumentType(klass: Class) : PsiEleme } } -private object PsiChildRangeArgumentType : PsiElementPlaceholderArgumentType(javaClass(), javaClass()) { +private object PsiChildRangeArgumentType : PsiElementPlaceholderArgumentType(PsiChildRange::class.java, KtElement::class.java) { override fun replacePlaceholderElement(placeholder: KtElement, argument: PsiChildRange) { val project = placeholder.getProject() val codeStyleManager = CodeStyleManager.getInstance(project) @@ -81,10 +81,10 @@ private object PsiChildRangeArgumentType : PsiElementPlaceholderArgumentType(javaClass()), - PsiElementArgumentType(javaClass()), - PlainTextArgumentType(javaClass(), toPlainText = { it }), - PlainTextArgumentType(javaClass(), toPlainText = { it.render() }), + PsiElementArgumentType(KtExpression::class.java), + PsiElementArgumentType(KtTypeReference::class.java), + PlainTextArgumentType(String::class.java, toPlainText = { it }), + PlainTextArgumentType(Name::class.java, toPlainText = { it.render() }), PsiChildRangeArgumentType ) @@ -184,7 +184,7 @@ private data class PatternData(val processedText: String, val placeholders: Map< private fun processPattern(pattern: String, args: List): PatternData { val ranges = LinkedHashMap>() - fun charOrNull(i: Int) = if (0 <= i && i < pattern.length()) pattern[i] else null + fun charOrNull(i: Int) = if (0 <= i && i < pattern.length) pattern[i] else null fun check(condition: Boolean, message: String) { if (!condition) { @@ -192,9 +192,9 @@ private fun processPattern(pattern: String, args: List): PatternData { } } - val text = StringBuilder { + val text = buildString { var i = 0 - while (i < pattern.length()) { + while (i < pattern.length) { var c = pattern[i] if (c == '$') { @@ -205,12 +205,12 @@ private fun processPattern(pattern: String, args: List): PatternData { else { check(nextChar?.isDigit() ?: false, "unclosed '$'") - val lastIndex = (i..pattern.length() - 1).firstOrNull { !pattern[it].isDigit() } ?: pattern.length() + val lastIndex = (i..pattern.length - 1).firstOrNull { !pattern[it].isDigit() } ?: pattern.length val n = pattern.substring(i, lastIndex).toInt() check(n >= 0, "invalid placeholder number: $n") i = lastIndex - val arg: Any? = if (n < args.size()) args[n] else null /* report wrong number of arguments later */ + val arg: Any? = if (n < args.size) args[n] else null /* report wrong number of arguments later */ val placeholderText = if (charOrNull(i) != ':' || charOrNull(i + 1) != '\'') { if (arg is String) arg else "xyz" } @@ -226,7 +226,7 @@ private fun processPattern(pattern: String, args: List): PatternData { } append(placeholderText) - val range = TextRange(length() - placeholderText.length(), length()) + val range = TextRange(length - placeholderText.length, length) ranges.getOrPut(n, { ArrayList() }).add(Placeholder(range, placeholderText)) continue } @@ -236,17 +236,17 @@ private fun processPattern(pattern: String, args: List): PatternData { } i++ } - }.toString() + } if (!ranges.isEmpty()) { - val max = ranges.keySet().max()!! + val max = ranges.keys.max()!! for (i in 0..max) { check(ranges.contains(i), "no '$$i' placeholder") } } - if (args.size() != ranges.size()) { - throw IllegalArgumentException("Wrong number of arguments, expected: ${ranges.size()}, passed: ${args.size()}") + if (args.size != ranges.size) { + throw IllegalArgumentException("Wrong number of arguments, expected: ${ranges.size}, passed: ${args.size}") } return PatternData(text, ranges) @@ -262,14 +262,14 @@ public class BuilderByPattern { } public fun appendNonFormattedText(text: String): BuilderByPattern { - patternBuilder.append("$" + arguments.size()) + patternBuilder.append("$" + arguments.size) arguments.add(text) return this } public fun appendExpression(expression: KtExpression?): BuilderByPattern { if (expression != null) { - patternBuilder.append("$" + arguments.size()) + patternBuilder.append("$" + arguments.size) arguments.add(expression) } return this @@ -287,20 +287,20 @@ public class BuilderByPattern { public fun appendTypeReference(typeRef: KtTypeReference?): BuilderByPattern { if (typeRef != null) { - patternBuilder.append("$" + arguments.size()) + patternBuilder.append("$" + arguments.size) arguments.add(typeRef) } return this } public fun appendName(name: Name): BuilderByPattern { - patternBuilder.append("$" + arguments.size()) + patternBuilder.append("$" + arguments.size) arguments.add(name) return this } public fun appendChildRange(range: PsiChildRange): BuilderByPattern { - patternBuilder.append("$" + arguments.size()) + patternBuilder.append("$" + arguments.size) arguments.add(range) return this } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/KtStringTemplateExpressionManipulator.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/KtStringTemplateExpressionManipulator.kt index d37d459ea4f..405ec0c8ab1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/KtStringTemplateExpressionManipulator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/KtStringTemplateExpressionManipulator.kt @@ -30,7 +30,7 @@ public class KtStringTemplateExpressionManipulator : AbstractElementManipulator< val newText = oldText.substring(0, range.getStartOffset()) + content + oldText.substring(range.getEndOffset()) val expression = KtPsiFactory(element.getProject()).createExpression(newText) node.replaceAllChildrenToChildrenOf(expression.getNode()) - return node.getPsi(javaClass()) + return node.getPsi(KtStringTemplateExpression::class.java) } override fun getRangeInElement(element: KtStringTemplateExpression): TextRange { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/StringTemplateExpressionManipulator.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/StringTemplateExpressionManipulator.kt index f6e05ec6977..4947e8ac781 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/StringTemplateExpressionManipulator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/StringTemplateExpressionManipulator.kt @@ -30,7 +30,7 @@ public class StringTemplateExpressionManipulator: AbstractElementManipulator( - this, javaClass(), /* strict = */false, javaClass() + this, KtAnnotationEntry::class.java, /* strict = */false, KtValueArgumentList::class.java ) ?: return getTextRange() val startOffset = annotationEntry.getAtSymbol()?.getTextRange()?.getStartOffset() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt index db3a00bad14..dd927f39443 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt @@ -117,23 +117,23 @@ public fun PsiElement.getNonStrictParentOfType(parentClass: Cla } inline public fun PsiElement.getParentOfType(strict: Boolean): T? { - return PsiTreeUtil.getParentOfType(this, javaClass(), strict) + return PsiTreeUtil.getParentOfType(this, T::class.java, strict) } inline public fun PsiElement.getStrictParentOfType(): T? { - return PsiTreeUtil.getParentOfType(this, javaClass(), true) + return PsiTreeUtil.getParentOfType(this, T::class.java, true) } inline public fun PsiElement.getNonStrictParentOfType(): T? { - return PsiTreeUtil.getParentOfType(this, javaClass(), false) + return PsiTreeUtil.getParentOfType(this, T::class.java, false) } inline public fun PsiElement.getChildOfType(): T? { - return PsiTreeUtil.getChildOfType(this, javaClass()) + return PsiTreeUtil.getChildOfType(this, T::class.java) } inline public fun PsiElement.getChildrenOfType(): Array { - return PsiTreeUtil.getChildrenOfType(this, javaClass()) ?: arrayOf() + return PsiTreeUtil.getChildrenOfType(this, T::class.java) ?: arrayOf() } public fun PsiElement.getNextSiblingIgnoringWhitespaceAndComments(): PsiElement? { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtAnnotationUseSiteTargetElementType.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtAnnotationUseSiteTargetElementType.kt index 9e5118fff87..8e88d7ab5d1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtAnnotationUseSiteTargetElementType.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtAnnotationUseSiteTargetElementType.kt @@ -26,11 +26,11 @@ import org.jetbrains.kotlin.psi.stubs.KotlinAnnotationUseSiteTargetStub import org.jetbrains.kotlin.psi.stubs.impl.KotlinAnnotationUseSiteTargetStubImpl public class KtAnnotationUseSiteTargetElementType(debugName: String) : KtStubElementType( - debugName, javaClass(), javaClass() + debugName, KtAnnotationUseSiteTarget::class.java, KotlinAnnotationUseSiteTargetStub::class.java ) { override fun createStub(psi: KtAnnotationUseSiteTarget, parentStub: StubElement): KotlinAnnotationUseSiteTargetStub { - val useSiteTarget = psi.getAnnotationUseSiteTarget().name() + val useSiteTarget = psi.getAnnotationUseSiteTarget().name return KotlinAnnotationUseSiteTargetStubImpl(parentStub, StringRef.fromString(useSiteTarget)!!) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtEnumEntrySuperClassReferenceExpressionElementType.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtEnumEntrySuperClassReferenceExpressionElementType.kt index 14113938f8c..40807660787 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtEnumEntrySuperClassReferenceExpressionElementType.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtEnumEntrySuperClassReferenceExpressionElementType.kt @@ -28,8 +28,8 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinEnumEntrySuperclassReferenceExp public class KtEnumEntrySuperClassReferenceExpressionElementType(@NonNls debugName: String) : KtStubElementType( debugName, - javaClass(), - javaClass() + KtEnumEntrySuperclassReferenceExpression::class.java, + KotlinEnumEntrySuperclassReferenceExpressionStub::class.java ) { override fun createStub(psi: KtEnumEntrySuperclassReferenceExpression, parentStub: StubElement<*>): KotlinEnumEntrySuperclassReferenceExpressionStub { 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 958310f07d6..1159c587834 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 @@ -75,8 +75,8 @@ public open class KotlinStubBaseImpl>(parent: StubEleme } companion object { - private val LOGGER: Logger = Logger.getInstance(javaClass>>()) + private val LOGGER: Logger = Logger.getInstance(KotlinStubBaseImpl::class.java) - private val BASE_STUB_INTERFACES = listOf(javaClass>(), javaClass>(), javaClass>(), javaClass>()) + private val BASE_STUB_INTERFACES = listOf(KotlinStubWithFqName::class.java, KotlinClassOrObjectStub::class.java, NamedStub::class.java, KotlinCallableStubBase::class.java) } } 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 42c4f33fa86..e4886ee7f81 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.KtModifierKeywordToken public object ModifierMaskUtils { init { - assert(MODIFIER_KEYWORDS_ARRAY.size() <= 32) { "Current implementation depends on the ability to represent modifier list as bit mask" } + assert(MODIFIER_KEYWORDS_ARRAY.size <= 32) { "Current implementation depends on the ability to represent modifier list as bit mask" } } @JvmStatic diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/Utils.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/Utils.kt index b17698dd930..b303698b87f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/Utils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/Utils.kt @@ -20,6 +20,6 @@ import com.intellij.util.io.StringRef object Utils { fun wrapStrings(names : List) : Array { - return Array(names.size()) { i -> StringRef.fromString(names.get(i))!! } + return Array(names.size) { i -> StringRef.fromString(names.get(i))!! } } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt index 189a3f1b495..60401e79021 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt @@ -157,7 +157,7 @@ public class AnnotationChecker(private val additionalCheckers: Iterable().mapNotNull { KotlinTarget.valueOrNull(it.value.name.asString()) }.toSet() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt index b8afbe1d9f0..948f2ebf2c7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt @@ -52,7 +52,7 @@ private fun CallableDescriptor.isPlatformStaticIn(predicate: (DeclarationDescrip } public fun AnnotationDescriptor.argumentValue(parameterName: String): Any? { - return getAllValueArguments().entrySet() + return getAllValueArguments().entries .singleOrNull { it.key.getName().asString() == parameterName } ?.value?.value } \ No newline at end of file diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.kt index 25642ff63ca..b91cb5e1922 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.kt @@ -42,10 +42,10 @@ public fun KtReturnExpression.getTargetFunctionDescriptor(context: BindingContex if (targetLabel != null) return context[LABEL_TARGET, targetLabel]?.let { context[FUNCTION, it] } val declarationDescriptor = context[DECLARATION_TO_DESCRIPTOR, getNonStrictParentOfType()] - val containingFunctionDescriptor = DescriptorUtils.getParentOfType(declarationDescriptor, javaClass(), false) + val containingFunctionDescriptor = DescriptorUtils.getParentOfType(declarationDescriptor, FunctionDescriptor::class.java, false) if (containingFunctionDescriptor == null) return null - return sequence(containingFunctionDescriptor) { DescriptorUtils.getParentOfType(it, javaClass()) } + return sequence(containingFunctionDescriptor) { DescriptorUtils.getParentOfType(it, FunctionDescriptor::class.java) } .dropWhile { it is AnonymousFunctionDescriptor } .firstOrNull() } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt index 466359f13bf..46fe3104e45 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt @@ -27,7 +27,7 @@ public interface CodeAnalyzerInitializer { companion object { public fun getInstance(project: Project): CodeAnalyzerInitializer = - ServiceManager.getService(project, javaClass())!! + ServiceManager.getService(project, CodeAnalyzerInitializer::class.java)!! } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt index 26baca776ae..35e11c52341 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt @@ -36,7 +36,7 @@ public class CompositeBindingContext private constructor( companion object { public fun create(delegates: List): BindingContext { if (delegates.isEmpty()) return BindingContext.EMPTY - if (delegates.size() == 1) return delegates.first() + if (delegates.size == 1) return delegates.first() return CompositeBindingContext(delegates) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassUtils.kt index 0dc0a727a97..f530c1520df 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassUtils.kt @@ -34,7 +34,7 @@ public fun isComponentLike(name: Name): Boolean { } public fun getComponentIndex(componentName: Name): Int = - componentName.asString().substring(COMPONENT_FUNCTION_NAME_PREFIX.length()).toInt() + componentName.asString().substring(COMPONENT_FUNCTION_NAME_PREFIX.length).toInt() public fun createComponentName(index: Int): Name = Name.identifier(COMPONENT_FUNCTION_NAME_PREFIX + index) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt index 41a5f806bcd..cb9e58b609b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt @@ -51,7 +51,7 @@ public class DeclarationResolver( } public fun checkRedeclarations(c: TopDownAnalysisContext) { - for (classDescriptor in c.getDeclaredClasses().values()) { + for (classDescriptor in c.getDeclaredClasses().values) { val descriptorMap = HashMultimap.create() for (desc in classDescriptor.getUnsubstitutedMemberScope().getContributedDescriptors()) { if (desc is ClassDescriptor || desc is PropertyDescriptor) { @@ -67,7 +67,7 @@ public class DeclarationResolver( val redeclarations = Sets.newHashSet>() for (name in descriptorMap.keySet()) { val descriptors = descriptorMap[name] - if (descriptors.size() <= 1) { + if (descriptors.size <= 1) { continue } // We mustn't compare PropertyDescriptor with PropertyDescriptor because we do this at OverloadResolver @@ -97,7 +97,7 @@ public class DeclarationResolver( val descriptors = getTopLevelDescriptorsByFqName(topLevelDescriptorProvider, fqName, NoLookupLocation.WHEN_CHECK_REDECLARATIONS) - if (descriptors.size() > 1) { + if (descriptors.size > 1) { for (declarationOrPackageDirective in declarationsOrPackageDirectives) { val reportAt = if (declarationOrPackageDirective is KtPackageDirective) declarationOrPackageDirective.getNameIdentifier() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.kt index eca85e16ae6..d36dac10dc9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.kt @@ -67,7 +67,7 @@ public object DescriptorToSourceUtils { @JvmStatic public fun descriptorToDeclaration(descriptor: DeclarationDescriptor): PsiElement? { val effectiveReferencedDescriptors = getEffectiveReferencedDescriptors(descriptor) - return if (effectiveReferencedDescriptors.size() == 1) getSourceFromDescriptor(effectiveReferencedDescriptors.firstOrNull()!!) else null + return if (effectiveReferencedDescriptors.size == 1) getSourceFromDescriptor(effectiveReferencedDescriptors.firstOrNull()!!) else null } @JvmStatic diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt index 7ab69ed3ea7..aa8d7a6eb75 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt @@ -195,7 +195,7 @@ class FunctionDescriptorResolver( ): List { val expectedValueParameters = expectedFunctionType.getValueParameters(functionDescriptor) if (expectedValueParameters != null) { - if (expectedValueParameters.size() == 1 && function is KtFunctionLiteral && function.getValueParameterList() == null) { + if (expectedValueParameters.size == 1 && function is KtFunctionLiteral && function.getValueParameterList() == null) { // it parameter for lambda val valueParameterDescriptor = expectedValueParameters.first() val it = ValueParameterDescriptorImpl(functionDescriptor, null, 0, Annotations.EMPTY, Name.identifier("it"), @@ -205,9 +205,9 @@ class FunctionDescriptorResolver( trace.record(BindingContext.AUTO_CREATED_IT, it) return listOf(it) } - if (function.getValueParameters().size() != expectedValueParameters.size()) { + if (function.getValueParameters().size != expectedValueParameters.size) { val expectedParameterTypes = ExpressionTypingUtils.getValueParametersTypes(expectedValueParameters) - trace.report(EXPECTED_PARAMETERS_NUMBER_MISMATCH.on(function, expectedParameterTypes.size(), expectedParameterTypes)) + trace.report(EXPECTED_PARAMETERS_NUMBER_MISMATCH.on(function, expectedParameterTypes.size, expectedParameterTypes)) } } @@ -313,7 +313,7 @@ class FunctionDescriptorResolver( for (i in valueParameters.indices) { val valueParameter = valueParameters.get(i) val typeReference = valueParameter.getTypeReference() - val expectedType = expectedValueParameters?.let { if (i < it.size()) it[i].getType() else null } + val expectedType = expectedValueParameters?.let { if (i < it.size) it[i].getType() else null } val type: KotlinType if (typeReference != null) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt index 77d372512fb..e43f4b93aa1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt @@ -83,12 +83,12 @@ public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageVa ) as? ClassifierDescriptor return TypeQualifierResolutionResult(qualifierPartList, descriptor) } - assert(qualifierPartList.size() >= 1) { + assert(qualifierPartList.size >= 1) { "Too short qualifier list for user type $userType : ${qualifierPartList.joinToString()}" } val qualifier = resolveToPackageOrClass( - qualifierPartList.subList(0, qualifierPartList.size() - 1), module, + qualifierPartList.subList(0, qualifierPartList.size - 1), module, trace, scope.ownerDescriptor, scope.check { !userType.startWithPackage }, position = QualifierPosition.TYPE ) ?: return TypeQualifierResolutionResult(qualifierPartList, null) @@ -170,7 +170,7 @@ public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageVa } val packageOrClassDescriptor = resolveToPackageOrClass( - path.subList(0, path.size() - 1), moduleDescriptor, trace, + path.subList(0, path.size - 1), moduleDescriptor, trace, packageFragmentForVisibilityCheck, scopeForFirstPart = null, position = QualifierPosition.IMPORT ) ?: return null @@ -480,7 +480,7 @@ public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageVa trace: BindingTrace, position: QualifierPosition ): Pair { - val possiblePackagePrefixSize = path.indexOfFirst { it.typeArguments != null }.let { if (it == -1) path.size() else it + 1 } + val possiblePackagePrefixSize = path.indexOfFirst { it.typeArguments != null }.let { if (it == -1) path.size else it + 1 } var fqName = path.subList(0, possiblePackagePrefixSize).fold(FqName.ROOT) { fqName, qualifierPart -> fqName.child(qualifierPart.name) } @@ -522,13 +522,13 @@ public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageVa position: QualifierPosition, isQualifier: Boolean = true ) { - if (descriptors.size() > 1) { + if (descriptors.size > 1) { val visibleDescriptors = descriptors.filter { isVisible(it, shouldBeVisibleFrom, position) } if (visibleDescriptors.isEmpty()) { val descriptor = descriptors.first() as DeclarationDescriptorWithVisibility trace.report(Errors.INVISIBLE_REFERENCE.on(referenceExpression, descriptor, descriptor.visibility, descriptor)) } - else if (visibleDescriptors.size() > 1) { + else if (visibleDescriptors.size > 1) { trace.record(BindingContext.AMBIGUOUS_REFERENCE_TARGET, referenceExpression, visibleDescriptors) } else { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt index 0ea5a6a6677..8a8282fc2be 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt @@ -76,8 +76,8 @@ private class ExplicitTypeBinding( override fun getArgumentBindings(): List?> { val psiTypeArguments = psiElement.getTypeArgumentsAsTypes() val isErrorBinding = run { - val sizeIsEqual = psiTypeArguments.size() == kotlinType.getArguments().size() - && psiTypeArguments.size() == kotlinType.getConstructor().getParameters().size() + val sizeIsEqual = psiTypeArguments.size == kotlinType.getArguments().size + && psiTypeArguments.size == kotlinType.getConstructor().getParameters().size kotlinType.isError() || !sizeIsEqual } @@ -115,7 +115,7 @@ private class NoTypeElementBinding( ): TypeBinding

{ override fun getArgumentBindings(): List?> { - val isErrorBinding = kotlinType.isError() || kotlinType.getConstructor().getParameters().size() != kotlinType.getArguments().size() + val isErrorBinding = kotlinType.isError() || kotlinType.getConstructor().getParameters().size != kotlinType.getArguments().size return kotlinType.getArguments().indices.map { val typeProjection = kotlinType.getArguments()[it] TypeArgumentBindingImpl( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index cc1321d5ccb..e82089f9ee0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -493,7 +493,7 @@ public class TypeResolver( ModifierCheckerCore.check(argumentElement, c.trace, null) if (projectionKind == KtProjectionKind.STAR) { val parameters = constructor.getParameters() - if (parameters.size() > i) { + if (parameters.size > i) { val parameterDescriptor = parameters[i] TypeUtils.makeStarProjection(parameterDescriptor) } @@ -504,7 +504,7 @@ public class TypeResolver( else { val type = resolveType(c.noBareTypes(), argumentElement.getTypeReference()!!) val kind = resolveProjectionKind(projectionKind) - if (constructor.getParameters().size() > i) { + if (constructor.getParameters().size > i) { val parameterDescriptor = constructor.getParameters()[i] if (kind != INVARIANT && parameterDescriptor.getVariance() != INVARIANT) { if (kind == parameterDescriptor.getVariance()) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt index 65e6b1f6457..99c547c20d5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt @@ -55,7 +55,7 @@ class VarianceChecker(private val trace: BindingTrace) { } private fun checkClasses(c: TopDownAnalysisContext) { - for (jetClassOrObject in c.getDeclaredClasses()!!.keySet()) { + for (jetClassOrObject in c.getDeclaredClasses()!!.keys) { if (jetClassOrObject is KtClass) { for (specifier in jetClassOrObject.getSuperTypeListEntries()) { specifier.getTypeReference()?.checkTypePosition(trace.getBindingContext(), OUT_VARIANCE, trace) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt index f1c631f0132..0c9667b5ad8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt @@ -121,15 +121,15 @@ public class CandidateResolver( typeArguments.add(type) } - val expectedTypeArgumentCount = candidateDescriptor.getTypeParameters().size() - for (index in jetTypeArguments.size()..expectedTypeArgumentCount - 1) { + val expectedTypeArgumentCount = candidateDescriptor.getTypeParameters().size + for (index in jetTypeArguments.size..expectedTypeArgumentCount - 1) { typeArguments.add(ErrorUtils.createErrorType( "Explicit type argument expected for " + candidateDescriptor.getTypeParameters().get(index).getName())) } val substitution = FunctionDescriptorUtil.createSubstitution(candidateDescriptor as FunctionDescriptor, typeArguments) val substitutor = TypeSubstitutor.create(SubstitutionFilteringInternalResolveAnnotations(substitution)) - if (expectedTypeArgumentCount != jetTypeArguments.size()) { + if (expectedTypeArgumentCount != jetTypeArguments.size) { candidateCall.addStatus(OTHER_ERROR) tracing.wrongNumberOfTypeArguments(trace, expectedTypeArgumentCount) } @@ -315,9 +315,9 @@ public class CandidateResolver( var resultStatus = SUCCESS val argumentTypes = Lists.newArrayList() val infoForArguments = candidateCall.getDataFlowInfoForArguments() - for (entry in candidateCall.getValueArguments().entrySet()) { - val parameterDescriptor = entry.getKey() - val resolvedArgument = entry.getValue() + for (entry in candidateCall.getValueArguments().entries) { + val parameterDescriptor = entry.key + val resolvedArgument = entry.value for (argument in resolvedArgument.getArguments()) { @@ -507,7 +507,7 @@ public class CandidateResolver( substitutor: TypeSubstitutor, trace: BindingTrace) { val typeParameters = functionDescriptor.getTypeParameters() - for (i in 0..Math.min(typeParameters.size(), jetTypeArguments.size()) - 1) { + for (i in 0..Math.min(typeParameters.size, jetTypeArguments.size) - 1) { val typeParameterDescriptor = typeParameters.get(i) val typeArgument = typeArguments.get(i) val typeReference = jetTypeArguments.get(i).getTypeReference() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt index 268c5f13975..8bfeab62911 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt @@ -155,7 +155,7 @@ class DynamicCallableDescriptors(private val builtIns: KotlinBuiltIns) { val parameters = ArrayList() fun addParameter(arg : ValueArgument, outType: KotlinType, varargElementType: KotlinType?) { - val index = parameters.size() + val index = parameters.size parameters.add(ValueParameterDescriptorImpl( owner, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt index 6127e4c1726..73f041572c6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt @@ -45,7 +45,7 @@ public fun ResolvedCall.hasUnmappedArguments(): Bool public fun ResolvedCall.hasUnmappedParameters(): Boolean { val parameterToArgumentMap = getValueArguments() - return !parameterToArgumentMap.keySet().containsAll(getResultingDescriptor().getValueParameters()) + return !parameterToArgumentMap.keys.containsAll(getResultingDescriptor().getValueParameters()) } public fun ResolvedCall.allArgumentsMapped() @@ -144,8 +144,8 @@ public fun KtElement.getCall(context: BindingContext): Call? { public fun KtElement.getParentCall(context: BindingContext, strict: Boolean = true): Call? { val callExpressionTypes = arrayOf?>( - javaClass(), javaClass(), javaClass(), - javaClass(), javaClass()) + KtSimpleNameExpression::class.java, KtCallElement::class.java, KtBinaryExpression::class.java, + KtUnaryExpression::class.java, KtArrayAccessExpression::class.java) val parent = if (strict) { PsiTreeUtil.getParentOfType(this, *callExpressionTypes) 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 6f7c95e6bf6..302eb846631 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 @@ -367,7 +367,7 @@ private class ConstantExpressionEvaluatorVisitor( val leftExpression = expression.left ?: return null val operationToken = expression.operationToken - if (OperatorConventions.BOOLEAN_OPERATIONS.containsKeyRaw(operationToken)) { + if (OperatorConventions.BOOLEAN_OPERATIONS.containsKey(operationToken)) { val booleanType = constantExpressionEvaluator.builtIns.booleanType val leftConstant = evaluate(leftExpression, booleanType) ?: return null diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt index f4506f2bd16..4ff976278ed 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt @@ -110,7 +110,7 @@ class LazyImportResolver( } for (alias in explicitClassImports.keySet()) { val imports = explicitClassImports.get(alias) - if (imports.size() > 1) { + if (imports.size > 1) { imports.forEach { traceForImportResolve.report(Errors.CONFLICTING_IMPORT.on(it, alias)) } 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 0e1c2bc463d..ab37a35ed88 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 @@ -42,7 +42,7 @@ public abstract class DeclarationProviderFactoryService { syntheticFiles: Collection, filesScope: GlobalSearchScope ): DeclarationProviderFactory { - return ServiceManager.getService(project, javaClass())!! + return ServiceManager.getService(project, DeclarationProviderFactoryService::class.java)!! .create(project, storageManager, syntheticFiles, filteringScope(syntheticFiles, filesScope)) } 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 4719f2e4586..6a11c167c8b 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 @@ -127,7 +127,7 @@ protected constructor( location: LookupLocation ): List { val declarations = declarationProvider.getDeclarations(kindFilter, nameFilter) - val result = LinkedHashSet(declarations.size()) + val result = LinkedHashSet(declarations.size) for (declaration in declarations) { if (declaration is KtClassOrObject) { val name = declaration.nameAsSafeName 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 759a0bc12f8..2d876d451c4 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 @@ -131,7 +131,7 @@ public open class LazyClassMemberScope( } result.addAll(generateDelegatingDescriptors(name, EXTRACT_FUNCTIONS, result)) generateDataClassMethods(result, name, location) - generateFakeOverrides(name, fromSupertypes, result, javaClass()) + generateFakeOverrides(name, fromSupertypes, result, FunctionDescriptor::class.java) } private fun generateDataClassMethods(result: MutableCollection, name: Name, location: LookupLocation) { @@ -140,7 +140,7 @@ public open class LazyClassMemberScope( val constructor = getPrimaryConstructor() ?: return val primaryConstructorParameters = declarationProvider.getOwnerInfo().getPrimaryConstructorParameters() - assert(constructor.getValueParameters().size() == primaryConstructorParameters.size()) { "From descriptor: " + constructor.getValueParameters().size() + " but from PSI: " + primaryConstructorParameters.size() } + assert(constructor.getValueParameters().size == primaryConstructorParameters.size) { "From descriptor: " + constructor.getValueParameters().size + " but from PSI: " + primaryConstructorParameters.size } if (isComponentLike(name)) { var componentIndex = 0 @@ -200,7 +200,7 @@ public open class LazyClassMemberScope( fromSupertypes.addAll(supertype.memberScope.getContributedVariables(name, NoLookupLocation.FOR_ALREADY_TRACKED)) } result.addAll(generateDelegatingDescriptors(name, EXTRACT_PROPERTIES, result)) - generateFakeOverrides(name, fromSupertypes, result, javaClass()) + generateFakeOverrides(name, fromSupertypes, result, PropertyDescriptor::class.java) } protected open fun createPropertiesFromPrimaryConstructorParameters(name: Name, result: MutableSet) { @@ -211,8 +211,8 @@ public open class LazyClassMemberScope( val valueParameterDescriptors = primaryConstructor.getValueParameters() val primaryConstructorParameters = classInfo.getPrimaryConstructorParameters() - assert(valueParameterDescriptors.size() == primaryConstructorParameters.size()) { - "From descriptor: ${valueParameterDescriptors.size()} but from PSI: ${primaryConstructorParameters.size()}" + assert(valueParameterDescriptors.size == primaryConstructorParameters.size) { + "From descriptor: ${valueParameterDescriptors.size} but from PSI: ${primaryConstructorParameters.size}" } for (valueParameterDescriptor in valueParameterDescriptors) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalWritableScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalWritableScope.kt index 775204e3518..59e7f16df4f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalWritableScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalWritableScope.kt @@ -42,7 +42,7 @@ class LexicalWritableScope( private var lastSnapshot: Snapshot? = null public fun changeLockLevel(lockLevel: LockLevel) { - if (lockLevel.ordinal() < this.lockLevel.ordinal()) { + if (lockLevel.ordinal < this.lockLevel.ordinal) { throw IllegalStateException("cannot lower lock level from " + this.lockLevel + " to " + lockLevel + " at " + toString()) } this.lockLevel = lockLevel @@ -50,8 +50,8 @@ class LexicalWritableScope( public fun takeSnapshot(): LexicalScope { checkMayRead() - if (lastSnapshot == null || lastSnapshot!!.descriptorLimit != addedDescriptors.size()) { - lastSnapshot = Snapshot(addedDescriptors.size()) + if (lastSnapshot == null || lastSnapshot!!.descriptorLimit != addedDescriptors.size) { + lastSnapshot = Snapshot(addedDescriptors.size) } return lastSnapshot!! } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeStorage.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeStorage.kt index 64ac043da5d..215cf441e2b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeStorage.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeStorage.kt @@ -60,7 +60,7 @@ abstract class WritableScopeStorage(val redeclarationHandler: RedeclarationHandl functionsByName!![name] = functionsByName!![name] + descriptorIndex } - protected fun variableOrClassDescriptorByName(name: Name, descriptorLimit: Int = addedDescriptors.size()): DeclarationDescriptor? { + protected fun variableOrClassDescriptorByName(name: Name, descriptorLimit: Int = addedDescriptors.size): DeclarationDescriptor? { if (descriptorLimit == 0) return null var list = variablesAndClassifiersByName?.get(name) @@ -74,7 +74,7 @@ abstract class WritableScopeStorage(val redeclarationHandler: RedeclarationHandl return null } - protected fun functionsByName(name: Name, descriptorLimit: Int = addedDescriptors.size()): List? { + protected fun functionsByName(name: Name, descriptorLimit: Int = addedDescriptors.size): List? { if (descriptorLimit == 0) return null var list = functionsByName?.get(name) @@ -89,7 +89,7 @@ abstract class WritableScopeStorage(val redeclarationHandler: RedeclarationHandl private fun addDescriptor(descriptor: DeclarationDescriptor): Int { addedDescriptors.add(descriptor) - return addedDescriptors.size() - 1 + return addedDescriptors.size - 1 } private class IntList(val last: Int, val prev: IntList?) @@ -108,13 +108,13 @@ abstract class WritableScopeStorage(val redeclarationHandler: RedeclarationHandl return result } - protected fun getClassifier(name: Name, descriptorLimit: Int = addedDescriptors.size()) + protected fun getClassifier(name: Name, descriptorLimit: Int = addedDescriptors.size) = variableOrClassDescriptorByName(name, descriptorLimit) as? ClassifierDescriptor - protected fun getVariables(name: Name, descriptorLimit: Int = addedDescriptors.size()): Collection + protected fun getVariables(name: Name, descriptorLimit: Int = addedDescriptors.size): Collection = listOfNotNull(variableOrClassDescriptorByName(name, descriptorLimit) as? VariableDescriptor) - protected fun getFunctions(name: Name, descriptorLimit: Int = addedDescriptors.size()): Collection + protected fun getFunctions(name: Name, descriptorLimit: Int = addedDescriptors.size): Collection = functionsByName(name, descriptorLimit) ?: emptyList() } \ No newline at end of file diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/DeprecatedSymbolValidator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/DeprecatedSymbolValidator.kt index 41d277a3b40..af0d13fd486 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/DeprecatedSymbolValidator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/validation/DeprecatedSymbolValidator.kt @@ -50,12 +50,12 @@ public class DeprecatedSymbolValidator : SymbolUsageValidator { override fun validateTypeUsage(targetDescriptor: ClassifierDescriptor, trace: BindingTrace, element: PsiElement) { // Do not check types in annotation entries to prevent cycles in resolve, rely on call message - val annotationEntry = KtStubbedPsiUtil.getPsiOrStubParent(element, javaClass(), true) + val annotationEntry = KtStubbedPsiUtil.getPsiOrStubParent(element, KtAnnotationEntry::class.java, true) if (annotationEntry != null && annotationEntry.getCalleeExpression()!!.getConstructorReferenceExpression() == element) return // Do not check types in calls to super constructor in extends list, rely on call message - val superExpression = KtStubbedPsiUtil.getPsiOrStubParent(element, javaClass(), true) + val superExpression = KtStubbedPsiUtil.getPsiOrStubParent(element, KtSuperTypeCallEntry::class.java, true) if (superExpression != null && superExpression.getCalleeExpression().getConstructorReferenceExpression() == element) return @@ -86,7 +86,7 @@ public class DeprecatedSymbolValidator : SymbolUsageValidator { expression: PsiElement ) { // property getters do not come as callable yet, so we analyse surroundings to check for deprecation annotation on getter - val binaryExpression = PsiTreeUtil.getParentOfType(expression, javaClass()) + val binaryExpression = PsiTreeUtil.getParentOfType(expression, KtBinaryExpression::class.java) if (binaryExpression != null) { val left = binaryExpression.getLeft() if (left == expression) { @@ -95,7 +95,7 @@ public class DeprecatedSymbolValidator : SymbolUsageValidator { return } - val jetReferenceExpressions = PsiTreeUtil.getChildrenOfType(left, javaClass()) + val jetReferenceExpressions = PsiTreeUtil.getChildrenOfType(left, KtReferenceExpression::class.java) if (jetReferenceExpressions != null) { for (expr in jetReferenceExpressions) { if (expr == expression) { @@ -107,7 +107,7 @@ public class DeprecatedSymbolValidator : SymbolUsageValidator { } } - val unaryExpression = PsiTreeUtil.getParentOfType(expression, javaClass()) + val unaryExpression = PsiTreeUtil.getParentOfType(expression, KtUnaryExpression::class.java) if (unaryExpression != null) { val operation = unaryExpression.getOperationReference().getReferencedNameElementType() if (operation != null && operation in PROPERTY_SET_OPERATIONS) @@ -115,7 +115,7 @@ public class DeprecatedSymbolValidator : SymbolUsageValidator { } - val callableExpression = PsiTreeUtil.getParentOfType(expression, javaClass()) + val callableExpression = PsiTreeUtil.getParentOfType(expression, KtCallableReferenceExpression::class.java) if (callableExpression != null && callableExpression.getCallableReference() == expression) { return // skip Type::property } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt index 803c9cafc71..3f04b6635ee 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt @@ -46,7 +46,7 @@ public class FakeCallResolver( val traceWithFakeArgumentInfo = TemporaryBindingTrace.create(context.trace, "trace to store fake argument for", name) val fakeArguments = ArrayList() for (type in argumentTypes) { - fakeArguments.add(ExpressionTypingUtils.createFakeExpressionOfType(project, traceWithFakeArgumentInfo, "fakeArgument" + fakeArguments.size(), type)) + fakeArguments.add(ExpressionTypingUtils.createFakeExpressionOfType(project, traceWithFakeArgumentInfo, "fakeArgument" + fakeArguments.size, type)) } return makeAndResolveFakeCall(receiver, context.replaceBindingTrace(traceWithFakeArgumentInfo), fakeArguments, name, callElement).second } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PreliminaryLoopVisitor.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PreliminaryLoopVisitor.kt index 99388925068..b3acae017b5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PreliminaryLoopVisitor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PreliminaryLoopVisitor.kt @@ -32,7 +32,7 @@ class PreliminaryLoopVisitor private constructor() : AssignedVariablesSearcher() var resultFlowInfo = dataFlowInfo val nullabilityMap = resultFlowInfo.completeNullabilityInfo val valueSetToClear = LinkedHashSet() - for (value in nullabilityMap.keySet()) { + for (value in nullabilityMap.keys) { // Only predictable variables are under interest here val id = value.id if (value.kind == DataFlowValue.Kind.PREDICTABLE_VARIABLE && id is LocalVariableDescriptor) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/unqualifiedSuper/unqualifiedSuper.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/unqualifiedSuper/unqualifiedSuper.kt index 2beda40d309..65b42fc77fb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/unqualifiedSuper/unqualifiedSuper.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/unqualifiedSuper/unqualifiedSuper.kt @@ -72,11 +72,11 @@ public fun resolveUnqualifiedSuperFromExpressionContext( private val ARITY_OF_METHODS_OF_ANY = hashMapOf("hashCode" to 0, "equals" to 1, "toString" to 0) private fun isCallingMethodOfAny(callExpression: KtCallExpression, calleeName: Name): Boolean = - ARITY_OF_METHODS_OF_ANY.getOrElse(calleeName.asString(), { -1 }) == callExpression.valueArguments.size() + ARITY_OF_METHODS_OF_ANY.getOrElse(calleeName.asString(), { -1 }) == callExpression.valueArguments.size public fun isPossiblyAmbiguousUnqualifiedSuper(superExpression: KtSuperExpression, supertypes: Collection): Boolean = - supertypes.size() > 1 || - (supertypes.size() == 1 && supertypes.single().isInterface() && isCallingMethodOfAnyWithSuper(superExpression)) + supertypes.size > 1 || + (supertypes.size == 1 && supertypes.single().isInterface() && isCallingMethodOfAnyWithSuper(superExpression)) private fun isCallingMethodOfAnyWithSuper(superExpression: KtSuperExpression): Boolean { val parent = superExpression.parent 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 370ca15f678..46042d2b91b 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt @@ -142,8 +142,8 @@ public class KotlinCodeBlockModificationListener(modificationTracker: PsiModific } private val BLOCK_DECLARATION_TYPES = arrayOf>( - javaClass(), - javaClass() + KtProperty::class.java, + KtNamedFunction::class.java ) } } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt index 2f75652a872..eea2ea579e2 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt @@ -68,7 +68,7 @@ public class KtLightClassForFacade private constructor( companion object { public fun getInstance(project: Project): FacadeStubCache { - return ServiceManager.getService(project, javaClass()) + return ServiceManager.getService(project, FacadeStubCache::class.java) } } } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt index ddc31d1be6a..33de8e6d5f7 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt @@ -104,8 +104,8 @@ class FilteredJvmDiagnostics(val jvmDiagnostics: Diagnostics, val otherDiagnosti conflicting.groupBy { it.data().signature.name }.forEach { - val diagnostics = it.getValue() - if (diagnostics.size() <= 1) { + val diagnostics = it.value + if (diagnostics.size <= 1) { filtered.addAll(diagnostics) } else { diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt index 1aea9de0ae4..7c726ac22b1 100644 --- a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt +++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CliOptions.kt @@ -41,9 +41,9 @@ public fun cliPluginUsageString(pluginId: String, options: Collection val renderedOptions = options.map { val name = "${it.name} ${it.valueDescription}" - val margin = if (name.length() > MAX_OPTION_WIDTH) { + val margin = if (name.length > MAX_OPTION_WIDTH) { "\n" + " ".repeat(MAX_OPTION_WIDTH + LEFT_INDENT + 1) - } else " ".repeat(1 + MAX_OPTION_WIDTH - name.length()) + } else " ".repeat(1 + MAX_OPTION_WIDTH - name.length) val modifiers = listOfNotNull( if (it.required) "required" else null, diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt index 735b462b2d1..2c700d2138a 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt @@ -69,22 +69,22 @@ public abstract class AbstractPseudoValueTest : AbstractPseudocodeTest() { .mapNotNull { (it as? InstructionWithValue)?.outputValue } .filter { it.element == null } .sortedBy { it.debugName } - val allValues = elementToValues.values() + unboundValues + val allValues = elementToValues.values + unboundValues if (allValues.isEmpty()) return val valueDescriptions = LinkedHashMap, String>() for (value in unboundValues) { valueDescriptions[value to null] = valueDescription(null, value) } - for ((element, value) in elementToValues.entrySet()) { + for ((element, value) in elementToValues.entries) { valueDescriptions[value to element] = valueDescription(element, value) } - val elementColumnWidth = elementToValues.keySet().map { elementText(it).length() }.max() ?: 1 - val valueColumnWidth = allValues.map { valueDecl(it).length() }.max()!! - val valueDescColumnWidth = valueDescriptions.values().map { it.length() }.max()!! + val elementColumnWidth = elementToValues.keys.map { elementText(it).length }.max() ?: 1 + val valueColumnWidth = allValues.map { valueDecl(it).length }.max()!! + val valueDescColumnWidth = valueDescriptions.values.map { it.length }.max()!! - for ((ve, description) in valueDescriptions.entrySet()) { + for ((ve, description) in valueDescriptions.entries) { val (value, element) = ve out .append("%1$-${elementColumnWidth}s".format(elementText(element))) diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt index 4a6eb946de6..38eada88792 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt @@ -45,7 +45,7 @@ class LazyOperationsLog( val stringSanitizer: (String) -> String ) { val ids = IdentityHashMap() - private fun objectId(o: Any): Int = ids.getOrPut(o, { ids.size() }) + private fun objectId(o: Any): Int = ids.getOrPut(o, { ids.size }) private class Record( val lambda: Any, @@ -62,7 +62,7 @@ class LazyOperationsLog( public fun getText(): String { val groupedByOwner = records.groupByTo(IdentityHashMap()) { it.data.fieldOwner - }.map { Pair(it.getKey(), it.getValue()) } + }.map { Pair(it.key, it.value) } return groupedByOwner.map { val (owner, records) = it @@ -79,7 +79,7 @@ class LazyOperationsLog( private fun String.renumberObjects(): String { val ids = HashMap() fun newId(objectId: String): String { - return ids.getOrPut(objectId, { "@" + ids.size() }) + return ids.getOrPut(objectId, { "@" + ids.size }) } val m = Pattern.compile("@\\d+").matcher(this) @@ -181,10 +181,10 @@ class LazyOperationsLog( } } o is KotlinTypeImpl -> { - StringBuilder { + StringBuilder().apply { append(o.getConstructor()) if (!o.getArguments().isEmpty()) { - append("<${o.getArguments().size()}>") + append("<${o.getArguments().size}>") } }.appendQuoted() } diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index 371e86eb385..e6c666e1d13 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -109,15 +109,15 @@ public class CodeConformanceTest : TestCase() { } if (tests.flatMap { it.result }.isNotEmpty()) { - fail(StringBuilder { + fail(buildString { for (test in tests) { if (test.result.isNotEmpty()) { - append(test.message.format(test.result.size(), test.result.joinToString("\n"))) + append(test.message.format(test.result.size, test.result.joinToString("\n"))) appendln() appendln() } } - }.toString()) + }) } } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt index 59b2f870b99..764496d6cf7 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt @@ -44,7 +44,7 @@ class BridgeTest : TestCase() { } private fun v(text: String): Fun { - assert(text.length() == 3) { "Function vertex representation should consist of 3 characters: $text" } + assert(text.length == 3) { "Function vertex representation should consist of 3 characters: $text" } assert(text[0] in setOf('-', '+')) { "First character should be '-' for abstract functions or '+' for concrete ones: $text" } assert(text[1] in setOf('D', 'F')) { "Second character should be 'D' for declarations or 'F' for fake overrides: $text" } assert(text[2].isDigit()) { @@ -95,7 +95,7 @@ class BridgeTest : TestCase() { for (vertex in vertices) { val directConcreteSuperFunctions = vertex.overriddenFunctions.filter { !it.isAbstract } - assert(directConcreteSuperFunctions.size() <= 1) { + assert(directConcreteSuperFunctions.size <= 1) { "Incorrect test data: function $vertex has more than one direct concrete super-function: ${vertex.overriddenFunctions}\n" + "This is not allowed because only classes can contain implementations (concrete functions), and having more than one " + "concrete super-function means having more than one superclass, which is prohibited in Kotlin" @@ -118,7 +118,7 @@ class BridgeTest : TestCase() { assert(concreteDeclarations.isNotEmpty()) { "Incorrect test data: concrete fake override vertex $vertex has no concrete super-declarations" } - assert(concreteDeclarations.size() == 1) { + assert(concreteDeclarations.size == 1) { "Incorrect test data: concrete fake override vertex $vertex has more than one concrete super-declaration: " + "$concreteDeclarations" } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt index 8c670a611e0..c6144dd7073 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt @@ -65,7 +65,7 @@ public interface AbstractSMAPBaseTest { val compiledData = extractSMAPFromClasses(outputFiles).groupBy { it.sourceFile }.map { - val smap = it.getValue().mapNotNull { it.smap?.replaceHash() }.joinToString("\n") + val smap = it.value.mapNotNull { it.smap?.replaceHash() }.joinToString("\n") SMAPAndFile(if (smap.isNotEmpty()) smap else null, it.key) }.toMapBy { it.sourceFile } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt index e4c212ddaac..8036852082b 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt @@ -91,7 +91,7 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() { fun check() { Assert.assertTrue(classSuitesByClassName.isNotEmpty()) - classSuitesByClassName.values().forEach { it.check() } + classSuitesByClassName.values.forEach { it.check() } } } @@ -135,7 +135,7 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() { methodExpectations.filterNotTo(uncheckedExpectations) { it.isChecked() } fieldExpectations.filterNotTo(uncheckedExpectations) { it.isChecked() } Assert.assertTrue( - "Unchecked expectations (${uncheckedExpectations.size()} total):\n " + uncheckedExpectations.joinToString("\n "), + "Unchecked expectations (${uncheckedExpectations.size} total):\n " + uncheckedExpectations.joinToString("\n "), uncheckedExpectations.isEmpty()) } @@ -185,7 +185,7 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() { val lines = Files.readLines(ktFile, Charset.forName("utf-8")) var lineNo = 0 - while (lineNo < lines.size()) { + while (lineNo < lines.size) { val line = lines[lineNo] val expectationMatch = expectationRegex.matchExact(line) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index c650e62075c..74b0ea8efd2 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -102,7 +102,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() { } } } - return modules.values().toList() + return modules.values.toList() } private fun performChecks(resolverForProject: ResolverForProject, modules: List) { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt index 0544516f20b..92dabf53a69 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt @@ -85,7 +85,7 @@ private fun ValueArgument.getText() = this.getArgumentExpression()?.getText()?.r private fun ArgumentMapping.getText() = when (this) { is ArgumentMatch -> { val parameterType = DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(valueParameter.getType()) - "${status.name()} ${valueParameter.getName()} : ${parameterType} =" + "${status.name} ${valueParameter.getName()} : ${parameterType} =" } else -> "ARGUMENT UNMAPPED: " } @@ -96,7 +96,7 @@ private fun DeclarationDescriptor.getText(): String = when (this) { } private fun ResolvedCall<*>.renderToText(): String { - return StringBuilder { + return buildString { appendln("Resolved call:") appendln() @@ -123,5 +123,5 @@ private fun ResolvedCall<*>.renderToText(): String { appendln("$argumentMappingText $argumentText") } } - }.toString() + } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt index 6c748c305a5..5cdc2e72fff 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt @@ -44,7 +44,7 @@ public class ConstraintSystemTestData( init { val functions = context.getSliceContents(BindingContext.FUNCTION) - functionFoo = findFunctionByName(functions.values(), "foo") + functionFoo = findFunctionByName(functions.values, "foo") val function = DescriptorToSourceUtils.descriptorToDeclaration(functionFoo) as KtFunction val fooBody = function.getBodyExpression() scopeToResolveTypeParameters = context.get(BindingContext.LEXICAL_SCOPE, fooBody)!! diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt index 1d3b8a5b059..6afcb446ca0 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt @@ -43,8 +43,8 @@ public class CapturedTypeApproximationTest() : KotlinLiteFixture() { override fun createEnvironment(): KotlinCoreEnvironment = createEnvironmentWithMockJdk(ConfigurationKind.JDK_ONLY) public fun doTest(filePath: String, vararg substitutions: String) { - assert(substitutions.size() in 1..2) { "Captured type approximation test requires substitutions for (T) or (T, R)" } - val oneTypeVariable = substitutions.size() == 1 + assert(substitutions.size in 1..2) { "Captured type approximation test requires substitutions for (T) or (T, R)" } + val oneTypeVariable = substitutions.size == 1 val declarationsText = KotlinTestUtils.doLoadFile(File(getTestDataPath() + "/declarations.kt")) @@ -53,7 +53,7 @@ public class CapturedTypeApproximationTest() : KotlinLiteFixture() { val testFile = KtPsiFactory(getProject()).createFile(test) val bindingContext = JvmResolveUtil.analyzeOneFileWithJavaIntegration(testFile).bindingContext val functions = bindingContext.getSliceContents(BindingContext.FUNCTION) - val functionFoo = functions.values().firstOrNull { it.getName().asString() == "foo" } ?: + val functionFoo = functions.values.firstOrNull { it.getName().asString() == "foo" } ?: throw AssertionError("Function 'foo' is not declared") Pair(bindingContext, functionFoo) } @@ -90,7 +90,7 @@ public class CapturedTypeApproximationTest() : KotlinLiteFixture() { } val testTypes = if (oneTypeVariable) getTestTypesForOneTypeVariable() else getTestTypesForTwoTypeVariables() - val result = StringBuilder { + val result = buildString { for ((index, testTypeWithUnsubstitutedTypeVars) in testTypes.withIndex()) { val testType = createTestType(testTypeWithUnsubstitutedTypeVars) val (bindingContext, functionFoo) = analyzeTestFile(testType) @@ -115,8 +115,8 @@ public class CapturedTypeApproximationTest() : KotlinLiteFixture() { TypeProjectionImpl(INVARIANT, typeWithCapturedType), approximateContravariant = false) append(" ") - for (typeParameter in testSubstitution.keySet()) { - if (testSubstitution.size() > 1) append("${typeParameter.getName()} = ") + for (typeParameter in testSubstitution.keys) { + if (testSubstitution.size > 1) append("${typeParameter.getName()} = ") append("${testSubstitution[typeParameter]}. ") } appendln("lower: $lower; upper: $upper; substitution: $substitution") @@ -125,7 +125,7 @@ public class CapturedTypeApproximationTest() : KotlinLiteFixture() { } } - KotlinTestUtils.assertEqualsToFile(File(getTestDataPath() + "/" + filePath), result.toString()) + KotlinTestUtils.assertEqualsToFile(File(getTestDataPath() + "/" + filePath), result) } private fun getTypePatternsForOneTypeVariable() = listOf("In<#T#>", "Out<#T#>", "Inv<#T#>", "Inv", "Inv") @@ -142,7 +142,7 @@ public class CapturedTypeApproximationTest() : KotlinLiteFixture() { fun addRandomVariants(vararg randomVariants: String) { variants.addAll(randomVariants.map { digits -> digits.map { digit -> digit - '0' } }) } - assert(typePatterns.size() == 5) { "Generated random variants below depend on size 5" } + assert(typePatterns.size == 5) { "Generated random variants below depend on size 5" } //From 021 the following is generated: In>>, where In = typePatterns[0], Inv = typePatterns[2], Out = typePatterns[1] addRandomVariants("021", "111", "230", "421", "322", "120", "411", "102", "401", "012") addRandomVariants("4243", "3103", "3043", "2003", "4442", "4143", "1440", "0303", "1302", "1332") diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt index 2d8888b9599..cefee08ad23 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt @@ -47,7 +47,7 @@ public abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() { val classFile = tmpdir.walkTopDown().singleOrNull { it.path.endsWith("$classNameSuffix.class") } ?: error("Local class with suffix `$classNameSuffix` is not found in: ${tmpdir.listFiles().toList()}") - val clazz = classLoader.loadClass(classFile.relativeTo(tmpdir).substringBeforeLast(".class").replace('/', '.').replace('\\', '.')) + val clazz = classLoader.loadClass(classFile.toRelativeString(tmpdir).substringBeforeLast(".class").replace('/', '.').replace('\\', '.')) assertHasAnnotationData(clazz) val environment = KotlinCoreEnvironment.createForTests( diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt index 13b313554c4..40b5be6aaaa 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt @@ -80,7 +80,7 @@ public class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() { private fun deserialize(metaFile: File): ModuleDescriptorImpl { val module = KotlinTestUtils.createEmptyModule("<$MODULE_NAME>", JsPlatform) val metadata = KotlinJavascriptMetadataUtils.loadMetadata(metaFile) - assert(metadata.size() == 1) + assert(metadata.size == 1) val provider = KotlinJavascriptSerializationUtil.createPackageFragmentProvider(module, metadata[0].body, LockBasedStorageManager()) .sure { "No package fragment provider was created" } diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/jetTestUtils.kt b/compiler/tests/org/jetbrains/kotlin/test/util/jetTestUtils.kt index cc218406a30..2d30d92290b 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/jetTestUtils.kt +++ b/compiler/tests/org/jetbrains/kotlin/test/util/jetTestUtils.kt @@ -48,7 +48,7 @@ public fun CodeInsightTestFixture.configureWithExtraFile(path: String, vararg ex } public fun PsiFile.findElementByCommentPrefix(commentText: String): PsiElement? = - findElementsByCommentPrefix(commentText).keySet().singleOrNull() + findElementsByCommentPrefix(commentText).keys.singleOrNull() public fun PsiFile.findElementsByCommentPrefix(prefix: String): Map { var result = SmartFMap.emptyMap() @@ -63,11 +63,11 @@ public fun PsiFile.findElementsByCommentPrefix(prefix: String): Map parent else -> PsiTreeUtil.skipSiblingsForward( comment, - javaClass(), javaClass(), javaClass() + PsiWhiteSpace::class.java, PsiComment::class.java, KtPackageDirective::class.java ) } as? PsiElement ?: return - result = result.plus(elementToAdd, commentText.substring(prefix.length()).trim()) + result = result.plus(elementToAdd, commentText.substring(prefix.length).trim()) } } } diff --git a/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt b/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt index 941e0ef4b19..74971a3fdd6 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt @@ -44,14 +44,14 @@ abstract class AbstractTypeBindingTest : KotlinLiteFixture() { assertEqualsToFile( testFile, - StringBuilder { + buildString { append(removeLastComment(testKtFile)) append("/*\n") MyPrinter(this).print(typeBinding) append("*/") - }.toString() + } ) } diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt index 14f5984f968..d7f26df45bc 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt @@ -29,7 +29,7 @@ import java.util.jar.Manifest import java.util.zip.ZipFile public object LibraryUtils { - private val LOG = Logger.getInstance(javaClass()) + private val LOG = Logger.getInstance(LibraryUtils::class.java) public val KOTLIN_JS_MODULE_NAME: String = "Kotlin-JS-Module-Name" private var TITLE_KOTLIN_JAVASCRIPT_STDLIB: String @@ -43,7 +43,7 @@ public object LibraryUtils { var jsStdLib = "" var jsLib = "" - val manifestProperties = javaClass().getResourceAsStream("/kotlinManifest.properties") + val manifestProperties = LibraryUtils::class.java.getResourceAsStream("/kotlinManifest.properties") if (manifestProperties != null) { try { val properties = Properties() @@ -157,7 +157,7 @@ public object LibraryUtils { processDirectory(dir, action) } catch (ex: IOException) { - LOG.error("Could not read files from directory ${dir.getName()}: ${ex.getMessage()}") + LOG.error("Could not read files from directory ${dir.getName()}: ${ex.message}") } } @@ -185,7 +185,7 @@ public object LibraryUtils { } } catch (ex: IOException) { - LOG.error("Could not extract files from archive ${file.getName()}: ${ex.getMessage()}") + LOG.error("Could not extract files from archive ${file.getName()}: ${ex.message}") } finally { zipFile.close() @@ -196,7 +196,7 @@ public object LibraryUtils { val systemIndependentPath = FileUtil.toSystemIndependentName(path) if (systemIndependentPath.startsWith(METAINF)) { if (systemIndependentPath.startsWith(METAINF_RESOURCES)) { - return path.substring(METAINF_RESOURCES.length()) + return path.substring(METAINF_RESOURCES.length) } return null } diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/fileUtils.kt b/compiler/util/src/org/jetbrains/kotlin/utils/fileUtils.kt index e340169223d..ee472bfbd7c 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/fileUtils.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/fileUtils.kt @@ -25,7 +25,7 @@ public fun File?.readTextOrEmpty(): String = this?.readText() ?: "" public fun File.withReplacedExtensionOrNull(oldExt: String, newExt: String): File? { if (getName().endsWith(oldExt)) { val path = getPath() - val pathWithoutExt = path.substring(0, path.length() - oldExt.length()) + val pathWithoutExt = path.substring(0, path.length - oldExt.length) val pathWithNewExt = pathWithoutExt + newExt return File(pathWithNewExt) } diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/strings.kt b/compiler/util/src/org/jetbrains/kotlin/utils/strings.kt index f6eb5fb1fe9..c1dc86feccf 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/strings.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/strings.kt @@ -24,10 +24,10 @@ private val END_MARKER = "<~END~>" public fun CharSequence.substringWithContext(beginIndex: Int, endIndex: Int, range: Int): String { val start = Math.max(0, beginIndex - range) - val end = Math.min(this.length(), endIndex + range) + val end = Math.min(this.length, endIndex + range) val notFromBegin = start != 0 - val notToEnd = end != this.length() + val notToEnd = end != this.length val updatedStart = beginIndex - start val updatedEnd = endIndex - start diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidOnDestroyClassBuilderInterceptorExtension.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidOnDestroyClassBuilderInterceptorExtension.kt index 3636d54ccf9..63226c3a73c 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidOnDestroyClassBuilderInterceptorExtension.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidOnDestroyClassBuilderInterceptorExtension.kt @@ -98,7 +98,7 @@ public class AndroidOnDestroyClassBuilderInterceptorExtension : ClassBuilderInte super.visitCode() if (name != AndroidExpressionCodegenExtension.ON_DESTROY_METHOD_NAME || currentClass == null) return - if (Type.getArgumentTypes(desc).size() != 0) return + if (Type.getArgumentTypes(desc).size != 0) return if (Type.getReturnType(desc) != Type.VOID_TYPE) return val classType = currentClassName?.let { Type.getObjectType(it) } ?: return