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

Minor simplification

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-04-28 13:40:57 +03:00
parent 569483af5d
commit a80d36e8eb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/importConversion.kt
+2 -1
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.j2k.ast.ImportList
import org.jetbrains.kotlin.j2k.ast.assignPrototype import org.jetbrains.kotlin.j2k.ast.assignPrototype
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
import org.jetbrains.kotlin.renderer.render
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
fun Converter.convertImportList(importList: PsiImportList): ImportList = fun Converter.convertImportList(importList: PsiImportList): ImportList =
@@ -61,7 +62,7 @@ private fun Converter.filterImport(name: String, ref: PsiJavaCodeReferenceElemen
val target = ref.resolve() val target = ref.resolve()
if (target is KtLightClassForFacade) { if (target is KtLightClassForFacade) {
return quoteKeywords(target.getFqName().parent().toString()) + ".*" return target.getFqName().parent().render() + ".*"
} }
else if (target is KtLightClass) { else if (target is KtLightClass) {
if (isFacadeClassFromLibrary(target)) return null if (isFacadeClassFromLibrary(target)) return null