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

check type of containing file in getTestClass()

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-07-02 18:01:41 +02:00
committed by Nikolay Krasko
parent 49714d0817
commit d29e63e2b8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt
+2 -1
View File
@@ -130,9 +130,10 @@ public class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer<JUni
} }
private fun getTestClass(leaf: PsiElement): PsiClass? { private fun getTestClass(leaf: PsiElement): PsiClass? {
val containingFile = leaf.getContainingFile() as? JetFile ?: return null
var jetClass = leaf.getParentOfType<JetClass>(false) var jetClass = leaf.getParentOfType<JetClass>(false)
if (!jetClass.isJUnitTestClass()) { if (!jetClass.isJUnitTestClass()) {
jetClass = getTestClassInFile(leaf.getContainingFile() as JetFile) jetClass = getTestClassInFile(containingFile)
} }
if (jetClass != null) { if (jetClass != null) {
return LightClassUtil.getPsiClass(jetClass) return LightClassUtil.getPsiClass(jetClass)