From 46ac3571d509be3330687b4b2e4c77d97ec947c1 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 24 Nov 2015 17:27:48 +0300 Subject: [PATCH] Fix "infix modifier required" errors in project --- .../codegen/optimization/common/MethodAnalyzer.kt | 2 +- .../jetbrains/kotlin/serialization/builtins/run.kt | 4 ++-- .../cli/jvm/repl/reader/ConsoleReplCommandReader.kt | 2 +- .../org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt | 2 +- .../kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt | 2 +- .../kotlin/resolve/QualifiedExpressionResolver.kt | 6 +++--- .../org/jetbrains/kotlin/resolve/VarianceChecker.kt | 2 +- .../CliDeclarationProviderFactoryService.kt | 2 +- .../types/expressions/ValueParameterResolver.kt | 2 +- .../kotlin/asJava/duplicateJvmSignatureUtil.kt | 2 +- .../jvm/compiler/AbstractWriteSignatureTest.kt | 8 ++++---- .../js/KotlinJavascriptSerializerTest.kt | 2 +- .../lazy/descriptors/LazyJavaClassMemberScope.kt | 2 +- .../deserialization/AnnotationDeserializer.kt | 2 +- .../kotlin/generators/builtins/generateBuiltIns.kt | 2 +- .../generators/builtins/GenerateBuiltInsTest.kt | 2 +- .../org/jetbrains/kotlin/util/substitutionUtils.kt | 4 ++-- .../jetbrains/kotlin/idea/references/KtReference.kt | 2 +- .../org/jetbrains/kotlin/idea/search/searchUtil.kt | 8 ++++---- .../kotlin/idea/completion/CompletionSession.kt | 6 +++--- .../kotlin/idea/completion/CompletionUtils.kt | 4 ++-- .../idea/completion/KotlinCompletionContributor.kt | 2 +- .../kotlin/console/gutter/ConsoleErrorRenderer.kt | 2 +- .../highlighter/markers/OverridenFunctionMarker.kt | 2 +- .../callableBuilder/CallableBuilder.kt | 2 +- .../callableBuilder/templateExpressions.kt | 2 +- .../createFromUsage/callableBuilder/typeUtils.kt | 2 +- .../kotlin/idea/refactoring/CallableRefactoring.kt | 2 +- .../refactoring/changeSignature/KotlinChangeInfo.kt | 2 +- .../changeSignature/KotlinChangeSignature.kt | 2 +- .../introduce/extractionEngine/extractorUtil.kt | 2 +- .../KotlinIntroduceParameterHandler.kt | 2 +- .../KotlinIntroduceVariableHandler.kt | 4 ++-- .../MoveKotlinTopLevelDeclarationsProcessor.kt | 2 +- .../util/psi/patternMatching/KotlinPsiUnifier.kt | 12 ++++++------ j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt | 4 ++-- .../org/jetbrains/kotlin/j2k/ExpressionConverter.kt | 2 +- j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt | 2 +- .../kotlin/js/resolve/nativeAnnotationCheckers.kt | 2 +- .../jetbrains/kotlin/js/inline/util/collectUtils.kt | 2 +- .../jetbrains/kotlin/js/inline/util/namingUtils.kt | 2 +- .../js/KotlinJavascriptSerializationUtil.kt | 2 +- .../js/translate/callTranslator/FunctionCallCases.kt | 4 ++-- .../resolve/android/test/AbstractAndroidBoxTest.kt | 2 +- 44 files changed, 65 insertions(+), 65 deletions(-) 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 4bd8f72caf1..c8b3c317cc8 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 @@ -125,7 +125,7 @@ public open class MethodAnalyzer( frames[instructions.indexOf(insn)] private fun checkAssertions() { - if (instructions.toArray() any { it.getOpcode() == Opcodes.JSR || it.getOpcode() == Opcodes.RET }) + if (instructions.toArray().any { it.getOpcode() == Opcodes.JSR || it.getOpcode() == Opcodes.RET }) throw AssertionError("Subroutines are deprecated since Java 6") } diff --git a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/run.kt b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/run.kt index 30ef62bad92..67c344200ba 100644 --- a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/run.kt +++ b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/run.kt @@ -36,10 +36,10 @@ found top-level declarations to (files such as val destDir = File(args[0]) - val srcDirs = args drop(1) map { File(it) } + val srcDirs = args.drop(1).map { File(it) } assert(srcDirs.isNotEmpty()) { "At least one source directory should be specified" } - val missing = srcDirs filterNot { it.exists() } + val missing = srcDirs.filterNot { it.exists() } assert(missing.isEmpty()) { "These source directories are missing: $missing" } BuiltInsSerializer(dependOnOldBuiltIns = false).serialize(destDir, srcDirs, listOf()) { totalSize, totalFiles -> diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/reader/ConsoleReplCommandReader.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/reader/ConsoleReplCommandReader.kt index 5434567bcb9..8c618c750c4 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/reader/ConsoleReplCommandReader.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/reader/ConsoleReplCommandReader.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.cli.jvm.repl.ReplFromTerminal import java.io.File public class ConsoleReplCommandReader : ReplCommandReader { - private val consoleReader = ConsoleReader("kotlin", System.`in`, System.`out`, null) apply { + private val consoleReader = ConsoleReader("kotlin", System.`in`, System.`out`, null).apply { isHistoryEnabled = true expandEvents = false history = FileHistory(File(File(System.getProperty("user.home")), ".kotlin_history")) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt index 5819eb93832..e1573d09ae6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/ktPsiUtil.kt @@ -412,7 +412,7 @@ public val KtDeclaration.containingClassOrObject: KtClassOrObject? get() = (parent as? KtClassBody)?.parent as? KtClassOrObject public fun KtExpression.getOutermostParenthesizerOrThis(): KtExpression { - return (parentsWithSelf zip parents).firstOrNull { + return (parentsWithSelf.zip(parents)).firstOrNull { val (element, parent) = it when (parent) { is KtParenthesizedExpression -> false diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt index bbb15ee1898..96383396ce3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt @@ -37,7 +37,7 @@ public class KotlinObjectStubImpl( ) : KotlinStubBaseImpl(parent, KtStubElementTypes.OBJECT_DECLARATION), KotlinObjectStub { override fun getFqName() = fqName override fun getName() = StringRef.toString(name) - override fun getSuperNames() = superNames map { it.toString() } + override fun getSuperNames() = superNames.map { it.toString() } override fun isTopLevel() = isTopLevel override fun isCompanion() = isDefault override fun isObjectLiteral() = isObjectLiteral diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt index 896b3814f8f..9c621a76a5f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt @@ -118,7 +118,7 @@ public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageVa while (userType != null) { val referenceExpression = userType.referenceExpression if (referenceExpression != null) { - result add QualifierPart(referenceExpression.getReferencedNameAsName(), referenceExpression, userType.typeArgumentList) + result.add(QualifierPart(referenceExpression.getReferencedNameAsName(), referenceExpression, userType.typeArgumentList)) } else { hasError = true @@ -261,12 +261,12 @@ public class QualifiedExpressionResolver(val symbolUsageValidator: SymbolUsageVa loop@ while (expression != null) { when (expression) { is KtSimpleNameExpression -> { - result add QualifierPart(expression.getReferencedNameAsName(), expression) + result.add(QualifierPart(expression.getReferencedNameAsName(), expression)) break@loop } is KtQualifiedExpression -> { (expression.selectorExpression as? KtSimpleNameExpression)?.let { - result add QualifierPart(it.getReferencedNameAsName(), it) + result.add(QualifierPart(it.getReferencedNameAsName(), it)) } expression = expression.receiverExpression if (expression is KtSafeQualifiedExpression) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt index 77ec35a0e09..71250105b1f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt @@ -192,6 +192,6 @@ class VarianceChecker(private val trace: BindingTrace) { return noError } - private fun Boolean.and(other: Boolean?) = if (other == null) this else this and other + private infix fun Boolean.and(other: Boolean?) = if (other == null) this else this and other } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt index 639c4f8449f..b42ae802a98 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CliDeclarationProviderFactoryService.kt @@ -36,7 +36,7 @@ public class CliDeclarationProviderFactoryService(private val sourceFiles: Colle val vFile = it.getVirtualFile().sure { "Source files should be physical files" } filesScope.contains(vFile) } - allFiles addAll syntheticFiles + allFiles.addAll(syntheticFiles) return FileBasedDeclarationProviderFactory(storageManager, allFiles) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt index e8bef272236..30c8a1df399 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ValueParameterResolver.kt @@ -49,7 +49,7 @@ public class ValueParameterResolver( val contextForDefaultValue = ExpressionTypingContext.newContext(trace, scopeForDefaultValue, dataFlowInfo, TypeUtils.NO_EXPECTED_TYPE, callChecker) - for ((descriptor, parameter) in valueParameterDescriptors zip valueParameters) { + for ((descriptor, parameter) in valueParameterDescriptors.zip(valueParameters)) { ForceResolveUtil.forceResolveAllContents(descriptor.getAnnotations()) resolveDefaultValue(descriptor, parameter, contextForDefaultValue) } 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 92f4d72af6f..9691facf182 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt @@ -138,7 +138,7 @@ class FilteredJvmDiagnostics(val jvmDiagnostics: Diagnostics, val otherDiagnosti } } -private fun ConflictingJvmDeclarationsData.higherThan(other: ConflictingJvmDeclarationsData): Boolean { +private infix fun ConflictingJvmDeclarationsData.higherThan(other: ConflictingJvmDeclarationsData): Boolean { return when (other.classOrigin.originKind) { PACKAGE_PART -> this.classOrigin.originKind == PACKAGE_FACADE INTERFACE_DEFAULT_IMPL -> this.classOrigin.originKind != INTERFACE_DEFAULT_IMPL diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt index 641a3d3bf77..c0fd1b7d158 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt @@ -124,7 +124,7 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() { val packageFacadePrefix = classLastName.replace(".class", "\$") classDir.listFiles { dir, lastName -> lastName.startsWith(packageFacadePrefix) && lastName.endsWith(".class") - } forEach { packageFacadeFile -> + }.forEach { packageFacadeFile -> checkClassFile(checker, packageFacadeFile) } } @@ -152,17 +152,17 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() { private inner class Checker : ClassVisitor(Opcodes.ASM5) { override fun visit(version: Int, access: Int, name: String, signature: String?, superName: String?, interfaces: Array?) { - classExpectations forEach { it.check(name, name, signature?:"null") } + classExpectations.forEach { it.check(name, name, signature ?: "null") } super.visit(version, access, name, signature, superName, interfaces) } override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array?): MethodVisitor? { - methodExpectations forEach { it.check(name, desc, signature?:"null") } + methodExpectations.forEach { it.check(name, desc, signature ?: "null") } return super.visitMethod(access, name, desc, signature, exceptions) } override fun visitField(access: Int, name: String, desc: String, signature: String?, value: Any?): FieldVisitor? { - fieldExpectations forEach { it.check(name, desc, signature?:"null") } + fieldExpectations.forEach { it.check(name, desc, signature ?: "null") } return super.visitField(access, name, desc, signature, value) } } diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt index 669860ed4c3..ff9d49cdde0 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt @@ -51,7 +51,7 @@ public class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() { val configuration = CompilerConfiguration() configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE) - configuration.addKotlinSourceRoots(srcDirs map { it.path }) + configuration.addKotlinSourceRoots(srcDirs.map { it.path }) serialize(configuration, metaFile) val module = deserialize(metaFile) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt index 61832abc5a2..6b545fc2755 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt @@ -83,7 +83,7 @@ public class LazyJavaClassMemberScope( } enhanceSignatures( - result ifEmpty { emptyOrSingletonList(createDefaultConstructor()) } + result.ifEmpty { emptyOrSingletonList(createDefaultConstructor()) } ).toReadOnlyList() } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt index 0179d8f1a73..79b5baede32 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt @@ -122,7 +122,7 @@ public class AnnotationDeserializer(private val module: ModuleDescriptor) { else -> error("Unsupported annotation argument type: ${value.getType()} (expected $expectedType)") } - if (result.type isSubtypeOf expectedType) { + if (result.type.isSubtypeOf(expectedType)) { return result } else { diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt index 06fca1650b6..c7ef7818f69 100644 --- a/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt +++ b/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt @@ -82,7 +82,7 @@ fun main(args: Array) { generateBuiltIns { file, generator -> println("generating $file") file.getParentFile()?.mkdirs() - PrintWriter(file) use { + PrintWriter(file).use { generator(it).generate() } } diff --git a/generators/tests/org/jetbrains/kotlin/generators/builtins/GenerateBuiltInsTest.kt b/generators/tests/org/jetbrains/kotlin/generators/builtins/GenerateBuiltInsTest.kt index 8052cf61289..f5495ad6e47 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/builtins/GenerateBuiltInsTest.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/builtins/GenerateBuiltInsTest.kt @@ -28,7 +28,7 @@ class GenerateBuiltInsTest : UsefulTestCase() { fun testBuiltInsAreUpToDate() { generateBuiltIns { file, generator -> val sw = StringWriter() - PrintWriter(sw) use { + PrintWriter(sw).use { generator(it).generate() } diff --git a/idea/ide-common/src/org/jetbrains/kotlin/util/substitutionUtils.kt b/idea/ide-common/src/org/jetbrains/kotlin/util/substitutionUtils.kt index 80ce4546b61..c92d7267e66 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/util/substitutionUtils.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/util/substitutionUtils.kt @@ -26,7 +26,7 @@ public fun getTypeSubstitution(baseType: KotlinType, derivedType: KotlinType): L val substitutedType = TypeCheckingProcedure.findCorrespondingSupertype(derivedType, baseType) ?: return null val substitution = LinkedHashMap(substitutedType.getArguments().size()) - for ((param, arg) in baseType.getConstructor().getParameters() zip substitutedType.getArguments()) { + for ((param, arg) in baseType.getConstructor().getParameters().zip(substitutedType.getArguments())) { substitution[param.getTypeConstructor()] = arg } @@ -41,7 +41,7 @@ public fun getCallableSubstitution( val derivedClass = derivedCallable.getContainingDeclaration() as? ClassDescriptor ?: return null val substitution = getTypeSubstitution(baseClass.getDefaultType(), derivedClass.getDefaultType()) ?: return null - for ((baseParam, derivedParam) in baseCallable.getTypeParameters() zip derivedCallable.getTypeParameters()) { + for ((baseParam, derivedParam) in baseCallable.getTypeParameters().zip(derivedCallable.getTypeParameters())) { substitution[baseParam.getTypeConstructor()] = TypeProjectionImpl(derivedParam.getDefaultType()) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt index f60490aa34c..2916df2cfbd 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt @@ -81,7 +81,7 @@ public abstract class AbstractKtReference(element: T) private fun resolveToPsiElements(context: BindingContext, targetDescriptors: Collection): Collection { if (targetDescriptors.isNotEmpty()) { - return targetDescriptors flatMap { target -> resolveToPsiElements(target) } + return targetDescriptors.flatMap { target -> resolveToPsiElements(target) } } val labelTargets = getLabelTargets(context) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt index 62b95576ae1..b9822f08aa7 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt @@ -24,10 +24,10 @@ import com.intellij.psi.search.SearchScope import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.psi.KtFile -public fun SearchScope.and(otherScope: SearchScope): SearchScope = intersectWith(otherScope) -public fun SearchScope.or(otherScope: SearchScope): SearchScope = union(otherScope) -public fun SearchScope.minus(otherScope: GlobalSearchScope): SearchScope = this and !otherScope -public fun GlobalSearchScope.not(): GlobalSearchScope = GlobalSearchScope.notScope(this) +infix fun SearchScope.and(otherScope: SearchScope): SearchScope = intersectWith(otherScope) +infix fun SearchScope.or(otherScope: SearchScope): SearchScope = union(otherScope) +operator fun SearchScope.minus(otherScope: GlobalSearchScope): SearchScope = this and !otherScope +operator fun GlobalSearchScope.not(): GlobalSearchScope = GlobalSearchScope.notScope(this) public fun Project.allScope(): GlobalSearchScope = GlobalSearchScope.allScope(this) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt index 3b031ef6dea..f9a819dd8fd 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt @@ -103,8 +103,8 @@ abstract class CompletionSession( protected val bindingContext = resolutionFacade.analyze(position.parentsWithSelf.firstIsInstance(), BodyResolveMode.PARTIAL_FOR_COMPLETION) protected val inDescriptor = position.getResolutionScope(bindingContext, resolutionFacade).ownerDescriptor - private val kotlinIdentifierStartPattern = StandardPatterns.character().javaIdentifierStart() andNot singleCharPattern('$') - private val kotlinIdentifierPartPattern = StandardPatterns.character().javaIdentifierPart() andNot singleCharPattern('$') + private val kotlinIdentifierStartPattern = StandardPatterns.character().javaIdentifierStart().andNot(singleCharPattern('$')) + private val kotlinIdentifierPartPattern = StandardPatterns.character().javaIdentifierPart().andNot(singleCharPattern('$')) protected val prefix = CompletionUtil.findIdentifierPrefix( parameters.getPosition().getContainingFile(), @@ -123,7 +123,7 @@ abstract class CompletionSession( nameFilter } - private fun ((Name) -> Boolean).or(otherFilter: (Name) -> Boolean): (Name) -> Boolean + private infix fun ((Name) -> Boolean).or(otherFilter: (Name) -> Boolean): (Name) -> Boolean = { this(it) || otherFilter(it) } protected val isVisibleFilter: (DeclarationDescriptor) -> Boolean = { isVisibleDescriptor(it, completeNonAccessible = configuration.completeNonAccessibleDeclarations) } diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt index 8227ba0a6a4..94b35a8db1a 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt @@ -345,9 +345,9 @@ fun shortenReferences(context: InsertionContext, startOffset: Int, endOffset: In ShortenReferences.DEFAULT.process(context.file as KtFile, startOffset, endOffset) } -fun ElementPattern.and(rhs: ElementPattern) = StandardPatterns.and(this, rhs) +infix fun ElementPattern.and(rhs: ElementPattern) = StandardPatterns.and(this, rhs) fun ElementPattern.andNot(rhs: ElementPattern) = StandardPatterns.and(this, StandardPatterns.not(rhs)) -fun ElementPattern.or(rhs: ElementPattern) = StandardPatterns.or(this, rhs) +infix fun ElementPattern.or(rhs: ElementPattern) = StandardPatterns.or(this, rhs) fun singleCharPattern(char: Char) = StandardPatterns.character().equalTo(char) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt index 64efc5c71d2..5c0b4ca7b8f 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt @@ -215,7 +215,7 @@ public class KotlinCompletionContributor : CompletionContributor() { if (tokenType == KtTokens.FUN_KEYWORD) { tail += "()" } - builder append tail + builder.append(tail) val text = builder.toString() val file = KtPsiFactory(tokenBefore.getProject()).createFile(text) diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/ConsoleErrorRenderer.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/ConsoleErrorRenderer.kt index 26a4a658c0d..faf0f14d69e 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/ConsoleErrorRenderer.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/ConsoleErrorRenderer.kt @@ -28,7 +28,7 @@ public class ConsoleErrorRenderer(private val messages: List) : } override fun getTooltipText(): String { - val htmlTooltips = messages map { "${msgType(it.severity)} ${it.description}" } + val htmlTooltips = messages.map { "${msgType(it.severity)} ${it.description}" } return "${htmlTooltips.joinToString("
")}" } diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt index f26a30563e0..06c931aa206 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt @@ -85,7 +85,7 @@ public fun getOverriddenMethodTooltip(method: PsiMethod): String? { val comparator = MethodCellRenderer(false).getComparator() - val overridingJavaMethods = processor.getCollection().filter { !it.isMethodWithDeclarationInOtherClass() } sortedWith (comparator) + val overridingJavaMethods = processor.getCollection().filter { !it.isMethodWithDeclarationInOtherClass() }.sortedWith(comparator) if (overridingJavaMethods.isEmpty()) return null val start = if (isAbstract) DaemonBundle.message("method.is.implemented.header") else DaemonBundle.message("method.is.overriden.header") diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index 93e213e9882..a9f7edc6074 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -377,7 +377,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { fakeFunction: FunctionDescriptor, typeArguments: Set, result: MutableMap) { - for ((typeArgument, typeParameter) in typeArguments zip fakeFunction.getTypeParameters()) { + for ((typeArgument, typeParameter) in typeArguments.zip(fakeFunction.getTypeParameters())) { result[typeArgument] = typeParameter.getDefaultType() } } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt index 9a47d608c0a..4df7bcb0633 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt @@ -43,7 +43,7 @@ internal class ParameterNameExpression( private val names: Array, private val parameterTypeToNamesMap: Map>) : Expression() { init { - assert(names all { it.isNotEmpty() }) + assert(names.all { it.isNotEmpty() }) } override fun calculateResult(context: ExpressionContext?): Result? { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt index 1da90d4ed57..34f46e07387 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt @@ -276,7 +276,7 @@ private fun TypePredicate.getRepresentativeTypes(): Set { is AllSubtypes -> Collections.singleton(upperBound) is ForAllTypes -> { if (typeSets.isEmpty()) AllTypes.getRepresentativeTypes() - else typeSets.map { it.getRepresentativeTypes() }.reduce { a, b -> a intersect b } + else typeSets.map { it.getRepresentativeTypes() }.reduce { a, b -> a.intersect(b) } } is ForSomeType -> typeSets.flatMapTo(LinkedHashSet()) { it.getRepresentativeTypes() } is AllTypes -> emptySet() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt index c51d9e14ce2..fabd48867c5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt @@ -109,7 +109,7 @@ public abstract class CallableRefactoring( public fun run(): Boolean { fun buttonPressed(code: Int, dialogButtons: List, button: String): Boolean { - return code == dialogButtons indexOf button && button in dialogButtons + return code == dialogButtons.indexOf(button) && button in dialogButtons } fun performForWholeHierarchy(dialogButtons: List, code: Int): Boolean { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt index 342bfed2a04..ac0d13d0aba 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt @@ -337,7 +337,7 @@ public open class KotlinChangeInfo( if (!(isPrimaryMethodUpdated && originalBaseFunctionDescriptor is FunctionDescriptor && originalBaseFunctionDescriptor.hasJvmOverloadsAnnotation())) { - return (originalPsiMethods zip currentPsiMethods).toMap() + return (originalPsiMethods.zip(currentPsiMethods)).toMap() } if (originalPsiMethods.isEmpty() || currentPsiMethods.isEmpty()) return emptyMap() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt index 45b757bef34..ecb68ff25fb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt @@ -158,7 +158,7 @@ public class KotlinChangeSignature(project: Project, // TODO: Support visibility change val visibility = VisibilityUtil.getVisibilityModifier(originalMethod.getModifierList()) val returnType = CanonicalTypes.createTypeWrapper(preview.getReturnType() ?: PsiType.VOID) - val params = (preview.getParameterList().getParameters() zip ktChangeInfo.getNewParameters()).map { + val params = (preview.getParameterList().getParameters().zip(ktChangeInfo.getNewParameters())).map { val (param, paramInfo) = it // Keep original default value for proper update of Kotlin usages KotlinAwareJavaParameterInfoImpl(paramInfo.getOldIndex(), param.getName()!!, param.getType(), paramInfo.defaultValueForCall) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt index 9d99af7b1a7..213d266d7f7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt @@ -213,7 +213,7 @@ fun ExtractableCodeDescriptor.findDuplicates(): List { .originalRange .match(scopeElement, unifier) .asSequence() - .filter { !(it.range.getPhysicalTextRange() intersects originalTextRange) } + .filter { !(it.range.getPhysicalTextRange().intersects(originalTextRange)) } .mapNotNull { match -> val controlFlow = getControlFlowIfMatched(match) val range = with(match.range) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt index 46985824b47..45c0357a618 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt @@ -179,7 +179,7 @@ fun selectNewParameterContext( file = file, getContainers = { elements, parent -> val parents = parent.parents - val stopAt = (parent.parents zip parent.parents.drop(1)) + val stopAt = (parent.parents.zip(parent.parents.drop(1))) .firstOrNull { isObjectOrNonInnerClass(it.first) } ?.second diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt index 1e72e202b4b..4dfd951009e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt @@ -337,7 +337,7 @@ object KotlinIntroduceVariableHandler : KotlinIntroduceHandlerBase() { private fun KtElement.getContainer(): KtElement? { if (this is KtBlockExpression) return this - return (parentsWithSelf zip parents).firstOrNull { + return (parentsWithSelf.zip(parents)).firstOrNull { val (place, parent) = it when (parent) { is KtContainerNode -> !parent.isBadContainerNode(place) @@ -361,7 +361,7 @@ object KotlinIntroduceVariableHandler : KotlinIntroduceHandlerBase() { private fun KtExpression.getOccurrenceContainer(): KtElement? { var result: KtElement? = null - for ((place, parent) in parentsWithSelf zip parents) { + for ((place, parent) in parentsWithSelf.zip(parents)) { when { parent is KtContainerNode && place !is KtBlockExpression && !parent.isBadContainerNode(place) -> result = parent parent is KtClassBody, parent is KtFile -> return result diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index 47900788673..ae2be9dd510 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -301,7 +301,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor( oldToNewElementsMapping[sourceFile] = newDeclaration.getContainingKtFile() getTransaction()!!.getElementListener(oldDeclaration).elementMoved(newDeclaration) - for ((oldElement, newElement) in oldLightElements.asSequence() zip newDeclaration.toLightElements().asSequence()) { + for ((oldElement, newElement) in oldLightElements.asSequence().zip(newDeclaration.toLightElements().asSequence())) { oldToNewElementsMapping[oldElement] = newElement } } diff --git a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt index 6557325bded..b3d21e5cbb3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt @@ -194,12 +194,12 @@ public class KotlinPsiUnifier( if (args1.size() != args2.size()) return UNMATCHED if (rc1.getCall().getValueArguments().size() != args1.size() || rc2.getCall().getValueArguments().size() != args2.size()) return null - return (args1.asSequence() zip args2.asSequence()).fold(MATCHED) { s, p -> + return (args1.asSequence().zip(args2.asSequence())).fold(MATCHED) { s, p -> val (arg1, arg2) = p s and when { arg1 == arg2 -> MATCHED arg1 == null || arg2 == null -> UNMATCHED - else -> (arg1.getArguments().asSequence() zip arg2.getArguments().asSequence()).fold(MATCHED) { s, p -> + else -> (arg1.getArguments().asSequence().zip(arg2.getArguments().asSequence())).fold(MATCHED) { s, p -> s and matchArguments(p.first, p.second) } } @@ -250,7 +250,7 @@ public class KotlinPsiUnifier( val typeArgs2 = rc2.getTypeArguments().toList() if (typeArgs1.size() != typeArgs2.size()) return UNMATCHED - for ((typeArg1, typeArg2) in (typeArgs1 zip typeArgs2)) { + for ((typeArg1, typeArg2) in (typeArgs1.zip(typeArgs2))) { if (!matchDescriptors(typeArg1.first, typeArg2.first)) return UNMATCHED val s = matchTypes(typeArg1.second, typeArg2.second) @@ -354,7 +354,7 @@ public class KotlinPsiUnifier( fun sortTypes(types: Collection) = types.sortedBy { DescriptorRenderer.DEBUG_TEXT.renderType(it) } if (types1.size() != types2.size()) return false - return (sortTypes(types1) zip sortTypes(types2)).all { matchTypes(it.first, it.second) == MATCHED } + return (sortTypes(types1).zip(sortTypes(types2))).all { matchTypes(it.first, it.second) == MATCHED } } private fun KtElement.shouldIgnoreResolvedCall(): Boolean { @@ -527,7 +527,7 @@ public class KotlinPsiUnifier( declarations2: List, matchPair: (Pair) -> Boolean ): Boolean { - val zippedParams = declarations1 zip declarations2 + val zippedParams = declarations1.zip(declarations2) if (declarations1.size() != declarations2.size() || !zippedParams.all { matchPair(it) }) return false zippedParams.forEach { declarationPatternsToTargets.putValue(it.first, it.second) } @@ -777,7 +777,7 @@ public class KotlinPsiUnifier( val patternElements = pattern.elements if (targetElements.size() != patternElements.size()) return UNMATCHED - return (targetElements.asSequence() zip patternElements.asSequence()).fold(MATCHED) { s, p -> + return (targetElements.asSequence().zip(patternElements.asSequence())).fold(MATCHED) { s, p -> if (s != UNMATCHED) s and doUnify(p.first, p.second) else s } } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt b/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt index 631d40ed72a..8de9baf583a 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt @@ -60,7 +60,7 @@ class CodeBuilder(private val topElement: PsiElement?, private var docConverter: private val imports = LinkedHashSet() - public fun append(text: String): CodeBuilder + public infix fun append(text: String): CodeBuilder = append(text, false) public fun addImport(fqName: FqName) { @@ -100,7 +100,7 @@ class CodeBuilder(private val topElement: PsiElement?, private var docConverter: public val importsToAdd: Set get() = imports - public fun append(element: Element): CodeBuilder { + public infix fun append(element: Element): CodeBuilder { if (element.isEmpty) return this // do not insert comment and spaces for empty elements to avoid multiple blank lines if (element.prototypes == null && topElement != null) { diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt index e4103b2433d..22879590487 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt @@ -429,7 +429,7 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter { } else { if (target is PsiClass) { - if (PrimitiveType.values() any { it.getTypeName().asString() == target.getName() }) { + if (PrimitiveType.values().any { it.getTypeName().asString() == target.getName() }) { result = Identifier(target.getQualifiedName()!!, false) return } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt index b0dbfd2d93c..74eca86770e 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt @@ -73,7 +73,7 @@ class Modifiers(modifiers: Collection) : Element() { fun Modifiers.filter(predicate: (Modifier) -> Boolean): Modifiers = Modifiers(modifiers.filter(predicate)).assignPrototypesFrom(this) -fun CodeBuilder.appendWithSpaceAfter(modifiers: Modifiers): CodeBuilder { +infix fun CodeBuilder.appendWithSpaceAfter(modifiers: Modifiers): CodeBuilder { if (!modifiers.isEmpty) { this append modifiers append " " } diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt index 4988ca21428..b66c74b7eec 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/nativeAnnotationCheckers.kt @@ -117,7 +117,7 @@ internal class NativeSetterChecker : AbstractNativeIndexerChecker(PredefinedAnno if (parameters.size() < 2) return val secondParameterType = parameters.get(1).getType() - if (secondParameterType isSubtypeOf returnType) return + if (secondParameterType.isSubtypeOf(returnType)) return diagnosticHolder.report(ErrorsJs.NATIVE_SETTER_WRONG_RETURN_TYPE.on(declaration)) } diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt index 86788a86c3a..0ffa2fd3b84 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.js.inline.util.collectors.PropertyCollector import org.jetbrains.kotlin.js.translate.expression.* public fun collectFunctionReferencesInside(scope: JsNode): List = - collectReferencesInside(scope) filter { it.staticRef is JsFunction } + collectReferencesInside(scope).filter { it.staticRef is JsFunction } public fun collectReferencesInside(scope: JsNode): List { return with(ReferenceNameCollector()) { diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt index 294da80db18..fa4520fc0ce 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/namingUtils.kt @@ -29,7 +29,7 @@ public fun aliasArgumentsIfNeeded( ) { assertTrue { arguments.size() <= parameters.size() } - for ((arg, param) in arguments zip parameters) { + for ((arg, param) in arguments.zip(parameters)) { val paramName = param.getName() val replacement = if (arg.needToAlias()) { diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt index 8d00db86d70..7bc326d3462 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt @@ -84,7 +84,7 @@ public object KotlinJavascriptSerializationUtil { public fun contentMapToByteArray(contentMap: Map): ByteArray { val contentBuilder = JsProtoBuf.Library.newBuilder() - contentMap forEach { + contentMap.forEach { val entry = JsProtoBuf.Library.FileEntry.newBuilder().setPath(it.getKey()).setContent(ByteString.copyFrom(it.getValue())).build() contentBuilder.addEntry(entry) } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt index 87f6cc4fd41..0ae70512019 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt @@ -255,9 +255,9 @@ object DynamicInvokeAndBracketAccessCallCase : FunctionCallCase() { object DynamicOperatorCallCase : FunctionCallCase() { fun canApply(callInfo: FunctionCallInfo): Boolean = callInfo.callableDescriptor.isDynamic() && - callInfo.resolvedCall.getCall().getCallElement() let { + callInfo.resolvedCall.getCall().getCallElement().let { it is KtOperationExpression && - PsiUtils.getOperationToken(it) let { (it == KtTokens.NOT_IN || OperatorTable.hasCorrespondingOperator(it)) } + PsiUtils.getOperationToken(it).let { (it == KtTokens.NOT_IN || OperatorTable.hasCorrespondingOperator(it)) } } override fun FunctionCallInfo.dispatchReceiver(): JsExpression { diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt index fe05fffec8e..300594bc428 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt @@ -58,7 +58,7 @@ public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() { } private fun getFakeFiles(path: String): Collection { - return FileUtil.findFilesByMask(Pattern.compile("^Fake.*\\.kt$"), File(path.replace(getTestName(true), ""))) map { relativePath(it) } + return FileUtil.findFilesByMask(Pattern.compile("^Fake.*\\.kt$"), File(path.replace(getTestName(true), ""))).map { relativePath(it) } } private fun needsInvocationTest(path: String): Boolean {