MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't fork if there is only one module, pass encoding to forked vm (IDEA-181751)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-11-15 15:32:32 +01:00
parent 89dba2a9e9
commit 95406b5024
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+6 -1
View File
@@ -41,6 +41,7 @@ import com.intellij.execution.util.JavaParametersUtil;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.JavaSdkType;
import com.intellij.openapi.projectRoots.JdkUtil;
@@ -379,7 +380,11 @@ public abstract class JavaTestFrameworkRunnableState<T extends
final GlobalSearchScope configurationSearchScope = GlobalSearchScopesCore.projectTestScope(project).intersectWith(
sourceScope.getGlobalSearchScope());
final PsiDirectory[] directories = aPackage.getDirectories(configurationSearchScope);
return directories.length > 1;
return Arrays.stream(directories)
.map(dir -> ModuleUtilCore.findModuleForFile(dir.getVirtualFile(), project))
.filter(Objects::isNull)
.distinct()
.count() > 1;
}
}
}