From df5c2f90c12b4282433d1d49d8ce2eaaa541e1be Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 5 Dec 2018 17:04:37 +0300 Subject: [PATCH] New J2K: Add basic import list mapping --- .../kotlin/j2k/conversions/ImportStatementConversion.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImportStatementConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImportStatementConversion.kt index c65b785dc85..a0af1b1f62b 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImportStatementConversion.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImportStatementConversion.kt @@ -19,7 +19,12 @@ import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitorVoid class ImportStatementConversion : RecursiveApplicableConversionBase() { override fun applyToElement(element: JKTreeElement): JKTreeElement { if (element !is JKFile) return recurse(element) - + element.importList = element.importList.map { + mapOf("java.util.Collection" to "kotlin.collections.Collection")[it.name.value]?.let { + JKImportStatementImpl(JKNameIdentifierImpl(it)) + } ?: it + } + val packageName = element.packageDeclaration.packageName.value for (import in element.declarationList.collectImports()) { if (!element.importList.containsImport(import) && importIsInPacakge(import, packageName)) { element.importList += JKImportStatementImpl(JKNameIdentifierImpl(import))