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

[workspace model] Make separate get folder for test source roots and group source roots

Browse Source 
GitOrigin-RevId: a6c11b19052def30963454560f1db34e8ec95581
This commit is contained in:
Mikhail Mazurkevich
2024-04-01 23:21:58 +00:00
committed by intellij-monorepo-bot
parent dcad2cb789
commit f598f97fb6
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/intellij.devkit.workspaceModel/src/WorkspaceModelGenerator.kt
+20 -3
View File
@@ -55,7 +55,7 @@ class WorkspaceModelGenerator(private val project: Project, private val coroutin
LOG.info("Acceptable module source roots not found")
return
}
acceptedSourceRoots.map { sourceRoot ->
acceptedSourceRoots.forEach { sourceRoot ->
withContext(Dispatchers.EDT) {
DumbService.getInstance(project).completeJustSubmittedTasks() // Waiting for smart mode
CodeWriter.generate(
@@ -64,16 +64,30 @@ class WorkspaceModelGenerator(private val project: Project, private val coroutin
explicitApiEnabled = module.explicitApiEnabled,
isTestModule = module.isTestModule, // TODO(It doesn't work for all modules)
targetFolderGenerator = { createGeneratedSourceFolder(module, sourceRoot) },
existingTargetFolder = { sourceRoot.file?.parent?.children?.find { it.name == GENERATED_FOLDER_NAME } }
existingTargetFolder = { calculateExistingGenFolder(sourceRoot) }
)
}
}
}
private fun calculateExistingGenFolder(sourceFolder: SourceFolder): VirtualFile? {
return sourceFolder.file?.parent?.children?.find {
if (sourceFolder.isTestSource) {
it.name == TEST_GENERATED_FOLDER_NAME
} else {
it.name == GENERATED_FOLDER_NAME
}
}
}
private fun createGeneratedSourceFolder(module: Module, sourceFolder: SourceFolder): VirtualFile? {
// Create gen folder if it doesn't exist
val generatedFolder = WriteAction.compute<VirtualFile, RuntimeException> {
VfsUtil.createDirectoryIfMissing(sourceFolder.file?.parent, GENERATED_FOLDER_NAME)
if (sourceFolder.isTestSource) {
VfsUtil.createDirectoryIfMissing(sourceFolder.file?.parent, TEST_GENERATED_FOLDER_NAME)
} else {
VfsUtil.createDirectoryIfMissing(sourceFolder.file?.parent, GENERATED_FOLDER_NAME)
}
}
val moduleRootManager = ModuleRootManager.getInstance(module)
@@ -112,6 +126,7 @@ class WorkspaceModelGenerator(private val project: Project, private val coroutin
//}
return contentEntries.flatMap { it.sourceFolders.asIterable() }.filter {
if (it.file == null) return@filter false
if (it.rootType !is JavaSourceRootType) return@filter false
val javaSourceRootProperties = it.jpsElement.properties as? JavaSourceRootProperties
if (javaSourceRootProperties == null) return@filter true
return@filter !javaSourceRootProperties.isForGeneratedSources
@@ -131,6 +146,8 @@ class WorkspaceModelGenerator(private val project: Project, private val coroutin
companion object {
const val GENERATED_FOLDER_NAME = "gen"
const val TEST_GENERATED_FOLDER_NAME = "testGen"
private const val RIDER_MODULES_PREFIX = "intellij.rider"
val modulesWithAbstractTypes: Set<String> = setOf("intellij.platform.workspace.storage.testEntities")