From 0712db8bd3dc707710cbe1122631c3c80a1c554e Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 5 Dec 2018 14:06:24 +0300 Subject: [PATCH] New J2K: Add filtering local imports in ImportStatementConversion --- .../kotlin/j2k/conversions/ImportStatementConversion.kt | 6 +++++- 1 file changed, 5 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 0ec4692e3af..c65b785dc85 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImportStatementConversion.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImportStatementConversion.kt @@ -21,13 +21,17 @@ class ImportStatementConversion : RecursiveApplicableConversionBase() { if (element !is JKFile) return recurse(element) for (import in element.declarationList.collectImports()) { - if (!element.importList.containsImport(import)) { + if (!element.importList.containsImport(import) && importIsInPacakge(import, packageName)) { element.importList += JKImportStatementImpl(JKNameIdentifierImpl(import)) } } return recurse(element) } + private fun importIsInPacakge(import: String, packageName: String) = + '.' !in import.substringAfter(packageName) + + private fun List.containsImport(import: String) = asSequence() .map { it.name.value }