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

Minor: remove warnings in KotlinCliJavaFileManagerImpl

Browse Source
This commit is contained in:
Nikolay Krasko
2015-11-09 18:26:23 +03:00
parent bd4ffb9ced
commit 0b01c8a4cf
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt
+4 -5
View File
@@ -57,13 +57,12 @@ public class KotlinCliJavaFileManagerImpl(private val myPsiManager: PsiManager)
// which supposedly shouldn't have errors so the dependencies exist in general // which supposedly shouldn't have errors so the dependencies exist in general
// Most classes are top level classes so we will try to find them fast // Most classes are top level classes so we will try to find them fast
// but we must sometimes fallback to support finding inner/nested classes // but we must sometimes fallback to support finding inner/nested classes
return qName.toSafeTopLevelClassId()?.let { classId -> findClass(classId, scope) } return qName.toSafeTopLevelClassId()?.let { classId -> findClass(classId, scope) } ?: super.findClass(qName, scope)
?: super<CoreJavaFileManager>.findClass(qName, scope)
} }
override fun findClasses(qName: String, scope: GlobalSearchScope): Array<PsiClass> { override fun findClasses(qName: String, scope: GlobalSearchScope): Array<PsiClass> {
return perfCounter.time { return perfCounter.time {
val classIdAsTopLevelClass = qName.toSafeTopLevelClassId() ?: return@time super<CoreJavaFileManager>.findClasses(qName, scope) val classIdAsTopLevelClass = qName.toSafeTopLevelClassId() ?: return@time super.findClasses(qName, scope)
val result = ArrayList<PsiClass>() val result = ArrayList<PsiClass>()
val classNameWithInnerClasses = classIdAsTopLevelClass.getRelativeClassName().asString() val classNameWithInnerClasses = classIdAsTopLevelClass.getRelativeClassName().asString()
@@ -76,7 +75,7 @@ public class KotlinCliJavaFileManagerImpl(private val myPsiManager: PsiManager)
true true
} }
if (result.isEmpty()) { if (result.isEmpty()) {
super<CoreJavaFileManager>.findClasses(qName, scope) super.findClasses(qName, scope)
} }
else { else {
result.toTypedArray() result.toTypedArray()
@@ -122,7 +121,7 @@ public class KotlinCliJavaFileManagerImpl(private val myPsiManager: PsiManager)
} }
companion object { companion object {
private val LOG = Logger.getInstance(javaClass<KotlinCliJavaFileManagerImpl>()) private val LOG = Logger.getInstance(KotlinCliJavaFileManagerImpl::class.java)
private fun findClassInPsiFile(classNameWithInnerClassesDotSeparated: String, file: PsiClassOwner): PsiClass? { private fun findClassInPsiFile(classNameWithInnerClassesDotSeparated: String, file: PsiClassOwner): PsiClass? {
for (topLevelClass in file.getClasses()) { for (topLevelClass in file.getClasses()) {