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

More cleanup: lift return / assignment out

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-07-07 13:57:36 +03:00
parent 9269de721e
commit dfe2c16bc7
116 changed files with 472 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/KotlinClassifiersCache.kt
+4 -4
View File
@@ -205,12 +205,12 @@ private fun tryToResolveInner(name: String,
private fun KtFile.tryToResolvePackageClass(name: String,
javac: JavacWrapper,
nameParts: List<String> = emptyList()): JavaClass? {
if (nameParts.size > 1) {
return find(FqName("${packageFqName.asString()}.${nameParts.first()}"), javac, nameParts)
return if (nameParts.size > 1) {
find(FqName("${packageFqName.asString()}.${nameParts.first()}"), javac, nameParts)
}
else {
return javac.findClass(FqName("${packageFqName.asString()}.$name"))
?: javac.getKotlinClassifier(FqName("${packageFqName.asString()}.$name"))
javac.findClass(FqName("${packageFqName.asString()}.$name"))
?: javac.getKotlinClassifier(FqName("${packageFqName.asString()}.$name"))
}
}