diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt index 26097cd79a7..b12ce34ce58 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt @@ -217,16 +217,16 @@ class CollectionStubMethodGenerator( val allSuperClasses = TypeUtils.getAllSupertypes(descriptor.defaultType).classes().toHashSet() - val ourSuperCollectionClasses = collectionClasses.filter { pair -> - pair.readOnlyClass in allSuperClasses && pair.mutableClass !in allSuperClasses + val ourSuperCollectionClasses = collectionClasses.filter { (readOnlyClass, mutableClass) -> + readOnlyClass in allSuperClasses && mutableClass !in allSuperClasses } if (ourSuperCollectionClasses.isEmpty()) return listOf() // Filter out built-in classes which are overridden by other built-in classes in the list, to avoid duplicating methods. - val redundantClasses = ourSuperCollectionClasses.flatMapTo(HashSet()) { pair -> - pair.readOnlyClass.typeConstructor.supertypes.classes() + val redundantClasses = ourSuperCollectionClasses.flatMapTo(HashSet()) { (readOnlyClass) -> + readOnlyClass.typeConstructor.supertypes.classes() } - return ourSuperCollectionClasses.filter { klass -> klass.readOnlyClass !in redundantClasses } + return ourSuperCollectionClasses.filter { (readOnlyClass) -> readOnlyClass !in redundantClasses } } private fun Collection.classes(): Collection = 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 dc7fb5dda40..14cd69c1df2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt @@ -57,9 +57,9 @@ class SMAPBuilder( private fun generateDebugStrata(realMappings: List): String { val combinedMapping = FileMapping(source, path) realMappings.forEach { fileMapping -> - fileMapping.lineMappings.filter { it.callSiteMarker != null }.forEach { rangeMapping -> + fileMapping.lineMappings.filter { it.callSiteMarker != null }.forEach { (source, dest, range, callSiteMarker) -> combinedMapping.addRangeMapping(RangeMapping( - rangeMapping.callSiteMarker!!.lineNumber, rangeMapping.dest, rangeMapping.range + callSiteMarker!!.lineNumber, dest, range )) } } diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt b/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt index 05afb125986..28a440a5ff3 100644 --- a/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt +++ b/compiler/container/src/org/jetbrains/kotlin/container/Storage.kt @@ -176,8 +176,8 @@ class ComponentStorage(val myId: String, parent: ComponentStorage?) : ValueResol private fun injectProperties(instance: Any, context: ValueResolveContext) { val classInfo = instance.javaClass.getInfo() - classInfo.setterInfos.forEach { setterInfo -> - val methodBinding = setterInfo.method.bindToMethod(context) + classInfo.setterInfos.forEach { (method) -> + val methodBinding = method.bindToMethod(context) methodBinding.invoke(instance) } } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt index e841d12b09f..a0b2c416cf6 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt @@ -78,8 +78,8 @@ class IncrementalPackageFragmentProvider( ChainedMemberScope.create( "Member scope for incremental compilation: union of multifile class parts data for $multifileClassFqName", partsInternalNames.mapNotNull { internalName -> - incrementalCache.getPackagePartData(internalName)?.let { proto -> - val (nameResolver, packageProto) = JvmProtoBufUtil.readPackageDataFrom(proto.data, proto.strings) + incrementalCache.getPackagePartData(internalName)?.let { (data, strings) -> + val (nameResolver, packageProto) = JvmProtoBufUtil.readPackageDataFrom(data, strings) DeserializedPackageMemberScope( this, packageProto, nameResolver, JvmPackagePartSource( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.kt index 2c31b3cefe2..aff68980102 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.kt @@ -38,8 +38,8 @@ class OverloadResolver( fun checkOverloads(c: BodiesResolveContext) { val inClasses = findConstructorsInNestedClassesAndTypeAliases(c) - for (entry in c.declaredClasses.entries) { - checkOverloadsInClass(entry.value, inClasses.get(entry.value)) + for ((key, value) in c.declaredClasses) { + checkOverloadsInClass(value, inClasses.get(value)) } checkOverloadsInPackages(c) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt index 6a27528de8e..c7150cbf2e1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt @@ -575,8 +575,8 @@ class QualifiedExpressionResolver { trace: BindingTrace, position: QualifierPosition ) { - path.foldRight(packageView) { qualifierPart, currentView -> - storeResult(trace, qualifierPart.expression, currentView, shouldBeVisibleFrom = null, position = position) + path.foldRight(packageView) { (name, expression), currentView -> + storeResult(trace, expression, currentView, shouldBeVisibleFrom = null, position = position) currentView.containingDeclaration ?: error("Containing Declaration must be not null for package with fqName: ${currentView.fqName}, " + "path: ${path.joinToString()}, packageView fqName: ${packageView.fqName}") diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index a93baaffca4..ab35088fca6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -623,9 +623,9 @@ class TypeResolver( Math.min(classifierChainLastIndex + 1, reversedQualifierParts.size), reversedQualifierParts.size) - for (qualifierPart in nonClassQualifierParts) { - if (qualifierPart.typeArguments != null) { - c.trace.report(TYPE_ARGUMENTS_NOT_ALLOWED.on(qualifierPart.typeArguments, "here")) + for ((name, expression, typeArguments) in nonClassQualifierParts) { + if (typeArguments != null) { + c.trace.report(TYPE_ARGUMENTS_NOT_ALLOWED.on(typeArguments, "here")) return null } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt index 773ae34cec4..836769d75da 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt @@ -160,14 +160,14 @@ internal class ConstraintSystemImpl( fun KotlinType.substitute(): KotlinType? = substitutor.substitute(this, Variance.INVARIANT) return initialConstraints.all { - constraint -> - val resultSubType = constraint.subtype.substitute()?.let { + (kind, subtype, superType, position) -> + val resultSubType = subtype.substitute()?.let { // the call might be done via safe access, so we check for notNullable receiver type; // 'unsafe call' error is reported otherwise later - if (constraint.position.kind != ConstraintPositionKind.RECEIVER_POSITION) it else it.makeNotNullable() + if (position.kind != ConstraintPositionKind.RECEIVER_POSITION) it else it.makeNotNullable() } ?: return false - val resultSuperType = constraint.superType.substitute() ?: return false - when (constraint.kind) { + val resultSuperType = superType.substitute() ?: return false + when (kind) { SUB_TYPE -> KotlinTypeChecker.DEFAULT.isSubtypeOf(resultSubType, resultSuperType) EQUAL -> KotlinTypeChecker.DEFAULT.equalTypes(resultSubType, resultSuperType) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt index a9d68b69d1b..5f1d791394c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt @@ -48,9 +48,9 @@ class LazyScriptClassMemberScope( } private fun createScriptParameters(constructor: ClassConstructorDescriptorImpl): List { - return scriptDescriptor.scriptDefinition.getScriptParameters(scriptDescriptor).mapIndexed { index, scriptParameter -> + return scriptDescriptor.scriptDefinition.getScriptParameters(scriptDescriptor).mapIndexed { index, (name, type) -> ValueParameterDescriptorImpl( - constructor, null, index, Annotations.EMPTY, scriptParameter.name, scriptParameter.type, + constructor, null, index, Annotations.EMPTY, name, type, /* declaresDefaultValue = */ false, /* isCrossinline = */ false, /* isNoinline = */ false,