From 480ddcb20e987d8104c1b6bd63bf52f090b14421 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 17 Feb 2015 17:12:46 +0300
Subject: [PATCH] Minor

---
 .../kotlin/idea/imports/KotlinImportOptimizer.kt         | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
index 8bfee3d7152..1cc5956dd08 100644
--- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
@@ -55,9 +55,6 @@ public class KotlinImportOptimizer() : ImportOptimizer {
                 if (aliasName != null) {
                     aliasImports.put(aliasName, path.fqnPart())
                 }
-                else {
-                    //TODO: detect other "special" imports
-                }
             }
             this.aliasImports = aliasImports
         }
@@ -105,7 +102,7 @@ public class KotlinImportOptimizer() : ImportOptimizer {
                     else {
                         val useCount = incUseCount(parentFqName)
 
-                        if (descriptor is ClassifierDescriptor) {
+                        if (descriptor is ClassDescriptor) {
                             classNames.add(fqName)
                         }
 
@@ -144,7 +141,7 @@ public class KotlinImportOptimizer() : ImportOptimizer {
                 }
             }
 
-            //TODO: drop unused aliases
+            //TODO: drop unused aliases?
             aliasImports.mapTo(importsToGenerate) { ImportPath(it.getValue(), false, it.getKey())}
 
             val sortedImportsToGenerate = importsToGenerate.sortBy(importInsertHelper.importSortComparator)
@@ -186,7 +183,7 @@ public class KotlinImportOptimizer() : ImportOptimizer {
                         val targets = reference.resolveToDescriptors()
                         for (target in targets) {
                             if (!target.canBeReferencedViaImport()) continue
-                            if (target is PackageViewDescriptor && target.getFqName().parent() == FqName.ROOT) continue // no need to import top-level packages (TODO: is that always true?)
+                            if (target is PackageViewDescriptor && target.getFqName().parent() == FqName.ROOT) continue // no need to import top-level packages
 
                             if (!target.isExtension) { // for non-extension targets, count only non-qualified simple name usages
                                 if (element !is JetNameReferenceExpression) continue