MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 19:02:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

[workspace model] cleanup: remove 'serializeFacets' parameter which is always true now

Browse Source 
GitOrigin-RevId: 6b6438086809636d8c6819c4d14171930221134e
This commit is contained in:
nik
2020-04-08 17:07:23 +00:00
committed by intellij-monorepo-bot
parent 5508e5a51f
commit e1a8fd8362
4 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/workspaceModel-ide-tests/testSrc/com/intellij/workspace/jps/jpsTestUtils.kt
+1 -1
View File
@@ -132,7 +132,7 @@ internal fun assertDirectoryMatches(actualDir: File, expectedDir: File, filesToI
internal fun createSerializationData(projectDir: File): JpsEntitiesSerializationData {
val reader = CachingJpsFileContentReader(VfsUtilCore.pathToUrl(projectDir.systemIndependentPath))
return JpsProjectEntitiesLoader.createProjectSerializers(projectDir.asStoragePlace(), reader, true, true)
return JpsProjectEntitiesLoader.createProjectSerializers(projectDir.asStoragePlace(), reader, true)
}
fun JpsEntitiesSerializationData.checkConsistency(projectBaseDirUrl: String, storage: TypedEntityStorage) {
platform/workspaceModel-ide/src/com/intellij/workspace/jps/JpsProjectEntitiesLoader.kt
+11 -15
View File
@@ -21,13 +21,12 @@ object JpsProjectEntitiesLoader {
*/
fun createProjectSerializers(storagePlace: JpsProjectStoragePlace,
reader: JpsFileContentReader,
serializeArtifacts: Boolean,
serializeFacets: Boolean): JpsEntitiesSerializationData {
return createProjectEntitiesSerializers(storagePlace, serializeArtifacts, serializeFacets).createSerializers(reader)
serializeArtifacts: Boolean): JpsEntitiesSerializationData {
return createProjectEntitiesSerializers(storagePlace, serializeArtifacts).createSerializers(reader)
}
fun loadProject(storagePlace: JpsProjectStoragePlace, builder: TypedEntityStorageBuilder): JpsEntitiesSerializationData {
val mainFactories = createProjectEntitiesSerializers(storagePlace, true, true)
val mainFactories = createProjectEntitiesSerializers(storagePlace, true)
val reader = CachingJpsFileContentReader(storagePlace.baseDirectoryUrlString)
val data = mainFactories.createSerializers(reader)
data.loadAll(reader, builder)
@@ -43,7 +42,7 @@ object JpsProjectEntitiesLoader {
source: JpsFileEntitySource.FileInDirectory,
storagePlace: JpsProjectStoragePlace,
builder: TypedEntityStorageBuilder) {
val mainFactories = createProjectEntitiesSerializers(storagePlace, false, true)
val mainFactories = createProjectEntitiesSerializers(storagePlace, false)
val reader = CachingJpsFileContentReader(storagePlace.baseDirectoryUrlString)
val moduleSerializerFactory = mainFactories.fileSerializerFactories.filterIsInstance<ModuleSerializersFactory>().single()
@@ -52,17 +51,15 @@ object JpsProjectEntitiesLoader {
}
private fun createProjectEntitiesSerializers(storagePlace: JpsProjectStoragePlace,
serializeArtifacts: Boolean,
serializeFacets: Boolean): JpsEntitiesSerializerFactories {
serializeArtifacts: Boolean): JpsEntitiesSerializerFactories {
return when (storagePlace) {
is JpsProjectStoragePlace.FileBased -> createIprProjectSerializers(storagePlace, serializeArtifacts, serializeFacets)
is JpsProjectStoragePlace.DirectoryBased -> createDirectoryProjectSerializers(storagePlace, serializeArtifacts, serializeFacets)
is JpsProjectStoragePlace.FileBased -> createIprProjectSerializers(storagePlace, serializeArtifacts)
is JpsProjectStoragePlace.DirectoryBased -> createDirectoryProjectSerializers(storagePlace, serializeArtifacts)
}
}
private fun createDirectoryProjectSerializers(storagePlace: JpsProjectStoragePlace.DirectoryBased,
serializeArtifacts: Boolean,
serializeFacets: Boolean): JpsEntitiesSerializerFactories {
serializeArtifacts: Boolean): JpsEntitiesSerializerFactories {
val projectDirUrl = storagePlace.projectDir.url
val directorySerializersFactories = ArrayList<JpsDirectoryEntitiesSerializerFactory<*>>()
directorySerializersFactories += JpsLibrariesDirectorySerializerFactory("$projectDirUrl/.idea/libraries")
@@ -71,13 +68,12 @@ object JpsProjectEntitiesLoader {
}
return JpsEntitiesSerializerFactories(entityTypeSerializers = emptyList(),
directorySerializersFactories = directorySerializersFactories,
fileSerializerFactories = listOf(ModuleSerializersFactory("$projectDirUrl/.idea/modules.xml", serializeFacets)),
fileSerializerFactories = listOf(ModuleSerializersFactory("$projectDirUrl/.idea/modules.xml")),
storagePlace = storagePlace)
}
private fun createIprProjectSerializers(storagePlace: JpsProjectStoragePlace.FileBased,
serializeArtifacts: Boolean,
serializeFacets: Boolean): JpsEntitiesSerializerFactories {
serializeArtifacts: Boolean): JpsEntitiesSerializerFactories {
val projectFileSource = JpsFileEntitySource.ExactFile(storagePlace.iprFile, storagePlace)
val projectFileUrl = projectFileSource.file
val entityTypeSerializers = ArrayList<JpsFileEntityTypeSerializer<*>>()
@@ -87,7 +83,7 @@ object JpsProjectEntitiesLoader {
}
return JpsEntitiesSerializerFactories(entityTypeSerializers,
directorySerializersFactories = emptyList(),
fileSerializerFactories = listOf(ModuleSerializersFactory(projectFileUrl.url, serializeFacets)),
fileSerializerFactories = listOf(ModuleSerializersFactory(projectFileUrl.url)),
storagePlace = storagePlace)
}
platform/workspaceModel-ide/src/com/intellij/workspace/jps/JpsProjectModelSynchronizer.kt
+1 -1
View File
@@ -125,7 +125,7 @@ internal class JpsProjectModelSynchronizer(private val project: Project) : Dispo
val activity = StartUpMeasurer.startActivity("(wm) Load initial project")
val baseDirUrl = storagePlace.baseDirectoryUrlString
fileContentReader = StorageJpsConfigurationReader(project, baseDirUrl)
val serializationData = JpsProjectEntitiesLoader.createProjectSerializers(storagePlace, fileContentReader, false, true)
val serializationData = JpsProjectEntitiesLoader.createProjectSerializers(storagePlace, fileContentReader, false)
this.serializationData.set(serializationData)
registerListener()
val builder = TypedEntityStorageBuilder.create()
platform/workspaceModel-ide/src/com/intellij/workspace/jps/ModuleImlFileEntitiesSerializer.kt
+8 -13
View File
@@ -26,8 +26,7 @@ private const val URL_ATTRIBUTE = "url"
internal class ModuleImlFileEntitiesSerializer(internal val modulePath: ModulePath,
override val fileUrl: VirtualFileUrl,
override val entitySource: JpsFileEntitySource,
private val serializeFacets: Boolean) : JpsFileEntitiesSerializer<ModuleEntity> {
override val entitySource: JpsFileEntitySource) : JpsFileEntitiesSerializer<ModuleEntity> {
override val mainEntityClass: Class<ModuleEntity>
get() = ModuleEntity::class.java
@@ -44,9 +43,7 @@ internal class ModuleImlFileEntitiesSerializer(internal val modulePath: ModulePa
loadRootManager(rootManagerElement, moduleEntity, builder)
}
if (serializeFacets) {
FacetEntitiesSerializer(fileUrl, entitySource).loadFacetEntities(builder, moduleEntity, reader)
}
FacetEntitiesSerializer(fileUrl, entitySource).loadFacetEntities(builder, moduleEntity, reader)
}
private fun loadRootManager(rootManagerElement: Element,
@@ -254,12 +251,10 @@ internal class ModuleImlFileEntitiesSerializer(internal val modulePath: ModulePa
writer.saveComponent(fileUrl.url, MODULE_ROOT_MANAGER_COMPONENT_NAME, rootManagerElement)
if (serializeFacets) {
@Suppress("UNCHECKED_CAST")
val facets = entities[FacetEntity::class.java] as List<FacetEntity>? ?: emptyList()
if (facets.isNotEmpty()) {
FacetEntitiesSerializer(fileUrl, entitySource).saveFacetEntities(module, facets, writer)
}
@Suppress("UNCHECKED_CAST")
val facets = entities[FacetEntity::class.java] as List<FacetEntity>? ?: emptyList()
if (facets.isNotEmpty()) {
FacetEntitiesSerializer(fileUrl, entitySource).saveFacetEntities(module, facets, writer)
}
return savedEntities
}
@@ -406,7 +401,7 @@ internal class ModuleImlFileEntitiesSerializer(internal val modulePath: ModulePa
private const val MODULE_MANAGER_COMPONENT_NAME = "ProjectModuleManager"
internal class ModuleSerializersFactory(override val fileUrl: String, private val serializeFacets: Boolean) : JpsFileSerializerFactory<ModuleEntity> {
internal class ModuleSerializersFactory(override val fileUrl: String) : JpsFileSerializerFactory<ModuleEntity> {
override val entityClass: Class<ModuleEntity>
get() = ModuleEntity::class.java
@@ -415,7 +410,7 @@ internal class ModuleSerializersFactory(override val fileUrl: String, private va
}
override fun createSerializer(source: JpsFileEntitySource, fileUrl: VirtualFileUrl): JpsFileEntitiesSerializer<ModuleEntity> {
return ModuleImlFileEntitiesSerializer(ModulePath(JpsPathUtil.urlToPath(fileUrl.filePath), null), fileUrl, source, serializeFacets)
return ModuleImlFileEntitiesSerializer(ModulePath(JpsPathUtil.urlToPath(fileUrl.filePath), null), fileUrl, source)
}
override fun loadFileList(reader: JpsFileContentReader): List<VirtualFileUrl> {