mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
fixup: simplify code
(cherry picked from commit eb9d9d7cab7b0d54daeed2a1dc3795c3f6b56d77) IJ-CR-179279 GitOrigin-RevId: bcb44b64044fea8648d30992c3c7af4834ef3969
This commit is contained in:
committed by
intellij-monorepo-bot
parent
56854f775e
commit
d5e6f3277b
@@ -13,10 +13,10 @@ import com.intellij.openapi.util.io.FileUtil;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import com.intellij.openapi.vfs.VirtualFileManager;
|
||||
import com.intellij.openapi.vfs.pointers.VirtualFilePointer;
|
||||
import com.intellij.util.containers.ContainerUtil;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ModuleCompileScope extends FileIndexCompileScope {
|
||||
private final Project myProject;
|
||||
@@ -24,7 +24,6 @@ public class ModuleCompileScope extends FileIndexCompileScope {
|
||||
private final Set<Module> myScopeModules;
|
||||
private final Module[] myModules;
|
||||
private final Collection<String> myIncludedUnloadedModules;
|
||||
private final boolean myIncludeTests;
|
||||
|
||||
public ModuleCompileScope(final Module module, boolean includeDependentModules) {
|
||||
this(module.getProject(), Collections.singleton(module), Collections.emptyList(), includeDependentModules, false);
|
||||
@@ -45,7 +44,6 @@ public class ModuleCompileScope extends FileIndexCompileScope {
|
||||
public ModuleCompileScope(Project project, final Collection<? extends Module> modules, Collection<String> includedUnloadedModules, boolean includeDependentModules, boolean includeRuntimeDeps, boolean includeTests) {
|
||||
myProject = project;
|
||||
myIncludedUnloadedModules = includedUnloadedModules;
|
||||
myIncludeTests = includeTests;
|
||||
myTestSourcesModules = new HashSet<>();
|
||||
myScopeModules = new HashSet<>();
|
||||
for (Module module : modules) {
|
||||
@@ -89,11 +87,7 @@ public class ModuleCompileScope extends FileIndexCompileScope {
|
||||
|
||||
@Override
|
||||
public Collection<ModuleSourceSet> getAffectedSourceSets() {
|
||||
Collection<ModuleSourceSet> result = super.getAffectedSourceSets();
|
||||
if (myIncludeTests) {
|
||||
return result.stream().filter(set -> !set.getType().isTest() || myTestSourcesModules.contains(set.getModule())).collect(Collectors.toList());
|
||||
}
|
||||
return result.stream().filter(set -> !set.getType().isTest() || myTestSourcesModules.contains(set.getModule())).collect(Collectors.toList());
|
||||
return ContainerUtil.filter(super.getAffectedSourceSets(), set -> !set.getType().isTest() || myTestSourcesModules.contains(set.getModule()));
|
||||
}
|
||||
|
||||
public static boolean shouldIncludeTestsFromDependentModulesToTestClasspath(@NotNull Module module) {
|
||||
|
||||
Reference in New Issue
Block a user