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] [IJPL-583] Regenerate all production entities

Browse Source 
GitOrigin-RevId: 09541638086c00db6360844bae428947704d68ce
This commit is contained in:
Alex Plate
2024-03-25 13:27:42 +00:00
committed by intellij-monorepo-bot
parent 994b5c14d6
commit f41403b70a
62 changed files with 706 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/gen/com/intellij/ide/scratch/workspace/ScratchRootsEntityImpl.kt
+1 -1
View File
@@ -188,7 +188,7 @@ class ScratchRootsEntityData : WorkspaceEntityData<ScratchRootsEntity>() {
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ScratchRootsEntity(roots, entitySource) {
}
}
platform/lang-impl/src/com/intellij/ide/scratch/workspace/ScratchRootsEntity.kt
+3 -3
View File
@@ -14,9 +14,9 @@ interface ScratchRootsEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ScratchRootsEntity, WorkspaceEntity.Builder<ScratchRootsEntity> {
interface Builder : WorkspaceEntity.Builder<ScratchRootsEntity> {
override var entitySource: EntitySource
override var roots: MutableList<VirtualFileUrl>
var roots: MutableList<VirtualFileUrl>
}
companion object : EntityType<ScratchRootsEntity, Builder>() {
@@ -27,7 +27,7 @@ interface ScratchRootsEntity : WorkspaceEntity {
roots: List<VirtualFileUrl>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ScratchRootsEntity {
): Builder {
val builder = builder()
builder.roots = roots.toMutableWorkspaceList()
builder.entitySource = entitySource
platform/lang-impl/testEntities/gen/com/intellij/util/indexing/testEntities/IndexingTestEntityImpl.kt
+1 -1
View File
@@ -229,7 +229,7 @@ class IndexingTestEntityData : WorkspaceEntityData<IndexingTestEntity>() {
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return IndexingTestEntity(roots, excludedRoots, entitySource) {
}
}
platform/lang-impl/testEntities/testSrc/com/intellij/util/indexing/testEntities/IndexingTestEntity.kt
+4 -4
View File
@@ -15,10 +15,10 @@ interface IndexingTestEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : IndexingTestEntity, WorkspaceEntity.Builder<IndexingTestEntity> {
interface Builder : WorkspaceEntity.Builder<IndexingTestEntity> {
override var entitySource: EntitySource
override var roots: MutableList<VirtualFileUrl>
override var excludedRoots: MutableList<VirtualFileUrl>
var roots: MutableList<VirtualFileUrl>
var excludedRoots: MutableList<VirtualFileUrl>
}
companion object : EntityType<IndexingTestEntity, Builder>() {
@@ -30,7 +30,7 @@ interface IndexingTestEntity : WorkspaceEntity {
excludedRoots: List<VirtualFileUrl>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): IndexingTestEntity {
): Builder {
val builder = builder()
builder.roots = roots.toMutableWorkspaceList()
builder.excludedRoots = excludedRoots.toMutableWorkspaceList()
platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArchivePackagingElementEntityImpl.kt
+26 -17
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -28,6 +29,7 @@ import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParen
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -153,15 +155,19 @@ open class ArchivePackagingElementEntityImpl(private val dataSource: ArchivePack
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -192,15 +198,16 @@ open class ArchivePackagingElementEntityImpl(private val dataSource: ArchivePack
changedProperty.add("parentEntity")
}
override var artifact: ArtifactEntity?
override var artifact: ArtifactEntity.Builder?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractOneParent(ARTIFACT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
ARTIFACT_CONNECTION_ID)] as? ArtifactEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(ARTIFACT_CONNECTION_ID, this) as? ArtifactEntity.Builder)
?: (this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity
this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity.Builder
}
}
set(value) {
@@ -227,17 +234,19 @@ open class ArchivePackagingElementEntityImpl(private val dataSource: ArchivePack
changedProperty.add("artifact")
}
override var children: List<PackagingElementEntity>
override var children: List<PackagingElementEntity.Builder<out PackagingElementEntity>>
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyChildren<PackagingElementEntity>(CHILDREN_CONNECTION_ID,
this)!!.toList() + (this.entityLinks[EntityLink(true,
CHILDREN_CONNECTION_ID)] as? List<PackagingElementEntity>
?: emptyList())
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILDREN_CONNECTION_ID,
this)!!.toList() as List<PackagingElementEntity.Builder<out PackagingElementEntity>>) +
(this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as? List<PackagingElementEntity.Builder<out PackagingElementEntity>>
?: emptyList())
}
else {
this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List<PackagingElementEntity> ?: emptyList()
this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List<PackagingElementEntity.Builder<out PackagingElementEntity>>
?: emptyList()
}
}
set(value) {
@@ -320,10 +329,10 @@ class ArchivePackagingElementEntityData : WorkspaceEntityData<ArchivePackagingEl
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ArchivePackagingElementEntity(fileName, entitySource) {
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.artifact = parents.filterIsInstance<ArtifactEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
this.artifact = parents.filterIsInstance<ArtifactEntity.Builder>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactEntityImpl.kt
+24 -15
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -28,6 +29,7 @@ import com.intellij.platform.workspace.storage.impl.updateOneToManyChildrenOfPar
import com.intellij.platform.workspace.storage.impl.updateOneToOneChildOfParent
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -211,15 +213,19 @@ open class ArtifactEntityImpl(private val dataSource: ArtifactEntityData) : Arti
if (_diff != null) index(this, "outputUrl", value)
}
override var rootElement: CompositePackagingElementEntity?
override var rootElement: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractOneChild(ROOTELEMENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true,
ROOTELEMENT_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(ROOTELEMENT_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(true,
ROOTELEMENT_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(true, ROOTELEMENT_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(true,
ROOTELEMENT_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -248,18 +254,18 @@ open class ArtifactEntityImpl(private val dataSource: ArtifactEntityData) : Arti
// List of non-abstract referenced types
var _customProperties: List<ArtifactPropertiesEntity>? = emptyList()
override var customProperties: List<ArtifactPropertiesEntity>
override var customProperties: List<ArtifactPropertiesEntity.Builder>
get() {
// Getter of the list of non-abstract referenced types
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyChildren<ArtifactPropertiesEntity>(CUSTOMPROPERTIES_CONNECTION_ID,
this)!!.toList() + (this.entityLinks[EntityLink(true,
CUSTOMPROPERTIES_CONNECTION_ID)] as? List<ArtifactPropertiesEntity>
?: emptyList())
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CUSTOMPROPERTIES_CONNECTION_ID,
this)!!.toList() as List<ArtifactPropertiesEntity.Builder>) +
(this.entityLinks[EntityLink(true, CUSTOMPROPERTIES_CONNECTION_ID)] as? List<ArtifactPropertiesEntity.Builder> ?: emptyList())
}
else {
this.entityLinks[EntityLink(true, CUSTOMPROPERTIES_CONNECTION_ID)] as? List<ArtifactPropertiesEntity> ?: emptyList()
this.entityLinks[EntityLink(true, CUSTOMPROPERTIES_CONNECTION_ID)] as? List<ArtifactPropertiesEntity.Builder> ?: emptyList()
}
}
set(value) {
@@ -293,15 +299,18 @@ open class ArtifactEntityImpl(private val dataSource: ArtifactEntityData) : Arti
changedProperty.add("customProperties")
}
override var artifactOutputPackagingElement: ArtifactOutputPackagingElementEntity?
override var artifactOutputPackagingElement: ArtifactOutputPackagingElementEntity.Builder?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneChild(ARTIFACTOUTPUTPACKAGINGELEMENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true,
ARTIFACTOUTPUTPACKAGINGELEMENT_CONNECTION_ID)] as? ArtifactOutputPackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(ARTIFACTOUTPUTPACKAGINGELEMENT_CONNECTION_ID,
this) as? ArtifactOutputPackagingElementEntity.Builder)
?: (this.entityLinks[EntityLink(true,
ARTIFACTOUTPUTPACKAGINGELEMENT_CONNECTION_ID)] as? ArtifactOutputPackagingElementEntity.Builder)
}
else {
this.entityLinks[EntityLink(true, ARTIFACTOUTPUTPACKAGINGELEMENT_CONNECTION_ID)] as? ArtifactOutputPackagingElementEntity
this.entityLinks[EntityLink(true, ARTIFACTOUTPUTPACKAGINGELEMENT_CONNECTION_ID)] as? ArtifactOutputPackagingElementEntity.Builder
}
}
set(value) {
@@ -379,7 +388,7 @@ class ArtifactEntityData : WorkspaceEntityData.WithCalculableSymbolicId<Artifact
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ArtifactEntity(name, artifactType, includeInProjectBuild, entitySource) {
this.outputUrl = this@ArtifactEntityData.outputUrl
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactOutputPackagingElementEntityImpl.kt
+12 -6
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -26,6 +27,7 @@ import com.intellij.platform.workspace.storage.impl.indices.WorkspaceMutableInde
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -123,15 +125,19 @@ open class ArtifactOutputPackagingElementEntityImpl(private val dataSource: Arti
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -265,10 +271,10 @@ class ArtifactOutputPackagingElementEntityData : WorkspaceEntityData<ArtifactOut
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ArtifactOutputPackagingElementEntity(entitySource) {
this.artifact = this@ArtifactOutputPackagingElementEntityData.artifact
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactPropertiesEntityImpl.kt
+9 -6
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -23,6 +24,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyParent
import com.intellij.platform.workspace.storage.impl.updateOneToManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -140,15 +142,16 @@ open class ArtifactPropertiesEntityImpl(private val dataSource: ArtifactProperti
}
override var artifact: ArtifactEntity
override var artifact: ArtifactEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyParent(ARTIFACT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
ARTIFACT_CONNECTION_ID)]!! as ArtifactEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(ARTIFACT_CONNECTION_ID, this) as? ArtifactEntity.Builder)
?: (this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)]!! as ArtifactEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)]!! as ArtifactEntity
this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)]!! as ArtifactEntity.Builder
}
}
set(value) {
@@ -238,10 +241,10 @@ class ArtifactPropertiesEntityData : WorkspaceEntityData<ArtifactPropertiesEntit
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ArtifactPropertiesEntity(providerType, entitySource) {
this.propertiesXmlTag = this@ArtifactPropertiesEntityData.propertiesXmlTag
parents.filterIsInstance<ArtifactEntity>().singleOrNull()?.let { this.artifact = it }
parents.filterIsInstance<ArtifactEntity.Builder>().singleOrNull()?.let { this.artifact = it }
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactRootElementEntityImpl.kt
+26 -17
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -28,6 +29,7 @@ import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParen
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -143,15 +145,19 @@ open class ArtifactRootElementEntityImpl(private val dataSource: ArtifactRootEle
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -182,15 +188,16 @@ open class ArtifactRootElementEntityImpl(private val dataSource: ArtifactRootEle
changedProperty.add("parentEntity")
}
override var artifact: ArtifactEntity?
override var artifact: ArtifactEntity.Builder?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractOneParent(ARTIFACT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
ARTIFACT_CONNECTION_ID)] as? ArtifactEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(ARTIFACT_CONNECTION_ID, this) as? ArtifactEntity.Builder)
?: (this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity
this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity.Builder
}
}
set(value) {
@@ -217,17 +224,19 @@ open class ArtifactRootElementEntityImpl(private val dataSource: ArtifactRootEle
changedProperty.add("artifact")
}
override var children: List<PackagingElementEntity>
override var children: List<PackagingElementEntity.Builder<out PackagingElementEntity>>
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyChildren<PackagingElementEntity>(CHILDREN_CONNECTION_ID,
this)!!.toList() + (this.entityLinks[EntityLink(true,
CHILDREN_CONNECTION_ID)] as? List<PackagingElementEntity>
?: emptyList())
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILDREN_CONNECTION_ID,
this)!!.toList() as List<PackagingElementEntity.Builder<out PackagingElementEntity>>) +
(this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as? List<PackagingElementEntity.Builder<out PackagingElementEntity>>
?: emptyList())
}
else {
this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List<PackagingElementEntity> ?: emptyList()
this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List<PackagingElementEntity.Builder<out PackagingElementEntity>>
?: emptyList()
}
}
set(value) {
@@ -300,10 +309,10 @@ class ArtifactRootElementEntityData : WorkspaceEntityData<ArtifactRootElementEnt
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ArtifactRootElementEntity(entitySource) {
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.artifact = parents.filterIsInstance<ArtifactEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
this.artifact = parents.filterIsInstance<ArtifactEntity.Builder>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactsOrderEntityImpl.kt
+2 -1
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -193,7 +194,7 @@ class ArtifactsOrderEntityData : WorkspaceEntityData<ArtifactsOrderEntity>() {
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ArtifactsOrderEntity(orderOfArtifacts, entitySource) {
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/CustomPackagingElementEntityImpl.kt
+26 -17
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -28,6 +29,7 @@ import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParen
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -163,15 +165,19 @@ open class CustomPackagingElementEntityImpl(private val dataSource: CustomPackag
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -202,15 +208,16 @@ open class CustomPackagingElementEntityImpl(private val dataSource: CustomPackag
changedProperty.add("parentEntity")
}
override var artifact: ArtifactEntity?
override var artifact: ArtifactEntity.Builder?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractOneParent(ARTIFACT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
ARTIFACT_CONNECTION_ID)] as? ArtifactEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(ARTIFACT_CONNECTION_ID, this) as? ArtifactEntity.Builder)
?: (this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity
this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity.Builder
}
}
set(value) {
@@ -237,17 +244,19 @@ open class CustomPackagingElementEntityImpl(private val dataSource: CustomPackag
changedProperty.add("artifact")
}
override var children: List<PackagingElementEntity>
override var children: List<PackagingElementEntity.Builder<out PackagingElementEntity>>
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyChildren<PackagingElementEntity>(CHILDREN_CONNECTION_ID,
this)!!.toList() + (this.entityLinks[EntityLink(true,
CHILDREN_CONNECTION_ID)] as? List<PackagingElementEntity>
?: emptyList())
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILDREN_CONNECTION_ID,
this)!!.toList() as List<PackagingElementEntity.Builder<out PackagingElementEntity>>) +
(this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as? List<PackagingElementEntity.Builder<out PackagingElementEntity>>
?: emptyList())
}
else {
this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List<PackagingElementEntity> ?: emptyList()
this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List<PackagingElementEntity.Builder<out PackagingElementEntity>>
?: emptyList()
}
}
set(value) {
@@ -340,10 +349,10 @@ class CustomPackagingElementEntityData : WorkspaceEntityData<CustomPackagingElem
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return CustomPackagingElementEntity(typeId, propertiesXmlTag, entitySource) {
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.artifact = parents.filterIsInstance<ArtifactEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
this.artifact = parents.filterIsInstance<ArtifactEntity.Builder>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryCopyPackagingElementEntityImpl.kt
+12 -6
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -23,6 +24,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToAbstractManyPare
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -123,15 +125,19 @@ open class DirectoryCopyPackagingElementEntityImpl(private val dataSource: Direc
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -215,9 +221,9 @@ class DirectoryCopyPackagingElementEntityData : WorkspaceEntityData<DirectoryCop
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return DirectoryCopyPackagingElementEntity(filePath, entitySource) {
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryPackagingElementEntityImpl.kt
+26 -17
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -28,6 +29,7 @@ import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParen
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -153,15 +155,19 @@ open class DirectoryPackagingElementEntityImpl(private val dataSource: Directory
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -192,15 +198,16 @@ open class DirectoryPackagingElementEntityImpl(private val dataSource: Directory
changedProperty.add("parentEntity")
}
override var artifact: ArtifactEntity?
override var artifact: ArtifactEntity.Builder?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractOneParent(ARTIFACT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
ARTIFACT_CONNECTION_ID)] as? ArtifactEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(ARTIFACT_CONNECTION_ID, this) as? ArtifactEntity.Builder)
?: (this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity
this.entityLinks[EntityLink(false, ARTIFACT_CONNECTION_ID)] as? ArtifactEntity.Builder
}
}
set(value) {
@@ -227,17 +234,19 @@ open class DirectoryPackagingElementEntityImpl(private val dataSource: Directory
changedProperty.add("artifact")
}
override var children: List<PackagingElementEntity>
override var children: List<PackagingElementEntity.Builder<out PackagingElementEntity>>
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyChildren<PackagingElementEntity>(CHILDREN_CONNECTION_ID,
this)!!.toList() + (this.entityLinks[EntityLink(true,
CHILDREN_CONNECTION_ID)] as? List<PackagingElementEntity>
?: emptyList())
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILDREN_CONNECTION_ID,
this)!!.toList() as List<PackagingElementEntity.Builder<out PackagingElementEntity>>) +
(this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as? List<PackagingElementEntity.Builder<out PackagingElementEntity>>
?: emptyList())
}
else {
this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List<PackagingElementEntity> ?: emptyList()
this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List<PackagingElementEntity.Builder<out PackagingElementEntity>>
?: emptyList()
}
}
set(value) {
@@ -321,10 +330,10 @@ class DirectoryPackagingElementEntityData : WorkspaceEntityData<DirectoryPackagi
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return DirectoryPackagingElementEntity(directoryName, entitySource) {
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.artifact = parents.filterIsInstance<ArtifactEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
this.artifact = parents.filterIsInstance<ArtifactEntity.Builder>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/ExtractedDirectoryPackagingElementEntityImpl.kt
+12 -6
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -23,6 +24,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToAbstractManyPare
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -133,15 +135,19 @@ open class ExtractedDirectoryPackagingElementEntityImpl(private val dataSource:
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -235,9 +241,9 @@ class ExtractedDirectoryPackagingElementEntityData : WorkspaceEntityData<Extract
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ExtractedDirectoryPackagingElementEntity(filePath, pathInArchive, entitySource) {
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileCopyPackagingElementEntityImpl.kt
+12 -6
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -23,6 +24,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToAbstractManyPare
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -130,15 +132,19 @@ open class FileCopyPackagingElementEntityImpl(private val dataSource: FileCopyPa
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -230,10 +236,10 @@ class FileCopyPackagingElementEntityData : WorkspaceEntityData<FileCopyPackaging
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return FileCopyPackagingElementEntity(filePath, entitySource) {
this.renamedOutputFileName = this@FileCopyPackagingElementEntityData.renamedOutputFileName
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaModuleSettingsEntityImpl.kt
+8 -6
View File
@@ -20,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneParent
import com.intellij.platform.workspace.storage.impl.updateOneToOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -157,15 +158,16 @@ open class JavaModuleSettingsEntityImpl(private val dataSource: JavaModuleSettin
}
override var module: ModuleEntity
override var module: ModuleEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneParent(MODULE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
MODULE_CONNECTION_ID)]!! as ModuleEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULE_CONNECTION_ID, this) as? ModuleEntity.Builder)
?: (this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder
}
}
set(value) {
@@ -290,13 +292,13 @@ class JavaModuleSettingsEntityData : WorkspaceEntityData<JavaModuleSettingsEntit
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return JavaModuleSettingsEntity(inheritedCompilerOutput, excludeOutput, entitySource) {
this.compilerOutput = this@JavaModuleSettingsEntityData.compilerOutput
this.compilerOutputForTests = this@JavaModuleSettingsEntityData.compilerOutputForTests
this.languageLevelId = this@JavaModuleSettingsEntityData.languageLevelId
this.manifestAttributes = this@JavaModuleSettingsEntityData.manifestAttributes
parents.filterIsInstance<ModuleEntity>().singleOrNull()?.let { this.module = it }
parents.filterIsInstance<ModuleEntity.Builder>().singleOrNull()?.let { this.module = it }
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaResourceRootPropertiesEntityImpl.kt
+8 -6
View File
@@ -21,6 +21,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyParent
import com.intellij.platform.workspace.storage.impl.updateOneToManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
@GeneratedCodeApiVersion(2)
@@ -135,15 +136,16 @@ open class JavaResourceRootPropertiesEntityImpl(private val dataSource: JavaReso
}
override var sourceRoot: SourceRootEntity
override var sourceRoot: SourceRootEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyParent(SOURCEROOT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(SOURCEROOT_CONNECTION_ID, this) as? SourceRootEntity.Builder)
?: (this.entityLinks[EntityLink(false, SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity
this.entityLinks[EntityLink(false, SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity.Builder
}
}
set(value) {
@@ -235,9 +237,9 @@ class JavaResourceRootPropertiesEntityData : WorkspaceEntityData<JavaResourceRoo
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return JavaResourceRootPropertiesEntity(generated, relativeOutputPath, entitySource) {
parents.filterIsInstance<SourceRootEntity>().singleOrNull()?.let { this.sourceRoot = it }
parents.filterIsInstance<SourceRootEntity.Builder>().singleOrNull()?.let { this.sourceRoot = it }
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaSourceRootPropertiesEntityImpl.kt
+8 -6
View File
@@ -21,6 +21,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyParent
import com.intellij.platform.workspace.storage.impl.updateOneToManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
@GeneratedCodeApiVersion(2)
@@ -135,15 +136,16 @@ open class JavaSourceRootPropertiesEntityImpl(private val dataSource: JavaSource
}
override var sourceRoot: SourceRootEntity
override var sourceRoot: SourceRootEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyParent(SOURCEROOT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(SOURCEROOT_CONNECTION_ID, this) as? SourceRootEntity.Builder)
?: (this.entityLinks[EntityLink(false, SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity
this.entityLinks[EntityLink(false, SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity.Builder
}
}
set(value) {
@@ -234,9 +236,9 @@ class JavaSourceRootPropertiesEntityData : WorkspaceEntityData<JavaSourceRootPro
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return JavaSourceRootPropertiesEntity(generated, packagePrefix, entitySource) {
parents.filterIsInstance<SourceRootEntity>().singleOrNull()?.let { this.sourceRoot = it }
parents.filterIsInstance<SourceRootEntity.Builder>().singleOrNull()?.let { this.sourceRoot = it }
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/LibraryFilesPackagingElementEntityImpl.kt
+12 -6
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -26,6 +27,7 @@ import com.intellij.platform.workspace.storage.impl.indices.WorkspaceMutableInde
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -123,15 +125,19 @@ open class LibraryFilesPackagingElementEntityImpl(private val dataSource: Librar
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -265,10 +271,10 @@ class LibraryFilesPackagingElementEntityData : WorkspaceEntityData<LibraryFilesP
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return LibraryFilesPackagingElementEntity(entitySource) {
this.library = this@LibraryFilesPackagingElementEntityData.library
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleOutputPackagingElementEntityImpl.kt
+12 -6
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -26,6 +27,7 @@ import com.intellij.platform.workspace.storage.impl.indices.WorkspaceMutableInde
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -123,15 +125,19 @@ open class ModuleOutputPackagingElementEntityImpl(private val dataSource: Module
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -265,10 +271,10 @@ class ModuleOutputPackagingElementEntityData : WorkspaceEntityData<ModuleOutputP
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ModuleOutputPackagingElementEntity(entitySource) {
this.module = this@ModuleOutputPackagingElementEntityData.module
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleSourcePackagingElementEntityImpl.kt
+12 -6
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -26,6 +27,7 @@ import com.intellij.platform.workspace.storage.impl.indices.WorkspaceMutableInde
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -123,15 +125,19 @@ open class ModuleSourcePackagingElementEntityImpl(private val dataSource: Module
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -265,10 +271,10 @@ class ModuleSourcePackagingElementEntityData : WorkspaceEntityData<ModuleSourceP
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ModuleSourcePackagingElementEntity(entitySource) {
this.module = this@ModuleSourcePackagingElementEntityData.module
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleTestOutputPackagingElementEntityImpl.kt
+12 -6
View File
@@ -7,6 +7,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntityInformation
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.GeneratedCodeImplVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
@@ -26,6 +27,7 @@ import com.intellij.platform.workspace.storage.impl.indices.WorkspaceMutableInde
import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -123,15 +125,19 @@ open class ModuleTestOutputPackagingElementEntityImpl(private val dataSource: Mo
}
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID,
this) as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
?: (this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>)
}
else {
this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity
this.entityLinks[EntityLink(false,
PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>
}
}
set(value) {
@@ -265,10 +271,10 @@ class ModuleTestOutputPackagingElementEntityData : WorkspaceEntityData<ModuleTes
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ModuleTestOutputPackagingElementEntity(entitySource) {
this.module = this@ModuleTestOutputPackagingElementEntityData.module
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity>().singleOrNull()
this.parentEntity = parents.filterIsInstance<CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ContentRootEntityImpl.kt
+20 -16
View File
@@ -24,6 +24,7 @@ import com.intellij.platform.workspace.storage.impl.updateOneToManyChildrenOfPar
import com.intellij.platform.workspace.storage.impl.updateOneToManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -184,15 +185,16 @@ open class ContentRootEntityImpl(private val dataSource: ContentRootEntityData)
}
override var module: ModuleEntity
override var module: ModuleEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyParent(MODULE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
MODULE_CONNECTION_ID)]!! as ModuleEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULE_CONNECTION_ID, this) as? ModuleEntity.Builder)
?: (this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder
}
}
set(value) {
@@ -257,17 +259,18 @@ open class ContentRootEntityImpl(private val dataSource: ContentRootEntityData)
// List of non-abstract referenced types
var _sourceRoots: List<SourceRootEntity>? = emptyList()
override var sourceRoots: List<SourceRootEntity>
override var sourceRoots: List<SourceRootEntity.Builder>
get() {
// Getter of the list of non-abstract referenced types
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyChildren<SourceRootEntity>(SOURCEROOTS_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink(true,
SOURCEROOTS_CONNECTION_ID)] as? List<SourceRootEntity>
?: emptyList())
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(SOURCEROOTS_CONNECTION_ID,
this)!!.toList() as List<SourceRootEntity.Builder>) +
(this.entityLinks[EntityLink(true, SOURCEROOTS_CONNECTION_ID)] as? List<SourceRootEntity.Builder> ?: emptyList())
}
else {
this.entityLinks[EntityLink(true, SOURCEROOTS_CONNECTION_ID)] as? List<SourceRootEntity> ?: emptyList()
this.entityLinks[EntityLink(true, SOURCEROOTS_CONNECTION_ID)] as? List<SourceRootEntity.Builder> ?: emptyList()
}
}
set(value) {
@@ -303,17 +306,18 @@ open class ContentRootEntityImpl(private val dataSource: ContentRootEntityData)
// List of non-abstract referenced types
var _excludedUrls: List<ExcludeUrlEntity>? = emptyList()
override var excludedUrls: List<ExcludeUrlEntity>
override var excludedUrls: List<ExcludeUrlEntity.Builder>
get() {
// Getter of the list of non-abstract referenced types
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyChildren<ExcludeUrlEntity>(EXCLUDEDURLS_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink(true,
EXCLUDEDURLS_CONNECTION_ID)] as? List<ExcludeUrlEntity>
?: emptyList())
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(EXCLUDEDURLS_CONNECTION_ID,
this)!!.toList() as List<ExcludeUrlEntity.Builder>) +
(this.entityLinks[EntityLink(true, EXCLUDEDURLS_CONNECTION_ID)] as? List<ExcludeUrlEntity.Builder> ?: emptyList())
}
else {
this.entityLinks[EntityLink(true, EXCLUDEDURLS_CONNECTION_ID)] as? List<ExcludeUrlEntity> ?: emptyList()
this.entityLinks[EntityLink(true, EXCLUDEDURLS_CONNECTION_ID)] as? List<ExcludeUrlEntity.Builder> ?: emptyList()
}
}
set(value) {
@@ -398,9 +402,9 @@ class ContentRootEntityData : WorkspaceEntityData<ContentRootEntity>() {
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ContentRootEntity(url, excludedPatterns, entitySource) {
parents.filterIsInstance<ModuleEntity>().singleOrNull()?.let { this.module = it }
parents.filterIsInstance<ModuleEntity.Builder>().singleOrNull()?.let { this.module = it }
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomSourceRootPropertiesEntityImpl.kt
+8 -6
View File
@@ -21,6 +21,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneParent
import com.intellij.platform.workspace.storage.impl.updateOneToOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.ApiStatus
@@ -132,15 +133,16 @@ open class CustomSourceRootPropertiesEntityImpl(private val dataSource: CustomSo
}
override var sourceRoot: SourceRootEntity
override var sourceRoot: SourceRootEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneParent(SOURCEROOT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(SOURCEROOT_CONNECTION_ID, this) as? SourceRootEntity.Builder)
?: (this.entityLinks[EntityLink(false, SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity
this.entityLinks[EntityLink(false, SOURCEROOT_CONNECTION_ID)]!! as SourceRootEntity.Builder
}
}
set(value) {
@@ -218,9 +220,9 @@ class CustomSourceRootPropertiesEntityData : WorkspaceEntityData<CustomSourceRoo
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return CustomSourceRootPropertiesEntity(propertiesXmlTag, entitySource) {
parents.filterIsInstance<SourceRootEntity>().singleOrNull()?.let { this.sourceRoot = it }
parents.filterIsInstance<SourceRootEntity.Builder>().singleOrNull()?.let { this.sourceRoot = it }
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlEntityImpl.kt
+1 -1
View File
@@ -160,7 +160,7 @@ class ExcludeUrlEntityData : WorkspaceEntityData<ExcludeUrlEntity>() {
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ExcludeUrlEntity(url, entitySource) {
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlOrderEntityImpl.kt
+8 -6
View File
@@ -22,6 +22,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneParent
import com.intellij.platform.workspace.storage.impl.updateOneToOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.ApiStatus
@@ -164,15 +165,16 @@ open class ExcludeUrlOrderEntityImpl(private val dataSource: ExcludeUrlOrderEnti
orderUpdater.invoke(value)
}
override var contentRoot: ContentRootEntity
override var contentRoot: ContentRootEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneParent(CONTENTROOT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
CONTENTROOT_CONNECTION_ID)]!! as ContentRootEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(CONTENTROOT_CONNECTION_ID, this) as? ContentRootEntity.Builder)
?: (this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootEntity
this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootEntity.Builder
}
}
set(value) {
@@ -248,9 +250,9 @@ class ExcludeUrlOrderEntityData : WorkspaceEntityData<ExcludeUrlOrderEntity>() {
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ExcludeUrlOrderEntity(order, entitySource) {
parents.filterIsInstance<ContentRootEntity>().singleOrNull()?.let { this.contentRoot = it }
parents.filterIsInstance<ContentRootEntity.Builder>().singleOrNull()?.let { this.contentRoot = it }
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExternalSystemModuleOptionsEntityImpl.kt
+8 -6
View File
@@ -21,6 +21,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneParent
import com.intellij.platform.workspace.storage.impl.updateOneToOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.NonNls
@@ -170,15 +171,16 @@ open class ExternalSystemModuleOptionsEntityImpl(private val dataSource: Externa
}
override var module: ModuleEntity
override var module: ModuleEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneParent(MODULE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
MODULE_CONNECTION_ID)]!! as ModuleEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULE_CONNECTION_ID, this) as? ModuleEntity.Builder)
?: (this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder
}
}
set(value) {
@@ -309,7 +311,7 @@ class ExternalSystemModuleOptionsEntityData : WorkspaceEntityData<ExternalSystem
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ExternalSystemModuleOptionsEntity(entitySource) {
this.externalSystem = this@ExternalSystemModuleOptionsEntityData.externalSystem
this.externalSystemModuleVersion = this@ExternalSystemModuleOptionsEntityData.externalSystemModuleVersion
@@ -318,7 +320,7 @@ class ExternalSystemModuleOptionsEntityData : WorkspaceEntityData<ExternalSystem
this.rootProjectPath = this@ExternalSystemModuleOptionsEntityData.rootProjectPath
this.externalSystemModuleGroup = this@ExternalSystemModuleOptionsEntityData.externalSystemModuleGroup
this.externalSystemModuleType = this@ExternalSystemModuleOptionsEntityData.externalSystemModuleType
parents.filterIsInstance<ModuleEntity>().singleOrNull()?.let { this.module = it }
parents.filterIsInstance<ModuleEntity.Builder>().singleOrNull()?.let { this.module = it }
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetEntityImpl.kt
+14 -11
View File
@@ -21,6 +21,7 @@ import com.intellij.platform.workspace.storage.impl.indices.WorkspaceMutableInde
import com.intellij.platform.workspace.storage.impl.updateOneToManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import org.jetbrains.annotations.NonNls
@@ -177,15 +178,16 @@ open class FacetEntityImpl(private val dataSource: FacetEntityData) : FacetEntit
}
override var module: ModuleEntity
override var module: ModuleEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyParent(MODULE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
MODULE_CONNECTION_ID)]!! as ModuleEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULE_CONNECTION_ID, this) as? ModuleEntity.Builder)
?: (this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder
}
}
set(value) {
@@ -233,15 +235,16 @@ open class FacetEntityImpl(private val dataSource: FacetEntityData) : FacetEntit
changedProperty.add("configurationXmlTag")
}
override var underlyingFacet: FacetEntity?
override var underlyingFacet: FacetEntity.Builder?
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyParent(UNDERLYINGFACET_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
UNDERLYINGFACET_CONNECTION_ID)] as? FacetEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(UNDERLYINGFACET_CONNECTION_ID, this) as? FacetEntity.Builder)
?: (this.entityLinks[EntityLink(false, UNDERLYINGFACET_CONNECTION_ID)] as? FacetEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, UNDERLYINGFACET_CONNECTION_ID)] as? FacetEntity
this.entityLinks[EntityLink(false, UNDERLYINGFACET_CONNECTION_ID)] as? FacetEntity.Builder
}
}
set(value) {
@@ -360,11 +363,11 @@ class FacetEntityData : WorkspaceEntityData.WithCalculableSymbolicId<FacetEntity
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return FacetEntity(name, moduleId, typeId, entitySource) {
this.configurationXmlTag = this@FacetEntityData.configurationXmlTag
parents.filterIsInstance<ModuleEntity>().singleOrNull()?.let { this.module = it }
this.underlyingFacet = parents.filterIsInstance<FacetEntity>().singleOrNull()
parents.filterIsInstance<ModuleEntity.Builder>().singleOrNull()?.let { this.module = it }
this.underlyingFacet = parents.filterIsInstance<FacetEntity.Builder>().singleOrNull()
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetsOrderEntityImpl.kt
+8 -6
View File
@@ -21,6 +21,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneParent
import com.intellij.platform.workspace.storage.impl.updateOneToOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import org.jetbrains.annotations.ApiStatus
@@ -157,15 +158,16 @@ open class FacetsOrderEntityImpl(private val dataSource: FacetsOrderEntityData)
orderOfFacetsUpdater.invoke(value)
}
override var moduleEntity: ModuleEntity
override var moduleEntity: ModuleEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneParent(MODULEENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
MODULEENTITY_CONNECTION_ID)]!! as ModuleEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULEENTITY_CONNECTION_ID, this) as? ModuleEntity.Builder)
?: (this.entityLinks[EntityLink(false, MODULEENTITY_CONNECTION_ID)]!! as ModuleEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, MODULEENTITY_CONNECTION_ID)]!! as ModuleEntity
this.entityLinks[EntityLink(false, MODULEENTITY_CONNECTION_ID)]!! as ModuleEntity.Builder
}
}
set(value) {
@@ -241,9 +243,9 @@ class FacetsOrderEntityData : WorkspaceEntityData<FacetsOrderEntity>() {
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return FacetsOrderEntity(orderOfFacets, entitySource) {
parents.filterIsInstance<ModuleEntity>().singleOrNull()?.let { this.moduleEntity = it }
parents.filterIsInstance<ModuleEntity.Builder>().singleOrNull()?.let { this.moduleEntity = it }
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryEntityImpl.kt
+8 -5
View File
@@ -25,6 +25,7 @@ import com.intellij.platform.workspace.storage.impl.indices.WorkspaceMutableInde
import com.intellij.platform.workspace.storage.impl.updateOneToManyChildrenOfParent
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import java.io.Serializable
@@ -237,16 +238,18 @@ open class LibraryEntityImpl(private val dataSource: LibraryEntityData) : Librar
// List of non-abstract referenced types
var _excludedRoots: List<ExcludeUrlEntity>? = emptyList()
override var excludedRoots: List<ExcludeUrlEntity>
override var excludedRoots: List<ExcludeUrlEntity.Builder>
get() {
// Getter of the list of non-abstract referenced types
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyChildren<ExcludeUrlEntity>(EXCLUDEDROOTS_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink(
true, EXCLUDEDROOTS_CONNECTION_ID)] as? List<ExcludeUrlEntity> ?: emptyList())
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(EXCLUDEDROOTS_CONNECTION_ID,
this)!!.toList() as List<ExcludeUrlEntity.Builder>) +
(this.entityLinks[EntityLink(true, EXCLUDEDROOTS_CONNECTION_ID)] as? List<ExcludeUrlEntity.Builder> ?: emptyList())
}
else {
this.entityLinks[EntityLink(true, EXCLUDEDROOTS_CONNECTION_ID)] as? List<ExcludeUrlEntity> ?: emptyList()
this.entityLinks[EntityLink(true, EXCLUDEDROOTS_CONNECTION_ID)] as? List<ExcludeUrlEntity.Builder> ?: emptyList()
}
}
set(value) {
@@ -424,7 +427,7 @@ class LibraryEntityData : WorkspaceEntityData.WithCalculableSymbolicId<LibraryEn
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return LibraryEntity(name, tableId, roots, entitySource) {
this.typeId = this@LibraryEntityData.typeId
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryPropertiesEntityImpl.kt
+9 -6
View File
@@ -18,6 +18,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneParent
import com.intellij.platform.workspace.storage.impl.updateOneToOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.NonNls
@@ -124,15 +125,17 @@ open class LibraryPropertiesEntityImpl(private val dataSource: LibraryProperties
}
override var library: LibraryEntity
override var library: LibraryEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneParent(LIBRARY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
LIBRARY_CONNECTION_ID)]!! as LibraryEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(LIBRARY_CONNECTION_ID, this) as? LibraryEntity.Builder)
?: (this.entityLinks[EntityLink(false,
LIBRARY_CONNECTION_ID)]!! as LibraryEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, LIBRARY_CONNECTION_ID)]!! as LibraryEntity
this.entityLinks[EntityLink(false, LIBRARY_CONNECTION_ID)]!! as LibraryEntity.Builder
}
}
set(value) {
@@ -209,10 +212,10 @@ class LibraryPropertiesEntityData : WorkspaceEntityData<LibraryPropertiesEntity>
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return LibraryPropertiesEntity(entitySource) {
this.propertiesXmlTag = this@LibraryPropertiesEntityData.propertiesXmlTag
parents.filterIsInstance<LibraryEntity>().singleOrNull()?.let { this.library = it }
parents.filterIsInstance<LibraryEntity.Builder>().singleOrNull()?.let { this.library = it }
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleCustomImlDataEntityImpl.kt
+8 -6
View File
@@ -21,6 +21,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneParent
import com.intellij.platform.workspace.storage.impl.updateOneToOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.NonNls
@@ -137,15 +138,16 @@ open class ModuleCustomImlDataEntityImpl(private val dataSource: ModuleCustomIml
}
override var module: ModuleEntity
override var module: ModuleEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneParent(MODULE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
MODULE_CONNECTION_ID)]!! as ModuleEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULE_CONNECTION_ID, this) as? ModuleEntity.Builder)
?: (this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder
}
}
set(value) {
@@ -232,10 +234,10 @@ class ModuleCustomImlDataEntityData : WorkspaceEntityData<ModuleCustomImlDataEnt
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ModuleCustomImlDataEntity(customModuleOptions, entitySource) {
this.rootManagerTagCustomData = this@ModuleCustomImlDataEntityData.rootManagerTagCustomData
parents.filterIsInstance<ModuleEntity>().singleOrNull()?.let { this.module = it }
parents.filterIsInstance<ModuleEntity.Builder>().singleOrNull()?.let { this.module = it }
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleEntityImpl.kt
+14 -10
View File
@@ -27,6 +27,7 @@ import com.intellij.platform.workspace.storage.impl.indices.WorkspaceMutableInde
import com.intellij.platform.workspace.storage.impl.updateOneToManyChildrenOfParent
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import org.jetbrains.annotations.NonNls
@@ -216,16 +217,18 @@ open class ModuleEntityImpl(private val dataSource: ModuleEntityData) : ModuleEn
// List of non-abstract referenced types
var _contentRoots: List<ContentRootEntity>? = emptyList()
override var contentRoots: List<ContentRootEntity>
override var contentRoots: List<ContentRootEntity.Builder>
get() {
// Getter of the list of non-abstract referenced types
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyChildren<ContentRootEntity>(CONTENTROOTS_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink(
true, CONTENTROOTS_CONNECTION_ID)] as? List<ContentRootEntity> ?: emptyList())
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CONTENTROOTS_CONNECTION_ID,
this)!!.toList() as List<ContentRootEntity.Builder>) +
(this.entityLinks[EntityLink(true, CONTENTROOTS_CONNECTION_ID)] as? List<ContentRootEntity.Builder> ?: emptyList())
}
else {
this.entityLinks[EntityLink(true, CONTENTROOTS_CONNECTION_ID)] as? List<ContentRootEntity> ?: emptyList()
this.entityLinks[EntityLink(true, CONTENTROOTS_CONNECTION_ID)] as? List<ContentRootEntity.Builder> ?: emptyList()
}
}
set(value) {
@@ -261,17 +264,18 @@ open class ModuleEntityImpl(private val dataSource: ModuleEntityData) : ModuleEn
// List of non-abstract referenced types
var _facets: List<FacetEntity>? = emptyList()
override var facets: List<FacetEntity>
override var facets: List<FacetEntity.Builder>
get() {
// Getter of the list of non-abstract referenced types
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyChildren<FacetEntity>(FACETS_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink(true,
FACETS_CONNECTION_ID)] as? List<FacetEntity>
?: emptyList())
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(FACETS_CONNECTION_ID,
this)!!.toList() as List<FacetEntity.Builder>) +
(this.entityLinks[EntityLink(true, FACETS_CONNECTION_ID)] as? List<FacetEntity.Builder> ?: emptyList())
}
else {
this.entityLinks[EntityLink(true, FACETS_CONNECTION_ID)] as? List<FacetEntity> ?: emptyList()
this.entityLinks[EntityLink(true, FACETS_CONNECTION_ID)] as? List<FacetEntity.Builder> ?: emptyList()
}
}
set(value) {
@@ -504,7 +508,7 @@ class ModuleEntityData : WorkspaceEntityData.WithCalculableSymbolicId<ModuleEnti
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ModuleEntity(name, dependencies, entitySource) {
this.type = this@ModuleEntityData.type
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleGroupPathEntityImpl.kt
+8 -6
View File
@@ -22,6 +22,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneParent
import com.intellij.platform.workspace.storage.impl.updateOneToOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.NonNls
@@ -138,15 +139,16 @@ open class ModuleGroupPathEntityImpl(private val dataSource: ModuleGroupPathEnti
}
override var module: ModuleEntity
override var module: ModuleEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneParent(MODULE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
MODULE_CONNECTION_ID)]!! as ModuleEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULE_CONNECTION_ID, this) as? ModuleEntity.Builder)
?: (this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder
}
}
set(value) {
@@ -244,9 +246,9 @@ class ModuleGroupPathEntityData : WorkspaceEntityData<ModuleGroupPathEntity>() {
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return ModuleGroupPathEntity(path, entitySource) {
parents.filterIsInstance<ModuleEntity>().singleOrNull()?.let { this.module = it }
parents.filterIsInstance<ModuleEntity.Builder>().singleOrNull()?.let { this.module = it }
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SdkEntityImpl.kt
+1 -1
View File
@@ -299,7 +299,7 @@ class SdkEntityData : WorkspaceEntityData.WithCalculableSymbolicId<SdkEntity>()
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return SdkEntity(name, type, roots, additionalData, entitySource) {
this.version = this@SdkEntityData.version
this.homePath = this@SdkEntityData.homePath
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootEntityImpl.kt
+8 -6
View File
@@ -21,6 +21,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyParent
import com.intellij.platform.workspace.storage.impl.updateOneToManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.NonNls
@@ -140,15 +141,16 @@ open class SourceRootEntityImpl(private val dataSource: SourceRootEntityData) :
}
override var contentRoot: ContentRootEntity
override var contentRoot: ContentRootEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyParent(CONTENTROOT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
CONTENTROOT_CONNECTION_ID)]!! as ContentRootEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(CONTENTROOT_CONNECTION_ID, this) as? ContentRootEntity.Builder)
?: (this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootEntity
this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootEntity.Builder
}
}
set(value) {
@@ -242,9 +244,9 @@ class SourceRootEntityData : WorkspaceEntityData<SourceRootEntity>() {
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return SourceRootEntity(url, rootTypeId, entitySource) {
parents.filterIsInstance<ContentRootEntity>().singleOrNull()?.let { this.contentRoot = it }
parents.filterIsInstance<ContentRootEntity.Builder>().singleOrNull()?.let { this.contentRoot = it }
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootOrderEntityImpl.kt
+9 -6
View File
@@ -22,6 +22,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneParent
import com.intellij.platform.workspace.storage.impl.updateOneToOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import org.jetbrains.annotations.ApiStatus
@@ -141,15 +142,17 @@ open class SourceRootOrderEntityImpl(private val dataSource: SourceRootOrderEnti
}
override var contentRootEntity: ContentRootEntity
override var contentRootEntity: ContentRootEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneParent(CONTENTROOTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
CONTENTROOTENTITY_CONNECTION_ID)]!! as ContentRootEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(CONTENTROOTENTITY_CONNECTION_ID,
this) as? ContentRootEntity.Builder)
?: (this.entityLinks[EntityLink(false, CONTENTROOTENTITY_CONNECTION_ID)]!! as ContentRootEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, CONTENTROOTENTITY_CONNECTION_ID)]!! as ContentRootEntity
this.entityLinks[EntityLink(false, CONTENTROOTENTITY_CONNECTION_ID)]!! as ContentRootEntity.Builder
}
}
set(value) {
@@ -248,9 +251,9 @@ class SourceRootOrderEntityData : WorkspaceEntityData<SourceRootOrderEntity>() {
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return SourceRootOrderEntity(orderOfSourceRoots, entitySource) {
parents.filterIsInstance<ContentRootEntity>().singleOrNull()?.let { this.contentRootEntity = it }
parents.filterIsInstance<ContentRootEntity.Builder>().singleOrNull()?.let { this.contentRootEntity = it }
}
}
platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/TestModulePropertiesEntityImpl.kt
+8 -6
View File
@@ -24,6 +24,7 @@ import com.intellij.platform.workspace.storage.impl.indices.WorkspaceMutableInde
import com.intellij.platform.workspace.storage.impl.updateOneToOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.NonNls
@@ -133,15 +134,16 @@ open class TestModulePropertiesEntityImpl(private val dataSource: TestModuleProp
}
override var module: ModuleEntity
override var module: ModuleEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneParent(MODULE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
MODULE_CONNECTION_ID)]!! as ModuleEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULE_CONNECTION_ID, this) as? ModuleEntity.Builder)
?: (this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder
}
}
set(value) {
@@ -257,9 +259,9 @@ class TestModulePropertiesEntityData : WorkspaceEntityData<TestModulePropertiesE
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return TestModulePropertiesEntity(productionModuleId, entitySource) {
parents.filterIsInstance<ModuleEntity>().singleOrNull()?.let { this.module = it }
parents.filterIsInstance<ModuleEntity.Builder>().singleOrNull()?.let { this.module = it }
}
}
platform/workspace/jps/src/com/intellij/java/workspace/entities/artifact.kt
+86 -86
View File
@@ -36,15 +36,15 @@ interface ArtifactEntity : WorkspaceEntityWithSymbolicId {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ArtifactEntity, WorkspaceEntity.Builder<ArtifactEntity> {
interface Builder : WorkspaceEntity.Builder<ArtifactEntity> {
override var entitySource: EntitySource
override var name: String
override var artifactType: String
override var includeInProjectBuild: Boolean
override var outputUrl: VirtualFileUrl?
override var rootElement: CompositePackagingElementEntity?
override var customProperties: List<ArtifactPropertiesEntity>
override var artifactOutputPackagingElement: ArtifactOutputPackagingElementEntity?
var name: String
var artifactType: String
var includeInProjectBuild: Boolean
var outputUrl: VirtualFileUrl?
var rootElement: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
var customProperties: List<ArtifactPropertiesEntity.Builder>
var artifactOutputPackagingElement: ArtifactOutputPackagingElementEntity.Builder?
}
companion object : EntityType<ArtifactEntity, Builder>() {
@@ -57,7 +57,7 @@ interface ArtifactEntity : WorkspaceEntityWithSymbolicId {
includeInProjectBuild: Boolean,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ArtifactEntity {
): Builder {
val builder = builder()
builder.name = name
builder.artifactType = artifactType
@@ -88,11 +88,11 @@ interface ArtifactPropertiesEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ArtifactPropertiesEntity, WorkspaceEntity.Builder<ArtifactPropertiesEntity> {
interface Builder : WorkspaceEntity.Builder<ArtifactPropertiesEntity> {
override var entitySource: EntitySource
override var artifact: ArtifactEntity
override var providerType: String
override var propertiesXmlTag: String?
var artifact: ArtifactEntity.Builder
var providerType: String
var propertiesXmlTag: String?
}
companion object : EntityType<ArtifactPropertiesEntity, Builder>() {
@@ -103,7 +103,7 @@ interface ArtifactPropertiesEntity : WorkspaceEntity {
providerType: String,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ArtifactPropertiesEntity {
): Builder {
val builder = builder()
builder.providerType = providerType
builder.entitySource = entitySource
@@ -129,9 +129,9 @@ fun MutableEntityStorage.modifyEntity(
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder<T : PackagingElementEntity> : PackagingElementEntity, WorkspaceEntity.Builder<T> {
interface Builder<T : PackagingElementEntity> : WorkspaceEntity.Builder<T> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
}
companion object : EntityType<PackagingElementEntity, Builder<PackagingElementEntity>>() {
@@ -141,7 +141,7 @@ fun MutableEntityStorage.modifyEntity(
operator fun invoke(
entitySource: EntitySource,
init: (Builder<PackagingElementEntity>.() -> Unit)? = null,
): PackagingElementEntity {
): Builder<PackagingElementEntity> {
val builder = builder()
builder.entitySource = entitySource
init?.invoke(builder)
@@ -159,11 +159,11 @@ fun MutableEntityStorage.modifyEntity(
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder<T : CompositePackagingElementEntity> : CompositePackagingElementEntity, PackagingElementEntity.Builder<T>, WorkspaceEntity.Builder<T> {
interface Builder<T : CompositePackagingElementEntity> : WorkspaceEntity.Builder<T>, PackagingElementEntity.Builder<T> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var artifact: ArtifactEntity?
override var children: List<PackagingElementEntity>
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
var artifact: ArtifactEntity.Builder?
var children: List<PackagingElementEntity.Builder<out PackagingElementEntity>>
}
companion object : EntityType<CompositePackagingElementEntity, Builder<CompositePackagingElementEntity>>(PackagingElementEntity) {
@@ -173,7 +173,7 @@ fun MutableEntityStorage.modifyEntity(
operator fun invoke(
entitySource: EntitySource,
init: (Builder<CompositePackagingElementEntity>.() -> Unit)? = null,
): CompositePackagingElementEntity {
): Builder<CompositePackagingElementEntity> {
val builder = builder()
builder.entitySource = entitySource
init?.invoke(builder)
@@ -189,12 +189,12 @@ interface DirectoryPackagingElementEntity: CompositePackagingElementEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : DirectoryPackagingElementEntity, CompositePackagingElementEntity.Builder<DirectoryPackagingElementEntity>, WorkspaceEntity.Builder<DirectoryPackagingElementEntity> {
interface Builder : WorkspaceEntity.Builder<DirectoryPackagingElementEntity>, CompositePackagingElementEntity.Builder<DirectoryPackagingElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var artifact: ArtifactEntity?
override var children: List<PackagingElementEntity>
override var directoryName: String
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
override var artifact: ArtifactEntity.Builder?
override var children: List<PackagingElementEntity.Builder<out PackagingElementEntity>>
var directoryName: String
}
companion object : EntityType<DirectoryPackagingElementEntity, Builder>(CompositePackagingElementEntity) {
@@ -205,7 +205,7 @@ interface DirectoryPackagingElementEntity: CompositePackagingElementEntity {
directoryName: String,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): DirectoryPackagingElementEntity {
): Builder {
val builder = builder()
builder.directoryName = directoryName
builder.entitySource = entitySource
@@ -231,12 +231,12 @@ interface ArchivePackagingElementEntity: CompositePackagingElementEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ArchivePackagingElementEntity, CompositePackagingElementEntity.Builder<ArchivePackagingElementEntity>, WorkspaceEntity.Builder<ArchivePackagingElementEntity> {
interface Builder : WorkspaceEntity.Builder<ArchivePackagingElementEntity>, CompositePackagingElementEntity.Builder<ArchivePackagingElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var artifact: ArtifactEntity?
override var children: List<PackagingElementEntity>
override var fileName: String
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
override var artifact: ArtifactEntity.Builder?
override var children: List<PackagingElementEntity.Builder<out PackagingElementEntity>>
var fileName: String
}
companion object : EntityType<ArchivePackagingElementEntity, Builder>(CompositePackagingElementEntity) {
@@ -247,7 +247,7 @@ interface ArchivePackagingElementEntity: CompositePackagingElementEntity {
fileName: String,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ArchivePackagingElementEntity {
): Builder {
val builder = builder()
builder.fileName = fileName
builder.entitySource = entitySource
@@ -271,11 +271,11 @@ fun MutableEntityStorage.modifyEntity(
interface ArtifactRootElementEntity: CompositePackagingElementEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ArtifactRootElementEntity, CompositePackagingElementEntity.Builder<ArtifactRootElementEntity>, WorkspaceEntity.Builder<ArtifactRootElementEntity> {
interface Builder : WorkspaceEntity.Builder<ArtifactRootElementEntity>, CompositePackagingElementEntity.Builder<ArtifactRootElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var artifact: ArtifactEntity?
override var children: List<PackagingElementEntity>
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
override var artifact: ArtifactEntity.Builder?
override var children: List<PackagingElementEntity.Builder<out PackagingElementEntity>>
}
companion object : EntityType<ArtifactRootElementEntity, Builder>(CompositePackagingElementEntity) {
@@ -285,7 +285,7 @@ interface ArtifactRootElementEntity: CompositePackagingElementEntity {
operator fun invoke(
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ArtifactRootElementEntity {
): Builder {
val builder = builder()
builder.entitySource = entitySource
init?.invoke(builder)
@@ -310,10 +310,10 @@ interface ArtifactOutputPackagingElementEntity: PackagingElementEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ArtifactOutputPackagingElementEntity, PackagingElementEntity.Builder<ArtifactOutputPackagingElementEntity>, WorkspaceEntity.Builder<ArtifactOutputPackagingElementEntity> {
interface Builder : WorkspaceEntity.Builder<ArtifactOutputPackagingElementEntity>, PackagingElementEntity.Builder<ArtifactOutputPackagingElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var artifact: ArtifactId?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
var artifact: ArtifactId?
}
companion object : EntityType<ArtifactOutputPackagingElementEntity, Builder>(PackagingElementEntity) {
@@ -323,7 +323,7 @@ interface ArtifactOutputPackagingElementEntity: PackagingElementEntity {
operator fun invoke(
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ArtifactOutputPackagingElementEntity {
): Builder {
val builder = builder()
builder.entitySource = entitySource
init?.invoke(builder)
@@ -342,8 +342,8 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(ArtifactOutputPackagingElementEntity.Builder::class.java, entity, modification)
}
var ArtifactOutputPackagingElementEntity.Builder.artifactEntity: ArtifactEntity?
by WorkspaceEntity.extension()
var ArtifactOutputPackagingElementEntity.Builder.artifactEntity: ArtifactEntity.Builder?
by WorkspaceEntity.extensionBuilder(ArtifactEntity::class.java)
//endregion
val ArtifactOutputPackagingElementEntity.artifactEntity: ArtifactEntity?
@@ -354,10 +354,10 @@ interface ModuleOutputPackagingElementEntity : PackagingElementEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ModuleOutputPackagingElementEntity, PackagingElementEntity.Builder<ModuleOutputPackagingElementEntity>, WorkspaceEntity.Builder<ModuleOutputPackagingElementEntity> {
interface Builder : WorkspaceEntity.Builder<ModuleOutputPackagingElementEntity>, PackagingElementEntity.Builder<ModuleOutputPackagingElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var module: ModuleId?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
var module: ModuleId?
}
companion object : EntityType<ModuleOutputPackagingElementEntity, Builder>(PackagingElementEntity) {
@@ -367,7 +367,7 @@ interface ModuleOutputPackagingElementEntity : PackagingElementEntity {
operator fun invoke(
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ModuleOutputPackagingElementEntity {
): Builder {
val builder = builder()
builder.entitySource = entitySource
init?.invoke(builder)
@@ -392,10 +392,10 @@ interface LibraryFilesPackagingElementEntity : PackagingElementEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : LibraryFilesPackagingElementEntity, PackagingElementEntity.Builder<LibraryFilesPackagingElementEntity>, WorkspaceEntity.Builder<LibraryFilesPackagingElementEntity> {
interface Builder : WorkspaceEntity.Builder<LibraryFilesPackagingElementEntity>, PackagingElementEntity.Builder<LibraryFilesPackagingElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var library: LibraryId?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
var library: LibraryId?
}
companion object : EntityType<LibraryFilesPackagingElementEntity, Builder>(PackagingElementEntity) {
@@ -405,7 +405,7 @@ interface LibraryFilesPackagingElementEntity : PackagingElementEntity {
operator fun invoke(
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): LibraryFilesPackagingElementEntity {
): Builder {
val builder = builder()
builder.entitySource = entitySource
init?.invoke(builder)
@@ -430,10 +430,10 @@ interface ModuleSourcePackagingElementEntity : PackagingElementEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ModuleSourcePackagingElementEntity, PackagingElementEntity.Builder<ModuleSourcePackagingElementEntity>, WorkspaceEntity.Builder<ModuleSourcePackagingElementEntity> {
interface Builder : WorkspaceEntity.Builder<ModuleSourcePackagingElementEntity>, PackagingElementEntity.Builder<ModuleSourcePackagingElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var module: ModuleId?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
var module: ModuleId?
}
companion object : EntityType<ModuleSourcePackagingElementEntity, Builder>(PackagingElementEntity) {
@@ -443,7 +443,7 @@ interface ModuleSourcePackagingElementEntity : PackagingElementEntity {
operator fun invoke(
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ModuleSourcePackagingElementEntity {
): Builder {
val builder = builder()
builder.entitySource = entitySource
init?.invoke(builder)
@@ -468,10 +468,10 @@ interface ModuleTestOutputPackagingElementEntity : PackagingElementEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ModuleTestOutputPackagingElementEntity, PackagingElementEntity.Builder<ModuleTestOutputPackagingElementEntity>, WorkspaceEntity.Builder<ModuleTestOutputPackagingElementEntity> {
interface Builder : WorkspaceEntity.Builder<ModuleTestOutputPackagingElementEntity>, PackagingElementEntity.Builder<ModuleTestOutputPackagingElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var module: ModuleId?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
var module: ModuleId?
}
companion object : EntityType<ModuleTestOutputPackagingElementEntity, Builder>(PackagingElementEntity) {
@@ -481,7 +481,7 @@ interface ModuleTestOutputPackagingElementEntity : PackagingElementEntity {
operator fun invoke(
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ModuleTestOutputPackagingElementEntity {
): Builder {
val builder = builder()
builder.entitySource = entitySource
init?.invoke(builder)
@@ -506,10 +506,10 @@ fun MutableEntityStorage.modifyEntity(
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder<T : FileOrDirectoryPackagingElementEntity> : FileOrDirectoryPackagingElementEntity, PackagingElementEntity.Builder<T>, WorkspaceEntity.Builder<T> {
interface Builder<T : FileOrDirectoryPackagingElementEntity> : WorkspaceEntity.Builder<T>, PackagingElementEntity.Builder<T> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var filePath: VirtualFileUrl
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
var filePath: VirtualFileUrl
}
companion object : EntityType<FileOrDirectoryPackagingElementEntity, Builder<FileOrDirectoryPackagingElementEntity>>(
@@ -521,7 +521,7 @@ fun MutableEntityStorage.modifyEntity(
filePath: VirtualFileUrl,
entitySource: EntitySource,
init: (Builder<FileOrDirectoryPackagingElementEntity>.() -> Unit)? = null,
): FileOrDirectoryPackagingElementEntity {
): Builder<FileOrDirectoryPackagingElementEntity> {
val builder = builder()
builder.filePath = filePath
builder.entitySource = entitySource
@@ -536,9 +536,9 @@ fun MutableEntityStorage.modifyEntity(
interface DirectoryCopyPackagingElementEntity : FileOrDirectoryPackagingElementEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : DirectoryCopyPackagingElementEntity, FileOrDirectoryPackagingElementEntity.Builder<DirectoryCopyPackagingElementEntity>, WorkspaceEntity.Builder<DirectoryCopyPackagingElementEntity> {
interface Builder : WorkspaceEntity.Builder<DirectoryCopyPackagingElementEntity>, FileOrDirectoryPackagingElementEntity.Builder<DirectoryCopyPackagingElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
override var filePath: VirtualFileUrl
}
@@ -550,7 +550,7 @@ interface DirectoryCopyPackagingElementEntity : FileOrDirectoryPackagingElementE
filePath: VirtualFileUrl,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): DirectoryCopyPackagingElementEntity {
): Builder {
val builder = builder()
builder.filePath = filePath
builder.entitySource = entitySource
@@ -576,11 +576,11 @@ interface ExtractedDirectoryPackagingElementEntity: FileOrDirectoryPackagingElem
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ExtractedDirectoryPackagingElementEntity, FileOrDirectoryPackagingElementEntity.Builder<ExtractedDirectoryPackagingElementEntity>, WorkspaceEntity.Builder<ExtractedDirectoryPackagingElementEntity> {
interface Builder : WorkspaceEntity.Builder<ExtractedDirectoryPackagingElementEntity>, FileOrDirectoryPackagingElementEntity.Builder<ExtractedDirectoryPackagingElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
override var filePath: VirtualFileUrl
override var pathInArchive: String
var pathInArchive: String
}
companion object : EntityType<ExtractedDirectoryPackagingElementEntity, Builder>(FileOrDirectoryPackagingElementEntity) {
@@ -592,7 +592,7 @@ interface ExtractedDirectoryPackagingElementEntity: FileOrDirectoryPackagingElem
pathInArchive: String,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ExtractedDirectoryPackagingElementEntity {
): Builder {
val builder = builder()
builder.filePath = filePath
builder.pathInArchive = pathInArchive
@@ -619,11 +619,11 @@ interface FileCopyPackagingElementEntity : FileOrDirectoryPackagingElementEntity
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : FileCopyPackagingElementEntity, FileOrDirectoryPackagingElementEntity.Builder<FileCopyPackagingElementEntity>, WorkspaceEntity.Builder<FileCopyPackagingElementEntity> {
interface Builder : WorkspaceEntity.Builder<FileCopyPackagingElementEntity>, FileOrDirectoryPackagingElementEntity.Builder<FileCopyPackagingElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
override var filePath: VirtualFileUrl
override var renamedOutputFileName: String?
var renamedOutputFileName: String?
}
companion object : EntityType<FileCopyPackagingElementEntity, Builder>(FileOrDirectoryPackagingElementEntity) {
@@ -634,7 +634,7 @@ interface FileCopyPackagingElementEntity : FileOrDirectoryPackagingElementEntity
filePath: VirtualFileUrl,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): FileCopyPackagingElementEntity {
): Builder {
val builder = builder()
builder.filePath = filePath
builder.entitySource = entitySource
@@ -661,13 +661,13 @@ interface CustomPackagingElementEntity : CompositePackagingElementEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : CustomPackagingElementEntity, CompositePackagingElementEntity.Builder<CustomPackagingElementEntity>, WorkspaceEntity.Builder<CustomPackagingElementEntity> {
interface Builder : WorkspaceEntity.Builder<CustomPackagingElementEntity>, CompositePackagingElementEntity.Builder<CustomPackagingElementEntity> {
override var entitySource: EntitySource
override var parentEntity: CompositePackagingElementEntity?
override var artifact: ArtifactEntity?
override var children: List<PackagingElementEntity>
override var typeId: String
override var propertiesXmlTag: String
override var parentEntity: CompositePackagingElementEntity.Builder<out CompositePackagingElementEntity>?
override var artifact: ArtifactEntity.Builder?
override var children: List<PackagingElementEntity.Builder<out PackagingElementEntity>>
var typeId: String
var propertiesXmlTag: String
}
companion object : EntityType<CustomPackagingElementEntity, Builder>(CompositePackagingElementEntity) {
@@ -679,7 +679,7 @@ interface CustomPackagingElementEntity : CompositePackagingElementEntity {
propertiesXmlTag: String,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): CustomPackagingElementEntity {
): Builder {
val builder = builder()
builder.typeId = typeId
builder.propertiesXmlTag = propertiesXmlTag
@@ -710,9 +710,9 @@ interface ArtifactsOrderEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ArtifactsOrderEntity, WorkspaceEntity.Builder<ArtifactsOrderEntity> {
interface Builder : WorkspaceEntity.Builder<ArtifactsOrderEntity> {
override var entitySource: EntitySource
override var orderOfArtifacts: MutableList<String>
var orderOfArtifacts: MutableList<String>
}
companion object : EntityType<ArtifactsOrderEntity, Builder>() {
@@ -723,7 +723,7 @@ interface ArtifactsOrderEntity : WorkspaceEntity {
orderOfArtifacts: List<String>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ArtifactsOrderEntity {
): Builder {
val builder = builder()
builder.orderOfArtifacts = orderOfArtifacts.toMutableWorkspaceList()
builder.entitySource = entitySource
platform/workspace/jps/src/com/intellij/java/workspace/entities/javaModuleSettings.kt
+11 -11
View File
@@ -25,15 +25,15 @@ interface JavaModuleSettingsEntity: WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : JavaModuleSettingsEntity, WorkspaceEntity.Builder<JavaModuleSettingsEntity> {
interface Builder : WorkspaceEntity.Builder<JavaModuleSettingsEntity> {
override var entitySource: EntitySource
override var module: ModuleEntity
override var inheritedCompilerOutput: Boolean
override var excludeOutput: Boolean
override var compilerOutput: VirtualFileUrl?
override var compilerOutputForTests: VirtualFileUrl?
override var languageLevelId: String?
override var manifestAttributes: Map<String, String>
var module: ModuleEntity.Builder
var inheritedCompilerOutput: Boolean
var excludeOutput: Boolean
var compilerOutput: VirtualFileUrl?
var compilerOutputForTests: VirtualFileUrl?
var languageLevelId: String?
var manifestAttributes: Map<String, String>
}
companion object : EntityType<JavaModuleSettingsEntity, Builder>() {
@@ -45,7 +45,7 @@ interface JavaModuleSettingsEntity: WorkspaceEntity {
excludeOutput: Boolean,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): JavaModuleSettingsEntity {
): Builder {
val builder = builder()
builder.inheritedCompilerOutput = inheritedCompilerOutput
builder.excludeOutput = excludeOutput
@@ -66,8 +66,8 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(JavaModuleSettingsEntity.Builder::class.java, entity, modification)
}
var ModuleEntity.Builder.javaSettings: @Child JavaModuleSettingsEntity?
by WorkspaceEntity.extension()
var ModuleEntity.Builder.javaSettings: @Child JavaModuleSettingsEntity.Builder?
by WorkspaceEntity.extensionBuilder(JavaModuleSettingsEntity::class.java)
//endregion
val ModuleEntity.javaSettings: @Child JavaModuleSettingsEntity?
platform/workspace/jps/src/com/intellij/java/workspace/entities/javaRoots.kt
+16 -21
View File
@@ -2,14 +2,9 @@
package com.intellij.java.workspace.entities
import com.intellij.openapi.util.NlsSafe
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntity
import com.intellij.platform.workspace.storage.annotations.Child
import com.intellij.platform.workspace.jps.entities.SourceRootEntity
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.annotations.Child
interface JavaSourceRootPropertiesEntity : WorkspaceEntity {
val sourceRoot: SourceRootEntity
@@ -19,11 +14,11 @@ interface JavaSourceRootPropertiesEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : JavaSourceRootPropertiesEntity, WorkspaceEntity.Builder<JavaSourceRootPropertiesEntity> {
interface Builder : WorkspaceEntity.Builder<JavaSourceRootPropertiesEntity> {
override var entitySource: EntitySource
override var sourceRoot: SourceRootEntity
override var generated: Boolean
override var packagePrefix: String
var sourceRoot: SourceRootEntity.Builder
var generated: Boolean
var packagePrefix: String
}
companion object : EntityType<JavaSourceRootPropertiesEntity, Builder>() {
@@ -35,7 +30,7 @@ interface JavaSourceRootPropertiesEntity : WorkspaceEntity {
packagePrefix: String,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): JavaSourceRootPropertiesEntity {
): Builder {
val builder = builder()
builder.generated = generated
builder.packagePrefix = packagePrefix
@@ -56,8 +51,8 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(JavaSourceRootPropertiesEntity.Builder::class.java, entity, modification)
}
var SourceRootEntity.Builder.javaSourceRoots: @Child List<JavaSourceRootPropertiesEntity>
by WorkspaceEntity.extension()
var SourceRootEntity.Builder.javaSourceRoots: @Child List<JavaSourceRootPropertiesEntity.Builder>
by WorkspaceEntity.extensionBuilder(JavaSourceRootPropertiesEntity::class.java)
//endregion
val SourceRootEntity.javaSourceRoots: List<@Child JavaSourceRootPropertiesEntity>
@@ -71,11 +66,11 @@ interface JavaResourceRootPropertiesEntity: WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : JavaResourceRootPropertiesEntity, WorkspaceEntity.Builder<JavaResourceRootPropertiesEntity> {
interface Builder : WorkspaceEntity.Builder<JavaResourceRootPropertiesEntity> {
override var entitySource: EntitySource
override var sourceRoot: SourceRootEntity
override var generated: Boolean
override var relativeOutputPath: String
var sourceRoot: SourceRootEntity.Builder
var generated: Boolean
var relativeOutputPath: String
}
companion object : EntityType<JavaResourceRootPropertiesEntity, Builder>() {
@@ -87,7 +82,7 @@ interface JavaResourceRootPropertiesEntity: WorkspaceEntity {
relativeOutputPath: String,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): JavaResourceRootPropertiesEntity {
): Builder {
val builder = builder()
builder.generated = generated
builder.relativeOutputPath = relativeOutputPath
@@ -108,8 +103,8 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(JavaResourceRootPropertiesEntity.Builder::class.java, entity, modification)
}
var SourceRootEntity.Builder.javaResourceRoots: @Child List<JavaResourceRootPropertiesEntity>
by WorkspaceEntity.extension()
var SourceRootEntity.Builder.javaResourceRoots: @Child List<JavaResourceRootPropertiesEntity.Builder>
by WorkspaceEntity.extensionBuilder(JavaResourceRootPropertiesEntity::class.java)
//endregion
val SourceRootEntity.javaResourceRoots: List<@Child JavaResourceRootPropertiesEntity>
platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/dependencies.kt
+9 -9
View File
@@ -32,13 +32,13 @@ interface LibraryEntity : WorkspaceEntityWithSymbolicId {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : LibraryEntity, WorkspaceEntity.Builder<LibraryEntity> {
interface Builder : WorkspaceEntity.Builder<LibraryEntity> {
override var entitySource: EntitySource
override var name: String
override var tableId: LibraryTableId
override var typeId: LibraryTypeId?
override var roots: MutableList<LibraryRoot>
override var excludedRoots: List<ExcludeUrlEntity>
var name: String
var tableId: LibraryTableId
var typeId: LibraryTypeId?
var roots: MutableList<LibraryRoot>
var excludedRoots: List<ExcludeUrlEntity.Builder>
}
companion object : EntityType<LibraryEntity, Builder>() {
@@ -51,7 +51,7 @@ interface LibraryEntity : WorkspaceEntityWithSymbolicId {
roots: List<LibraryRoot>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): LibraryEntity {
): Builder {
val builder = builder()
builder.name = name
builder.tableId = tableId
@@ -73,8 +73,8 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(LibraryEntity.Builder::class.java, entity, modification)
}
var LibraryEntity.Builder.libraryProperties: @Child LibraryPropertiesEntity?
by WorkspaceEntity.extension()
var LibraryEntity.Builder.libraryProperties: @Child LibraryPropertiesEntity.Builder?
by WorkspaceEntity.extensionBuilder(LibraryPropertiesEntity::class.java)
//endregion
val ExcludeUrlEntity.library: LibraryEntity? by WorkspaceEntity.extension()
platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/exclude.kt
+7 -7
View File
@@ -19,9 +19,9 @@ interface ExcludeUrlEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ExcludeUrlEntity, WorkspaceEntity.Builder<ExcludeUrlEntity> {
interface Builder : WorkspaceEntity.Builder<ExcludeUrlEntity> {
override var entitySource: EntitySource
override var url: VirtualFileUrl
var url: VirtualFileUrl
}
companion object : EntityType<ExcludeUrlEntity, Builder>() {
@@ -32,7 +32,7 @@ interface ExcludeUrlEntity : WorkspaceEntity {
url: VirtualFileUrl,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ExcludeUrlEntity {
): Builder {
val builder = builder()
builder.url = url
builder.entitySource = entitySource
@@ -51,8 +51,8 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(ExcludeUrlEntity.Builder::class.java, entity, modification)
}
var ExcludeUrlEntity.Builder.contentRoot: ContentRootEntity?
by WorkspaceEntity.extension()
var ExcludeUrlEntity.Builder.library: LibraryEntity?
by WorkspaceEntity.extension()
var ExcludeUrlEntity.Builder.contentRoot: ContentRootEntity.Builder?
by WorkspaceEntity.extensionBuilder(ContentRootEntity::class.java)
var ExcludeUrlEntity.Builder.library: LibraryEntity.Builder?
by WorkspaceEntity.extensionBuilder(LibraryEntity::class.java)
//endregion
platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/facet.kt
+8 -8
View File
@@ -27,14 +27,14 @@ interface FacetEntity: ModuleSettingsBase {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : FacetEntity, ModuleSettingsBase.Builder<FacetEntity>, WorkspaceEntity.Builder<FacetEntity> {
interface Builder : WorkspaceEntity.Builder<FacetEntity>, ModuleSettingsBase.Builder<FacetEntity> {
override var entitySource: EntitySource
override var name: String
override var moduleId: ModuleId
override var module: ModuleEntity
override var typeId: FacetEntityTypeId
override var configurationXmlTag: String?
override var underlyingFacet: FacetEntity?
var module: ModuleEntity.Builder
var typeId: FacetEntityTypeId
var configurationXmlTag: String?
var underlyingFacet: FacetEntity.Builder?
}
companion object : EntityType<FacetEntity, Builder>(ModuleSettingsBase) {
@@ -47,7 +47,7 @@ interface FacetEntity: ModuleSettingsBase {
typeId: FacetEntityTypeId,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): FacetEntity {
): Builder {
val builder = builder()
builder.name = name
builder.moduleId = moduleId
@@ -69,8 +69,8 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(FacetEntity.Builder::class.java, entity, modification)
}
var FacetEntity.Builder.childrenFacets: @Child List<FacetEntity>
by WorkspaceEntity.extension()
var FacetEntity.Builder.childrenFacets: @Child List<FacetEntity.Builder>
by WorkspaceEntity.extensionBuilder(FacetEntity::class.java)
//endregion
val FacetEntity.childrenFacets: List<@Child FacetEntity>
platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/library_extensions.kt
+4 -4
View File
@@ -20,10 +20,10 @@ interface LibraryPropertiesEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : LibraryPropertiesEntity, WorkspaceEntity.Builder<LibraryPropertiesEntity> {
interface Builder : WorkspaceEntity.Builder<LibraryPropertiesEntity> {
override var entitySource: EntitySource
override var library: LibraryEntity
override var propertiesXmlTag: String?
var library: LibraryEntity.Builder
var propertiesXmlTag: String?
}
companion object : EntityType<LibraryPropertiesEntity, Builder>() {
@@ -33,7 +33,7 @@ interface LibraryPropertiesEntity : WorkspaceEntity {
operator fun invoke(
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): LibraryPropertiesEntity {
): Builder {
val builder = builder()
builder.entitySource = entitySource
init?.invoke(builder)
platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module.kt
+19 -24
View File
@@ -5,11 +5,6 @@ package com.intellij.platform.workspace.jps.entities
import com.intellij.openapi.util.NlsSafe
import com.intellij.platform.workspace.storage.*
import com.intellij.platform.workspace.storage.EntitySource
import com.intellij.platform.workspace.storage.EntityType
import com.intellij.platform.workspace.storage.GeneratedCodeApiVersion
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.WorkspaceEntity
import com.intellij.platform.workspace.storage.annotations.Child
import com.intellij.platform.workspace.storage.impl.containers.toMutableWorkspaceList
import org.jetbrains.annotations.NonNls
@@ -34,13 +29,13 @@ interface ModuleEntity : WorkspaceEntityWithSymbolicId {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ModuleEntity, WorkspaceEntity.Builder<ModuleEntity> {
interface Builder : WorkspaceEntity.Builder<ModuleEntity> {
override var entitySource: EntitySource
override var name: String
override var type: ModuleTypeId?
override var dependencies: MutableList<ModuleDependencyItem>
override var contentRoots: List<ContentRootEntity>
override var facets: List<FacetEntity>
var name: String
var type: ModuleTypeId?
var dependencies: MutableList<ModuleDependencyItem>
var contentRoots: List<ContentRootEntity.Builder>
var facets: List<FacetEntity.Builder>
}
companion object : EntityType<ModuleEntity, Builder>() {
@@ -52,7 +47,7 @@ interface ModuleEntity : WorkspaceEntityWithSymbolicId {
dependencies: List<ModuleDependencyItem>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ModuleEntity {
): Builder {
val builder = builder()
builder.name = name
builder.dependencies = dependencies.toMutableWorkspaceList()
@@ -73,16 +68,16 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(ModuleEntity.Builder::class.java, entity, modification)
}
var ModuleEntity.Builder.customImlData: @Child ModuleCustomImlDataEntity?
by WorkspaceEntity.extension()
var ModuleEntity.Builder.exModuleOptions: @Child ExternalSystemModuleOptionsEntity?
by WorkspaceEntity.extension()
var ModuleEntity.Builder.facetOrder: @Child FacetsOrderEntity?
by WorkspaceEntity.extension()
var ModuleEntity.Builder.groupPath: @Child ModuleGroupPathEntity?
by WorkspaceEntity.extension()
var ModuleEntity.Builder.sourceRoots: List<SourceRootEntity>
by WorkspaceEntity.extension()
var ModuleEntity.Builder.testProperties: @Child TestModulePropertiesEntity?
by WorkspaceEntity.extension()
var ModuleEntity.Builder.customImlData: @Child ModuleCustomImlDataEntity.Builder?
by WorkspaceEntity.extensionBuilder(ModuleCustomImlDataEntity::class.java)
var ModuleEntity.Builder.exModuleOptions: @Child ExternalSystemModuleOptionsEntity.Builder?
by WorkspaceEntity.extensionBuilder(ExternalSystemModuleOptionsEntity::class.java)
var ModuleEntity.Builder.facetOrder: @Child FacetsOrderEntity.Builder?
by WorkspaceEntity.extensionBuilder(FacetsOrderEntity::class.java)
var ModuleEntity.Builder.groupPath: @Child ModuleGroupPathEntity.Builder?
by WorkspaceEntity.extensionBuilder(ModuleGroupPathEntity::class.java)
var ModuleEntity.Builder.sourceRoots: List<SourceRootEntity.Builder>
by WorkspaceEntity.extensionBuilder(SourceRootEntity::class.java)
var ModuleEntity.Builder.testProperties: @Child TestModulePropertiesEntity.Builder?
by WorkspaceEntity.extensionBuilder(TestModulePropertiesEntity::class.java)
//endregion
platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_extensions.kt
+23 -23
View File
@@ -30,11 +30,11 @@ interface ModuleCustomImlDataEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ModuleCustomImlDataEntity, WorkspaceEntity.Builder<ModuleCustomImlDataEntity> {
interface Builder : WorkspaceEntity.Builder<ModuleCustomImlDataEntity> {
override var entitySource: EntitySource
override var module: ModuleEntity
override var rootManagerTagCustomData: String?
override var customModuleOptions: Map<String, String>
var module: ModuleEntity.Builder
var rootManagerTagCustomData: String?
var customModuleOptions: Map<String, String>
}
companion object : EntityType<ModuleCustomImlDataEntity, Builder>() {
@@ -45,7 +45,7 @@ interface ModuleCustomImlDataEntity : WorkspaceEntity {
customModuleOptions: Map<String, String>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ModuleCustomImlDataEntity {
): Builder {
val builder = builder()
builder.customModuleOptions = customModuleOptions
builder.entitySource = entitySource
@@ -82,10 +82,10 @@ interface ModuleGroupPathEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ModuleGroupPathEntity, WorkspaceEntity.Builder<ModuleGroupPathEntity> {
interface Builder : WorkspaceEntity.Builder<ModuleGroupPathEntity> {
override var entitySource: EntitySource
override var module: ModuleEntity
override var path: MutableList<String>
var module: ModuleEntity.Builder
var path: MutableList<String>
}
companion object : EntityType<ModuleGroupPathEntity, Builder>() {
@@ -96,7 +96,7 @@ interface ModuleGroupPathEntity : WorkspaceEntity {
path: List<String>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ModuleGroupPathEntity {
): Builder {
val builder = builder()
builder.path = path.toMutableWorkspaceList()
builder.entitySource = entitySource
@@ -138,16 +138,16 @@ interface ExternalSystemModuleOptionsEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ExternalSystemModuleOptionsEntity, WorkspaceEntity.Builder<ExternalSystemModuleOptionsEntity> {
interface Builder : WorkspaceEntity.Builder<ExternalSystemModuleOptionsEntity> {
override var entitySource: EntitySource
override var module: ModuleEntity
override var externalSystem: String?
override var externalSystemModuleVersion: String?
override var linkedProjectPath: String?
override var linkedProjectId: String?
override var rootProjectPath: String?
override var externalSystemModuleGroup: String?
override var externalSystemModuleType: String?
var module: ModuleEntity.Builder
var externalSystem: String?
var externalSystemModuleVersion: String?
var linkedProjectPath: String?
var linkedProjectId: String?
var rootProjectPath: String?
var externalSystemModuleGroup: String?
var externalSystemModuleType: String?
}
companion object : EntityType<ExternalSystemModuleOptionsEntity, Builder>() {
@@ -157,7 +157,7 @@ interface ExternalSystemModuleOptionsEntity : WorkspaceEntity {
operator fun invoke(
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ExternalSystemModuleOptionsEntity {
): Builder {
val builder = builder()
builder.entitySource = entitySource
init?.invoke(builder)
@@ -191,10 +191,10 @@ interface TestModulePropertiesEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : TestModulePropertiesEntity, WorkspaceEntity.Builder<TestModulePropertiesEntity> {
interface Builder : WorkspaceEntity.Builder<TestModulePropertiesEntity> {
override var entitySource: EntitySource
override var module: ModuleEntity
override var productionModuleId: ModuleId
var module: ModuleEntity.Builder
var productionModuleId: ModuleId
}
companion object : EntityType<TestModulePropertiesEntity, Builder>() {
@@ -205,7 +205,7 @@ interface TestModulePropertiesEntity : WorkspaceEntity {
productionModuleId: ModuleId,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): TestModulePropertiesEntity {
): Builder {
val builder = builder()
builder.productionModuleId = productionModuleId
builder.entitySource = entitySource
platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_settings.kt
+4 -4
View File
@@ -16,10 +16,10 @@ interface ModuleSettingsBase : WorkspaceEntityWithSymbolicId {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder<T : ModuleSettingsBase> : ModuleSettingsBase, WorkspaceEntity.Builder<T> {
interface Builder<T : ModuleSettingsBase> : WorkspaceEntity.Builder<T> {
override var entitySource: EntitySource
override var name: String
override var moduleId: ModuleId
var name: String
var moduleId: ModuleId
}
companion object : EntityType<ModuleSettingsBase, Builder<ModuleSettingsBase>>() {
@@ -31,7 +31,7 @@ interface ModuleSettingsBase : WorkspaceEntityWithSymbolicId {
moduleId: ModuleId,
entitySource: EntitySource,
init: (Builder<ModuleSettingsBase>.() -> Unit)? = null,
): ModuleSettingsBase {
): Builder<ModuleSettingsBase> {
val builder = builder()
builder.name = name
builder.moduleId = moduleId
platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/orders.kt
+4 -4
View File
@@ -22,10 +22,10 @@ interface FacetsOrderEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : FacetsOrderEntity, WorkspaceEntity.Builder<FacetsOrderEntity> {
interface Builder : WorkspaceEntity.Builder<FacetsOrderEntity> {
override var entitySource: EntitySource
override var orderOfFacets: MutableList<String>
override var moduleEntity: ModuleEntity
var orderOfFacets: MutableList<String>
var moduleEntity: ModuleEntity.Builder
}
companion object : EntityType<FacetsOrderEntity, Builder>() {
@@ -36,7 +36,7 @@ interface FacetsOrderEntity : WorkspaceEntity {
orderOfFacets: List<String>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): FacetsOrderEntity {
): Builder {
val builder = builder()
builder.orderOfFacets = orderOfFacets.toMutableWorkspaceList()
builder.entitySource = entitySource
platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/roots.kt
+18 -18
View File
@@ -29,13 +29,13 @@ interface ContentRootEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ContentRootEntity, WorkspaceEntity.Builder<ContentRootEntity> {
interface Builder : WorkspaceEntity.Builder<ContentRootEntity> {
override var entitySource: EntitySource
override var module: ModuleEntity
override var url: VirtualFileUrl
override var excludedPatterns: MutableList<String>
override var sourceRoots: List<SourceRootEntity>
override var excludedUrls: List<ExcludeUrlEntity>
var module: ModuleEntity.Builder
var url: VirtualFileUrl
var excludedPatterns: MutableList<String>
var sourceRoots: List<SourceRootEntity.Builder>
var excludedUrls: List<ExcludeUrlEntity.Builder>
}
companion object : EntityType<ContentRootEntity, Builder>() {
@@ -47,7 +47,7 @@ interface ContentRootEntity : WorkspaceEntity {
excludedPatterns: List<String>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ContentRootEntity {
): Builder {
val builder = builder()
builder.url = url
builder.excludedPatterns = excludedPatterns.toMutableWorkspaceList()
@@ -68,10 +68,10 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(ContentRootEntity.Builder::class.java, entity, modification)
}
var ContentRootEntity.Builder.excludeUrlOrder: @Child ExcludeUrlOrderEntity?
by WorkspaceEntity.extension()
var ContentRootEntity.Builder.sourceRootOrder: @Child SourceRootOrderEntity?
by WorkspaceEntity.extension()
var ContentRootEntity.Builder.excludeUrlOrder: @Child ExcludeUrlOrderEntity.Builder?
by WorkspaceEntity.extensionBuilder(ExcludeUrlOrderEntity::class.java)
var ContentRootEntity.Builder.sourceRootOrder: @Child SourceRootOrderEntity.Builder?
by WorkspaceEntity.extensionBuilder(SourceRootOrderEntity::class.java)
//endregion
val ExcludeUrlEntity.contentRoot: ContentRootEntity? by WorkspaceEntity.extension()
@@ -91,11 +91,11 @@ interface SourceRootEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : SourceRootEntity, WorkspaceEntity.Builder<SourceRootEntity> {
interface Builder : WorkspaceEntity.Builder<SourceRootEntity> {
override var entitySource: EntitySource
override var contentRoot: ContentRootEntity
override var url: VirtualFileUrl
override var rootTypeId: SourceRootTypeId
var contentRoot: ContentRootEntity.Builder
var url: VirtualFileUrl
var rootTypeId: SourceRootTypeId
}
companion object : EntityType<SourceRootEntity, Builder>() {
@@ -107,7 +107,7 @@ interface SourceRootEntity : WorkspaceEntity {
rootTypeId: SourceRootTypeId,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): SourceRootEntity {
): Builder {
val builder = builder()
builder.url = url
builder.rootTypeId = rootTypeId
@@ -128,6 +128,6 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(SourceRootEntity.Builder::class.java, entity, modification)
}
var SourceRootEntity.Builder.customSourceRootProperties: @Child CustomSourceRootPropertiesEntity?
by WorkspaceEntity.extension()
var SourceRootEntity.Builder.customSourceRootProperties: @Child CustomSourceRootPropertiesEntity.Builder?
by WorkspaceEntity.extensionBuilder(CustomSourceRootPropertiesEntity::class.java)
//endregion
platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/roots_extensions.kt
+12 -12
View File
@@ -26,10 +26,10 @@ interface SourceRootOrderEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : SourceRootOrderEntity, WorkspaceEntity.Builder<SourceRootOrderEntity> {
interface Builder : WorkspaceEntity.Builder<SourceRootOrderEntity> {
override var entitySource: EntitySource
override var contentRootEntity: ContentRootEntity
override var orderOfSourceRoots: MutableList<VirtualFileUrl>
var contentRootEntity: ContentRootEntity.Builder
var orderOfSourceRoots: MutableList<VirtualFileUrl>
}
companion object : EntityType<SourceRootOrderEntity, Builder>() {
@@ -40,7 +40,7 @@ interface SourceRootOrderEntity : WorkspaceEntity {
orderOfSourceRoots: List<VirtualFileUrl>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): SourceRootOrderEntity {
): Builder {
val builder = builder()
builder.orderOfSourceRoots = orderOfSourceRoots.toMutableWorkspaceList()
builder.entitySource = entitySource
@@ -77,10 +77,10 @@ interface CustomSourceRootPropertiesEntity: WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : CustomSourceRootPropertiesEntity, WorkspaceEntity.Builder<CustomSourceRootPropertiesEntity> {
interface Builder : WorkspaceEntity.Builder<CustomSourceRootPropertiesEntity> {
override var entitySource: EntitySource
override var sourceRoot: SourceRootEntity
override var propertiesXmlTag: String
var sourceRoot: SourceRootEntity.Builder
var propertiesXmlTag: String
}
companion object : EntityType<CustomSourceRootPropertiesEntity, Builder>() {
@@ -91,7 +91,7 @@ interface CustomSourceRootPropertiesEntity: WorkspaceEntity {
propertiesXmlTag: String,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): CustomSourceRootPropertiesEntity {
): Builder {
val builder = builder()
builder.propertiesXmlTag = propertiesXmlTag
builder.entitySource = entitySource
@@ -128,10 +128,10 @@ interface ExcludeUrlOrderEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : ExcludeUrlOrderEntity, WorkspaceEntity.Builder<ExcludeUrlOrderEntity> {
interface Builder : WorkspaceEntity.Builder<ExcludeUrlOrderEntity> {
override var entitySource: EntitySource
override var order: MutableList<VirtualFileUrl>
override var contentRoot: ContentRootEntity
var order: MutableList<VirtualFileUrl>
var contentRoot: ContentRootEntity.Builder
}
companion object : EntityType<ExcludeUrlOrderEntity, Builder>() {
@@ -142,7 +142,7 @@ interface ExcludeUrlOrderEntity : WorkspaceEntity {
order: List<VirtualFileUrl>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): ExcludeUrlOrderEntity {
): Builder {
val builder = builder()
builder.order = order.toMutableWorkspaceList()
builder.entitySource = entitySource
platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/sdk.kt
+8 -8
View File
@@ -25,14 +25,14 @@ interface SdkEntity: WorkspaceEntityWithSymbolicId {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : SdkEntity, WorkspaceEntity.Builder<SdkEntity> {
interface Builder : WorkspaceEntity.Builder<SdkEntity> {
override var entitySource: EntitySource
override var name: String
override var type: String
override var version: String?
override var homePath: VirtualFileUrl?
override var roots: MutableList<SdkRoot>
override var additionalData: String
var name: String
var type: String
var version: String?
var homePath: VirtualFileUrl?
var roots: MutableList<SdkRoot>
var additionalData: String
}
companion object : EntityType<SdkEntity, Builder>() {
@@ -46,7 +46,7 @@ interface SdkEntity: WorkspaceEntityWithSymbolicId {
additionalData: String,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): SdkEntity {
): Builder {
val builder = builder()
builder.name = name
builder.type = type
plugins/eclipse/gen/org/jetbrains/idea/eclipse/workspaceModel/EclipseProjectPropertiesEntityImpl.kt
+8 -6
View File
@@ -25,6 +25,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneParent
import com.intellij.platform.workspace.storage.impl.updateOneToOneParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
@@ -201,15 +202,16 @@ open class EclipseProjectPropertiesEntityImpl(private val dataSource: EclipsePro
}
override var module: ModuleEntity
override var module: ModuleEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToOneParent(MODULE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
MODULE_CONNECTION_ID)]!! as ModuleEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULE_CONNECTION_ID, this) as? ModuleEntity.Builder)
?: (this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder
}
}
set(value) {
@@ -398,10 +400,10 @@ class EclipseProjectPropertiesEntityData : WorkspaceEntityData<EclipseProjectPro
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return EclipseProjectPropertiesEntity(variablePaths, eclipseUrls, unknownCons, knownCons, forceConfigureJdk, expectedModuleSourcePlace,
srcPlace, entitySource) {
parents.filterIsInstance<ModuleEntity>().singleOrNull()?.let { this.module = it }
parents.filterIsInstance<ModuleEntity.Builder>().singleOrNull()?.let { this.module = it }
}
}
plugins/eclipse/src/org/jetbrains/idea/eclipse/workspaceModel/eclipseEntities.kt
+12 -12
View File
@@ -38,16 +38,16 @@ interface EclipseProjectPropertiesEntity : WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : EclipseProjectPropertiesEntity, WorkspaceEntity.Builder<EclipseProjectPropertiesEntity> {
interface Builder : WorkspaceEntity.Builder<EclipseProjectPropertiesEntity> {
override var entitySource: EntitySource
override var module: ModuleEntity
override var variablePaths: Map<String, String>
override var eclipseUrls: MutableList<VirtualFileUrl>
override var unknownCons: MutableList<String>
override var knownCons: MutableList<String>
override var forceConfigureJdk: Boolean
override var expectedModuleSourcePlace: Int
override var srcPlace: Map<String, Int>
var module: ModuleEntity.Builder
var variablePaths: Map<String, String>
var eclipseUrls: MutableList<VirtualFileUrl>
var unknownCons: MutableList<String>
var knownCons: MutableList<String>
var forceConfigureJdk: Boolean
var expectedModuleSourcePlace: Int
var srcPlace: Map<String, Int>
}
companion object : EntityType<EclipseProjectPropertiesEntity, Builder>() {
@@ -64,7 +64,7 @@ interface EclipseProjectPropertiesEntity : WorkspaceEntity {
srcPlace: Map<String, Int>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): EclipseProjectPropertiesEntity {
): Builder {
val builder = builder()
builder.variablePaths = variablePaths
builder.eclipseUrls = eclipseUrls.toMutableWorkspaceList()
@@ -90,8 +90,8 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(EclipseProjectPropertiesEntity.Builder::class.java, entity, modification)
}
var ModuleEntity.Builder.eclipseProperties: @Child EclipseProjectPropertiesEntity?
by WorkspaceEntity.extension()
var ModuleEntity.Builder.eclipseProperties: @Child EclipseProjectPropertiesEntity.Builder?
by WorkspaceEntity.extensionBuilder(EclipseProjectPropertiesEntity::class.java)
//endregion
val ModuleEntity.eclipseProperties: @Child EclipseProjectPropertiesEntity?
plugins/kotlin/base/facet/gen/org/jetbrains/kotlin/idea/workspaceModel/KotlinSettingsEntityImpl.kt
+8 -6
View File
@@ -29,6 +29,7 @@ import com.intellij.platform.workspace.storage.impl.indices.WorkspaceMutableInde
import com.intellij.platform.workspace.storage.impl.updateOneToManyParentOfChild
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentation
import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi
import com.intellij.platform.workspace.storage.instrumentation.MutableEntityStorageInstrumentation
import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata
import com.intellij.util.descriptors.ConfigFileItem
import org.jetbrains.kotlin.config.KotlinModuleKind
@@ -425,15 +426,16 @@ open class KotlinSettingsEntityImpl(private val dataSource: KotlinSettingsEntity
configFileItemsUpdater.invoke(value)
}
override var module: ModuleEntity
override var module: ModuleEntity.Builder
get() {
val _diff = diff
return if (_diff != null) {
_diff.extractOneToManyParent(MODULE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false,
MODULE_CONNECTION_ID)]!! as ModuleEntity
@OptIn(EntityStorageInstrumentationApi::class)
((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULE_CONNECTION_ID, this) as? ModuleEntity.Builder)
?: (this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder)
}
else {
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity
this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleEntity.Builder
}
}
set(value) {
@@ -880,12 +882,12 @@ class KotlinSettingsEntityData : WorkspaceEntityData.WithCalculableSymbolicId<Ko
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return KotlinSettingsEntity(name, moduleId, sourceRoots, configFileItems, useProjectSettings, implementedModuleNames,
dependsOnModuleNames, additionalVisibleModuleNames, productionOutputPath, testOutputPath, sourceSetNames,
isTestModule, externalProjectId, isHmppEnabled, pureKotlinSourceFolders, kind, compilerArguments,
compilerSettings, targetPlatform, externalSystemRunTasks, version, flushNeeded, entitySource) {
parents.filterIsInstance<ModuleEntity>().singleOrNull()?.let { this.module = it }
parents.filterIsInstance<ModuleEntity.Builder>().singleOrNull()?.let { this.module = it }
}
}
plugins/kotlin/base/facet/src/org/jetbrains/kotlin/idea/workspaceModel/KotlinSettingsEntity.kt
+25 -25
View File
@@ -55,31 +55,31 @@ interface KotlinSettingsEntity : ModuleSettingsBase {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : KotlinSettingsEntity, ModuleSettingsBase.Builder<KotlinSettingsEntity>, WorkspaceEntity.Builder<KotlinSettingsEntity> {
interface Builder : WorkspaceEntity.Builder<KotlinSettingsEntity>, ModuleSettingsBase.Builder<KotlinSettingsEntity> {
override var entitySource: EntitySource
override var name: String
override var moduleId: ModuleId
override var sourceRoots: MutableList<String>
override var configFileItems: MutableList<ConfigFileItem>
override var module: ModuleEntity
override var useProjectSettings: Boolean
override var implementedModuleNames: MutableList<String>
override var dependsOnModuleNames: MutableList<String>
override var additionalVisibleModuleNames: MutableSet<String>
override var productionOutputPath: String
override var testOutputPath: String
override var sourceSetNames: MutableList<String>
override var isTestModule: Boolean
override var externalProjectId: String
override var isHmppEnabled: Boolean
override var pureKotlinSourceFolders: MutableList<String>
override var kind: KotlinModuleKind
override var compilerArguments: String
override var compilerSettings: CompilerSettingsData
override var targetPlatform: String
override var externalSystemRunTasks: MutableList<String>
override var version: Int
override var flushNeeded: Boolean
var sourceRoots: MutableList<String>
var configFileItems: MutableList<ConfigFileItem>
var module: ModuleEntity.Builder
var useProjectSettings: Boolean
var implementedModuleNames: MutableList<String>
var dependsOnModuleNames: MutableList<String>
var additionalVisibleModuleNames: MutableSet<String>
var productionOutputPath: String
var testOutputPath: String
var sourceSetNames: MutableList<String>
var isTestModule: Boolean
var externalProjectId: String
var isHmppEnabled: Boolean
var pureKotlinSourceFolders: MutableList<String>
var kind: KotlinModuleKind
var compilerArguments: String
var compilerSettings: CompilerSettingsData
var targetPlatform: String
var externalSystemRunTasks: MutableList<String>
var version: Int
var flushNeeded: Boolean
}
companion object : EntityType<KotlinSettingsEntity, Builder>(ModuleSettingsBase) {
@@ -111,7 +111,7 @@ interface KotlinSettingsEntity : ModuleSettingsBase {
flushNeeded: Boolean,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): KotlinSettingsEntity {
): Builder {
val builder = builder()
builder.name = name
builder.moduleId = moduleId
@@ -152,8 +152,8 @@ fun MutableEntityStorage.modifyEntity(
return modifyEntity(KotlinSettingsEntity.Builder::class.java, entity, modification)
}
var ModuleEntity.Builder.kotlinSettings: @Child List<KotlinSettingsEntity>
by WorkspaceEntity.extension()
var ModuleEntity.Builder.kotlinSettings: @Child List<KotlinSettingsEntity.Builder>
by WorkspaceEntity.extensionBuilder(KotlinSettingsEntity::class.java)
//endregion
plugins/kotlin/base/scripting/gen/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptEntityImpl.kt
+1 -1
View File
@@ -268,7 +268,7 @@ class KotlinScriptEntityData : WorkspaceEntityData.WithCalculableSymbolicId<Kotl
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return KotlinScriptEntity(path, dependencies, entitySource) {
}
}
plugins/kotlin/base/scripting/gen/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptLibraryEntityImpl.kt
+1 -1
View File
@@ -334,7 +334,7 @@ class KotlinScriptLibraryEntityData : WorkspaceEntityData.WithCalculableSymbolic
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return KotlinScriptLibraryEntity(name, roots, indexSourceRoots, usedInScripts, entitySource) {
}
}
plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptEntity.kt
+4 -4
View File
@@ -27,10 +27,10 @@ interface KotlinScriptEntity: WorkspaceEntityWithSymbolicId {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : KotlinScriptEntity, WorkspaceEntity.Builder<KotlinScriptEntity> {
interface Builder : WorkspaceEntity.Builder<KotlinScriptEntity> {
override var entitySource: EntitySource
override var path: String
override var dependencies: MutableSet<KotlinScriptLibraryId>
var path: String
var dependencies: MutableSet<KotlinScriptLibraryId>
}
companion object : EntityType<KotlinScriptEntity, Builder>() {
@@ -42,7 +42,7 @@ interface KotlinScriptEntity: WorkspaceEntityWithSymbolicId {
dependencies: Set<KotlinScriptLibraryId>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): KotlinScriptEntity {
): Builder {
val builder = builder()
builder.path = path
builder.dependencies = dependencies.toMutableWorkspaceSet()
plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptLibraryEntity.kt
+6 -6
View File
@@ -49,12 +49,12 @@ interface KotlinScriptLibraryEntity : WorkspaceEntityWithSymbolicId {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : KotlinScriptLibraryEntity, WorkspaceEntity.Builder<KotlinScriptLibraryEntity> {
interface Builder : WorkspaceEntity.Builder<KotlinScriptLibraryEntity> {
override var entitySource: EntitySource
override var name: String
override var roots: MutableList<KotlinScriptLibraryRoot>
override var indexSourceRoots: Boolean
override var usedInScripts: MutableSet<KotlinScriptId>
var name: String
var roots: MutableList<KotlinScriptLibraryRoot>
var indexSourceRoots: Boolean
var usedInScripts: MutableSet<KotlinScriptId>
}
companion object : EntityType<KotlinScriptLibraryEntity, Builder>() {
@@ -68,7 +68,7 @@ interface KotlinScriptLibraryEntity : WorkspaceEntityWithSymbolicId {
usedInScripts: Set<KotlinScriptId>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): KotlinScriptLibraryEntity {
): Builder {
val builder = builder()
builder.name = name
builder.roots = roots.toMutableWorkspaceList()
plugins/maven/src/main/gen/org/jetbrains/idea/maven/importing/workspaceModel/MavenProjectsTreeSettingsEntityImpl.kt
+1 -1
View File
@@ -188,7 +188,7 @@ class MavenProjectsTreeSettingsEntityData : WorkspaceEntityData<MavenProjectsTre
override fun deserialize(de: EntityInformation.Deserializer) {
}
override fun createDetachedEntity(parents: List<WorkspaceEntity>): WorkspaceEntity {
override fun createDetachedEntity(parents: List<WorkspaceEntity.Builder<*>>): WorkspaceEntity.Builder<*> {
return MavenProjectsTreeSettingsEntity(importedFilePaths, entitySource) {
}
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/entities.kt
+3 -3
View File
@@ -16,9 +16,9 @@ interface MavenProjectsTreeSettingsEntity: WorkspaceEntity {
//region generated code
@GeneratedCodeApiVersion(2)
interface Builder : MavenProjectsTreeSettingsEntity, WorkspaceEntity.Builder<MavenProjectsTreeSettingsEntity> {
interface Builder : WorkspaceEntity.Builder<MavenProjectsTreeSettingsEntity> {
override var entitySource: EntitySource
override var importedFilePaths: MutableList<String>
var importedFilePaths: MutableList<String>
}
companion object : EntityType<MavenProjectsTreeSettingsEntity, Builder>() {
@@ -29,7 +29,7 @@ interface MavenProjectsTreeSettingsEntity: WorkspaceEntity {
importedFilePaths: List<String>,
entitySource: EntitySource,
init: (Builder.() -> Unit)? = null,
): MavenProjectsTreeSettingsEntity {
): Builder {
val builder = builder()
builder.importedFilePaths = importedFilePaths.toMutableWorkspaceList()
builder.entitySource = entitySource