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

Minor: clean deprecated warnings in KotlinTestFinder.kt

Browse Source
This commit is contained in:
Nikolay Krasko
2019-03-05 14:22:18 +03:00
parent 606a7766af
commit 878e56f2ab
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/dictionaries/Nikolay_Krasko.xml
Generated
+1
View File
@@ -19,6 +19,7 @@
<w>preloader</w> <w>preloader</w>
<w>preloading</w> <w>preloading</w>
<w>preprocess</w> <w>preprocess</w>
<w>proximities</w>
<w>redeclarations</w> <w>redeclarations</w>
<w>smap</w> <w>smap</w>
<w>subclassed</w> <w>subclassed</w>
idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestFinder.kt
+16 -12
View File
@@ -26,9 +26,8 @@ import com.intellij.psi.search.PsiShortNamesCache
import com.intellij.testIntegration.JavaTestFinder import com.intellij.testIntegration.JavaTestFinder
import com.intellij.testIntegration.TestFinderHelper import com.intellij.testIntegration.TestFinderHelper
import com.intellij.util.CommonProcessors import com.intellij.util.CommonProcessors
import com.intellij.util.containers.HashSet
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
import org.jetbrains.kotlin.asJava.findFacadeClass import org.jetbrains.kotlin.asJava.findFacadeClass
import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
@@ -71,8 +70,7 @@ class KotlinTestFinder : JavaTestFinder() {
if (eachClass is KtLightClassForFacade) { if (eachClass is KtLightClassForFacade) {
eachClass.files.mapTo(classesWithWeights) { Pair.create(it, candidateNameWithWeight.second) } eachClass.files.mapTo(classesWithWeights) { Pair.create(it, candidateNameWithWeight.second) }
} } else if (eachClass.isPhysical || eachClass is KtLightClassForSourceDeclaration) {
else if (eachClass.isPhysical || eachClass is KtLightClassForSourceDeclaration) {
classesWithWeights.add(Pair.create(eachClass, candidateNameWithWeight.second)) classesWithWeights.add(Pair.create(eachClass, candidateNameWithWeight.second))
} }
} }
@@ -94,16 +92,22 @@ class KotlinTestFinder : JavaTestFinder() {
val frameworks = TestFrameworks.getInstance() val frameworks = TestFrameworks.getInstance()
val cache = PsiShortNamesCache.getInstance(klass.project) val cache = PsiShortNamesCache.getInstance(klass.project)
val names = HashSet<String>() cache.processAllClassNames { candidateName ->
cache.getAllClassNames(names) if (!pattern.matcher(candidateName).matches()) return@processAllClassNames true
for (candidateName in names) {
if (!pattern.matcher(candidateName).matches()) continue
for (candidateClass in cache.getClassesByName(candidateName, scope)) { for (candidateClass in cache.getClassesByName(candidateName, scope)) {
if (!(frameworks.isTestClass(candidateClass) || frameworks.isPotentialTestClass(candidateClass))) continue if (!(frameworks.isTestClass(candidateClass) || frameworks.isPotentialTestClass(candidateClass))) {
if (!candidateClass.isPhysical && candidateClass !is KtLightClassForSourceDeclaration) continue return@processAllClassNames true
processor.process(Pair.create(candidateClass, TestFinderHelper.calcTestNameProximity(klassName, candidateName))) }
if (!candidateClass.isPhysical && candidateClass !is KtLightClassForSourceDeclaration) {
return@processAllClassNames true
}
if (!processor.process(Pair.create(candidateClass, TestFinderHelper.calcTestNameProximity(klassName, candidateName)))) {
return@processAllClassNames false
}
} }
return@processAllClassNames true
} }
return TestFinderHelper.getSortedElements(classesWithProximities, true) return TestFinderHelper.getSortedElements(classesWithProximities, true)