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

Create FqName safely in KotlinCliJavaFileManagerImpl#findPackage

Browse Source 
#KT-7501 Fixed
This commit is contained in:
Pavel V. Talanov
2015-04-22 15:20:54 +03:00
parent 525b9e63ae
commit dc05596ce0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt
+7 -3
View File
@@ -78,7 +78,8 @@ public class KotlinCliJavaFileManagerImpl(private val myPsiManager: PsiManager)
override fun findPackage(packageName: String): PsiPackage? { override fun findPackage(packageName: String): PsiPackage? {
var found = false var found = false
index.traverseDirectoriesInPackage(FqName(packageName)) { _, __ -> val packageFqName = packageName.toSafeFqName() ?: return null
index.traverseDirectoriesInPackage(packageFqName) { _, __ ->
found = true found = true
//abort on first found //abort on first found
false false
@@ -149,8 +150,8 @@ public class KotlinCliJavaFileManagerImpl(private val myPsiManager: PsiManager)
} }
// a sad workaround to avoid throwing exception when called from inside IDEA code // a sad workaround to avoid throwing exception when called from inside IDEA code
private fun String.toSafeTopLevelClassId(): ClassId? = try { private fun <T : Any> safely(compute: () -> T): T? = try {
ClassId.topLevel(FqName(this)) compute()
} }
catch (e: IllegalArgumentException) { catch (e: IllegalArgumentException) {
null null
@@ -158,3 +159,6 @@ catch (e: IllegalArgumentException) {
catch (e: AssertionError) { catch (e: AssertionError) {
null null
} }
private fun String.toSafeFqName(): FqName? = safely { FqName(this) }
private fun String.toSafeTopLevelClassId(): ClassId? = safely { ClassId.topLevel(FqName(this)) }