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

JavaElementFinder: cleanup code

Browse Source
This commit is contained in:
Dmitry Gridin
2021-09-09 14:10:28 +07:00
committed by Space
parent 862e87b1ba
commit 542d109166
1 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt
+15 -30
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.asJava.finder package org.jetbrains.kotlin.asJava.finder
@@ -175,13 +164,11 @@ class JavaElementFinder(
override fun getPackageFiles(psiPackage: PsiPackage, scope: GlobalSearchScope): Array<PsiFile> = override fun getPackageFiles(psiPackage: PsiPackage, scope: GlobalSearchScope): Array<PsiFile> =
kotlinAsJavaSupport.findFilesForPackage(FqName(psiPackage.qualifiedName), scope).toTypedArray() kotlinAsJavaSupport.findFilesForPackage(FqName(psiPackage.qualifiedName), scope).toTypedArray()
override fun getPackageFilesFilter(psiPackage: PsiPackage, scope: GlobalSearchScope): Condition<PsiFile>? { override fun getPackageFilesFilter(psiPackage: PsiPackage, scope: GlobalSearchScope): Condition<PsiFile> = Condition { input ->
return Condition { input -> if (input !is KtFile) {
if (input !is KtFile) { true
true } else {
} else { psiPackage.qualifiedName == input.packageFqName.asString()
psiPackage.qualifiedName == input.packageFqName.asString()
}
} }
} }
@@ -190,16 +177,14 @@ class JavaElementFinder(
EP.getPoint(project).extensions.firstIsInstanceOrNull() EP.getPoint(project).extensions.firstIsInstanceOrNull()
?: error(JavaElementFinder::class.java.simpleName + " is not found for project " + project) ?: error(JavaElementFinder::class.java.simpleName + " is not found for project " + project)
fun byClasspathComparator(searchScope: GlobalSearchScope): Comparator<PsiElement> { fun byClasspathComparator(searchScope: GlobalSearchScope): Comparator<PsiElement> = Comparator { o1, o2 ->
return Comparator { o1, o2 -> val f1 = PsiUtilCore.getVirtualFile(o1)
val f1 = PsiUtilCore.getVirtualFile(o1) val f2 = PsiUtilCore.getVirtualFile(o2)
val f2 = PsiUtilCore.getVirtualFile(o2) when {
when { f1 === f2 -> 0
f1 === f2 -> 0 f1 == null -> -1
f1 == null -> -1 f2 == null -> 1
f2 == null -> 1 else -> searchScope.compare(f2, f1)
else -> searchScope.compare(f2, f1)
}
} }
} }
} }