MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Workspace Model] Fix JPS compilation

Browse Source 
GitOrigin-RevId: 9a5705bcc746fc854557546ed2bc841ef55fcffe
This commit is contained in:
Alex Plate
2023-01-19 13:12:28 +02:00
committed by intellij-monorepo-bot
parent e4d31e9c41
commit d304f3d5d2
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectLoader.java
View File

@@ -45,6 +45,7 @@ import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;
import static org.jetbrains.jps.model.serialization.java.compiler.JpsJavaCompilerConfigurationSerializer.BYTECODE_TARGET_LEVEL;
@@ -398,6 +399,16 @@ public final class JpsProjectLoader extends JpsLoaderBase {
if (data == null) {
LOG.info("Module '" + getModuleName(file) + "' is skipped: " + file.toAbsolutePath() + " doesn't exist");
}
else {
// Copy the content roots that are defined in a separate tag, to a general content root component
List<Element> components = data.getChildren("component");
Map<String, Element> componentsByName = components.stream().collect(Collectors.toMap(o -> o.getAttributeValue("name"), v -> v));
Element rootManager = componentsByName.get("NewModuleRootManager");
Element additionalElements = componentsByName.get("AdditionalModuleElements");
if (rootManager != null && additionalElements != null) {
JDOMUtil.deepMerge(rootManager, additionalElements);
}
}
return new Pair<>(file, data);
}, executor));