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

[maven] allow importing duplicating content roots when CodeInsightContext is enabled IDEA-367571

Browse Source 
GitOrigin-RevId: b22b22ef469c4027c7a84422fba73190ea250dc1
This commit is contained in:
Nikita.Skvortsov
2025-02-14 16:54:53 +00:00
committed by intellij-monorepo-bot
parent de261d4d4d
commit 6c8675e758
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/WorkspaceFolderImporter.kt
+12 -7
View File
@@ -1,11 +1,13 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.maven.importing.workspaceModel
import com.intellij.codeInsight.multiverse.isSharedSourceSupportEnabled
import com.intellij.ide.util.projectWizard.importSources.JavaSourceRootDetectionUtil
import com.intellij.java.workspace.entities.JavaResourceRootPropertiesEntity
import com.intellij.java.workspace.entities.JavaSourceRootPropertiesEntity
import com.intellij.java.workspace.entities.javaResourceRoots
import com.intellij.java.workspace.entities.javaSourceRoots
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.platform.workspace.jps.entities.*
@@ -36,7 +38,8 @@ internal class WorkspaceFolderImporter(
private val virtualFileUrlManager: VirtualFileUrlManager,
private val importingSettings: MavenImportingSettings,
private val importingContext: FolderImportingContext,
private val workspaceConfigurators: List<MavenWorkspaceConfigurator>
private val workspaceConfigurators: List<MavenWorkspaceConfigurator>,
private val project: Project
) {
fun createContentRoots(
@@ -53,8 +56,7 @@ internal class WorkspaceFolderImporter(
if (moduleType == StandardMavenModuleType.MAIN_ONLY_ADDITIONAL) return outputFolders
val allFolders = mutableListOf<ContentRootCollector.ImportedFolder>()
addContentRoot(cachedFolders, allFolders)
addContentRoot(cachedFolders, allFolders, isSharedSourceSupportEnabled(project))
addCachedFolders(moduleType, cachedFolders, allFolders)
for (root in ContentRootCollector.collect(allFolders)) {
@@ -77,12 +79,15 @@ internal class WorkspaceFolderImporter(
}
private fun addContentRoot(cachedFolders: CachedProjectFolders,
allFolders: MutableList<ContentRootCollector.ImportedFolder>) {
allFolders: MutableList<ContentRootCollector.ImportedFolder>,
duplicatesAreAllowed: Boolean = false) {
val contentRoot = cachedFolders.projectContentRootPath
// make sure we don't have overlapping content roots in different modules
val alreadyRegisteredRoot = importingContext.alreadyRegisteredContentRoots.contains(contentRoot)
if (alreadyRegisteredRoot) return
if (!duplicatesAreAllowed) {
// make sure we don't have overlapping content roots in different modules
val alreadyRegisteredRoot = importingContext.alreadyRegisteredContentRoots.contains(contentRoot)
if (alreadyRegisteredRoot) return
}
allFolders.add(ContentRootCollector.ProjectRootFolder(contentRoot))
importingContext.alreadyRegisteredContentRoots.add(contentRoot)
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/WorkspaceModuleImporter.kt
+1 -1
View File
@@ -108,7 +108,7 @@ internal class WorkspaceModuleImporter(
moduleEntity: ModuleEntity,
folderImportingContext: WorkspaceFolderImporter.FolderImportingContext,
) {
val folderImporter = WorkspaceFolderImporter(builder, virtualFileUrlManager, importingSettings, folderImportingContext, workspaceConfigurators)
val folderImporter = WorkspaceFolderImporter(builder, virtualFileUrlManager, importingSettings, folderImportingContext, workspaceConfigurators, project)
val outputFolders = folderImporter.createContentRoots(importData.mavenProject, importData.moduleData.type, moduleEntity,
stats)
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/WorkspaceProjectImporter.kt
+2 -1
View File
@@ -578,7 +578,8 @@ internal open class WorkspaceProjectImporter(
workspaceModel.getVirtualFileUrlManager(),
mavenManager.importingSettings,
folderImportingContext,
MavenWorkspaceConfigurator.EXTENSION_POINT_NAME.extensionList)
MavenWorkspaceConfigurator.EXTENSION_POINT_NAME.extensionList,
project)
var numberOfModules = 0
readMavenExternalSystemData(builder).forEach { data ->