From 1cab2d1245e70b935e283d48c04396c8b135c829 Mon Sep 17 00:00:00 2001
From: Santeri Hiltunen <hiltunen.santeri@gmail.com>
Date: Tue, 29 Jan 2013 16:52:05 +0200
Subject: [PATCH] Drop imports that have Kotlin analogs

---
 src/org/jetbrains/jet/j2k/Converter.kt | 34 +++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/org/jetbrains/jet/j2k/Converter.kt b/src/org/jetbrains/jet/j2k/Converter.kt
index 0757ac16a72..df0f8d1959d 100644
--- a/src/org/jetbrains/jet/j2k/Converter.kt
+++ b/src/org/jetbrains/jet/j2k/Converter.kt
@@ -19,12 +19,35 @@ import org.jetbrains.jet.lang.types.expressions.OperatorConventions.*
 import com.intellij.openapi.util.Pair
 import java.text.MessageFormat
 import com.intellij.psi.util.PsiUtil
+import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMap
+import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
+import org.jetbrains.jet.internal.com.intellij.openapi.project.Project
+import org.jetbrains.jet.config.CompilerConfiguration
+import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
+import org.jetbrains.jet.internal.com.intellij.openapi.Disposable
+import org.jetbrains.jet.lang.resolve.name.FqName
 
 public open class Converter() {
     private var classIdentifiers: MutableSet<String> = Sets.newHashSet()!!
     private val dispatcher: Dispatcher = Dispatcher(this)
     private var methodReturnType: PsiType? = null
     private val flags: MutableSet<J2KConverterFlags?>? = Sets.newHashSet()
+    private val jetCoreEnvironment: JetCoreEnvironment
+    {
+        val disposable = (object : Disposable {
+            public override fun dispose() {}
+        })
+        jetCoreEnvironment = JetCoreEnvironment(disposable, CompilerConfiguration())
+    }
+    private val project: Project
+    {
+        project = jetCoreEnvironment.getProject()
+        KotlinBuiltIns.initialize(project)
+    }
+    private val javaToKotlinClassMap: JavaToKotlinClassMap
+    {
+        javaToKotlinClassMap = JavaToKotlinClassMap.getInstance()
+    }
     public open fun addFlag(flag: J2KConverterFlags): Boolean {
         return flags?.add(flag)!!
     }
@@ -77,7 +100,16 @@ public open class Converter() {
         val imports: MutableList<Import> = (if (importList == null)
             arrayList()
         else
-            ArrayList(importsToImportList(importList.getAllImportStatements())))
+            ArrayList(importsToImportList(importList.getAllImportStatements()) filter {
+                // If name is invalid, like with star imports, don't try to filter
+                if (!FqName.isValid(it.name))
+                    true
+                else {
+                    // If imported class has a kotlin analog, drop the import
+                    val kotlinAnalogsForClass = javaToKotlinClassMap.mapPlatformClass(FqName(it.name))
+                    kotlinAnalogsForClass.isEmpty()
+                }
+            }))
         for (i : String in additionalImports)
             imports.add(Import(i))