From 57a732c247ccd4ee466bd034bae30b3816632033 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Mon, 1 Jul 2019 19:21:44 +0700
Subject: [PATCH] Minor: fixes after review

---
 .../kotlin/idea/actions/KotlinAddImportAction.kt  |  6 +++++-
 .../kotlin/idea/imports/KotlinImportOptimizer.kt  | 15 +++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
index 4714ea8ed30..6b589a737d7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
@@ -347,7 +347,11 @@ private class SingleImportVariant(
     val descriptors: Collection<DeclarationDescriptor>
 ) : AutoImportVariant {
     override val descriptorsToImport: Collection<DeclarationDescriptor>
-        get() = listOf(descriptors.singleOrNull() ?: descriptors.minBy { if (it is ClassDescriptor) 0 else 1 }!!)
+        get() = listOf(
+            descriptors.singleOrNull()
+                ?: descriptors.minBy { if (it is ClassDescriptor) 0 else 1 }
+                ?: error("we create the class with not-empty descriptors always")
+        )
 
     override val hint: String get() = excludeFqNameCheck.asString()
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
index 34185deec00..270c3d707ec 100644
--- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.imports
 import com.intellij.lang.ImportOptimizer
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.progress.ProgressIndicatorProvider
+import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.descriptors.*
@@ -52,18 +53,8 @@ class KotlinImportOptimizer : ImportOptimizer {
 
         return object : ImportOptimizer.CollectingInfoRunnable {
             override fun getUserNotificationInfo(): String = if (remove == 0) "Rearranged imports"
-            else buildString {
-                append("Removed ")
-                append(remove)
-                append(" import")
-                if (remove > 1) append("s")
-                if (add > 0) {
-                    append(", added ")
-                    append(add)
-                    append(" import")
-                    if (add > 1) append("s")
-                }
-            }
+            else "Removed $remove ${StringUtil.pluralize("import", remove)}" +
+                    if (add > 0) ", added $add ${StringUtil.pluralize("import", add)}" else ""
 
             override fun run() = replaceImports(ktFile, imports)
         }