J2K ImportPath: kotlinify

This commit is contained in:
Pavel V. Talanov
2017-02-13 13:16:11 +03:00
parent 50d0f5bde6
commit babb3b557d
16 changed files with 45 additions and 77 deletions
@@ -91,7 +91,7 @@ class OptimizedImportsBuilder(
.mapNotNull { it.importPath }
.filter {
val aliasName = it.alias
aliasName != null && aliasName != it.fqnPart().shortName()
aliasName != null && aliasName != it.fqName.shortName()
}
.mapTo(importRules) { ImportRule.Add(it) }
@@ -48,7 +48,7 @@ private fun KtFile.buildAliasImportMap(): Multimap<String, String> {
val importList = importList ?: return map
for (import in importList.imports) {
val aliasName = import.aliasName ?: continue
val name = import.importPath?.fqnPart()?.shortName()?.asString() ?: continue
val name = import.importPath?.fqName?.shortName()?.asString() ?: continue
map.put(aliasName, name)
}
return map