MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-163185 [Gradle|Sync] fix: don't resolve the content root as a build root for the generated sources under it

Browse Source 
The build root cannot be excluded and used as a content root at the same time.

GitOrigin-RevId: 9129066a84a51db569b1058e27a92db49c6624ef
This commit is contained in:
Sergei Vorobyov
2024-09-02 16:52:10 +02:00
committed by intellij-monorepo-bot
parent 7818039983
commit 3ca055a407
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleContentRootIndex.kt
View File

@@ -59,21 +59,25 @@ class GradleContentRootIndex {
): Set<Path> {
val projectRootPath = externalProject.projectDir.toPath()
val buildRootPath = externalProject.buildDir.toPath()
val contentRootPaths = NioPathPrefixTreeFactory.createSet()
for (sourceDirectorySet in sources.values) {
for (sourceRootPath in sourceDirectorySet) {
val contentRootPath = resolveContentRoot(projectRootPath, sourceRootPath)
val contentRootPath = resolveContentRoot(projectRootPath, buildRootPath, sourceRootPath)
contentRootPaths.add(contentRootPath)
}
}
return contentRootPaths.getRoots()
}
private fun resolveContentRoot(projectRootPath: Path, sourceRootPath: Path): Path {
private fun resolveContentRoot(projectRootPath: Path, buildRootPath: Path, sourceRootPath: Path): Path {
if (!sourceRootPath.startsWith(projectRootPath)) {
return sourceRootPath
}
if (sourceRootPath.startsWith(buildRootPath)) {
return sourceRootPath
}
val contentRootPath = sourceRootPath.parent
if (contentRootPath == null || contentRootPath == projectRootPath) {
return sourceRootPath