From f61aa18a05d27808340d42c7ec99939d02f91e7a Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 19 Oct 2015 11:00:03 +0300 Subject: [PATCH] Code cleanup: get rid of `_` (mostly renamed to arg) --- .../jvm/compiler/JvmCliVirtualFileFinder.kt | 2 +- .../compiler/KotlinCliJavaFileManagerImpl.kt | 2 +- .../types/expressions/FakeCallResolver.kt | 2 +- .../KotlinSuppressableWarningProblemGroup.kt | 18 +++++++++--------- .../kotlin/console/KotlinConsoleRunner.kt | 4 ++-- .../actions/KotlinConsoleModuleDialog.kt | 2 +- .../console/actions/RunExecuteActions.kt | 2 +- .../KotlinConsoleGutterContentProvider.kt | 2 +- .../org/jetbrains/kotlin/j2k/CodeBuilder.kt | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmCliVirtualFileFinder.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmCliVirtualFileFinder.kt index 57fcbfd8ebf..5e311d721e4 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmCliVirtualFileFinder.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmCliVirtualFileFinder.kt @@ -24,7 +24,7 @@ public class JvmCliVirtualFileFinder(private val index: JvmDependenciesIndex) : override fun findVirtualFileWithHeader(classId: ClassId): VirtualFile? { val classFileName = classId.getRelativeClassName().asString().replace('.', '$') - return index.findClass(classId, acceptedRootTypes = JavaRoot.OnlyBinary) { dir, _ -> + return index.findClass(classId, acceptedRootTypes = JavaRoot.OnlyBinary) { dir, rootType -> dir.findChild("$classFileName.class")?.let { if (it.isValid()) it else null } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt index 300839c8138..3db77c731cb 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt @@ -87,7 +87,7 @@ public class KotlinCliJavaFileManagerImpl(private val myPsiManager: PsiManager) override fun findPackage(packageName: String): PsiPackage? { var found = false val packageFqName = packageName.toSafeFqName() ?: return null - index.traverseDirectoriesInPackage(packageFqName) { _, __ -> + index.traverseDirectoriesInPackage(packageFqName) { dir, rootType -> found = true //abort on first found false 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 65a472a91a9..dc6edd58b99 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt @@ -81,7 +81,7 @@ public class FakeCallResolver( val fakeBindingTrace = context.replaceBindingTrace(fakeTrace) return makeAndResolveFakeCallInContext(receiver, fakeBindingTrace, valueArguments, name, callElement) { fake -> - fakeTrace.commit({ _, key -> + fakeTrace.commit({ slice, key -> // excluding all entries related to fake expression key != fake }, true) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt index 47a984a0e40..12923f6e952 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt @@ -81,24 +81,24 @@ private object DeclarationKindDetector : JetVisitor( fun detect(declaration: JetDeclaration) = declaration.accept(this, null) - override fun visitDeclaration(d: JetDeclaration, _: Unit?) = null + override fun visitDeclaration(d: JetDeclaration, data: Unit?) = null - override fun visitClass(d: JetClass, _: Unit?) = detect(d, if (d.isInterface()) "interface" else "class") + override fun visitClass(d: JetClass, data: Unit?) = detect(d, if (d.isInterface()) "interface" else "class") - override fun visitNamedFunction(d: JetNamedFunction, _: Unit?) = detect(d, "fun") + override fun visitNamedFunction(d: JetNamedFunction, data: Unit?) = detect(d, "fun") - override fun visitProperty(d: JetProperty, _: Unit?) = detect(d, d.getValOrVarKeyword().getText()!!) + override fun visitProperty(d: JetProperty, data: Unit?) = detect(d, d.getValOrVarKeyword().getText()!!) - override fun visitMultiDeclaration(d: JetMultiDeclaration, _: Unit?) = detect(d, d.getValOrVarKeyword()?.getText() ?: "val", + override fun visitMultiDeclaration(d: JetMultiDeclaration, data: Unit?) = detect(d, d.getValOrVarKeyword()?.getText() ?: "val", name = d.getEntries().map { it.getName()!! }.join(", ", "(", ")")) - override fun visitTypeParameter(d: JetTypeParameter, _: Unit?) = detect(d, "type parameter", newLineNeeded = false) + override fun visitTypeParameter(d: JetTypeParameter, data: Unit?) = detect(d, "type parameter", newLineNeeded = false) - override fun visitEnumEntry(d: JetEnumEntry, _: Unit?) = detect(d, "enum entry") + override fun visitEnumEntry(d: JetEnumEntry, data: Unit?) = detect(d, "enum entry") - override fun visitParameter(d: JetParameter, _: Unit?) = detect(d, "parameter", newLineNeeded = false) + override fun visitParameter(d: JetParameter, data: Unit?) = detect(d, "parameter", newLineNeeded = false) - override fun visitObjectDeclaration(d: JetObjectDeclaration, _: Unit?): AnnotationHostKind? { + override fun visitObjectDeclaration(d: JetObjectDeclaration, data: Unit?): AnnotationHostKind? { if (d.isCompanion()) return detect(d, "companion object", name = "${d.getName()} of ${d.getStrictParentOfType()?.getName()}") if (d.getParent() is JetObjectLiteralExpression) return null return detect(d, "object") diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt index 510d311bcf2..488ecb3fa73 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt @@ -114,7 +114,7 @@ public class KotlinConsoleRunner( keeper.putVirtualFileToConsole(consoleFile, this) processHandler.addProcessListener(object : ProcessAdapter() { - override fun processTerminated(_: ProcessEvent) { + override fun processTerminated(event: ProcessEvent) { keeper.removeConsole(consoleFile) } }) @@ -123,7 +123,7 @@ public class KotlinConsoleRunner( } override fun createExecuteActionHandler() = object : ProcessBackedConsoleExecuteActionHandler(processHandler, false) { - override fun runExecuteAction(_: LanguageConsoleView) = executor.executeCommand() + override fun runExecuteAction(consoleView: LanguageConsoleView) = executor.executeCommand() } override fun fillToolBarActions(toolbarActions: DefaultActionGroup, diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/actions/KotlinConsoleModuleDialog.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/actions/KotlinConsoleModuleDialog.kt index 8beeee728f0..8ab1392132b 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/actions/KotlinConsoleModuleDialog.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/actions/KotlinConsoleModuleDialog.kt @@ -60,6 +60,6 @@ public class KotlinConsoleModuleDialog(private val project: Project) { } private fun createRunAction(module: Module) = object : AnAction(module.name) { - override fun actionPerformed(_: AnActionEvent) = runConsole(module) + override fun actionPerformed(e: AnActionEvent) = runConsole(module) } } \ No newline at end of file diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/actions/RunExecuteActions.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/actions/RunExecuteActions.kt index cab436641c2..f586202c54e 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/actions/RunExecuteActions.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/actions/RunExecuteActions.kt @@ -57,5 +57,5 @@ public class BuildAndRestartConsoleAction( private val runner: KotlinConsoleRunner ) : AnAction("Build and restart", "Build module '${runner.module.name}' and restart", AllIcons.Actions.Restart) { - override fun actionPerformed(_: AnActionEvent) = runner.compilerHelper.compileModule() + override fun actionPerformed(e: AnActionEvent) = runner.compilerHelper.compileModule() } \ No newline at end of file diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/KotlinConsoleGutterContentProvider.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/KotlinConsoleGutterContentProvider.kt index b2d5460770b..7f2b8a619db 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/KotlinConsoleGutterContentProvider.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/KotlinConsoleGutterContentProvider.kt @@ -24,5 +24,5 @@ public class KotlinConsoleGutterContentProvider : BasicGutterContentProvider() { * This method overriding is needed to prevent [BasicGutterContentProvider] from adding some strange unicode * symbols of zero width and to ease range highlighting. */ - override fun beforeEvaluate(_: Editor) = Unit + override fun beforeEvaluate(editor: Editor) = Unit } \ No newline at end of file diff --git a/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt b/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt index 01ff89c5a3e..69fa5201bc2 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt @@ -135,7 +135,7 @@ class CodeBuilder(private val topElement: PsiElement?, private var docConverter: if (prefix.lineBreaksBefore > 0) { val lineBreaksToAdd = prefix.lineBreaksBefore - builder.trailingLineBreakCount() - for (_ in 1..lineBreaksToAdd) { + for (it in 1..lineBreaksToAdd) { append("\n", false) } }