diff --git a/platform/lang-impl/gen/com/intellij/ide/scratch/workspace/ScratchRootsEntityImpl.kt b/platform/lang-impl/gen/com/intellij/ide/scratch/workspace/ScratchRootsEntityImpl.kt index d4b6defb0bc6..3492eba3ceb0 100644 --- a/platform/lang-impl/gen/com/intellij/ide/scratch/workspace/ScratchRootsEntityImpl.kt +++ b/platform/lang-impl/gen/com/intellij/ide/scratch/workspace/ScratchRootsEntityImpl.kt @@ -188,7 +188,7 @@ class ScratchRootsEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ScratchRootsEntity(roots, entitySource) { } } diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/workspace/ScratchRootsEntity.kt b/platform/lang-impl/src/com/intellij/ide/scratch/workspace/ScratchRootsEntity.kt index a6bd22b8409c..0d03f67d0e46 100644 --- a/platform/lang-impl/src/com/intellij/ide/scratch/workspace/ScratchRootsEntity.kt +++ b/platform/lang-impl/src/com/intellij/ide/scratch/workspace/ScratchRootsEntity.kt @@ -14,9 +14,9 @@ interface ScratchRootsEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ScratchRootsEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var roots: MutableList + var roots: MutableList } companion object : EntityType() { @@ -27,7 +27,7 @@ interface ScratchRootsEntity : WorkspaceEntity { roots: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ScratchRootsEntity { + ): Builder { val builder = builder() builder.roots = roots.toMutableWorkspaceList() builder.entitySource = entitySource diff --git a/platform/lang-impl/testEntities/gen/com/intellij/util/indexing/testEntities/IndexingTestEntityImpl.kt b/platform/lang-impl/testEntities/gen/com/intellij/util/indexing/testEntities/IndexingTestEntityImpl.kt index cd39121850b9..d2553cd06284 100644 --- a/platform/lang-impl/testEntities/gen/com/intellij/util/indexing/testEntities/IndexingTestEntityImpl.kt +++ b/platform/lang-impl/testEntities/gen/com/intellij/util/indexing/testEntities/IndexingTestEntityImpl.kt @@ -229,7 +229,7 @@ class IndexingTestEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return IndexingTestEntity(roots, excludedRoots, entitySource) { } } diff --git a/platform/lang-impl/testEntities/testSrc/com/intellij/util/indexing/testEntities/IndexingTestEntity.kt b/platform/lang-impl/testEntities/testSrc/com/intellij/util/indexing/testEntities/IndexingTestEntity.kt index 0116bcf6f632..172cb21ba09f 100644 --- a/platform/lang-impl/testEntities/testSrc/com/intellij/util/indexing/testEntities/IndexingTestEntity.kt +++ b/platform/lang-impl/testEntities/testSrc/com/intellij/util/indexing/testEntities/IndexingTestEntity.kt @@ -15,10 +15,10 @@ interface IndexingTestEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : IndexingTestEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var roots: MutableList - override var excludedRoots: MutableList + var roots: MutableList + var excludedRoots: MutableList } companion object : EntityType() { @@ -30,7 +30,7 @@ interface IndexingTestEntity : WorkspaceEntity { excludedRoots: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): IndexingTestEntity { + ): Builder { val builder = builder() builder.roots = roots.toMutableWorkspaceList() builder.excludedRoots = excludedRoots.toMutableWorkspaceList() diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArchivePackagingElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArchivePackagingElementEntityImpl.kt index 75a700e83351..e042f10724f6 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArchivePackagingElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArchivePackagingElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } 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 + override var children: List> get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractManyChildren(CHILDREN_CONNECTION_ID, - this)!!.toList() + (this.entityLinks[EntityLink(true, - CHILDREN_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILDREN_CONNECTION_ID, + this)!!.toList() as List>) + + (this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as? List> + ?: emptyList()) } else { - this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List ?: emptyList() + this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List> + ?: emptyList() } } set(value) { @@ -320,10 +329,10 @@ class ArchivePackagingElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ArchivePackagingElementEntity(fileName, entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() - this.artifact = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() + this.artifact = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactEntityImpl.kt index 519018f1d2fd..d5411e206f1e 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(true, + ROOTELEMENT_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(true, ROOTELEMENT_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(true, + ROOTELEMENT_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } set(value) { @@ -248,18 +254,18 @@ open class ArtifactEntityImpl(private val dataSource: ArtifactEntityData) : Arti // List of non-abstract referenced types var _customProperties: List? = emptyList() - override var customProperties: List + override var customProperties: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(CUSTOMPROPERTIES_CONNECTION_ID, - this)!!.toList() + (this.entityLinks[EntityLink(true, - CUSTOMPROPERTIES_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CUSTOMPROPERTIES_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, CUSTOMPROPERTIES_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, CUSTOMPROPERTIES_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, CUSTOMPROPERTIES_CONNECTION_ID)] as? List ?: 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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ArtifactEntity(name, artifactType, includeInProjectBuild, entitySource) { this.outputUrl = this@ArtifactEntityData.outputUrl } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactOutputPackagingElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactOutputPackagingElementEntityImpl.kt index c8a2be4e9a7d..47690baae9ec 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactOutputPackagingElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactOutputPackagingElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } set(value) { @@ -265,10 +271,10 @@ class ArtifactOutputPackagingElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ArtifactOutputPackagingElementEntity(entitySource) { this.artifact = this@ArtifactOutputPackagingElementEntityData.artifact - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactPropertiesEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactPropertiesEntityImpl.kt index 49ce27297a2f..0c76b41253a6 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactPropertiesEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactPropertiesEntityImpl.kt @@ -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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ArtifactPropertiesEntity(providerType, entitySource) { this.propertiesXmlTag = this@ArtifactPropertiesEntityData.propertiesXmlTag - parents.filterIsInstance().singleOrNull()?.let { this.artifact = it } + parents.filterIsInstance().singleOrNull()?.let { this.artifact = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactRootElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactRootElementEntityImpl.kt index 7fcdff42be0c..45e28ad2b565 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactRootElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactRootElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } 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 + override var children: List> get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractManyChildren(CHILDREN_CONNECTION_ID, - this)!!.toList() + (this.entityLinks[EntityLink(true, - CHILDREN_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILDREN_CONNECTION_ID, + this)!!.toList() as List>) + + (this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as? List> + ?: emptyList()) } else { - this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List ?: emptyList() + this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List> + ?: emptyList() } } set(value) { @@ -300,10 +309,10 @@ class ArtifactRootElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ArtifactRootElementEntity(entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() - this.artifact = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() + this.artifact = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactsOrderEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactsOrderEntityImpl.kt index 9198543d87a9..f7ef6be61f7b 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactsOrderEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ArtifactsOrderEntityImpl.kt @@ -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() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ArtifactsOrderEntity(orderOfArtifacts, entitySource) { } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CustomPackagingElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CustomPackagingElementEntityImpl.kt index 9480be6a5b23..dc4484077fc4 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CustomPackagingElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/CustomPackagingElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } 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 + override var children: List> get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractManyChildren(CHILDREN_CONNECTION_ID, - this)!!.toList() + (this.entityLinks[EntityLink(true, - CHILDREN_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILDREN_CONNECTION_ID, + this)!!.toList() as List>) + + (this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as? List> + ?: emptyList()) } else { - this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List ?: emptyList() + this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List> + ?: emptyList() } } set(value) { @@ -340,10 +349,10 @@ class CustomPackagingElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return CustomPackagingElementEntity(typeId, propertiesXmlTag, entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() - this.artifact = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() + this.artifact = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryCopyPackagingElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryCopyPackagingElementEntityImpl.kt index d4478f61c8e6..2b7145a223b8 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryCopyPackagingElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryCopyPackagingElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } set(value) { @@ -215,9 +221,9 @@ class DirectoryCopyPackagingElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return DirectoryCopyPackagingElementEntity(filePath, entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryPackagingElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryPackagingElementEntityImpl.kt index 83afe90560e9..8728093b9d68 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryPackagingElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/DirectoryPackagingElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } 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 + override var children: List> get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractManyChildren(CHILDREN_CONNECTION_ID, - this)!!.toList() + (this.entityLinks[EntityLink(true, - CHILDREN_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILDREN_CONNECTION_ID, + this)!!.toList() as List>) + + (this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as? List> + ?: emptyList()) } else { - this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List ?: emptyList() + this.entityLinks[EntityLink(true, CHILDREN_CONNECTION_ID)] as List> + ?: emptyList() } } set(value) { @@ -321,10 +330,10 @@ class DirectoryPackagingElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return DirectoryPackagingElementEntity(directoryName, entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() - this.artifact = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() + this.artifact = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ExtractedDirectoryPackagingElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ExtractedDirectoryPackagingElementEntityImpl.kt index 55c0f352d1f9..e6820b4cb1ea 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ExtractedDirectoryPackagingElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ExtractedDirectoryPackagingElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } set(value) { @@ -235,9 +241,9 @@ class ExtractedDirectoryPackagingElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ExtractedDirectoryPackagingElementEntity(filePath, pathInArchive, entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileCopyPackagingElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileCopyPackagingElementEntityImpl.kt index 3440f2bc88e8..94ee82f591f9 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileCopyPackagingElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/FileCopyPackagingElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } set(value) { @@ -230,10 +236,10 @@ class FileCopyPackagingElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return FileCopyPackagingElementEntity(filePath, entitySource) { this.renamedOutputFileName = this@FileCopyPackagingElementEntityData.renamedOutputFileName - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaModuleSettingsEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaModuleSettingsEntityImpl.kt index dfd5d4b53f0c..ec0868cbb03c 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaModuleSettingsEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaModuleSettingsEntityImpl.kt @@ -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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): 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().singleOrNull()?.let { this.module = it } + parents.filterIsInstance().singleOrNull()?.let { this.module = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaResourceRootPropertiesEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaResourceRootPropertiesEntityImpl.kt index fd90afa1de6d..8575752c423e 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaResourceRootPropertiesEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaResourceRootPropertiesEntityImpl.kt @@ -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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return JavaResourceRootPropertiesEntity(generated, relativeOutputPath, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.sourceRoot = it } + parents.filterIsInstance().singleOrNull()?.let { this.sourceRoot = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaSourceRootPropertiesEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaSourceRootPropertiesEntityImpl.kt index dcfe7bbd806d..c548de5def2a 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaSourceRootPropertiesEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/JavaSourceRootPropertiesEntityImpl.kt @@ -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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return JavaSourceRootPropertiesEntity(generated, packagePrefix, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.sourceRoot = it } + parents.filterIsInstance().singleOrNull()?.let { this.sourceRoot = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/LibraryFilesPackagingElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/LibraryFilesPackagingElementEntityImpl.kt index c11987471e85..dfa7dbd803ae 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/LibraryFilesPackagingElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/LibraryFilesPackagingElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } set(value) { @@ -265,10 +271,10 @@ class LibraryFilesPackagingElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return LibraryFilesPackagingElementEntity(entitySource) { this.library = this@LibraryFilesPackagingElementEntityData.library - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleOutputPackagingElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleOutputPackagingElementEntityImpl.kt index 9fae9a1f0192..b32c5602aa70 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleOutputPackagingElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleOutputPackagingElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } set(value) { @@ -265,10 +271,10 @@ class ModuleOutputPackagingElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ModuleOutputPackagingElementEntity(entitySource) { this.module = this@ModuleOutputPackagingElementEntityData.module - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleSourcePackagingElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleSourcePackagingElementEntityImpl.kt index a56b5f8e94ff..3e4927519134 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleSourcePackagingElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleSourcePackagingElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } set(value) { @@ -265,10 +271,10 @@ class ModuleSourcePackagingElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ModuleSourcePackagingElementEntity(entitySource) { this.module = this@ModuleSourcePackagingElementEntityData.module - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleTestOutputPackagingElementEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleTestOutputPackagingElementEntityImpl.kt index 88ca88bdca31..18009d0cbc6e 100644 --- a/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleTestOutputPackagingElementEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/java/workspace/entities/ModuleTestOutputPackagingElementEntityImpl.kt @@ -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? 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) + ?: (this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity + this.entityLinks[EntityLink(false, + PARENTENTITY_CONNECTION_ID)] as? CompositePackagingElementEntity.Builder } } set(value) { @@ -265,10 +271,10 @@ class ModuleTestOutputPackagingElementEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ModuleTestOutputPackagingElementEntity(entitySource) { this.module = this@ModuleTestOutputPackagingElementEntityData.module - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ContentRootEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ContentRootEntityImpl.kt index 3bd5776c5143..8751a8eba3bb 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ContentRootEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ContentRootEntityImpl.kt @@ -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? = emptyList() - override var sourceRoots: List + override var sourceRoots: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(SOURCEROOTS_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink(true, - SOURCEROOTS_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(SOURCEROOTS_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, SOURCEROOTS_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, SOURCEROOTS_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, SOURCEROOTS_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -303,17 +306,18 @@ open class ContentRootEntityImpl(private val dataSource: ContentRootEntityData) // List of non-abstract referenced types var _excludedUrls: List? = emptyList() - override var excludedUrls: List + override var excludedUrls: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(EXCLUDEDURLS_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink(true, - EXCLUDEDURLS_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(EXCLUDEDURLS_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, EXCLUDEDURLS_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, EXCLUDEDURLS_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, EXCLUDEDURLS_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -398,9 +402,9 @@ class ContentRootEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ContentRootEntity(url, excludedPatterns, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.module = it } + parents.filterIsInstance().singleOrNull()?.let { this.module = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomSourceRootPropertiesEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomSourceRootPropertiesEntityImpl.kt index 32bb0378277e..8c92393d25d3 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomSourceRootPropertiesEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/CustomSourceRootPropertiesEntityImpl.kt @@ -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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return CustomSourceRootPropertiesEntity(propertiesXmlTag, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.sourceRoot = it } + parents.filterIsInstance().singleOrNull()?.let { this.sourceRoot = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlEntityImpl.kt index 561bb4b666a7..0b773fb69926 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlEntityImpl.kt @@ -160,7 +160,7 @@ class ExcludeUrlEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ExcludeUrlEntity(url, entitySource) { } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlOrderEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlOrderEntityImpl.kt index 8e0d02bca42e..7e7afa33eff0 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlOrderEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExcludeUrlOrderEntityImpl.kt @@ -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() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ExcludeUrlOrderEntity(order, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.contentRoot = it } + parents.filterIsInstance().singleOrNull()?.let { this.contentRoot = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExternalSystemModuleOptionsEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExternalSystemModuleOptionsEntityImpl.kt index f1f92f862835..6f2b5a1cc017 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExternalSystemModuleOptionsEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ExternalSystemModuleOptionsEntityImpl.kt @@ -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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ExternalSystemModuleOptionsEntity(entitySource) { this.externalSystem = this@ExternalSystemModuleOptionsEntityData.externalSystem this.externalSystemModuleVersion = this@ExternalSystemModuleOptionsEntityData.externalSystemModuleVersion @@ -318,7 +320,7 @@ class ExternalSystemModuleOptionsEntityData : WorkspaceEntityData().singleOrNull()?.let { this.module = it } + parents.filterIsInstance().singleOrNull()?.let { this.module = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetEntityImpl.kt index 235ee7576c97..4347e266640e 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetEntityImpl.kt @@ -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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return FacetEntity(name, moduleId, typeId, entitySource) { this.configurationXmlTag = this@FacetEntityData.configurationXmlTag - parents.filterIsInstance().singleOrNull()?.let { this.module = it } - this.underlyingFacet = parents.filterIsInstance().singleOrNull() + parents.filterIsInstance().singleOrNull()?.let { this.module = it } + this.underlyingFacet = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetsOrderEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetsOrderEntityImpl.kt index 94e495957102..a5054811da65 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetsOrderEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/FacetsOrderEntityImpl.kt @@ -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() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return FacetsOrderEntity(orderOfFacets, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.moduleEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.moduleEntity = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryEntityImpl.kt index ec46504a371f..37afee822606 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryEntityImpl.kt @@ -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? = emptyList() - override var excludedRoots: List + override var excludedRoots: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(EXCLUDEDROOTS_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink( - true, EXCLUDEDROOTS_CONNECTION_ID)] as? List ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(EXCLUDEDROOTS_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, EXCLUDEDROOTS_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, EXCLUDEDROOTS_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, EXCLUDEDROOTS_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -424,7 +427,7 @@ class LibraryEntityData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return LibraryEntity(name, tableId, roots, entitySource) { this.typeId = this@LibraryEntityData.typeId } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryPropertiesEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryPropertiesEntityImpl.kt index 8f7654fd3442..a7a961bc84d6 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryPropertiesEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/LibraryPropertiesEntityImpl.kt @@ -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 override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return LibraryPropertiesEntity(entitySource) { this.propertiesXmlTag = this@LibraryPropertiesEntityData.propertiesXmlTag - parents.filterIsInstance().singleOrNull()?.let { this.library = it } + parents.filterIsInstance().singleOrNull()?.let { this.library = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleCustomImlDataEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleCustomImlDataEntityImpl.kt index 8231cec2cc71..205793fc2d1e 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleCustomImlDataEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleCustomImlDataEntityImpl.kt @@ -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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ModuleCustomImlDataEntity(customModuleOptions, entitySource) { this.rootManagerTagCustomData = this@ModuleCustomImlDataEntityData.rootManagerTagCustomData - parents.filterIsInstance().singleOrNull()?.let { this.module = it } + parents.filterIsInstance().singleOrNull()?.let { this.module = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleEntityImpl.kt index 2a729de37015..e058cbe70611 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleEntityImpl.kt @@ -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? = emptyList() - override var contentRoots: List + override var contentRoots: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(CONTENTROOTS_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink( - true, CONTENTROOTS_CONNECTION_ID)] as? List ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CONTENTROOTS_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, CONTENTROOTS_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, CONTENTROOTS_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, CONTENTROOTS_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -261,17 +264,18 @@ open class ModuleEntityImpl(private val dataSource: ModuleEntityData) : ModuleEn // List of non-abstract referenced types var _facets: List? = emptyList() - override var facets: List + override var facets: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(FACETS_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink(true, - FACETS_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(FACETS_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, FACETS_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, FACETS_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, FACETS_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -504,7 +508,7 @@ class ModuleEntityData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ModuleEntity(name, dependencies, entitySource) { this.type = this@ModuleEntityData.type } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleGroupPathEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleGroupPathEntityImpl.kt index 942c4ec07b6f..d3ec181782d6 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleGroupPathEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/ModuleGroupPathEntityImpl.kt @@ -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() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ModuleGroupPathEntity(path, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.module = it } + parents.filterIsInstance().singleOrNull()?.let { this.module = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SdkEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SdkEntityImpl.kt index 709d2f61ffde..428d634fb90d 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SdkEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SdkEntityImpl.kt @@ -299,7 +299,7 @@ class SdkEntityData : WorkspaceEntityData.WithCalculableSymbolicId() override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SdkEntity(name, type, roots, additionalData, entitySource) { this.version = this@SdkEntityData.version this.homePath = this@SdkEntityData.homePath diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootEntityImpl.kt index 80ebf2f0718a..70a935ca605b 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootEntityImpl.kt @@ -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() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SourceRootEntity(url, rootTypeId, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.contentRoot = it } + parents.filterIsInstance().singleOrNull()?.let { this.contentRoot = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootOrderEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootOrderEntityImpl.kt index c346d7bf79fe..995d6d33793a 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootOrderEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/SourceRootOrderEntityImpl.kt @@ -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() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SourceRootOrderEntity(orderOfSourceRoots, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.contentRootEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.contentRootEntity = it } } } diff --git a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/TestModulePropertiesEntityImpl.kt b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/TestModulePropertiesEntityImpl.kt index 720120277a50..231173ef7690 100644 --- a/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/TestModulePropertiesEntityImpl.kt +++ b/platform/workspace/jps/gen/com/intellij/platform/workspace/jps/entities/TestModulePropertiesEntityImpl.kt @@ -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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return TestModulePropertiesEntity(productionModuleId, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.module = it } + parents.filterIsInstance().singleOrNull()?.let { this.module = it } } } diff --git a/platform/workspace/jps/src/com/intellij/java/workspace/entities/artifact.kt b/platform/workspace/jps/src/com/intellij/java/workspace/entities/artifact.kt index b0b1f500473a..658675ea7ad7 100644 --- a/platform/workspace/jps/src/com/intellij/java/workspace/entities/artifact.kt +++ b/platform/workspace/jps/src/com/intellij/java/workspace/entities/artifact.kt @@ -36,15 +36,15 @@ interface ArtifactEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ArtifactEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { 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 - override var artifactOutputPackagingElement: ArtifactOutputPackagingElementEntity? + var name: String + var artifactType: String + var includeInProjectBuild: Boolean + var outputUrl: VirtualFileUrl? + var rootElement: CompositePackagingElementEntity.Builder? + var customProperties: List + var artifactOutputPackagingElement: ArtifactOutputPackagingElementEntity.Builder? } companion object : EntityType() { @@ -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 { + interface Builder : WorkspaceEntity.Builder { 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() { @@ -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 : PackagingElementEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? + var parentEntity: CompositePackagingElementEntity.Builder? } companion object : EntityType>() { @@ -141,7 +141,7 @@ fun MutableEntityStorage.modifyEntity( operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): PackagingElementEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -159,11 +159,11 @@ fun MutableEntityStorage.modifyEntity( //region generated code @GeneratedCodeApiVersion(2) - interface Builder : CompositePackagingElementEntity, PackagingElementEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, PackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? - override var artifact: ArtifactEntity? - override var children: List + override var parentEntity: CompositePackagingElementEntity.Builder? + var artifact: ArtifactEntity.Builder? + var children: List> } companion object : EntityType>(PackagingElementEntity) { @@ -173,7 +173,7 @@ fun MutableEntityStorage.modifyEntity( operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): CompositePackagingElementEntity { + ): Builder { 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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, CompositePackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? - override var artifact: ArtifactEntity? - override var children: List - override var directoryName: String + override var parentEntity: CompositePackagingElementEntity.Builder? + override var artifact: ArtifactEntity.Builder? + override var children: List> + var directoryName: String } companion object : EntityType(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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, CompositePackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? - override var artifact: ArtifactEntity? - override var children: List - override var fileName: String + override var parentEntity: CompositePackagingElementEntity.Builder? + override var artifact: ArtifactEntity.Builder? + override var children: List> + var fileName: String } companion object : EntityType(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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, CompositePackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? - override var artifact: ArtifactEntity? - override var children: List + override var parentEntity: CompositePackagingElementEntity.Builder? + override var artifact: ArtifactEntity.Builder? + override var children: List> } companion object : EntityType(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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, PackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? - override var artifact: ArtifactId? + override var parentEntity: CompositePackagingElementEntity.Builder? + var artifact: ArtifactId? } companion object : EntityType(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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, PackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? - override var module: ModuleId? + override var parentEntity: CompositePackagingElementEntity.Builder? + var module: ModuleId? } companion object : EntityType(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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, PackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? - override var library: LibraryId? + override var parentEntity: CompositePackagingElementEntity.Builder? + var library: LibraryId? } companion object : EntityType(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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, PackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? - override var module: ModuleId? + override var parentEntity: CompositePackagingElementEntity.Builder? + var module: ModuleId? } companion object : EntityType(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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, PackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? - override var module: ModuleId? + override var parentEntity: CompositePackagingElementEntity.Builder? + var module: ModuleId? } companion object : EntityType(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 : FileOrDirectoryPackagingElementEntity, PackagingElementEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, PackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? - override var filePath: VirtualFileUrl + override var parentEntity: CompositePackagingElementEntity.Builder? + var filePath: VirtualFileUrl } companion object : EntityType>( @@ -521,7 +521,7 @@ fun MutableEntityStorage.modifyEntity( filePath: VirtualFileUrl, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): FileOrDirectoryPackagingElementEntity { + ): Builder { 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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, FileOrDirectoryPackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? + override var parentEntity: CompositePackagingElementEntity.Builder? 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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, FileOrDirectoryPackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? + override var parentEntity: CompositePackagingElementEntity.Builder? override var filePath: VirtualFileUrl - override var pathInArchive: String + var pathInArchive: String } companion object : EntityType(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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, FileOrDirectoryPackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? + override var parentEntity: CompositePackagingElementEntity.Builder? override var filePath: VirtualFileUrl - override var renamedOutputFileName: String? + var renamedOutputFileName: String? } companion object : EntityType(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, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, CompositePackagingElementEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositePackagingElementEntity? - override var artifact: ArtifactEntity? - override var children: List - override var typeId: String - override var propertiesXmlTag: String + override var parentEntity: CompositePackagingElementEntity.Builder? + override var artifact: ArtifactEntity.Builder? + override var children: List> + var typeId: String + var propertiesXmlTag: String } companion object : EntityType(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 { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var orderOfArtifacts: MutableList + var orderOfArtifacts: MutableList } companion object : EntityType() { @@ -723,7 +723,7 @@ interface ArtifactsOrderEntity : WorkspaceEntity { orderOfArtifacts: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ArtifactsOrderEntity { + ): Builder { val builder = builder() builder.orderOfArtifacts = orderOfArtifacts.toMutableWorkspaceList() builder.entitySource = entitySource diff --git a/platform/workspace/jps/src/com/intellij/java/workspace/entities/javaModuleSettings.kt b/platform/workspace/jps/src/com/intellij/java/workspace/entities/javaModuleSettings.kt index 3615d30c7083..371470561a38 100644 --- a/platform/workspace/jps/src/com/intellij/java/workspace/entities/javaModuleSettings.kt +++ b/platform/workspace/jps/src/com/intellij/java/workspace/entities/javaModuleSettings.kt @@ -25,15 +25,15 @@ interface JavaModuleSettingsEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : JavaModuleSettingsEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { 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 + var module: ModuleEntity.Builder + var inheritedCompilerOutput: Boolean + var excludeOutput: Boolean + var compilerOutput: VirtualFileUrl? + var compilerOutputForTests: VirtualFileUrl? + var languageLevelId: String? + var manifestAttributes: Map } companion object : EntityType() { @@ -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? diff --git a/platform/workspace/jps/src/com/intellij/java/workspace/entities/javaRoots.kt b/platform/workspace/jps/src/com/intellij/java/workspace/entities/javaRoots.kt index f32f92f45748..ac88faf7964c 100644 --- a/platform/workspace/jps/src/com/intellij/java/workspace/entities/javaRoots.kt +++ b/platform/workspace/jps/src/com/intellij/java/workspace/entities/javaRoots.kt @@ -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 { + interface Builder : WorkspaceEntity.Builder { 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() { @@ -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 - by WorkspaceEntity.extension() +var SourceRootEntity.Builder.javaSourceRoots: @Child List + 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 { + interface Builder : WorkspaceEntity.Builder { 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() { @@ -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 - by WorkspaceEntity.extension() +var SourceRootEntity.Builder.javaResourceRoots: @Child List + by WorkspaceEntity.extensionBuilder(JavaResourceRootPropertiesEntity::class.java) //endregion val SourceRootEntity.javaResourceRoots: List<@Child JavaResourceRootPropertiesEntity> diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/dependencies.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/dependencies.kt index 849e77b1ba84..6181a58bd72d 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/dependencies.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/dependencies.kt @@ -32,13 +32,13 @@ interface LibraryEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : LibraryEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var name: String - override var tableId: LibraryTableId - override var typeId: LibraryTypeId? - override var roots: MutableList - override var excludedRoots: List + var name: String + var tableId: LibraryTableId + var typeId: LibraryTypeId? + var roots: MutableList + var excludedRoots: List } companion object : EntityType() { @@ -51,7 +51,7 @@ interface LibraryEntity : WorkspaceEntityWithSymbolicId { roots: List, 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() diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/exclude.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/exclude.kt index 2249cf05d220..1a98002a8b77 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/exclude.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/exclude.kt @@ -19,9 +19,9 @@ interface ExcludeUrlEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ExcludeUrlEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var url: VirtualFileUrl + var url: VirtualFileUrl } companion object : EntityType() { @@ -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 diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/facet.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/facet.kt index c8ecd016099e..f06f6cf3f04f 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/facet.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/facet.kt @@ -27,14 +27,14 @@ interface FacetEntity: ModuleSettingsBase { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : FacetEntity, ModuleSettingsBase.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, ModuleSettingsBase.Builder { 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(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 - by WorkspaceEntity.extension() +var FacetEntity.Builder.childrenFacets: @Child List + by WorkspaceEntity.extensionBuilder(FacetEntity::class.java) //endregion val FacetEntity.childrenFacets: List<@Child FacetEntity> diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/library_extensions.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/library_extensions.kt index 96a1342c20cc..ef94ebda27ff 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/library_extensions.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/library_extensions.kt @@ -20,10 +20,10 @@ interface LibraryPropertiesEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : LibraryPropertiesEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var library: LibraryEntity - override var propertiesXmlTag: String? + var library: LibraryEntity.Builder + var propertiesXmlTag: String? } companion object : EntityType() { @@ -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) diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module.kt index ba342c37e140..be3802d3227d 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module.kt @@ -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 { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var name: String - override var type: ModuleTypeId? - override var dependencies: MutableList - override var contentRoots: List - override var facets: List + var name: String + var type: ModuleTypeId? + var dependencies: MutableList + var contentRoots: List + var facets: List } companion object : EntityType() { @@ -52,7 +47,7 @@ interface ModuleEntity : WorkspaceEntityWithSymbolicId { dependencies: List, 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 - 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 + by WorkspaceEntity.extensionBuilder(SourceRootEntity::class.java) +var ModuleEntity.Builder.testProperties: @Child TestModulePropertiesEntity.Builder? + by WorkspaceEntity.extensionBuilder(TestModulePropertiesEntity::class.java) //endregion diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_extensions.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_extensions.kt index 362dc852823c..5ae7975a442a 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_extensions.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_extensions.kt @@ -30,11 +30,11 @@ interface ModuleCustomImlDataEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ModuleCustomImlDataEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var module: ModuleEntity - override var rootManagerTagCustomData: String? - override var customModuleOptions: Map + var module: ModuleEntity.Builder + var rootManagerTagCustomData: String? + var customModuleOptions: Map } companion object : EntityType() { @@ -45,7 +45,7 @@ interface ModuleCustomImlDataEntity : WorkspaceEntity { customModuleOptions: Map, 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 { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var module: ModuleEntity - override var path: MutableList + var module: ModuleEntity.Builder + var path: MutableList } companion object : EntityType() { @@ -96,7 +96,7 @@ interface ModuleGroupPathEntity : WorkspaceEntity { path: List, 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 { + interface Builder : WorkspaceEntity.Builder { 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() { @@ -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 { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var module: ModuleEntity - override var productionModuleId: ModuleId + var module: ModuleEntity.Builder + var productionModuleId: ModuleId } companion object : EntityType() { @@ -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 diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_settings.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_settings.kt index 4f82685eaefe..3107971ab291 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_settings.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/module_settings.kt @@ -16,10 +16,10 @@ interface ModuleSettingsBase : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ModuleSettingsBase, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var name: String - override var moduleId: ModuleId + var name: String + var moduleId: ModuleId } companion object : EntityType>() { @@ -31,7 +31,7 @@ interface ModuleSettingsBase : WorkspaceEntityWithSymbolicId { moduleId: ModuleId, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ModuleSettingsBase { + ): Builder { val builder = builder() builder.name = name builder.moduleId = moduleId diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/orders.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/orders.kt index 7e7a0e27f938..9dc5c2d79f00 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/orders.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/orders.kt @@ -22,10 +22,10 @@ interface FacetsOrderEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : FacetsOrderEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var orderOfFacets: MutableList - override var moduleEntity: ModuleEntity + var orderOfFacets: MutableList + var moduleEntity: ModuleEntity.Builder } companion object : EntityType() { @@ -36,7 +36,7 @@ interface FacetsOrderEntity : WorkspaceEntity { orderOfFacets: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): FacetsOrderEntity { + ): Builder { val builder = builder() builder.orderOfFacets = orderOfFacets.toMutableWorkspaceList() builder.entitySource = entitySource diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/roots.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/roots.kt index 282ffa293066..4ed96d51403a 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/roots.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/roots.kt @@ -29,13 +29,13 @@ interface ContentRootEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ContentRootEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var module: ModuleEntity - override var url: VirtualFileUrl - override var excludedPatterns: MutableList - override var sourceRoots: List - override var excludedUrls: List + var module: ModuleEntity.Builder + var url: VirtualFileUrl + var excludedPatterns: MutableList + var sourceRoots: List + var excludedUrls: List } companion object : EntityType() { @@ -47,7 +47,7 @@ interface ContentRootEntity : WorkspaceEntity { excludedPatterns: List, 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 { + interface Builder : WorkspaceEntity.Builder { 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() { @@ -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 diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/roots_extensions.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/roots_extensions.kt index 61ff74879a5e..e59d4250db9d 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/roots_extensions.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/roots_extensions.kt @@ -26,10 +26,10 @@ interface SourceRootOrderEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SourceRootOrderEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var contentRootEntity: ContentRootEntity - override var orderOfSourceRoots: MutableList + var contentRootEntity: ContentRootEntity.Builder + var orderOfSourceRoots: MutableList } companion object : EntityType() { @@ -40,7 +40,7 @@ interface SourceRootOrderEntity : WorkspaceEntity { orderOfSourceRoots: List, 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 { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var sourceRoot: SourceRootEntity - override var propertiesXmlTag: String + var sourceRoot: SourceRootEntity.Builder + var propertiesXmlTag: String } companion object : EntityType() { @@ -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 { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var order: MutableList - override var contentRoot: ContentRootEntity + var order: MutableList + var contentRoot: ContentRootEntity.Builder } companion object : EntityType() { @@ -142,7 +142,7 @@ interface ExcludeUrlOrderEntity : WorkspaceEntity { order: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ExcludeUrlOrderEntity { + ): Builder { val builder = builder() builder.order = order.toMutableWorkspaceList() builder.entitySource = entitySource diff --git a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/sdk.kt b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/sdk.kt index feded23c3d82..bb74f175d69f 100644 --- a/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/sdk.kt +++ b/platform/workspace/jps/src/com/intellij/platform/workspace/jps/entities/sdk.kt @@ -25,14 +25,14 @@ interface SdkEntity: WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SdkEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var name: String - override var type: String - override var version: String? - override var homePath: VirtualFileUrl? - override var roots: MutableList - override var additionalData: String + var name: String + var type: String + var version: String? + var homePath: VirtualFileUrl? + var roots: MutableList + var additionalData: String } companion object : EntityType() { @@ -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 diff --git a/plugins/eclipse/gen/org/jetbrains/idea/eclipse/workspaceModel/EclipseProjectPropertiesEntityImpl.kt b/plugins/eclipse/gen/org/jetbrains/idea/eclipse/workspaceModel/EclipseProjectPropertiesEntityImpl.kt index 06ceb1609f9a..c794ffa2a179 100644 --- a/plugins/eclipse/gen/org/jetbrains/idea/eclipse/workspaceModel/EclipseProjectPropertiesEntityImpl.kt +++ b/plugins/eclipse/gen/org/jetbrains/idea/eclipse/workspaceModel/EclipseProjectPropertiesEntityImpl.kt @@ -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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return EclipseProjectPropertiesEntity(variablePaths, eclipseUrls, unknownCons, knownCons, forceConfigureJdk, expectedModuleSourcePlace, srcPlace, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.module = it } + parents.filterIsInstance().singleOrNull()?.let { this.module = it } } } diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/workspaceModel/eclipseEntities.kt b/plugins/eclipse/src/org/jetbrains/idea/eclipse/workspaceModel/eclipseEntities.kt index 2d901d53607f..1446f6576d85 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/workspaceModel/eclipseEntities.kt +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/workspaceModel/eclipseEntities.kt @@ -38,16 +38,16 @@ interface EclipseProjectPropertiesEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : EclipseProjectPropertiesEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var module: ModuleEntity - override var variablePaths: Map - override var eclipseUrls: MutableList - override var unknownCons: MutableList - override var knownCons: MutableList - override var forceConfigureJdk: Boolean - override var expectedModuleSourcePlace: Int - override var srcPlace: Map + var module: ModuleEntity.Builder + var variablePaths: Map + var eclipseUrls: MutableList + var unknownCons: MutableList + var knownCons: MutableList + var forceConfigureJdk: Boolean + var expectedModuleSourcePlace: Int + var srcPlace: Map } companion object : EntityType() { @@ -64,7 +64,7 @@ interface EclipseProjectPropertiesEntity : WorkspaceEntity { srcPlace: Map, 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? diff --git a/plugins/kotlin/base/facet/gen/org/jetbrains/kotlin/idea/workspaceModel/KotlinSettingsEntityImpl.kt b/plugins/kotlin/base/facet/gen/org/jetbrains/kotlin/idea/workspaceModel/KotlinSettingsEntityImpl.kt index 4b59b62577a5..fc616f1cf26a 100644 --- a/plugins/kotlin/base/facet/gen/org/jetbrains/kotlin/idea/workspaceModel/KotlinSettingsEntityImpl.kt +++ b/plugins/kotlin/base/facet/gen/org/jetbrains/kotlin/idea/workspaceModel/KotlinSettingsEntityImpl.kt @@ -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): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): 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().singleOrNull()?.let { this.module = it } + parents.filterIsInstance().singleOrNull()?.let { this.module = it } } } diff --git a/plugins/kotlin/base/facet/src/org/jetbrains/kotlin/idea/workspaceModel/KotlinSettingsEntity.kt b/plugins/kotlin/base/facet/src/org/jetbrains/kotlin/idea/workspaceModel/KotlinSettingsEntity.kt index b6cc806f12ef..e463373dd69c 100644 --- a/plugins/kotlin/base/facet/src/org/jetbrains/kotlin/idea/workspaceModel/KotlinSettingsEntity.kt +++ b/plugins/kotlin/base/facet/src/org/jetbrains/kotlin/idea/workspaceModel/KotlinSettingsEntity.kt @@ -55,31 +55,31 @@ interface KotlinSettingsEntity : ModuleSettingsBase { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : KotlinSettingsEntity, ModuleSettingsBase.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, ModuleSettingsBase.Builder { override var entitySource: EntitySource override var name: String override var moduleId: ModuleId - override var sourceRoots: MutableList - override var configFileItems: MutableList - override var module: ModuleEntity - override var useProjectSettings: Boolean - override var implementedModuleNames: MutableList - override var dependsOnModuleNames: MutableList - override var additionalVisibleModuleNames: MutableSet - override var productionOutputPath: String - override var testOutputPath: String - override var sourceSetNames: MutableList - override var isTestModule: Boolean - override var externalProjectId: String - override var isHmppEnabled: Boolean - override var pureKotlinSourceFolders: MutableList - override var kind: KotlinModuleKind - override var compilerArguments: String - override var compilerSettings: CompilerSettingsData - override var targetPlatform: String - override var externalSystemRunTasks: MutableList - override var version: Int - override var flushNeeded: Boolean + var sourceRoots: MutableList + var configFileItems: MutableList + var module: ModuleEntity.Builder + var useProjectSettings: Boolean + var implementedModuleNames: MutableList + var dependsOnModuleNames: MutableList + var additionalVisibleModuleNames: MutableSet + var productionOutputPath: String + var testOutputPath: String + var sourceSetNames: MutableList + var isTestModule: Boolean + var externalProjectId: String + var isHmppEnabled: Boolean + var pureKotlinSourceFolders: MutableList + var kind: KotlinModuleKind + var compilerArguments: String + var compilerSettings: CompilerSettingsData + var targetPlatform: String + var externalSystemRunTasks: MutableList + var version: Int + var flushNeeded: Boolean } companion object : EntityType(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 - by WorkspaceEntity.extension() +var ModuleEntity.Builder.kotlinSettings: @Child List + by WorkspaceEntity.extensionBuilder(KotlinSettingsEntity::class.java) //endregion diff --git a/plugins/kotlin/base/scripting/gen/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptEntityImpl.kt b/plugins/kotlin/base/scripting/gen/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptEntityImpl.kt index be0e45402160..32c646786dfb 100644 --- a/plugins/kotlin/base/scripting/gen/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptEntityImpl.kt +++ b/plugins/kotlin/base/scripting/gen/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptEntityImpl.kt @@ -268,7 +268,7 @@ class KotlinScriptEntityData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return KotlinScriptEntity(path, dependencies, entitySource) { } } diff --git a/plugins/kotlin/base/scripting/gen/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptLibraryEntityImpl.kt b/plugins/kotlin/base/scripting/gen/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptLibraryEntityImpl.kt index cd6af57805d9..4de1f1601432 100644 --- a/plugins/kotlin/base/scripting/gen/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptLibraryEntityImpl.kt +++ b/plugins/kotlin/base/scripting/gen/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptLibraryEntityImpl.kt @@ -334,7 +334,7 @@ class KotlinScriptLibraryEntityData : WorkspaceEntityData.WithCalculableSymbolic override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return KotlinScriptLibraryEntity(name, roots, indexSourceRoots, usedInScripts, entitySource) { } } diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptEntity.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptEntity.kt index 2df5cdd0f19b..3f799624edf6 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptEntity.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptEntity.kt @@ -27,10 +27,10 @@ interface KotlinScriptEntity: WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : KotlinScriptEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var path: String - override var dependencies: MutableSet + var path: String + var dependencies: MutableSet } companion object : EntityType() { @@ -42,7 +42,7 @@ interface KotlinScriptEntity: WorkspaceEntityWithSymbolicId { dependencies: Set, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): KotlinScriptEntity { + ): Builder { val builder = builder() builder.path = path builder.dependencies = dependencies.toMutableWorkspaceSet() diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptLibraryEntity.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptLibraryEntity.kt index b9b2a72aac47..fcd8f7fa8c63 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptLibraryEntity.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ucache/KotlinScriptLibraryEntity.kt @@ -49,12 +49,12 @@ interface KotlinScriptLibraryEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : KotlinScriptLibraryEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var name: String - override var roots: MutableList - override var indexSourceRoots: Boolean - override var usedInScripts: MutableSet + var name: String + var roots: MutableList + var indexSourceRoots: Boolean + var usedInScripts: MutableSet } companion object : EntityType() { @@ -68,7 +68,7 @@ interface KotlinScriptLibraryEntity : WorkspaceEntityWithSymbolicId { usedInScripts: Set, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): KotlinScriptLibraryEntity { + ): Builder { val builder = builder() builder.name = name builder.roots = roots.toMutableWorkspaceList() diff --git a/plugins/maven/src/main/gen/org/jetbrains/idea/maven/importing/workspaceModel/MavenProjectsTreeSettingsEntityImpl.kt b/plugins/maven/src/main/gen/org/jetbrains/idea/maven/importing/workspaceModel/MavenProjectsTreeSettingsEntityImpl.kt index eaa3cc0f0388..dc731e8fc5b6 100644 --- a/plugins/maven/src/main/gen/org/jetbrains/idea/maven/importing/workspaceModel/MavenProjectsTreeSettingsEntityImpl.kt +++ b/plugins/maven/src/main/gen/org/jetbrains/idea/maven/importing/workspaceModel/MavenProjectsTreeSettingsEntityImpl.kt @@ -188,7 +188,7 @@ class MavenProjectsTreeSettingsEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return MavenProjectsTreeSettingsEntity(importedFilePaths, entitySource) { } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/entities.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/entities.kt index cb06c9e7ba5e..3cd49ea40ac8 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/entities.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/entities.kt @@ -16,9 +16,9 @@ interface MavenProjectsTreeSettingsEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : MavenProjectsTreeSettingsEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var importedFilePaths: MutableList + var importedFilePaths: MutableList } companion object : EntityType() { @@ -29,7 +29,7 @@ interface MavenProjectsTreeSettingsEntity: WorkspaceEntity { importedFilePaths: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): MavenProjectsTreeSettingsEntity { + ): Builder { val builder = builder() builder.importedFilePaths = importedFilePaths.toMutableWorkspaceList() builder.entitySource = entitySource