From 2efd467c42d442af9b2b0e552779678a609e4bca Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 4 Jul 2018 16:32:41 +0300 Subject: [PATCH] JS: Fix detection of run configuration with preconfigured Mocha #KT-25253 Fixed --- .../mocha/KotlinMochaRunConfigurationProducer.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/mocha/KotlinMochaRunConfigurationProducer.kt b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/mocha/KotlinMochaRunConfigurationProducer.kt index 86d849ead83..1048ccf2f2a 100644 --- a/ultimate/src/org/jetbrains/kotlin/idea/nodejs/mocha/KotlinMochaRunConfigurationProducer.kt +++ b/ultimate/src/org/jetbrains/kotlin/idea/nodejs/mocha/KotlinMochaRunConfigurationProducer.kt @@ -114,8 +114,6 @@ class KotlinMochaRunConfigurationProducer : MochaRunConfigurationProducer(), Kot } ?: return null val project = module.project - if (isTestRunnerPackageAvailableFor(project, file)) return null - val testFilePath = module.jsTestOutputFilePath ?: return null val testElementPath = TestElementPath.forElement(element, module) ?: return null @@ -123,16 +121,19 @@ class KotlinMochaRunConfigurationProducer : MochaRunConfigurationProducer(), Kot if (context?.getOriginalConfiguration(MochaConfigurationType.getInstance()) is MochaRunConfiguration) return configData + if (isTestRunnerPackageAvailableFor(project, file)) return configData + val roots = collectMochaTestRoots(project) if (roots.isEmpty()) return null val dirs = SmartHashSet() for (root in roots) { - if (root.isDirectory) { - dirs.add(root) - } else if (root == file) return configData + when { + root.isDirectory -> dirs.add(root) + root == file -> return configData + } } - return if (VfsUtilCore.isUnder(file, dirs)) configData else configData + return if (VfsUtilCore.isUnder(file, dirs)) configData else null } override val isForTests: Boolean