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

JS: Fix detection of run configuration with preconfigured Mocha

Browse Source 
#KT-25253 Fixed
This commit is contained in:
Alexey Sedunov
2018-07-04 16:32:41 +03:00
parent be40127ab3
commit 2efd467c42
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ultimate/src/org/jetbrains/kotlin/idea/nodejs/mocha/KotlinMochaRunConfigurationProducer.kt
+7 -6
View File
@@ -114,8 +114,6 @@ class KotlinMochaRunConfigurationProducer : MochaRunConfigurationProducer(), Kot
} ?: return null } ?: return null
val project = module.project val project = module.project
if (isTestRunnerPackageAvailableFor(project, file)) return null
val testFilePath = module.jsTestOutputFilePath ?: return null val testFilePath = module.jsTestOutputFilePath ?: return null
val testElementPath = TestElementPath.forElement(element, module) ?: 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 (context?.getOriginalConfiguration(MochaConfigurationType.getInstance()) is MochaRunConfiguration) return configData
if (isTestRunnerPackageAvailableFor(project, file)) return configData
val roots = collectMochaTestRoots(project) val roots = collectMochaTestRoots(project)
if (roots.isEmpty()) return null if (roots.isEmpty()) return null
val dirs = SmartHashSet<VirtualFile>() val dirs = SmartHashSet<VirtualFile>()
for (root in roots) { for (root in roots) {
if (root.isDirectory) { when {
dirs.add(root) root.isDirectory -> dirs.add(root)
} else if (root == file) return configData 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 override val isForTests: Boolean