MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[ES] do not override root type of imported source folders during collisions merge with other root types IDEA-219200

Browse Source 
GitOrigin-RevId: d19839f954f3de96767b92c3cd5a0febab72b836
This commit is contained in:
Vladislav.Soroka
2020-01-16 12:36:04 +03:00
committed by intellij-monorepo-bot
parent 6b36f90e31
commit a9c0841bd2
1 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ContentRootDataService.java
View File

@@ -154,12 +154,20 @@ public class ContentRootDataService extends AbstractProjectDataService<ContentRo
logDebug("Importing content root '%s' for module '%s' forceDirectoriesCreation=[%b]",
contentRoot.getRootPath(), module.getName(), forceDirectoriesCreation);
Set<String> updatedSourceRoots = new HashSet<>();
for (ExternalSystemSourceType externalSrcType : ExternalSystemSourceType.values()) {
final JpsModuleSourceRootType<?> type = getJavaSourceRootType(externalSrcType);
if (type != null) {
for (SourceRoot sourceRoot : contentRoot.getPaths(externalSrcType)) {
createSourceRootIfAbsent(sourceFolderManager, contentEntry, sourceRoot, module, type, forceDirectoriesCreation);
configureSourceFolder(sourceFolderManager, contentEntry, sourceRoot, externalSrcType.isGenerated());
String sourceRootPath = sourceRoot.getPath();
boolean createSourceFolder = !updatedSourceRoots.contains(sourceRootPath);
if (createSourceFolder) {
createOrReplaceSourceFolder(sourceFolderManager, contentEntry, sourceRoot, module, type, forceDirectoriesCreation);
if (externalSrcType == ExternalSystemSourceType.SOURCE || externalSrcType == ExternalSystemSourceType.TEST) {
updatedSourceRoots.add(sourceRootPath);
}
}
configureSourceFolder(sourceFolderManager, contentEntry, sourceRoot, createSourceFolder, externalSrcType.isGenerated());
}
}
}
@@ -237,12 +245,12 @@ public class ContentRootDataService extends AbstractProjectDataService<ContentRo
}
}
private static void createSourceRootIfAbsent(@NotNull SourceFolderManager sourceFolderManager,
@NotNull ContentEntry contentEntry,
@NotNull final SourceRoot sourceRoot,
@NotNull Module module,
@NotNull JpsModuleSourceRootType<?> sourceRootType,
boolean createEmptyContentRootDirectories) {
private static void createOrReplaceSourceFolder(@NotNull SourceFolderManager sourceFolderManager,
@NotNull ContentEntry contentEntry,
@NotNull final SourceRoot sourceRoot,
@NotNull Module module,
@NotNull JpsModuleSourceRootType<?> sourceRootType,
boolean createEmptyContentRootDirectories) {
SourceFolder folder = findSourceFolder(contentEntry, sourceRoot);
if (folder != null) {
@@ -272,6 +280,7 @@ public class ContentRootDataService extends AbstractProjectDataService<ContentRo
private static void configureSourceFolder(@NotNull SourceFolderManager sourceFolderManager,
@NotNull ContentEntry contentEntry,
@NotNull SourceRoot sourceRoot,
boolean updatePackagePrefix,
boolean generated) {
String packagePrefix = sourceRoot.getPackagePrefix();
String url = pathToUrl(sourceRoot.getPath());
@@ -280,14 +289,20 @@ public class ContentRootDataService extends AbstractProjectDataService<ContentRo
SourceFolder folder = findSourceFolder(contentEntry, sourceRoot);
if (folder == null) {
sourceFolderManager.setSourceFolderPackagePrefix(url, packagePrefix);
sourceFolderManager.setSourceFolderGenerated(url, generated);
if (updatePackagePrefix) {
sourceFolderManager.setSourceFolderPackagePrefix(url, packagePrefix);
}
if (generated) {
sourceFolderManager.setSourceFolderGenerated(url, true);
}
}
else {
if (StringUtil.isNotEmpty(packagePrefix)) {
if (updatePackagePrefix && StringUtil.isNotEmpty(packagePrefix)) {
folder.setPackagePrefix(packagePrefix);
}
setForGeneratedSources(folder, generated);
if (generated) {
setForGeneratedSources(folder, true);
}
}
}