azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New J2K: Do not filter default imports

Browse Source
This commit is contained in:
Ilya Kirillov
2018-12-24 20:30:33 +03:00
committed by Ilya Kirillov
parent 6e1adf9b6f
commit 6dae9da7e2
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ImportStatementConversion.kt
+16 -8
View File
@@ -10,6 +10,7 @@
package org.jetbrains.kotlin.j2k.conversions package org.jetbrains.kotlin.j2k.conversions
import com.intellij.psi.CommonClassNames
import org.jetbrains.kotlin.j2k.tree.* import org.jetbrains.kotlin.j2k.tree.*
import org.jetbrains.kotlin.j2k.tree.impl.JKImportStatementImpl import org.jetbrains.kotlin.j2k.tree.impl.JKImportStatementImpl
import org.jetbrains.kotlin.j2k.tree.impl.JKNameIdentifierImpl import org.jetbrains.kotlin.j2k.tree.impl.JKNameIdentifierImpl
@@ -19,21 +20,28 @@ import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitorVoid
class ImportStatementConversion : RecursiveApplicableConversionBase() { class ImportStatementConversion : RecursiveApplicableConversionBase() {
override fun applyToElement(element: JKTreeElement): JKTreeElement { override fun applyToElement(element: JKTreeElement): JKTreeElement {
if (element !is JKFile) return recurse(element) 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()) { for (import in element.declarationList.collectImports()) {
if (!element.importList.containsImport(import) && importIsInPacakge(import, packageName)) { if (!element.importList.containsImport(import)) {
element.importList += JKImportStatementImpl(JKNameIdentifierImpl(import)) element.importList += JKImportStatementImpl(JKNameIdentifierImpl(import))
} }
} }
element.importList = element.importList.filter { it.name.value !in importExceptionList }
return recurse(element) return recurse(element)
} }
private fun importIsInPacakge(import: String, packageName: String) = private val importExceptionList =
listOf(
CommonClassNames.JAVA_UTIL_ARRAY_LIST,
CommonClassNames.JAVA_UTIL_LIST,
CommonClassNames.JAVA_UTIL_HASH_SET,
CommonClassNames.JAVA_UTIL_HASH_MAP,
CommonClassNames.JAVA_UTIL_COLLECTION,
CommonClassNames.JAVA_UTIL_ITERATOR,
"java.util.LinkedHashMap",
"java.util.LinkedHashSet"
)
private fun importIsInPackage(import: String, packageName: String) =
'.' !in import.substringAfter(packageName) '.' !in import.substringAfter(packageName)