From c6f9c88d2aa38a0d1d0bf10c38555f92a88f892c Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Fri, 1 Apr 2016 05:33:02 -0800
Subject: [PATCH] Fix compiling messages.

---
 .../src/main/kotlin/com/beust/kobalt/misc/Strings.kt         | 5 +++--
 src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt | 5 +++--
 .../kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt  | 5 ++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt
index bc971959..8f79128b 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Strings.kt
@@ -2,9 +2,10 @@ package com.beust.kobalt.misc
 
 import com.google.common.base.CharMatcher
 
-public class Strings {
+class Strings {
     companion object {
         fun pluralize(s: String, n: Int) = s + (if (n != 1) "s" else "")
+        fun pluralizeAll(s: String, n: Int) = "$n " + pluralize(s, n)
     }
 
 }
@@ -12,6 +13,6 @@ public class Strings {
 /**
  * @Return the number of times the given character occurs in the string
  */
-public infix fun String.countChar(c: Char) : Int {
+infix fun String.countChar(c: Char) : Int {
     return CharMatcher.`is`(c).countIn(this)
 }
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt
index c8af64f4..0fbcf309 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaCompiler.kt
@@ -9,6 +9,7 @@ import com.beust.kobalt.api.Project
 import com.beust.kobalt.internal.ICompilerAction
 import com.beust.kobalt.internal.JvmCompiler
 import com.beust.kobalt.misc.KFiles
+import com.beust.kobalt.misc.Strings
 import com.beust.kobalt.misc.log
 import com.beust.kobalt.misc.warn
 import com.google.inject.Inject
@@ -52,7 +53,7 @@ class JavaCompiler @Inject constructor(val jvmCompiler: JvmCompiler) {
                     command = "javac " + allArgs.joinToString(" ") + " " + info.sourceFiles.joinToString(" ")
                     log(2, "Launching\n$command")
 
-                    log(1, "  Java compiling ${info.sourceFiles.size} files")
+                    log(1, "  Java compiling " + Strings.pluralizeAll("file", info.sourceFiles.size))
                     val result = task.call()
                     errorMessage = dc.diagnostics.joinToString("\n")
                     result
@@ -72,7 +73,7 @@ class JavaCompiler @Inject constructor(val jvmCompiler: JvmCompiler) {
                     val pb = ProcessBuilder(allArgs)
                     pb.inheritIO()
                     val line = allArgs.joinToString(" ")
-                    log(1, "  Java compiling ${info.sourceFiles.size} files")
+                    log(1, "  Java compiling " + Strings.pluralizeAll("file", info.sourceFiles.size))
                     log(2, "  Java compiling $line")
 
                     command = allArgs.joinToString(" ") + " " + info.sourceFiles.joinToString(" ")
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
index 5d42f61c..76556fbb 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinCompiler.kt
@@ -9,6 +9,7 @@ import com.beust.kobalt.maven.DependencyManager
 import com.beust.kobalt.maven.dependency.FileDependency
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.KobaltExecutors
+import com.beust.kobalt.misc.Strings
 import com.beust.kobalt.misc.log
 import org.jetbrains.kotlin.cli.common.CLICompiler
 import org.jetbrains.kotlin.cli.common.ExitCode
@@ -38,9 +39,7 @@ class KotlinCompiler @Inject constructor(
 
     val compilerAction = object: ICompilerAction {
         override fun compile(projectName: String?, info: CompilerActionInfo): TaskResult {
-            if (info.sourceFiles.size > 1) {
-                log(1, "  Kotlin compiling ${info.sourceFiles.size} files")
-            }
+            log(1, "  Kotlin compiling " + Strings.pluralizeAll("file", info.sourceFiles.size))
             val cp = compilerFirst(info.dependencies.map {it.jarFile.get()})
             val infoDir = info.directory
             val outputDir = if (infoDir != null) {