From 72acda1aa44957e233ae56a28c99092fc3afcc3e Mon Sep 17 00:00:00 2001 From: Alex Plate Date: Wed, 13 Mar 2024 22:10:42 +0200 Subject: [PATCH] [Workspace Model] [IJPL-583] Regenerate test entities Test entities are the biggest number of entities, so they'll be processed separately GitOrigin-RevId: 7c34ae1feb18d391ebbd727b9bab1c79f8f43a96 --- .../entities/AssertConsistencyEntityImpl.kt | 2 +- .../entities/AttachedEntityImpl.kt | 14 ++-- .../entities/AttachedEntityListImpl.kt | 14 ++-- .../entities/AttachedEntityParentListImpl.kt | 3 +- .../AttachedEntityToNullableParentImpl.kt | 3 +- .../entities/AttachedEntityToParentImpl.kt | 3 +- .../entities/BooleanEntityImpl.kt | 3 +- .../entities/ChainedEntityImpl.kt | 35 +++++---- .../entities/ChainedParentEntityImpl.kt | 15 ++-- .../testEntities/entities/ChildEntityImpl.kt | 14 ++-- .../entities/ChildFirstEntityImpl.kt | 15 ++-- .../entities/ChildMultipleEntityImpl.kt | 16 +++-- .../entities/ChildSampleEntityImpl.kt | 14 ++-- .../entities/ChildSecondEntityImpl.kt | 15 ++-- .../entities/ChildSingleFirstEntityImpl.kt | 16 +++-- .../entities/ChildSingleSecondEntityImpl.kt | 16 +++-- .../entities/ChildSourceEntityImpl.kt | 14 ++-- .../entities/ChildSubEntityImpl.kt | 23 +++--- .../entities/ChildSubSubEntityImpl.kt | 14 ++-- .../entities/ChildWithExtensionParentImpl.kt | 3 +- .../entities/ChildWithNullsImpl.kt | 3 +- .../entities/ChildWithNullsMultipleImpl.kt | 3 +- .../ChildWithNullsOppositeMultipleImpl.kt | 16 +++-- .../entities/ChildWpidSampleEntityImpl.kt | 16 +++-- .../entities/CollectionFieldEntityImpl.kt | 3 +- .../entities/ComposedIdSoftRefEntityImpl.kt | 2 +- .../entities/ComposedLinkEntityImpl.kt | 2 +- .../CompositeChildAbstractEntityImpl.kt | 42 ++++++----- .../entities/ContentRootTestEntityImpl.kt | 35 +++++---- .../entities/DefaultValueEntityImpl.kt | 3 +- .../entities/EntityWithSoftLinksImpl.kt | 14 ++-- .../entities/FacetTestEntityImpl.kt | 15 ++-- .../entities/FinalFieldsEntityImpl.kt | 3 +- .../entities/FirstEntityWithPIdImpl.kt | 3 +- .../entities/HeadAbstractionEntityImpl.kt | 13 ++-- .../testEntities/entities/IntEntityImpl.kt | 3 +- .../testEntities/entities/KeyChildImpl.kt | 15 ++-- .../testEntities/entities/KeyParentImpl.kt | 15 ++-- .../testEntities/entities/LeftEntityImpl.kt | 37 +++++----- .../entities/LinkedListEntityImpl.kt | 2 +- .../testEntities/entities/ListEntityImpl.kt | 3 +- .../entities/ListVFUEntityImpl.kt | 3 +- .../testEntities/entities/MainEntityImpl.kt | 3 +- .../entities/MainEntityListImpl.kt | 3 +- .../entities/MainEntityParentListImpl.kt | 14 ++-- .../entities/MainEntityToParentImpl.kt | 23 +++--- .../testEntities/entities/MiddleEntityImpl.kt | 15 ++-- .../entities/ModuleTestEntityImpl.kt | 25 ++++--- .../entities/NamedChildEntityImpl.kt | 14 ++-- .../testEntities/entities/NamedEntityImpl.kt | 14 ++-- .../entities/NullableVFUEntityImpl.kt | 3 +- .../entities/OneEntityWithSymbolicIdImpl.kt | 3 +- .../entities/OoChildAlsoWithPidEntityImpl.kt | 15 ++-- .../entities/OoChildEntityImpl.kt | 14 ++-- .../OoChildForParentWithPidEntityImpl.kt | 15 ++-- .../OoChildWithNullableParentEntityImpl.kt | 14 ++-- .../entities/OoChildWithPidEntityImpl.kt | 15 ++-- .../entities/OoParentEntityImpl.kt | 21 +++--- .../entities/OoParentWithPidEntityImpl.kt | 23 +++--- .../entities/OoParentWithoutPidEntityImpl.kt | 12 ++-- .../entities/OptionalIntEntityImpl.kt | 3 +- .../OptionalOneToOneChildEntityImpl.kt | 16 +++-- .../OptionalOneToOneParentEntityImpl.kt | 14 ++-- .../entities/OptionalStringEntityImpl.kt | 3 +- .../entities/ParentAbEntityImpl.kt | 18 +++-- .../entities/ParentChainEntityImpl.kt | 14 ++-- .../testEntities/entities/ParentEntityImpl.kt | 11 +-- .../entities/ParentMultipleEntityImpl.kt | 15 ++-- .../entities/ParentSingleAbEntityImpl.kt | 16 +++-- .../entities/ParentSubEntityImpl.kt | 12 ++-- .../entities/ParentWithExtensionEntityImpl.kt | 3 +- .../ParentWithLinkToAbstractChildImpl.kt | 15 ++-- .../entities/ParentWithNullsImpl.kt | 13 ++-- .../entities/ParentWithNullsMultipleImpl.kt | 14 ++-- .../ParentWithNullsOppositeMultipleImpl.kt | 3 +- .../entities/ProjectModelTestEntityImpl.kt | 38 +++++----- .../testEntities/entities/RightEntityImpl.kt | 37 +++++----- .../entities/SampleEntity2Impl.kt | 3 +- .../testEntities/entities/SampleEntityImpl.kt | 14 ++-- .../SampleWithSymbolicIdEntityImpl.kt | 14 ++-- .../entities/SecondEntityWithPIdImpl.kt | 3 +- .../entities/SecondSampleEntityImpl.kt | 2 +- .../entities/SelfLinkedEntityImpl.kt | 15 ++-- .../testEntities/entities/SetVFUEntityImpl.kt | 3 +- .../entities/SimpleChildAbstractEntityImpl.kt | 17 +++-- .../entities/SoftLinkReferencedChildImpl.kt | 16 +++-- .../testEntities/entities/SourceEntityImpl.kt | 14 ++-- .../entities/SourceRootTestEntityImpl.kt | 16 +++-- .../entities/SourceRootTestOrderEntityImpl.kt | 16 +++-- .../entities/SpecificChildEntityImpl.kt | 16 +++-- ...SpecificChildWithLinkToParentEntityImpl.kt | 2 +- .../entities/SpecificParentImpl.kt | 14 ++-- .../testEntities/entities/StringEntityImpl.kt | 3 +- .../entities/SymbolicIdEntityImpl.kt | 2 +- .../testEntities/entities/TreeEntityImpl.kt | 26 ++++--- .../entities/TreeMultiparentLeafEntityImpl.kt | 37 ++++++---- .../entities/TreeMultiparentRootEntityImpl.kt | 13 ++-- .../entities/UnknownFieldEntityImpl.kt | 3 +- .../testEntities/entities/VFUEntity2Impl.kt | 3 +- .../testEntities/entities/VFUEntityImpl.kt | 3 +- .../VFUWithTwoPropertiesEntityImpl.kt | 3 +- .../entities/WithListSoftLinksEntityImpl.kt | 2 +- .../entities/WithSealedEntityImpl.kt | 3 +- .../entities/WithSoftLinkEntityImpl.kt | 2 +- .../entities/XChildChildEntityImpl.kt | 26 ++++--- .../testEntities/entities/XChildEntityImpl.kt | 26 ++++--- .../XChildWithOptionalParentEntityImpl.kt | 15 ++-- .../entities/XParentEntityImpl.kt | 39 +++++----- .../AnotherOneToManyRefEntityImpl.kt | 15 ++-- .../AnotherOneToOneRefEntityImpl.kt | 15 ++-- .../ChangedComputablePropEntityImpl.kt | 3 +- .../ChangedComputablePropsOrderEntityImpl.kt | 3 +- .../cacheVersion/ChangedEnumNameEntityImpl.kt | 3 +- .../ChangedPropsOrderEntityImpl.kt | 3 +- .../ChangedValueTypeEntityImpl.kt | 3 +- .../cacheVersion/ComputablePropEntityImpl.kt | 3 +- .../cacheVersion/DefaultPropEntityImpl.kt | 3 +- .../cacheVersion/EnumPropsEntityImpl.kt | 3 +- .../cacheVersion/KeyPropEntityImpl.kt | 3 +- .../cacheVersion/NotNullToNullEntityImpl.kt | 3 +- .../cacheVersion/NullToNotNullEntityImpl.kt | 3 +- .../cacheVersion/OneToManyRefEntityImpl.kt | 16 +++-- .../cacheVersion/OneToOneRefEntityImpl.kt | 14 ++-- .../cacheVersion/SimpleObjectsEntityImpl.kt | 3 +- .../cacheVersion/SimplePropsEntityImpl.kt | 3 +- .../SimpleSealedClassEntityImpl.kt | 3 +- .../cacheVersion/SubsetEnumEntityImpl.kt | 3 +- .../SubsetSealedClassEntityImpl.kt | 3 +- .../AnotherOneToManyRefEntityImpl.kt | 15 ++-- .../AnotherOneToOneRefEntityImpl.kt | 15 ++-- .../ChangedComputablePropEntityImpl.kt | 2 +- .../ChangedComputablePropsOrderEntityImpl.kt | 2 +- .../ChangedEnumNameEntityImpl.kt | 3 +- .../ChangedPropsOrderEntityImpl.kt | 3 +- .../ChangedValueTypeEntityImpl.kt | 3 +- .../ComputablePropEntityImpl.kt | 3 +- .../currentVersion/DefaultPropEntityImpl.kt | 3 +- .../currentVersion/EnumPropsEntityImpl.kt | 3 +- .../currentVersion/KeyPropEntityImpl.kt | 3 +- .../currentVersion/NotNullToNullEntityImpl.kt | 3 +- .../currentVersion/NullToNotNullEntityImpl.kt | 3 +- .../currentVersion/OneToManyRefEntityImpl.kt | 14 ++-- .../currentVersion/OneToOneRefEntityImpl.kt | 16 +++-- .../currentVersion/SimpleObjectsEntityImpl.kt | 3 +- .../currentVersion/SimplePropsEntityImpl.kt | 3 +- .../SimpleSealedClassEntityImpl.kt | 3 +- .../currentVersion/SubsetEnumEntityImpl.kt | 3 +- .../SubsetSealedClassEntityImpl.kt | 2 +- .../AbstractExtensionToAbstractParent.kt | 24 +++---- .../entities/AbstractExtensionToChild.kt | 29 ++++---- .../entities/AbstractExtensionToParent.kt | 22 +++--- .../testEntities/entities/Abstraction.kt | 57 ++++++++------- .../testEntities/entities/ChainAbstract.kt | 38 +++++----- .../testEntities/entities/ChainedEntity.kt | 18 ++--- .../testEntities/entities/CollectionEntity.kt | 8 +-- .../entities/DefaultValueEntity.kt | 10 +-- .../entities/EntititesWithPersistentId.kt | 12 ++-- .../entities/ExtensionFieldEntity.kt | 23 +++--- .../entities/ExtensionFieldEntityList.kt | 23 +++--- .../ExtensionFieldEntityParentList.kt | 23 +++--- .../entities/ExtensionFieldEntityToParent.kt | 35 ++++----- .../entities/FinalFieldsEntity.kt | 10 +-- .../storage/testEntities/entities/JpsLike.kt | 50 ++++++------- .../testEntities/entities/KeyFieldEntities.kt | 18 ++--- .../testEntities/entities/LinkedListEntity.kt | 14 ++-- .../testEntities/entities/MultipleAbstract.kt | 30 ++++---- .../storage/testEntities/entities/OneToOne.kt | 71 ++++++++++--------- .../testEntities/entities/OptionalOneToOne.kt | 14 ++-- .../storage/testEntities/entities/Parent.kt | 40 +++++------ .../testEntities/entities/ParentAndChild.kt | 21 +++--- .../entities/ParentAndChildWithNulls.kt | 23 +++--- .../entities/ParentAndMultipleChildren.kt | 16 ++--- .../entities/RiderTestEntities.kt | 14 ++-- .../testEntities/entities/SampleEntity.kt | 56 +++++++-------- .../entities/SampleWithSymbolicIdEntity.kt | 26 +++---- .../testEntities/entities/SecondEntities.kt | 22 +++--- .../testEntities/entities/SelfLinkedEntity.kt | 10 +-- .../testEntities/entities/SingleAbstract.kt | 30 ++++---- .../testEntities/entities/SubChildren.kt | 24 +++---- .../testEntities/entities/TreeEntity.kt | 10 +-- .../entities/TreeMultiparentEntity.kt | 20 +++--- .../entities/UnknownFieldEntity.kt | 6 +- .../entities/WithAssertConsistency.kt | 11 ++- .../entities/WithNullsMultiple.kt | 23 +++--- .../entities/WithNullsMultipleOpposite.kt | 23 +++--- .../testEntities/entities/WithPersistentId.kt | 44 ++++++------ .../testEntities/entities/WithSealedEntity.kt | 8 +-- .../entities/WithSoftLinkEntityData.kt | 51 +++++++------ .../ChangedComputablePropEntity.kt | 6 +- .../ChangedComputablePropsOrderEntity.kt | 10 +-- .../cacheVersion/ChangedEnumNameEntity.kt | 6 +- .../cacheVersion/ChangedPropsOrderEntity.kt | 12 ++-- .../cacheVersion/ChangedValueTypeEntity.kt | 10 +-- .../cacheVersion/ComputablePropEntity.kt | 8 +-- .../cacheVersion/DefaultPropEntity.kt | 10 +-- .../entities/cacheVersion/EnumPropsEntity.kt | 6 +- .../entities/cacheVersion/KeyPropEntity.kt | 10 +-- .../cacheVersion/NotNullToNullEntity.kt | 10 +-- .../cacheVersion/NullToNotNullEntity.kt | 10 +-- .../cacheVersion/OneToManyRefEntity.kt | 18 ++--- .../cacheVersion/OneToOneRefEntity.kt | 20 +++--- .../cacheVersion/SimpleObjectsEntity.kt | 6 +- .../cacheVersion/SimplePropsEntity.kt | 14 ++-- .../cacheVersion/SimpleSealedClassEntity.kt | 8 +-- .../entities/cacheVersion/SubsetEnumEntity.kt | 6 +- .../cacheVersion/SubsetSealedClassEntity.kt | 6 +- .../ChangedComputablePropEntity.kt | 6 +- .../ChangedComputablePropsOrderEntity.kt | 10 +-- .../currentVersion/ChangedEnumNameEntity.kt | 6 +- .../currentVersion/ChangedPropsOrderEntity.kt | 12 ++-- .../currentVersion/ChangedValueTypeEntity.kt | 10 +-- .../currentVersion/ComputablePropEntity.kt | 10 +-- .../currentVersion/DefaultPropEntity.kt | 10 +-- .../currentVersion/EnumPropsEntity.kt | 6 +- .../entities/currentVersion/KeyPropEntity.kt | 10 +-- .../currentVersion/NotNullToNullEntity.kt | 10 +-- .../currentVersion/NullToNotNullEntity.kt | 10 +-- .../currentVersion/OneToManyRefEntity.kt | 18 ++--- .../currentVersion/OneToOneRefEntity.kt | 20 +++--- .../currentVersion/SimpleObjectsEntity.kt | 6 +- .../currentVersion/SimplePropsEntity.kt | 14 ++-- .../currentVersion/SimpleSealedClassEntity.kt | 8 +-- .../currentVersion/SubsetEnumEntity.kt | 6 +- .../currentVersion/SubsetSealedClassEntity.kt | 6 +- .../entities/primitiveEntities.kt | 36 +++++----- .../storage/testEntities/entities/vfu.kt | 47 ++++++------ 226 files changed, 1674 insertions(+), 1348 deletions(-) diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AssertConsistencyEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AssertConsistencyEntityImpl.kt index 7052a50bf63d..1a3f538a19a8 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AssertConsistencyEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AssertConsistencyEntityImpl.kt @@ -153,7 +153,7 @@ class AssertConsistencyEntityData : WorkspaceEntityData override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return AssertConsistencyEntity(passCheck, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityImpl.kt index 733175f6f969..8c0b8c42400a 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,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 @GeneratedCodeApiVersion(2) @@ -124,14 +126,16 @@ open class AttachedEntityImpl(private val dataSource: AttachedEntityData) : Atta } - override var ref: MainEntity + override var ref: MainEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(REF_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, REF_CONNECTION_ID)]!! as MainEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(REF_CONNECTION_ID, this) as? MainEntity.Builder) + ?: (this.entityLinks[EntityLink(false, REF_CONNECTION_ID)]!! as MainEntity.Builder) } else { - this.entityLinks[EntityLink(false, REF_CONNECTION_ID)]!! as MainEntity + this.entityLinks[EntityLink(false, REF_CONNECTION_ID)]!! as MainEntity.Builder } } set(value) { @@ -209,9 +213,9 @@ class AttachedEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return AttachedEntity(data, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.ref = it } + parents.filterIsInstance().singleOrNull()?.let { this.ref = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityListImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityListImpl.kt index d11127c5957d..8b06568eb7e2 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityListImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityListImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,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) @@ -114,14 +116,16 @@ open class AttachedEntityListImpl(private val dataSource: AttachedEntityListData } - override var ref: MainEntityList? + override var ref: MainEntityList.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(REF_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, REF_CONNECTION_ID)] as? MainEntityList + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(REF_CONNECTION_ID, this) as? MainEntityList.Builder) + ?: (this.entityLinks[EntityLink(false, REF_CONNECTION_ID)] as? MainEntityList.Builder) } else { - this.entityLinks[EntityLink(false, REF_CONNECTION_ID)] as? MainEntityList + this.entityLinks[EntityLink(false, REF_CONNECTION_ID)] as? MainEntityList.Builder } } set(value) { @@ -203,9 +207,9 @@ class AttachedEntityListData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return AttachedEntityList(data, entitySource) { - this.ref = parents.filterIsInstance().singleOrNull() + this.ref = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityParentListImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityParentListImpl.kt index bc10a271bf92..946c101ad578 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityParentListImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityParentListImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -158,7 +159,7 @@ class AttachedEntityParentListData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return AttachedEntityParentList(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToNullableParentImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToNullableParentImpl.kt index eeb7e9042aac..c45d91e35420 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToNullableParentImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToNullableParentImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -158,7 +159,7 @@ class AttachedEntityToNullableParentData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return AttachedEntityToNullableParent(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToParentImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToParentImpl.kt index 8e7fd77d5e51..5445c5ffcf77 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToParentImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/AttachedEntityToParentImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -158,7 +159,7 @@ class AttachedEntityToParentData : WorkspaceEntityData() override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return AttachedEntityToParent(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/BooleanEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/BooleanEntityImpl.kt index e0cf0b056205..fe7fbe6b4d83 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/BooleanEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/BooleanEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -153,7 +154,7 @@ class BooleanEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return BooleanEntity(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChainedEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChainedEntityImpl.kt index e1cc5324ef1a..4fdfc31ff637 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChainedEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChainedEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -22,6 +23,7 @@ import com.intellij.platform.workspace.storage.impl.updateOneToOneChildOfParent 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 @GeneratedCodeApiVersion(2) @@ -138,15 +140,16 @@ open class ChainedEntityImpl(private val dataSource: ChainedEntityData) : Chaine changedProperty.add("data") } - override var parent: ChainedEntity? + override var parent: ChainedEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENT_CONNECTION_ID)] as? ChainedEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENT_CONNECTION_ID, this) as? ChainedEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? ChainedEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? ChainedEntity + this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? ChainedEntity.Builder } } set(value) { @@ -173,14 +176,16 @@ open class ChainedEntityImpl(private val dataSource: ChainedEntityData) : Chaine changedProperty.add("parent") } - override var child: ChainedEntity? + override var child: ChainedEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChainedEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, this) as? ChainedEntity.Builder) + ?: (this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChainedEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChainedEntity + this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChainedEntity.Builder } } set(value) { @@ -207,15 +212,17 @@ open class ChainedEntityImpl(private val dataSource: ChainedEntityData) : Chaine changedProperty.add("child") } - override var generalParent: ChainedParentEntity? + override var generalParent: ChainedParentEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(GENERALPARENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - GENERALPARENT_CONNECTION_ID)] as? ChainedParentEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(GENERALPARENT_CONNECTION_ID, + this) as? ChainedParentEntity.Builder) + ?: (this.entityLinks[EntityLink(false, GENERALPARENT_CONNECTION_ID)] as? ChainedParentEntity.Builder) } else { - this.entityLinks[EntityLink(false, GENERALPARENT_CONNECTION_ID)] as? ChainedParentEntity + this.entityLinks[EntityLink(false, GENERALPARENT_CONNECTION_ID)] as? ChainedParentEntity.Builder } } set(value) { @@ -289,10 +296,10 @@ class ChainedEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChainedEntity(data, entitySource) { - this.parent = parents.filterIsInstance().singleOrNull() - this.generalParent = parents.filterIsInstance().singleOrNull() + this.parent = parents.filterIsInstance().singleOrNull() + this.generalParent = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChainedParentEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChainedParentEntityImpl.kt index b46203abda40..99205bbb2cc7 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChainedParentEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChainedParentEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @GeneratedCodeApiVersion(2) @@ -117,17 +119,18 @@ open class ChainedParentEntityImpl(private val dataSource: ChainedParentEntityDa // List of non-abstract referenced types var _child: List? = emptyList() - override var child: List + override var child: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(CHILD_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink(true, - CHILD_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILD_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -202,7 +205,7 @@ class ChainedParentEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChainedParentEntity(entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildEntityImpl.kt index 63560fcb635d..7ddac189d456 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildEntityImpl.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 @GeneratedCodeApiVersion(2) @@ -131,15 +132,16 @@ open class ChildEntityImpl(private val dataSource: ChildEntityData) : ChildEntit changedProperty.add("childData") } - override var parentEntity: ParentEntity + override var parentEntity: ParentEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as ParentEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? ParentEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentEntity.Builder } } set(value) { @@ -209,9 +211,9 @@ class ChildEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildEntity(childData, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildFirstEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildFirstEntityImpl.kt index 9c9b7517142e..0c389f6ddbc1 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildFirstEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildFirstEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,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 @GeneratedCodeApiVersion(2) @@ -144,15 +146,16 @@ open class ChildFirstEntityImpl(private val dataSource: ChildFirstEntityData) : changedProperty.add("commonData") } - override var parentEntity: ParentAbEntity + override var parentEntity: ParentAbEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as ParentAbEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? ParentAbEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentAbEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentAbEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentAbEntity.Builder } } set(value) { @@ -236,9 +239,9 @@ class ChildFirstEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildFirstEntity(commonData, firstData, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildMultipleEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildMultipleEntityImpl.kt index a2421500d0ed..5bcfcfd07177 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildMultipleEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildMultipleEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,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) @@ -133,15 +135,17 @@ open class ChildMultipleEntityImpl(private val dataSource: ChildMultipleEntityDa changedProperty.add("childData") } - override var parentEntity: ParentMultipleEntity + override var parentEntity: ParentMultipleEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as ParentMultipleEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? ParentMultipleEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentMultipleEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentMultipleEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentMultipleEntity.Builder } } set(value) { @@ -215,9 +219,9 @@ class ChildMultipleEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildMultipleEntity(childData, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSampleEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSampleEntityImpl.kt index e3745d31b93d..beaf88f90582 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSampleEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSampleEntityImpl.kt @@ -20,6 +20,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 java.util.UUID @@ -129,15 +130,16 @@ open class ChildSampleEntityImpl(private val dataSource: ChildSampleEntityData) changedProperty.add("data") } - override var parentEntity: SampleEntity? + override var parentEntity: SampleEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)] as? SampleEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? SampleEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? SampleEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? SampleEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? SampleEntity.Builder } } set(value) { @@ -211,9 +213,9 @@ class ChildSampleEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildSampleEntity(data, entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSecondEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSecondEntityImpl.kt index cd19f30bb52f..61468fad4948 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSecondEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSecondEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,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 @GeneratedCodeApiVersion(2) @@ -144,15 +146,16 @@ open class ChildSecondEntityImpl(private val dataSource: ChildSecondEntityData) changedProperty.add("commonData") } - override var parentEntity: ParentAbEntity + override var parentEntity: ParentAbEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as ParentAbEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? ParentAbEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentAbEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentAbEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentAbEntity.Builder } } set(value) { @@ -236,9 +239,9 @@ class ChildSecondEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildSecondEntity(commonData, secondData, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSingleFirstEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSingleFirstEntityImpl.kt index cef91c01fd5b..f5be2019e8a1 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSingleFirstEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSingleFirstEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToAbstractOneParen 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 @GeneratedCodeApiVersion(2) @@ -145,15 +147,17 @@ open class ChildSingleFirstEntityImpl(private val dataSource: ChildSingleFirstEn changedProperty.add("commonData") } - override var parentEntity: ParentSingleAbEntity + override var parentEntity: ParentSingleAbEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as ParentSingleAbEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? ParentSingleAbEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentSingleAbEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentSingleAbEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentSingleAbEntity.Builder } } set(value) { @@ -233,9 +237,9 @@ class ChildSingleFirstEntityData : WorkspaceEntityData() override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildSingleFirstEntity(commonData, firstData, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSingleSecondEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSingleSecondEntityImpl.kt index 5ae18c3fcaf7..ad6c63513f7f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSingleSecondEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSingleSecondEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToAbstractOneParen 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 @GeneratedCodeApiVersion(2) @@ -145,15 +147,17 @@ open class ChildSingleSecondEntityImpl(private val dataSource: ChildSingleSecond changedProperty.add("commonData") } - override var parentEntity: ParentSingleAbEntity + override var parentEntity: ParentSingleAbEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as ParentSingleAbEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? ParentSingleAbEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentSingleAbEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentSingleAbEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentSingleAbEntity.Builder } } set(value) { @@ -233,9 +237,9 @@ class ChildSingleSecondEntityData : WorkspaceEntityData override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildSingleSecondEntity(commonData, secondData, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSourceEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSourceEntityImpl.kt index 1faf0ca016e7..8db3c2898a20 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSourceEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSourceEntityImpl.kt @@ -20,6 +20,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 java.util.UUID @@ -139,15 +140,16 @@ open class ChildSourceEntityImpl(private val dataSource: ChildSourceEntityData) changedProperty.add("data") } - override var parentEntity: SourceEntity + override var parentEntity: SourceEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as SourceEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? SourceEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as SourceEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as SourceEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as SourceEntity.Builder } } set(value) { @@ -221,9 +223,9 @@ class ChildSourceEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildSourceEntity(data, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSubEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSubEntityImpl.kt index 8873770094e1..42d77bb702b0 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSubEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSubEntityImpl.kt @@ -20,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.updateOneToOneChildOfParent 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 kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads @@ -125,15 +126,16 @@ open class ChildSubEntityImpl(private val dataSource: ChildSubEntityData) : Chil } - override var parentEntity: ParentSubEntity + override var parentEntity: ParentSubEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as ParentSubEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? ParentSubEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentSubEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentSubEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ParentSubEntity.Builder } } set(value) { @@ -160,15 +162,16 @@ open class ChildSubEntityImpl(private val dataSource: ChildSubEntityData) : Chil changedProperty.add("parentEntity") } - override var child: ChildSubSubEntity? + override var child: ChildSubSubEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILD_CONNECTION_ID)] as? ChildSubSubEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, this) as? ChildSubSubEntity.Builder) + ?: (this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildSubSubEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildSubSubEntity + this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildSubSubEntity.Builder } } set(value) { @@ -236,9 +239,9 @@ class ChildSubEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildSubEntity(entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSubSubEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSubSubEntityImpl.kt index c92d41546c51..7edc7e4561c3 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSubSubEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildSubSubEntityImpl.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 kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads @@ -127,15 +128,16 @@ open class ChildSubSubEntityImpl(private val dataSource: ChildSubSubEntityData) } - override var parentEntity: ChildSubEntity + override var parentEntity: ChildSubEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as ChildSubEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? ChildSubEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ChildSubEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ChildSubEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as ChildSubEntity.Builder } } set(value) { @@ -213,9 +215,9 @@ class ChildSubSubEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildSubSubEntity(childData, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithExtensionParentImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithExtensionParentImpl.kt index a8607544045d..8e7a08461a9b 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithExtensionParentImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithExtensionParentImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -159,7 +160,7 @@ class ChildWithExtensionParentData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildWithExtensionParent(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsImpl.kt index bccc11e9f1a9..8dfbcb0f0e79 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -157,7 +158,7 @@ class ChildWithNullsData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildWithNulls(childData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsMultipleImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsMultipleImpl.kt index 96bcbd79011c..e8072fd9059f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsMultipleImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsMultipleImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -158,7 +159,7 @@ class ChildWithNullsMultipleData : WorkspaceEntityData() override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildWithNullsMultiple(childData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsOppositeMultipleImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsOppositeMultipleImpl.kt index 5336d00bb4bf..9454750d51a5 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsOppositeMultipleImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWithNullsOppositeMultipleImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,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) @@ -124,15 +126,17 @@ open class ChildWithNullsOppositeMultipleImpl(private val dataSource: ChildWithN changedProperty.add("childData") } - override var parentEntity: ParentWithNullsOppositeMultiple? + override var parentEntity: ParentWithNullsOppositeMultiple.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)] as? ParentWithNullsOppositeMultiple + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? ParentWithNullsOppositeMultiple.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? ParentWithNullsOppositeMultiple.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? ParentWithNullsOppositeMultiple + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? ParentWithNullsOppositeMultiple.Builder } } set(value) { @@ -206,9 +210,9 @@ class ChildWithNullsOppositeMultipleData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildWithNullsOppositeMultiple(childData, entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWpidSampleEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWpidSampleEntityImpl.kt index c038586cf38c..2ecf631ca47f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWpidSampleEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ChildWpidSampleEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,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 @@ -126,15 +128,17 @@ open class ChildWpidSampleEntityImpl(private val dataSource: ChildWpidSampleEnti changedProperty.add("data") } - override var parentEntity: SampleWithSymbolicIdEntity? + override var parentEntity: SampleWithSymbolicIdEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)] as? SampleWithSymbolicIdEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? SampleWithSymbolicIdEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? SampleWithSymbolicIdEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? SampleWithSymbolicIdEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? SampleWithSymbolicIdEntity.Builder } } set(value) { @@ -208,9 +212,9 @@ class ChildWpidSampleEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChildWpidSampleEntity(data, entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/CollectionFieldEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/CollectionFieldEntityImpl.kt index 57528f518ed9..52a4ff3de252 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/CollectionFieldEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/CollectionFieldEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -228,7 +229,7 @@ class CollectionFieldEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return CollectionFieldEntity(versions, names, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ComposedIdSoftRefEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ComposedIdSoftRefEntityImpl.kt index b44851d1b1ad..2c2d8bf9aa87 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ComposedIdSoftRefEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ComposedIdSoftRefEntityImpl.kt @@ -224,7 +224,7 @@ class ComposedIdSoftRefEntityData : WorkspaceEntityData.WithCalculableSymbolicId override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ComposedIdSoftRefEntity(myName, link, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ComposedLinkEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ComposedLinkEntityImpl.kt index 8e4c5c38e0c8..c88c75cbced2 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ComposedLinkEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ComposedLinkEntityImpl.kt @@ -199,7 +199,7 @@ class ComposedLinkEntityData : WorkspaceEntityData(), SoftLi override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ComposedLinkEntity(link, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/CompositeChildAbstractEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/CompositeChildAbstractEntityImpl.kt index f5ade3dc3cfc..fbef02e13ed9 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/CompositeChildAbstractEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/CompositeChildAbstractEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -24,6 +25,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 @GeneratedCodeApiVersion(2) @@ -137,15 +139,18 @@ open class CompositeChildAbstractEntityImpl(private val dataSource: CompositeChi } - override var parentInList: CompositeAbstractEntity? + override var parentInList: CompositeAbstractEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractManyParent(PARENTINLIST_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTINLIST_CONNECTION_ID)] as? CompositeAbstractEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTINLIST_CONNECTION_ID, + this) as? CompositeAbstractEntity.Builder) + ?: (this.entityLinks[EntityLink(false, + PARENTINLIST_CONNECTION_ID)] as? CompositeAbstractEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTINLIST_CONNECTION_ID)] as? CompositeAbstractEntity + this.entityLinks[EntityLink(false, PARENTINLIST_CONNECTION_ID)] as? CompositeAbstractEntity.Builder } } set(value) { @@ -176,17 +181,19 @@ open class CompositeChildAbstractEntityImpl(private val dataSource: CompositeChi changedProperty.add("parentInList") } - 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) { @@ -219,15 +226,16 @@ open class CompositeChildAbstractEntityImpl(private val dataSource: CompositeChi changedProperty.add("children") } - override var parentEntity: ParentChainEntity? + override var parentEntity: ParentChainEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)] as? ParentChainEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? ParentChainEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? ParentChainEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? ParentChainEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? ParentChainEntity.Builder } } set(value) { @@ -295,10 +303,10 @@ class CompositeChildAbstractEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return CompositeChildAbstractEntity(entitySource) { - this.parentInList = parents.filterIsInstance().singleOrNull() - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentInList = parents.filterIsInstance>().singleOrNull() + this.parentEntity = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ContentRootTestEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ContentRootTestEntityImpl.kt index e015467d1d8e..ca057ac709ae 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ContentRootTestEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ContentRootTestEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -22,6 +23,7 @@ import com.intellij.platform.workspace.storage.impl.updateOneToManyParentOfChild 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 @GeneratedCodeApiVersion(2) @@ -144,15 +146,16 @@ open class ContentRootTestEntityImpl(private val dataSource: ContentRootTestEnti } - override var module: ModuleTestEntity + override var module: ModuleTestEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(MODULE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - MODULE_CONNECTION_ID)]!! as ModuleTestEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULE_CONNECTION_ID, this) as? ModuleTestEntity.Builder) + ?: (this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleTestEntity.Builder) } else { - this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleTestEntity + this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleTestEntity.Builder } } set(value) { @@ -183,15 +186,17 @@ open class ContentRootTestEntityImpl(private val dataSource: ContentRootTestEnti changedProperty.add("module") } - override var sourceRootOrder: SourceRootTestOrderEntity? + override var sourceRootOrder: SourceRootTestOrderEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(SOURCEROOTORDER_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - SOURCEROOTORDER_CONNECTION_ID)] as? SourceRootTestOrderEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(SOURCEROOTORDER_CONNECTION_ID, + this) as? SourceRootTestOrderEntity.Builder) + ?: (this.entityLinks[EntityLink(true, SOURCEROOTORDER_CONNECTION_ID)] as? SourceRootTestOrderEntity.Builder) } else { - this.entityLinks[EntityLink(true, SOURCEROOTORDER_CONNECTION_ID)] as? SourceRootTestOrderEntity + this.entityLinks[EntityLink(true, SOURCEROOTORDER_CONNECTION_ID)] as? SourceRootTestOrderEntity.Builder } } set(value) { @@ -220,16 +225,18 @@ open class ContentRootTestEntityImpl(private val dataSource: ContentRootTestEnti // 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) { @@ -304,9 +311,9 @@ class ContentRootTestEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ContentRootTestEntity(entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.module = it } + parents.filterIsInstance().singleOrNull()?.let { this.module = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/DefaultValueEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/DefaultValueEntityImpl.kt index ccdb1d930525..7ef45bcf606f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/DefaultValueEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/DefaultValueEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -181,7 +182,7 @@ class DefaultValueEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return DefaultValueEntity(name, entitySource) { this.isGenerated = this@DefaultValueEntityData.isGenerated this.anotherName = this@DefaultValueEntityData.anotherName diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/EntityWithSoftLinksImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/EntityWithSoftLinksImpl.kt index 11a8fc4e29b4..722416021754 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/EntityWithSoftLinksImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/EntityWithSoftLinksImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -24,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 @GeneratedCodeApiVersion(2) @@ -448,16 +450,18 @@ open class EntityWithSoftLinksImpl(private val dataSource: EntityWithSoftLinksDa // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -1179,7 +1183,7 @@ class EntityWithSoftLinksData : WorkspaceEntityData(), Soft override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return EntityWithSoftLinks(link, manyLinks, inContainer, inContainerList, deepContainer, sealedContainer, listSealedContainer, justProperty, justListProperty, deepSealedClass, entitySource) { this.optionalLink = this@EntityWithSoftLinksData.optionalLink diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FacetTestEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FacetTestEntityImpl.kt index 1e4710e1c397..d4232d810c1a 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FacetTestEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FacetTestEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,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) @@ -151,15 +153,16 @@ open class FacetTestEntityImpl(private val dataSource: FacetTestEntityData) : Fa changedProperty.add("moreData") } - override var module: ModuleTestEntity + override var module: ModuleTestEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(MODULE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - MODULE_CONNECTION_ID)]!! as ModuleTestEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MODULE_CONNECTION_ID, this) as? ModuleTestEntity.Builder) + ?: (this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleTestEntity.Builder) } else { - this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleTestEntity + this.entityLinks[EntityLink(false, MODULE_CONNECTION_ID)]!! as ModuleTestEntity.Builder } } set(value) { @@ -239,9 +242,9 @@ class FacetTestEntityData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return FacetTestEntity(data, moreData, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.module = it } + parents.filterIsInstance().singleOrNull()?.let { this.module = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FinalFieldsEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FinalFieldsEntityImpl.kt index 9bc506064b33..39f0f8830fac 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FinalFieldsEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FinalFieldsEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -182,7 +183,7 @@ class FinalFieldsEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return FinalFieldsEntity(descriptor, entitySource) { this.description = this@FinalFieldsEntityData.description this.anotherVersion = this@FinalFieldsEntityData.anotherVersion diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FirstEntityWithPIdImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FirstEntityWithPIdImpl.kt index 488ef4794ef9..5057fcf9336e 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FirstEntityWithPIdImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/FirstEntityWithPIdImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -161,7 +162,7 @@ class FirstEntityWithPIdData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return FirstEntityWithPId(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/HeadAbstractionEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/HeadAbstractionEntityImpl.kt index 15d563bc10dc..0dfe39a247d6 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/HeadAbstractionEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/HeadAbstractionEntityImpl.kt @@ -20,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToAbstractOneChild import com.intellij.platform.workspace.storage.impl.updateOneToAbstractOneChildOfParent 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) @@ -125,15 +126,17 @@ open class HeadAbstractionEntityImpl(private val dataSource: HeadAbstractionEnti changedProperty.add("data") } - override var child: CompositeBaseEntity? + override var child: CompositeBaseEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILD_CONNECTION_ID)] as? CompositeBaseEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, + this) as? CompositeBaseEntity.Builder) + ?: (this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? CompositeBaseEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? CompositeBaseEntity + this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? CompositeBaseEntity.Builder } } set(value) { @@ -207,7 +210,7 @@ class HeadAbstractionEntityData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return HeadAbstractionEntity(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/IntEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/IntEntityImpl.kt index e9dbe2a0025a..06d1a4439721 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/IntEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/IntEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -152,7 +153,7 @@ class IntEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return IntEntity(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/KeyChildImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/KeyChildImpl.kt index 524db71d3e7f..86dbdfc5b675 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/KeyChildImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/KeyChildImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,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) @@ -131,15 +133,16 @@ open class KeyChildImpl(private val dataSource: KeyChildData) : KeyChild, Worksp changedProperty.add("data") } - override var parentEntity: KeyParent + override var parentEntity: KeyParent.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as KeyParent + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? KeyParent.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as KeyParent.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as KeyParent + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as KeyParent.Builder } } set(value) { @@ -213,9 +216,9 @@ class KeyChildData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return KeyChild(data, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/KeyParentImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/KeyParentImpl.kt index 7e77b48a0259..000eca87da0d 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/KeyParentImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/KeyParentImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @GeneratedCodeApiVersion(2) @@ -152,17 +154,18 @@ open class KeyParentImpl(private val dataSource: KeyParentData) : KeyParent, Wor // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -241,7 +244,7 @@ class KeyParentData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return KeyParent(keyField, notKeyField, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/LeftEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/LeftEntityImpl.kt index 8b16140325dc..b46a9e4664df 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/LeftEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/LeftEntityImpl.kt @@ -24,6 +24,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 @GeneratedCodeApiVersion(2) @@ -133,15 +134,17 @@ open class LeftEntityImpl(private val dataSource: LeftEntityData) : LeftEntity, } - override var parentEntity: CompositeBaseEntity? + override var parentEntity: CompositeBaseEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? CompositeBaseEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity.Builder } } set(value) { @@ -172,16 +175,17 @@ open class LeftEntityImpl(private val dataSource: LeftEntityData) : LeftEntity, changedProperty.add("parentEntity") } - 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) { @@ -214,15 +218,16 @@ open class LeftEntityImpl(private val dataSource: LeftEntityData) : LeftEntity, changedProperty.add("children") } - override var parent: HeadAbstractionEntity? + override var parent: HeadAbstractionEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractOneParent(PARENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENT_CONNECTION_ID)] as? HeadAbstractionEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENT_CONNECTION_ID, this) as? HeadAbstractionEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? HeadAbstractionEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? HeadAbstractionEntity + this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? HeadAbstractionEntity.Builder } } set(value) { @@ -290,10 +295,10 @@ class LeftEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return LeftEntity(entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() - this.parent = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() + this.parent = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/LinkedListEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/LinkedListEntityImpl.kt index cde4cf454680..a21e996ba4e4 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/LinkedListEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/LinkedListEntityImpl.kt @@ -221,7 +221,7 @@ class LinkedListEntityData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return LinkedListEntity(myName, next, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ListEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ListEntityImpl.kt index b73a656f4599..f497f62a2568 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ListEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ListEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -185,7 +186,7 @@ class ListEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ListEntity(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ListVFUEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ListVFUEntityImpl.kt index 5c64a43aa9ec..62018d72b08d 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ListVFUEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ListVFUEntityImpl.kt @@ -19,7 +19,6 @@ import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInst import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata import com.intellij.platform.workspace.storage.url.VirtualFileUrl -import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager @GeneratedCodeApiVersion(2) @GeneratedCodeImplVersion(3) @@ -211,7 +210,7 @@ class ListVFUEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ListVFUEntity(data, fileProperty, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityImpl.kt index 51316d7d8414..1f1d541a6150 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -156,7 +157,7 @@ class MainEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return MainEntity(x, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityListImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityListImpl.kt index 62d9676031c3..7765ebb485f9 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityListImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityListImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -157,7 +158,7 @@ class MainEntityListData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return MainEntityList(x, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityParentListImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityParentListImpl.kt index 57b3b422f6ff..c28ba5792bf7 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityParentListImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityParentListImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @GeneratedCodeApiVersion(2) @@ -137,16 +139,18 @@ open class MainEntityParentListImpl(private val dataSource: MainEntityParentList // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -223,7 +227,7 @@ class MainEntityParentListData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return MainEntityParentList(x, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityToParentImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityToParentImpl.kt index cf34f7aaddf1..7c811d829bbe 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityToParentImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MainEntityToParentImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneChild 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 @GeneratedCodeApiVersion(2) @@ -129,15 +131,16 @@ open class MainEntityToParentImpl(private val dataSource: MainEntityToParentData changedProperty.add("x") } - override var child: AttachedEntityToParent? + override var child: AttachedEntityToParent.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILD_CONNECTION_ID)] as? AttachedEntityToParent + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, this) as? AttachedEntityToParent.Builder) + ?: (this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? AttachedEntityToParent.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? AttachedEntityToParent + this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? AttachedEntityToParent.Builder } } set(value) { @@ -164,15 +167,17 @@ open class MainEntityToParentImpl(private val dataSource: MainEntityToParentData changedProperty.add("child") } - override var childNullableParent: AttachedEntityToNullableParent? + override var childNullableParent: AttachedEntityToNullableParent.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILDNULLABLEPARENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILDNULLABLEPARENT_CONNECTION_ID)] as? AttachedEntityToNullableParent + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILDNULLABLEPARENT_CONNECTION_ID, + this) as? AttachedEntityToNullableParent.Builder) + ?: (this.entityLinks[EntityLink(true, CHILDNULLABLEPARENT_CONNECTION_ID)] as? AttachedEntityToNullableParent.Builder) } else { - this.entityLinks[EntityLink(true, CHILDNULLABLEPARENT_CONNECTION_ID)] as? AttachedEntityToNullableParent + this.entityLinks[EntityLink(true, CHILDNULLABLEPARENT_CONNECTION_ID)] as? AttachedEntityToNullableParent.Builder } } set(value) { @@ -242,7 +247,7 @@ class MainEntityToParentData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return MainEntityToParent(x, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MiddleEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MiddleEntityImpl.kt index 804a2e66ca65..5607039d7d7b 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MiddleEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/MiddleEntityImpl.kt @@ -19,6 +19,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 @GeneratedCodeApiVersion(2) @@ -114,15 +115,17 @@ open class MiddleEntityImpl(private val dataSource: MiddleEntityData) : MiddleEn } - override var parentEntity: CompositeBaseEntity? + override var parentEntity: CompositeBaseEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? CompositeBaseEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity.Builder } } set(value) { @@ -204,9 +207,9 @@ class MiddleEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return MiddleEntity(property, entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ModuleTestEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ModuleTestEntityImpl.kt index 3a3fe1fb65c0..ccbeebaa80b8 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ModuleTestEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ModuleTestEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @GeneratedCodeApiVersion(2) @@ -154,16 +156,18 @@ open class ModuleTestEntityImpl(private val dataSource: ModuleTestEntityData) : // 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) { @@ -199,17 +203,18 @@ open class ModuleTestEntityImpl(private val dataSource: ModuleTestEntityData) : // 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) { @@ -290,7 +295,7 @@ class ModuleTestEntityData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ModuleTestEntity(name, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NamedChildEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NamedChildEntityImpl.kt index b4c6a5eb2857..d986680d0b3c 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NamedChildEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NamedChildEntityImpl.kt @@ -19,6 +19,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) @@ -133,15 +134,16 @@ open class NamedChildEntityImpl(private val dataSource: NamedChildEntityData) : changedProperty.add("childProperty") } - override var parentEntity: NamedEntity + override var parentEntity: NamedEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as NamedEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? NamedEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as NamedEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as NamedEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as NamedEntity.Builder } } set(value) { @@ -215,9 +217,9 @@ class NamedChildEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return NamedChildEntity(childProperty, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NamedEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NamedEntityImpl.kt index 0730f10bfaa6..5d8f92205165 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NamedEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NamedEntityImpl.kt @@ -20,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @GeneratedCodeApiVersion(2) @@ -151,17 +152,18 @@ open class NamedEntityImpl(private val dataSource: NamedEntityData) : NamedEntit // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -243,7 +245,7 @@ class NamedEntityData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return NamedEntity(myName, entitySource) { this.additionalProperty = this@NamedEntityData.additionalProperty } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NullableVFUEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NullableVFUEntityImpl.kt index 4bede5a9ad4e..35eeb908278c 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NullableVFUEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/NullableVFUEntityImpl.kt @@ -18,7 +18,6 @@ import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInst import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata import com.intellij.platform.workspace.storage.url.VirtualFileUrl -import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager @GeneratedCodeApiVersion(2) @GeneratedCodeImplVersion(3) @@ -179,7 +178,7 @@ class NullableVFUEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return NullableVFUEntity(data, entitySource) { this.fileProperty = this@NullableVFUEntityData.fileProperty } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OneEntityWithSymbolicIdImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OneEntityWithSymbolicIdImpl.kt index 4e606efc6246..8d233eee2084 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OneEntityWithSymbolicIdImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OneEntityWithSymbolicIdImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -165,7 +166,7 @@ class OneEntityWithSymbolicIdData : WorkspaceEntityData.WithCalculableSymbolicId override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OneEntityWithSymbolicId(myName, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildAlsoWithPidEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildAlsoWithPidEntityImpl.kt index 2a673cb148be..5a5dbf9c5d66 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildAlsoWithPidEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildAlsoWithPidEntityImpl.kt @@ -19,6 +19,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 @GeneratedCodeApiVersion(2) @@ -135,15 +136,17 @@ open class OoChildAlsoWithPidEntityImpl(private val dataSource: OoChildAlsoWithP changedProperty.add("childProperty") } - override var parentEntity: OoParentWithPidEntity + override var parentEntity: OoParentWithPidEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as OoParentWithPidEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? OoParentWithPidEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentWithPidEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentWithPidEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentWithPidEntity.Builder } } set(value) { @@ -217,9 +220,9 @@ class OoChildAlsoWithPidEntityData : WorkspaceEntityData.WithCalculableSymbolicI override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OoChildAlsoWithPidEntity(childProperty, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildEntityImpl.kt index ba935b7f7fee..ac8a5f775de9 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildEntityImpl.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 @GeneratedCodeApiVersion(2) @@ -132,15 +133,16 @@ open class OoChildEntityImpl(private val dataSource: OoChildEntityData) : OoChil changedProperty.add("childProperty") } - override var parentEntity: OoParentEntity + override var parentEntity: OoParentEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as OoParentEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? OoParentEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentEntity.Builder } } set(value) { @@ -210,9 +212,9 @@ class OoChildEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OoChildEntity(childProperty, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildForParentWithPidEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildForParentWithPidEntityImpl.kt index 046430a38e27..cbf99f8b3e1a 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildForParentWithPidEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildForParentWithPidEntityImpl.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 @GeneratedCodeApiVersion(2) @@ -134,15 +135,17 @@ open class OoChildForParentWithPidEntityImpl(private val dataSource: OoChildForP changedProperty.add("childProperty") } - override var parentEntity: OoParentWithPidEntity + override var parentEntity: OoParentWithPidEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as OoParentWithPidEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? OoParentWithPidEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentWithPidEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentWithPidEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentWithPidEntity.Builder } } set(value) { @@ -212,9 +215,9 @@ class OoChildForParentWithPidEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OoChildForParentWithPidEntity(childProperty, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildWithNullableParentEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildWithNullableParentEntityImpl.kt index 02993e98660d..0a298d18feac 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildWithNullableParentEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildWithNullableParentEntityImpl.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 @GeneratedCodeApiVersion(2) @@ -106,15 +107,16 @@ open class OoChildWithNullableParentEntityImpl(private val dataSource: OoChildWi } - override var parentEntity: OoParentEntity? + override var parentEntity: OoParentEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)] as? OoParentEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? OoParentEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? OoParentEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? OoParentEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? OoParentEntity.Builder } } set(value) { @@ -182,9 +184,9 @@ class OoChildWithNullableParentEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OoChildWithNullableParentEntity(entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildWithPidEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildWithPidEntityImpl.kt index de802f91ab58..abb5ab79060a 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildWithPidEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoChildWithPidEntityImpl.kt @@ -19,6 +19,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 @GeneratedCodeApiVersion(2) @@ -135,15 +136,17 @@ open class OoChildWithPidEntityImpl(private val dataSource: OoChildWithPidEntity changedProperty.add("childProperty") } - override var parentEntity: OoParentWithoutPidEntity + override var parentEntity: OoParentWithoutPidEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as OoParentWithoutPidEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? OoParentWithoutPidEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentWithoutPidEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentWithoutPidEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OoParentWithoutPidEntity.Builder } } set(value) { @@ -217,9 +220,9 @@ class OoChildWithPidEntityData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OoChildWithPidEntity(childProperty, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentEntityImpl.kt index 660ba97075a4..3e9dd86e3310 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentEntityImpl.kt @@ -18,6 +18,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneChild 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 @GeneratedCodeApiVersion(2) @@ -129,14 +130,16 @@ open class OoParentEntityImpl(private val dataSource: OoParentEntityData) : OoPa changedProperty.add("parentProperty") } - override var child: OoChildEntity? + override var child: OoChildEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? OoChildEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, this) as? OoChildEntity.Builder) + ?: (this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? OoChildEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? OoChildEntity + this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? OoChildEntity.Builder } } set(value) { @@ -163,15 +166,17 @@ open class OoParentEntityImpl(private val dataSource: OoParentEntityData) : OoPa changedProperty.add("child") } - override var anotherChild: OoChildWithNullableParentEntity? + override var anotherChild: OoChildWithNullableParentEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(ANOTHERCHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - ANOTHERCHILD_CONNECTION_ID)] as? OoChildWithNullableParentEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(ANOTHERCHILD_CONNECTION_ID, + this) as? OoChildWithNullableParentEntity.Builder) + ?: (this.entityLinks[EntityLink(true, ANOTHERCHILD_CONNECTION_ID)] as? OoChildWithNullableParentEntity.Builder) } else { - this.entityLinks[EntityLink(true, ANOTHERCHILD_CONNECTION_ID)] as? OoChildWithNullableParentEntity + this.entityLinks[EntityLink(true, ANOTHERCHILD_CONNECTION_ID)] as? OoChildWithNullableParentEntity.Builder } } set(value) { @@ -241,7 +246,7 @@ class OoParentEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OoParentEntity(parentProperty, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentWithPidEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentWithPidEntityImpl.kt index dfccae1bdce7..bec49edb0691 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentWithPidEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentWithPidEntityImpl.kt @@ -19,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneChild 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 @GeneratedCodeApiVersion(2) @@ -132,15 +133,17 @@ open class OoParentWithPidEntityImpl(private val dataSource: OoParentWithPidEnti changedProperty.add("parentProperty") } - override var childOne: OoChildForParentWithPidEntity? + override var childOne: OoChildForParentWithPidEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILDONE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILDONE_CONNECTION_ID)] as? OoChildForParentWithPidEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILDONE_CONNECTION_ID, + this) as? OoChildForParentWithPidEntity.Builder) + ?: (this.entityLinks[EntityLink(true, CHILDONE_CONNECTION_ID)] as? OoChildForParentWithPidEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILDONE_CONNECTION_ID)] as? OoChildForParentWithPidEntity + this.entityLinks[EntityLink(true, CHILDONE_CONNECTION_ID)] as? OoChildForParentWithPidEntity.Builder } } set(value) { @@ -167,15 +170,17 @@ open class OoParentWithPidEntityImpl(private val dataSource: OoParentWithPidEnti changedProperty.add("childOne") } - override var childThree: OoChildAlsoWithPidEntity? + override var childThree: OoChildAlsoWithPidEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILDTHREE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILDTHREE_CONNECTION_ID)] as? OoChildAlsoWithPidEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILDTHREE_CONNECTION_ID, + this) as? OoChildAlsoWithPidEntity.Builder) + ?: (this.entityLinks[EntityLink(true, CHILDTHREE_CONNECTION_ID)] as? OoChildAlsoWithPidEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILDTHREE_CONNECTION_ID)] as? OoChildAlsoWithPidEntity + this.entityLinks[EntityLink(true, CHILDTHREE_CONNECTION_ID)] as? OoChildAlsoWithPidEntity.Builder } } set(value) { @@ -249,7 +254,7 @@ class OoParentWithPidEntityData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OoParentWithPidEntity(parentProperty, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentWithoutPidEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentWithoutPidEntityImpl.kt index 65f5eae48c49..3d67bd60481e 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentWithoutPidEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OoParentWithoutPidEntityImpl.kt @@ -18,6 +18,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneChild 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 @GeneratedCodeApiVersion(2) @@ -124,15 +125,16 @@ open class OoParentWithoutPidEntityImpl(private val dataSource: OoParentWithoutP changedProperty.add("parentProperty") } - override var childOne: OoChildWithPidEntity? + override var childOne: OoChildWithPidEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILDONE_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILDONE_CONNECTION_ID)] as? OoChildWithPidEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILDONE_CONNECTION_ID, this) as? OoChildWithPidEntity.Builder) + ?: (this.entityLinks[EntityLink(true, CHILDONE_CONNECTION_ID)] as? OoChildWithPidEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILDONE_CONNECTION_ID)] as? OoChildWithPidEntity + this.entityLinks[EntityLink(true, CHILDONE_CONNECTION_ID)] as? OoChildWithPidEntity.Builder } } set(value) { @@ -202,7 +204,7 @@ class OoParentWithoutPidEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OoParentWithoutPidEntity(parentProperty, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalIntEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalIntEntityImpl.kt index 862be6ac432b..db09e24ca96f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalIntEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalIntEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -153,7 +154,7 @@ class OptionalIntEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OptionalIntEntity(entitySource) { this.data = this@OptionalIntEntityData.data } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOneChildEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOneChildEntityImpl.kt index 759f191523ac..a0374a43aa09 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOneChildEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOneChildEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,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 @GeneratedCodeApiVersion(2) @@ -124,15 +126,17 @@ open class OptionalOneToOneChildEntityImpl(private val dataSource: OptionalOneTo changedProperty.add("data") } - override var parent: OptionalOneToOneParentEntity? + override var parent: OptionalOneToOneParentEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENT_CONNECTION_ID)] as? OptionalOneToOneParentEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENT_CONNECTION_ID, + this) as? OptionalOneToOneParentEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? OptionalOneToOneParentEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? OptionalOneToOneParentEntity + this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? OptionalOneToOneParentEntity.Builder } } set(value) { @@ -202,9 +206,9 @@ class OptionalOneToOneChildEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OptionalOneToOneChildEntity(data, entitySource) { - this.parent = parents.filterIsInstance().singleOrNull() + this.parent = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOneParentEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOneParentEntityImpl.kt index 3ee544f748ae..6133c2529bfb 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOneParentEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOneParentEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneChild 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 @GeneratedCodeApiVersion(2) @@ -106,15 +108,17 @@ open class OptionalOneToOneParentEntityImpl(private val dataSource: OptionalOneT } - override var child: OptionalOneToOneChildEntity? + override var child: OptionalOneToOneChildEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILD_CONNECTION_ID)] as? OptionalOneToOneChildEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, + this) as? OptionalOneToOneChildEntity.Builder) + ?: (this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? OptionalOneToOneChildEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? OptionalOneToOneChildEntity + this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? OptionalOneToOneChildEntity.Builder } } set(value) { @@ -182,7 +186,7 @@ class OptionalOneToOneParentEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OptionalOneToOneParentEntity(entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalStringEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalStringEntityImpl.kt index aaa331c8c451..e8143c3e87a7 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalStringEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/OptionalStringEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -154,7 +155,7 @@ class OptionalStringEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OptionalStringEntity(entitySource) { this.data = this@OptionalStringEntityData.data } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentAbEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentAbEntityImpl.kt index 86a23e2c2fc2..835808aa2f2f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentAbEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentAbEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -20,6 +21,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren import com.intellij.platform.workspace.storage.impl.updateOneToAbstractManyChildrenOfParent 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) @@ -117,17 +119,19 @@ open class ParentAbEntityImpl(private val dataSource: ParentAbEntityData) : Pare } - 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) { @@ -201,7 +205,7 @@ class ParentAbEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ParentAbEntity(entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentChainEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentChainEntityImpl.kt index 9a10b515dcf7..2bfdf0beb6cd 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentChainEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentChainEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToAbstractOneChild import com.intellij.platform.workspace.storage.impl.updateOneToAbstractOneChildOfParent 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) @@ -105,15 +107,17 @@ open class ParentChainEntityImpl(private val dataSource: ParentChainEntityData) } - override var root: CompositeAbstractEntity? + override var root: CompositeAbstractEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractOneChild(ROOT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - ROOT_CONNECTION_ID)] as? CompositeAbstractEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(ROOT_CONNECTION_ID, + this) as? CompositeAbstractEntity.Builder) + ?: (this.entityLinks[EntityLink(true, ROOT_CONNECTION_ID)] as? CompositeAbstractEntity.Builder) } else { - this.entityLinks[EntityLink(true, ROOT_CONNECTION_ID)] as? CompositeAbstractEntity + this.entityLinks[EntityLink(true, ROOT_CONNECTION_ID)] as? CompositeAbstractEntity.Builder } } set(value) { @@ -181,7 +185,7 @@ class ParentChainEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ParentChainEntity(entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentEntityImpl.kt index f3cb5247b009..5a32dfaaa891 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentEntityImpl.kt @@ -18,6 +18,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneChild 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 @GeneratedCodeApiVersion(2) @@ -121,14 +122,16 @@ open class ParentEntityImpl(private val dataSource: ParentEntityData) : ParentEn changedProperty.add("parentData") } - override var child: ChildEntity? + override var child: ChildEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, this) as? ChildEntity.Builder) + ?: (this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildEntity + this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildEntity.Builder } } set(value) { @@ -198,7 +201,7 @@ class ParentEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ParentEntity(parentData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentMultipleEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentMultipleEntityImpl.kt index c603f4838147..55cc5b2b445d 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentMultipleEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentMultipleEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @GeneratedCodeApiVersion(2) @@ -137,17 +139,18 @@ open class ParentMultipleEntityImpl(private val dataSource: ParentMultipleEntity // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -224,7 +227,7 @@ class ParentMultipleEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ParentMultipleEntity(parentData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentSingleAbEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentSingleAbEntityImpl.kt index 00339dfdec1a..d4342970a5d2 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentSingleAbEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentSingleAbEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToAbstractOneChild import com.intellij.platform.workspace.storage.impl.updateOneToAbstractOneChildOfParent 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) @@ -107,15 +109,19 @@ open class ParentSingleAbEntityImpl(private val dataSource: ParentSingleAbEntity } - override var child: ChildSingleAbstractBaseEntity? + override var child: ChildSingleAbstractBaseEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILD_CONNECTION_ID)] as? ChildSingleAbstractBaseEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, + this) as? ChildSingleAbstractBaseEntity.Builder) + ?: (this.entityLinks[EntityLink(true, + CHILD_CONNECTION_ID)] as? ChildSingleAbstractBaseEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildSingleAbstractBaseEntity + this.entityLinks[EntityLink(true, + CHILD_CONNECTION_ID)] as? ChildSingleAbstractBaseEntity.Builder } } set(value) { @@ -183,7 +189,7 @@ class ParentSingleAbEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ParentSingleAbEntity(entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentSubEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentSubEntityImpl.kt index 7a32603e01f8..bf4acd3e2c96 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentSubEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentSubEntityImpl.kt @@ -18,6 +18,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneChild 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 kotlin.jvm.JvmName import kotlin.jvm.JvmOverloads @@ -125,15 +126,16 @@ open class ParentSubEntityImpl(private val dataSource: ParentSubEntityData) : Pa changedProperty.add("parentData") } - override var child: ChildSubEntity? + override var child: ChildSubEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILD_CONNECTION_ID)] as? ChildSubEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, this) as? ChildSubEntity.Builder) + ?: (this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildSubEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildSubEntity + this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildSubEntity.Builder } } set(value) { @@ -203,7 +205,7 @@ class ParentSubEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ParentSubEntity(parentData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithExtensionEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithExtensionEntityImpl.kt index 6e71fab5fa04..307f70f71831 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithExtensionEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithExtensionEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -159,7 +160,7 @@ class ParentWithExtensionEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ParentWithExtensionEntity(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithLinkToAbstractChildImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithLinkToAbstractChildImpl.kt index 44a04fa569df..dacf962e8acf 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithLinkToAbstractChildImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithLinkToAbstractChildImpl.kt @@ -19,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToAbstractOneChild import com.intellij.platform.workspace.storage.impl.updateOneToAbstractOneChildOfParent 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) @@ -125,15 +126,19 @@ open class ParentWithLinkToAbstractChildImpl(private val dataSource: ParentWithL changedProperty.add("data") } - override var child: AbstractChildWithLinkToParentEntity? + override var child: AbstractChildWithLinkToParentEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILD_CONNECTION_ID)] as? AbstractChildWithLinkToParentEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, + this) as? AbstractChildWithLinkToParentEntity.Builder) + ?: (this.entityLinks[EntityLink(true, + CHILD_CONNECTION_ID)] as? AbstractChildWithLinkToParentEntity.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? AbstractChildWithLinkToParentEntity + this.entityLinks[EntityLink(true, + CHILD_CONNECTION_ID)] as? AbstractChildWithLinkToParentEntity.Builder } } set(value) { @@ -203,7 +208,7 @@ class ParentWithLinkToAbstractChildData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ParentWithLinkToAbstractChild(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsImpl.kt index c3c1b76f003c..4b1eedb81b7c 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneChild 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 @GeneratedCodeApiVersion(2) @@ -122,15 +124,16 @@ open class ParentWithNullsImpl(private val dataSource: ParentWithNullsData) : Pa changedProperty.add("parentData") } - override var child: ChildWithNulls? + override var child: ChildWithNulls.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILD_CONNECTION_ID)] as? ChildWithNulls + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, this) as? ChildWithNulls.Builder) + ?: (this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildWithNulls.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildWithNulls + this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildWithNulls.Builder } } set(value) { @@ -200,7 +203,7 @@ class ParentWithNullsData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ParentWithNulls(parentData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsMultipleImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsMultipleImpl.kt index 191bd5fe8be7..43b047842d40 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsMultipleImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsMultipleImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @GeneratedCodeApiVersion(2) @@ -137,16 +139,18 @@ open class ParentWithNullsMultipleImpl(private val dataSource: ParentWithNullsMu // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -223,7 +227,7 @@ class ParentWithNullsMultipleData : WorkspaceEntityData override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ParentWithNullsMultiple(parentData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsOppositeMultipleImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsOppositeMultipleImpl.kt index 838a74e95744..d08350911097 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsOppositeMultipleImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ParentWithNullsOppositeMultipleImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -158,7 +159,7 @@ class ParentWithNullsOppositeMultipleData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ParentWithNullsOppositeMultiple(parentData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ProjectModelTestEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ProjectModelTestEntityImpl.kt index 6a3b38272f4c..7baba9737387 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ProjectModelTestEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/ProjectModelTestEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -22,6 +23,7 @@ import com.intellij.platform.workspace.storage.impl.updateOneToManyParentOfChild 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 @GeneratedCodeApiVersion(2) @@ -172,15 +174,17 @@ open class ProjectModelTestEntityImpl(private val dataSource: ProjectModelTestEn } - override var parentEntity: ProjectModelTestEntity? + override var parentEntity: ProjectModelTestEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)] as? ProjectModelTestEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? ProjectModelTestEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? ProjectModelTestEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? ProjectModelTestEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? ProjectModelTestEntity.Builder } } set(value) { @@ -213,18 +217,18 @@ open class ProjectModelTestEntityImpl(private val dataSource: ProjectModelTestEn // List of non-abstract referenced types var _childrenEntities: List? = emptyList() - override var childrenEntities: List + override var childrenEntities: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(CHILDRENENTITIES_CONNECTION_ID, - this)!!.toList() + (this.entityLinks[EntityLink(true, - CHILDRENENTITIES_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILDRENENTITIES_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, CHILDRENENTITIES_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, CHILDRENENTITIES_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, CHILDRENENTITIES_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -258,15 +262,17 @@ open class ProjectModelTestEntityImpl(private val dataSource: ProjectModelTestEn changedProperty.add("childrenEntities") } - override var contentRoot: ContentRootTestEntity? + override var contentRoot: ContentRootTestEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CONTENTROOT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CONTENTROOT_CONNECTION_ID)] as? ContentRootTestEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CONTENTROOT_CONNECTION_ID, + this) as? ContentRootTestEntity.Builder) + ?: (this.entityLinks[EntityLink(true, CONTENTROOT_CONNECTION_ID)] as? ContentRootTestEntity.Builder) } else { - this.entityLinks[EntityLink(true, CONTENTROOT_CONNECTION_ID)] as? ContentRootTestEntity + this.entityLinks[EntityLink(true, CONTENTROOT_CONNECTION_ID)] as? ContentRootTestEntity.Builder } } set(value) { @@ -338,9 +344,9 @@ class ProjectModelTestEntityData : WorkspaceEntityData() override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ProjectModelTestEntity(info, descriptor, entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/RightEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/RightEntityImpl.kt index dab58a1b9a30..cd84e099b356 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/RightEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/RightEntityImpl.kt @@ -24,6 +24,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 @GeneratedCodeApiVersion(2) @@ -133,15 +134,17 @@ open class RightEntityImpl(private val dataSource: RightEntityData) : RightEntit } - override var parentEntity: CompositeBaseEntity? + override var parentEntity: CompositeBaseEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? CompositeBaseEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? CompositeBaseEntity.Builder } } set(value) { @@ -172,16 +175,17 @@ open class RightEntityImpl(private val dataSource: RightEntityData) : RightEntit changedProperty.add("parentEntity") } - 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) { @@ -214,15 +218,16 @@ open class RightEntityImpl(private val dataSource: RightEntityData) : RightEntit changedProperty.add("children") } - override var parent: HeadAbstractionEntity? + override var parent: HeadAbstractionEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractOneParent(PARENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENT_CONNECTION_ID)] as? HeadAbstractionEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENT_CONNECTION_ID, this) as? HeadAbstractionEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? HeadAbstractionEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? HeadAbstractionEntity + this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)] as? HeadAbstractionEntity.Builder } } set(value) { @@ -290,10 +295,10 @@ class RightEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return RightEntity(entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() - this.parent = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance>().singleOrNull() + this.parent = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntity2Impl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntity2Impl.kt index 42b24b9990b3..c0f079453656 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntity2Impl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntity2Impl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -190,7 +191,7 @@ class SampleEntity2Data : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SampleEntity2(data, boolData, entitySource) { this.optionalData = this@SampleEntity2Data.optionalData } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntityImpl.kt index 5ca2df13ab6d..e68ca508d2a8 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntityImpl.kt @@ -21,6 +21,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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.util.UUID @@ -247,17 +248,18 @@ open class SampleEntityImpl(private val dataSource: SampleEntityData) : SampleEn // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -368,7 +370,7 @@ class SampleEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SampleEntity(booleanProperty, stringProperty, stringListProperty, stringMapProperty, fileProperty, entitySource) { this.nullableData = this@SampleEntityData.nullableData this.randomUUID = this@SampleEntityData.randomUUID diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleWithSymbolicIdEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleWithSymbolicIdEntityImpl.kt index 44a2d8981ce2..e661fe6ed0b5 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleWithSymbolicIdEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SampleWithSymbolicIdEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -21,6 +22,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @@ -239,16 +241,18 @@ open class SampleWithSymbolicIdEntityImpl(private val dataSource: SampleWithSymb // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -353,7 +357,7 @@ class SampleWithSymbolicIdEntityData : WorkspaceEntityData.WithCalculableSymboli override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SampleWithSymbolicIdEntity(booleanProperty, stringProperty, stringListProperty, stringMapProperty, fileProperty, entitySource) { this.nullableData = this@SampleWithSymbolicIdEntityData.nullableData } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SecondEntityWithPIdImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SecondEntityWithPIdImpl.kt index c444315c5929..8f8e3c2e2b36 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SecondEntityWithPIdImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SecondEntityWithPIdImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -161,7 +162,7 @@ class SecondEntityWithPIdData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SecondEntityWithPId(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SecondSampleEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SecondSampleEntityImpl.kt index 01e7a627571f..2805e601b270 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SecondSampleEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SecondSampleEntityImpl.kt @@ -160,7 +160,7 @@ class SecondSampleEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SecondSampleEntity(intProperty, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SelfLinkedEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SelfLinkedEntityImpl.kt index e3ca6762e435..a86c7e690924 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SelfLinkedEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SelfLinkedEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,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) @@ -104,15 +106,16 @@ open class SelfLinkedEntityImpl(private val dataSource: SelfLinkedEntityData) : } - override var parentEntity: SelfLinkedEntity? + override var parentEntity: SelfLinkedEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)] as? SelfLinkedEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? SelfLinkedEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? SelfLinkedEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? SelfLinkedEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? SelfLinkedEntity.Builder } } set(value) { @@ -184,9 +187,9 @@ class SelfLinkedEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SelfLinkedEntity(entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SetVFUEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SetVFUEntityImpl.kt index f46d3f1476a5..2e8ffa5c555c 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SetVFUEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SetVFUEntityImpl.kt @@ -19,7 +19,6 @@ import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInst import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata import com.intellij.platform.workspace.storage.url.VirtualFileUrl -import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager @GeneratedCodeApiVersion(2) @GeneratedCodeImplVersion(3) @@ -210,7 +209,7 @@ class SetVFUEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SetVFUEntity(data, fileProperty, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SimpleChildAbstractEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SimpleChildAbstractEntityImpl.kt index 5e24bdee165d..6b98ef0c8ce0 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SimpleChildAbstractEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SimpleChildAbstractEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,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 @GeneratedCodeApiVersion(2) @@ -107,15 +109,18 @@ open class SimpleChildAbstractEntityImpl(private val dataSource: SimpleChildAbst } - override var parentInList: CompositeAbstractEntity? + override var parentInList: CompositeAbstractEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractManyParent(PARENTINLIST_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTINLIST_CONNECTION_ID)] as? CompositeAbstractEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTINLIST_CONNECTION_ID, + this) as? CompositeAbstractEntity.Builder) + ?: (this.entityLinks[EntityLink(false, + PARENTINLIST_CONNECTION_ID)] as? CompositeAbstractEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTINLIST_CONNECTION_ID)] as? CompositeAbstractEntity + this.entityLinks[EntityLink(false, PARENTINLIST_CONNECTION_ID)] as? CompositeAbstractEntity.Builder } } set(value) { @@ -187,9 +192,9 @@ class SimpleChildAbstractEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SimpleChildAbstractEntity(entitySource) { - this.parentInList = parents.filterIsInstance().singleOrNull() + this.parentInList = parents.filterIsInstance>().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SoftLinkReferencedChildImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SoftLinkReferencedChildImpl.kt index b793a569d557..3d2da333e347 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SoftLinkReferencedChildImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SoftLinkReferencedChildImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -20,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) @@ -118,15 +120,17 @@ open class SoftLinkReferencedChildImpl(private val dataSource: SoftLinkReference } - override var parentEntity: EntityWithSoftLinks + override var parentEntity: EntityWithSoftLinks.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as EntityWithSoftLinks + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, + this) as? EntityWithSoftLinks.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as EntityWithSoftLinks.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as EntityWithSoftLinks + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as EntityWithSoftLinks.Builder } } set(value) { @@ -198,9 +202,9 @@ class SoftLinkReferencedChildData : WorkspaceEntityData override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SoftLinkReferencedChild(entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceEntityImpl.kt index cb6d9ee2d289..8ab4a9d6060d 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceEntityImpl.kt @@ -20,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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.util.UUID @@ -141,17 +142,18 @@ open class SourceEntityImpl(private val dataSource: SourceEntityData) : SourceEn // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -228,7 +230,7 @@ class SourceEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SourceEntity(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceRootTestEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceRootTestEntityImpl.kt index 2f8c26cccd0f..81b3229fefd9 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceRootTestEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceRootTestEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,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) @@ -134,15 +136,17 @@ open class SourceRootTestEntityImpl(private val dataSource: SourceRootTestEntity changedProperty.add("data") } - override var contentRoot: ContentRootTestEntity + override var contentRoot: ContentRootTestEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(CONTENTROOT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - CONTENTROOT_CONNECTION_ID)]!! as ContentRootTestEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(CONTENTROOT_CONNECTION_ID, + this) as? ContentRootTestEntity.Builder) + ?: (this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootTestEntity.Builder) } else { - this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootTestEntity + this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootTestEntity.Builder } } set(value) { @@ -216,9 +220,9 @@ class SourceRootTestEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SourceRootTestEntity(data, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.contentRoot = it } + parents.filterIsInstance().singleOrNull()?.let { this.contentRoot = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceRootTestOrderEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceRootTestOrderEntityImpl.kt index a908a696ebdc..4c4ebfc8acd5 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceRootTestOrderEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SourceRootTestOrderEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,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 @GeneratedCodeApiVersion(2) @@ -134,15 +136,17 @@ open class SourceRootTestOrderEntityImpl(private val dataSource: SourceRootTestO changedProperty.add("data") } - override var contentRoot: ContentRootTestEntity + override var contentRoot: ContentRootTestEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(CONTENTROOT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - CONTENTROOT_CONNECTION_ID)]!! as ContentRootTestEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(CONTENTROOT_CONNECTION_ID, + this) as? ContentRootTestEntity.Builder) + ?: (this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootTestEntity.Builder) } else { - this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootTestEntity + this.entityLinks[EntityLink(false, CONTENTROOT_CONNECTION_ID)]!! as ContentRootTestEntity.Builder } } set(value) { @@ -212,9 +216,9 @@ class SourceRootTestOrderEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SourceRootTestOrderEntity(data, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.contentRoot = it } + parents.filterIsInstance().singleOrNull()?.let { this.contentRoot = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificChildEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificChildEntityImpl.kt index 293dc3b1a5a3..d0717800746b 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificChildEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificChildEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToAbstractOneParen 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 @GeneratedCodeApiVersion(2) @@ -134,15 +136,17 @@ open class SpecificChildEntityImpl(private val dataSource: SpecificChildEntityDa changedProperty.add("data") } - override var parent: ParentWithExtensionEntity + override var parent: ParentWithExtensionEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToAbstractOneParent(PARENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENT_CONNECTION_ID)]!! as ParentWithExtensionEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENT_CONNECTION_ID, + this) as? ParentWithExtensionEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)]!! as ParentWithExtensionEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)]!! as ParentWithExtensionEntity + this.entityLinks[EntityLink(false, PARENT_CONNECTION_ID)]!! as ParentWithExtensionEntity.Builder } } set(value) { @@ -212,9 +216,9 @@ class SpecificChildEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SpecificChildEntity(data, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parent = it } + parents.filterIsInstance().singleOrNull()?.let { this.parent = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificChildWithLinkToParentEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificChildWithLinkToParentEntityImpl.kt index 432f1e8f9f3d..b5be57db0d6a 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificChildWithLinkToParentEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificChildWithLinkToParentEntityImpl.kt @@ -159,7 +159,7 @@ class SpecificChildWithLinkToParentEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SpecificChildWithLinkToParentEntity(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificParentImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificParentImpl.kt index a02efd7e0817..902e0190b87f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificParentImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SpecificParentImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -19,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneChild 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 @GeneratedCodeApiVersion(2) @@ -124,15 +126,17 @@ open class SpecificParentImpl(private val dataSource: SpecificParentData) : Spec changedProperty.add("data") } - override var child: ChildWithExtensionParent? + override var child: ChildWithExtensionParent.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(CHILD_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - CHILD_CONNECTION_ID)] as? ChildWithExtensionParent + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(CHILD_CONNECTION_ID, + this) as? ChildWithExtensionParent.Builder) + ?: (this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildWithExtensionParent.Builder) } else { - this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildWithExtensionParent + this.entityLinks[EntityLink(true, CHILD_CONNECTION_ID)] as? ChildWithExtensionParent.Builder } } set(value) { @@ -202,7 +206,7 @@ class SpecificParentData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SpecificParent(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/StringEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/StringEntityImpl.kt index 1a7836cfefb8..0700a6ed3438 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/StringEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/StringEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -156,7 +157,7 @@ class StringEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return StringEntity(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SymbolicIdEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SymbolicIdEntityImpl.kt index 910be2324d80..043d653e4572 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SymbolicIdEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/SymbolicIdEntityImpl.kt @@ -169,7 +169,7 @@ class SymbolicIdEntityData : WorkspaceEntityData.WithCalculableSymbolicId): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SymbolicIdEntity(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeEntityImpl.kt index 707a0671048b..e28fe2a186ca 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -20,6 +21,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 @GeneratedCodeApiVersion(2) @@ -142,17 +144,18 @@ open class TreeEntityImpl(private val dataSource: TreeEntityData) : TreeEntity, // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -186,15 +189,16 @@ open class TreeEntityImpl(private val dataSource: TreeEntityData) : TreeEntity, changedProperty.add("children") } - override var parentEntity: TreeEntity? + override var parentEntity: TreeEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)] as? TreeEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? TreeEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? TreeEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? TreeEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)] as? TreeEntity.Builder } } set(value) { @@ -268,9 +272,9 @@ class TreeEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return TreeEntity(data, entitySource) { - this.parentEntity = parents.filterIsInstance().singleOrNull() + this.parentEntity = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentLeafEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentLeafEntityImpl.kt index 2b302dd345af..445641fb26ac 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentLeafEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentLeafEntityImpl.kt @@ -21,6 +21,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 @GeneratedCodeApiVersion(2) @@ -152,15 +153,17 @@ open class TreeMultiparentLeafEntityImpl(private val dataSource: TreeMultiparent changedProperty.add("data") } - override var mainParent: TreeMultiparentRootEntity? + override var mainParent: TreeMultiparentRootEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(MAINPARENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - MAINPARENT_CONNECTION_ID)] as? TreeMultiparentRootEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(MAINPARENT_CONNECTION_ID, + this) as? TreeMultiparentRootEntity.Builder) + ?: (this.entityLinks[EntityLink(false, MAINPARENT_CONNECTION_ID)] as? TreeMultiparentRootEntity.Builder) } else { - this.entityLinks[EntityLink(false, MAINPARENT_CONNECTION_ID)] as? TreeMultiparentRootEntity + this.entityLinks[EntityLink(false, MAINPARENT_CONNECTION_ID)] as? TreeMultiparentRootEntity.Builder } } set(value) { @@ -191,15 +194,17 @@ open class TreeMultiparentLeafEntityImpl(private val dataSource: TreeMultiparent changedProperty.add("mainParent") } - override var leafParent: TreeMultiparentLeafEntity? + override var leafParent: TreeMultiparentLeafEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(LEAFPARENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - LEAFPARENT_CONNECTION_ID)] as? TreeMultiparentLeafEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(LEAFPARENT_CONNECTION_ID, + this) as? TreeMultiparentLeafEntity.Builder) + ?: (this.entityLinks[EntityLink(false, LEAFPARENT_CONNECTION_ID)] as? TreeMultiparentLeafEntity.Builder) } else { - this.entityLinks[EntityLink(false, LEAFPARENT_CONNECTION_ID)] as? TreeMultiparentLeafEntity + this.entityLinks[EntityLink(false, LEAFPARENT_CONNECTION_ID)] as? TreeMultiparentLeafEntity.Builder } } set(value) { @@ -232,16 +237,18 @@ open class TreeMultiparentLeafEntityImpl(private val dataSource: TreeMultiparent // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -318,10 +325,10 @@ class TreeMultiparentLeafEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return TreeMultiparentLeafEntity(data, entitySource) { - this.mainParent = parents.filterIsInstance().singleOrNull() - this.leafParent = parents.filterIsInstance().singleOrNull() + this.mainParent = parents.filterIsInstance().singleOrNull() + this.leafParent = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentRootEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentRootEntityImpl.kt index 66cb1727c263..a4d0242fd474 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentRootEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentRootEntityImpl.kt @@ -20,6 +20,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @GeneratedCodeApiVersion(2) @@ -139,16 +140,18 @@ open class TreeMultiparentRootEntityImpl(private val dataSource: TreeMultiparent // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -229,7 +232,7 @@ class TreeMultiparentRootEntityData : WorkspaceEntityData.WithCalculableSymbolic override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return TreeMultiparentRootEntity(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/UnknownFieldEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/UnknownFieldEntityImpl.kt index 518f3fdfb884..23329125c81d 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/UnknownFieldEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/UnknownFieldEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -159,7 +160,7 @@ class UnknownFieldEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return UnknownFieldEntity(data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUEntity2Impl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUEntity2Impl.kt index 5ef48e9d1cf9..8ff0898ae28f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUEntity2Impl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUEntity2Impl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -250,7 +251,7 @@ class VFUEntity2Data : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return VFUEntity2(data, directoryPath, notNullRoots, entitySource) { this.filePath = this@VFUEntity2Data.filePath } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUEntityImpl.kt index 00e99e727d7b..95ece1469d74 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUEntityImpl.kt @@ -18,7 +18,6 @@ import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInst import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata import com.intellij.platform.workspace.storage.url.VirtualFileUrl -import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager @GeneratedCodeApiVersion(2) @GeneratedCodeImplVersion(3) @@ -182,7 +181,7 @@ class VFUEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return VFUEntity(data, fileProperty, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUWithTwoPropertiesEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUWithTwoPropertiesEntityImpl.kt index 62b950c10f6c..55c76611e17d 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUWithTwoPropertiesEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/VFUWithTwoPropertiesEntityImpl.kt @@ -18,7 +18,6 @@ import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInst import com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi import com.intellij.platform.workspace.storage.metadata.model.EntityMetadata import com.intellij.platform.workspace.storage.url.VirtualFileUrl -import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager @GeneratedCodeApiVersion(2) @GeneratedCodeImplVersion(3) @@ -207,7 +206,7 @@ class VFUWithTwoPropertiesEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return VFUWithTwoPropertiesEntity(data, fileProperty, secondFileProperty, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithListSoftLinksEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithListSoftLinksEntityImpl.kt index 4fdc90d2ecd5..48114a5aad08 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithListSoftLinksEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithListSoftLinksEntityImpl.kt @@ -266,7 +266,7 @@ class WithListSoftLinksEntityData : WorkspaceEntityData.WithCalculableSymbolicId override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return WithListSoftLinksEntity(myName, links, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithSealedEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithSealedEntityImpl.kt index 914873959111..21854cd9496d 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithSealedEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithSealedEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -225,7 +226,7 @@ class WithSealedEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return WithSealedEntity(classes, interfaces, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithSoftLinkEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithSoftLinkEntityImpl.kt index 58649de6cd2f..1989589f70db 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithSoftLinkEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/WithSoftLinkEntityImpl.kt @@ -199,7 +199,7 @@ class WithSoftLinkEntityData : WorkspaceEntityData(), SoftLi override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return WithSoftLinkEntity(link, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildChildEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildChildEntityImpl.kt index 7c7027e8f4eb..1f01ff049d7b 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildChildEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildChildEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,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) @@ -130,15 +132,16 @@ open class XChildChildEntityImpl(private val dataSource: XChildChildEntityData) } - override var parent1: XParentEntity + override var parent1: XParentEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENT1_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENT1_CONNECTION_ID)]!! as XParentEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENT1_CONNECTION_ID, this) as? XParentEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENT1_CONNECTION_ID)]!! as XParentEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENT1_CONNECTION_ID)]!! as XParentEntity + this.entityLinks[EntityLink(false, PARENT1_CONNECTION_ID)]!! as XParentEntity.Builder } } set(value) { @@ -169,15 +172,16 @@ open class XChildChildEntityImpl(private val dataSource: XChildChildEntityData) changedProperty.add("parent1") } - override var parent2: XChildEntity + override var parent2: XChildEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENT2_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENT2_CONNECTION_ID)]!! as XChildEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENT2_CONNECTION_ID, this) as? XChildEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENT2_CONNECTION_ID)]!! as XChildEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENT2_CONNECTION_ID)]!! as XChildEntity + this.entityLinks[EntityLink(false, PARENT2_CONNECTION_ID)]!! as XChildEntity.Builder } } set(value) { @@ -249,10 +253,10 @@ class XChildChildEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return XChildChildEntity(entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parent1 = it } - parents.filterIsInstance().singleOrNull()?.let { this.parent2 = it } + parents.filterIsInstance().singleOrNull()?.let { this.parent1 = it } + parents.filterIsInstance().singleOrNull()?.let { this.parent2 = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildEntityImpl.kt index 9f93ac102e05..d792406c8421 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -20,6 +21,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 @GeneratedCodeApiVersion(2) @@ -166,15 +168,16 @@ open class XChildEntityImpl(private val dataSource: XChildEntityData) : XChildEn } - override var parentEntity: XParentEntity + override var parentEntity: XParentEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as XParentEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? XParentEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as XParentEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as XParentEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as XParentEntity.Builder } } set(value) { @@ -207,17 +210,18 @@ open class XChildEntityImpl(private val dataSource: XChildEntityData) : XChildEn // List of non-abstract referenced types var _childChild: List? = emptyList() - override var childChild: List + override var childChild: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(CHILDCHILD_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink(true, - CHILDCHILD_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILDCHILD_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, CHILDCHILD_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, CHILDCHILD_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, CHILDCHILD_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -295,10 +299,10 @@ class XChildEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return XChildEntity(childProperty, entitySource) { this.dataClass = this@XChildEntityData.dataClass - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildWithOptionalParentEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildWithOptionalParentEntityImpl.kt index 7653e2018514..7fc035201ad3 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildWithOptionalParentEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XChildWithOptionalParentEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,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) @@ -124,15 +126,16 @@ open class XChildWithOptionalParentEntityImpl(private val dataSource: XChildWith changedProperty.add("childProperty") } - override var optionalParent: XParentEntity? + override var optionalParent: XParentEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(OPTIONALPARENT_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - OPTIONALPARENT_CONNECTION_ID)] as? XParentEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(OPTIONALPARENT_CONNECTION_ID, this) as? XParentEntity.Builder) + ?: (this.entityLinks[EntityLink(false, OPTIONALPARENT_CONNECTION_ID)] as? XParentEntity.Builder) } else { - this.entityLinks[EntityLink(false, OPTIONALPARENT_CONNECTION_ID)] as? XParentEntity + this.entityLinks[EntityLink(false, OPTIONALPARENT_CONNECTION_ID)] as? XParentEntity.Builder } } set(value) { @@ -206,9 +209,9 @@ class XChildWithOptionalParentEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return XChildWithOptionalParentEntity(childProperty, entitySource) { - this.optionalParent = parents.filterIsInstance().singleOrNull() + this.optionalParent = parents.filterIsInstance().singleOrNull() } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XParentEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XParentEntityImpl.kt index 58e2ce48a5ae..d2c3544c42b4 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XParentEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/XParentEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @GeneratedCodeApiVersion(2) @@ -170,17 +172,18 @@ open class XParentEntityImpl(private val dataSource: XParentEntityData) : XParen // List of non-abstract referenced types var _children: List? = emptyList() - override var children: List + override var children: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(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) { @@ -216,18 +219,19 @@ open class XParentEntityImpl(private val dataSource: XParentEntityData) : XParen // List of non-abstract referenced types var _optionalChildren: List? = emptyList() - override var optionalChildren: List + override var optionalChildren: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(OPTIONALCHILDREN_CONNECTION_ID, - this)!!.toList() + (this.entityLinks[EntityLink(true, - OPTIONALCHILDREN_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(OPTIONALCHILDREN_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, OPTIONALCHILDREN_CONNECTION_ID)] as? List + ?: emptyList()) } else { - this.entityLinks[EntityLink(true, OPTIONALCHILDREN_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, OPTIONALCHILDREN_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -263,17 +267,18 @@ open class XParentEntityImpl(private val dataSource: XParentEntityData) : XParen // List of non-abstract referenced types var _childChild: List? = emptyList() - override var childChild: List + override var childChild: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(CHILDCHILD_CONNECTION_ID, this)!!.toList() + (this.entityLinks[EntityLink(true, - CHILDCHILD_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(CHILDCHILD_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, CHILDCHILD_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, CHILDCHILD_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, CHILDCHILD_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -350,7 +355,7 @@ class XParentEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return XParentEntity(parentProperty, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/AnotherOneToManyRefEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/AnotherOneToManyRefEntityImpl.kt index 898de9b9ddd4..f9b3dc0cb211 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/AnotherOneToManyRefEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/AnotherOneToManyRefEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -18,6 +19,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) @@ -132,15 +134,16 @@ open class AnotherOneToManyRefEntityImpl(private val dataSource: AnotherOneToMan } - override var parentEntity: OneToManyRefEntity + override var parentEntity: OneToManyRefEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as OneToManyRefEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? OneToManyRefEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToManyRefEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToManyRefEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToManyRefEntity.Builder } } set(value) { @@ -233,9 +236,9 @@ class AnotherOneToManyRefEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return AnotherOneToManyRefEntity(version, someData, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/AnotherOneToOneRefEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/AnotherOneToOneRefEntityImpl.kt index fdb63446fc70..7ec5e37cf57f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/AnotherOneToOneRefEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/AnotherOneToOneRefEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -18,6 +19,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 @GeneratedCodeApiVersion(2) @@ -148,15 +150,16 @@ open class AnotherOneToOneRefEntityImpl(private val dataSource: AnotherOneToOneR changedProperty.add("boolean") } - override var parentEntity: OneToOneRefEntity + override var parentEntity: OneToOneRefEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as OneToOneRefEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? OneToOneRefEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToOneRefEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToOneRefEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToOneRefEntity.Builder } } set(value) { @@ -228,9 +231,9 @@ class AnotherOneToOneRefEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return AnotherOneToOneRefEntity(someString, boolean, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropEntityImpl.kt index b030efbd0c70..97df9738cfca 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -162,7 +163,7 @@ class ChangedComputablePropEntityData : WorkspaceEntityData.WithCalculableSymbol override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChangedComputablePropEntity(text, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropsOrderEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropsOrderEntityImpl.kt index 7080e3014474..daa24cb91bc7 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropsOrderEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropsOrderEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -225,7 +226,7 @@ class ChangedComputablePropsOrderEntityData : WorkspaceEntityData.WithCalculable override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChangedComputablePropsOrderEntity(someKey, names, value, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedEnumNameEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedEnumNameEntityImpl.kt index 873d779afbe4..450518a999bd 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedEnumNameEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedEnumNameEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -158,7 +159,7 @@ class ChangedEnumNameEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChangedEnumNameEntity(someEnum, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedPropsOrderEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedPropsOrderEntityImpl.kt index ed03b99fc5c7..61dd9ab2a806 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedPropsOrderEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedPropsOrderEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -244,7 +245,7 @@ class ChangedPropsOrderEntityData : WorkspaceEntityData override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChangedPropsOrderEntity(version, string, list, data, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedValueTypeEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedValueTypeEntityImpl.kt index f22e23d42bf3..b7a8ce8fa591 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedValueTypeEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedValueTypeEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -223,7 +224,7 @@ class ChangedValueTypeEntityData : WorkspaceEntityData() override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChangedValueTypeEntity(type, someKey, text, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ComputablePropEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ComputablePropEntityImpl.kt index 36e60f4adbde..9b58d729a362 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ComputablePropEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ComputablePropEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -204,7 +205,7 @@ class ComputablePropEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ComputablePropEntity(list, value, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/DefaultPropEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/DefaultPropEntityImpl.kt index 4c6a7c790e5e..b17ece636867 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/DefaultPropEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/DefaultPropEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -219,7 +220,7 @@ class DefaultPropEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return DefaultPropEntity(someString, someList, entitySource) { this.constInt = this@DefaultPropEntityData.constInt } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/EnumPropsEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/EnumPropsEntityImpl.kt index 85f92c6947f1..60f3d33dd9b3 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/EnumPropsEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/EnumPropsEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -157,7 +158,7 @@ class EnumPropsEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return EnumPropsEntity(someEnum, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/KeyPropEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/KeyPropEntityImpl.kt index 962bb2fafb2b..5199c60ea623 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/KeyPropEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/KeyPropEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -196,7 +197,7 @@ class KeyPropEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return KeyPropEntity(someInt, text, url, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NotNullToNullEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NotNullToNullEntityImpl.kt index 8a7e7d4f081b..a287d3fa476f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NotNullToNullEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NotNullToNullEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -221,7 +222,7 @@ class NotNullToNullEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return NotNullToNullEntity(notNullString, notNullList, entitySource) { this.nullInt = this@NotNullToNullEntityData.nullInt } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NullToNotNullEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NullToNotNullEntityImpl.kt index e7c6429a109f..049e059db621 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NullToNotNullEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NullToNotNullEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -183,7 +184,7 @@ class NullToNotNullEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return NullToNotNullEntity(notNullBoolean, notNullInt, entitySource) { this.nullString = this@NullToNotNullEntityData.nullString } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToManyRefEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToManyRefEntityImpl.kt index bcc17b4b4e71..727e32cf015b 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToManyRefEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToManyRefEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @GeneratedCodeApiVersion(2) @@ -137,18 +139,18 @@ open class OneToManyRefEntityImpl(private val dataSource: OneToManyRefEntityData // List of non-abstract referenced types var _anotherEntity: List? = emptyList() - override var anotherEntity: List + override var anotherEntity: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(ANOTHERENTITY_CONNECTION_ID, - this)!!.toList() + (this.entityLinks[EntityLink(true, - ANOTHERENTITY_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(ANOTHERENTITY_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -225,7 +227,7 @@ class OneToManyRefEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OneToManyRefEntity(someData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToOneRefEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToOneRefEntityImpl.kt index db69bc95e3ee..8ce39d4df7c2 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToOneRefEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToOneRefEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneChild 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 @GeneratedCodeApiVersion(2) @@ -137,15 +139,17 @@ open class OneToOneRefEntityImpl(private val dataSource: OneToOneRefEntityData) changedProperty.add("text") } - override var anotherEntity: AnotherOneToOneRefEntity? + override var anotherEntity: AnotherOneToOneRefEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(ANOTHERENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - ANOTHERENTITY_CONNECTION_ID)] as? AnotherOneToOneRefEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(ANOTHERENTITY_CONNECTION_ID, + this) as? AnotherOneToOneRefEntity.Builder) + ?: (this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? AnotherOneToOneRefEntity.Builder) } else { - this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? AnotherOneToOneRefEntity + this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? AnotherOneToOneRefEntity.Builder } } set(value) { @@ -217,7 +221,7 @@ class OneToOneRefEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OneToOneRefEntity(version, text, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleObjectsEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleObjectsEntityImpl.kt index 8de6521dc47e..f8cbe274cc63 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleObjectsEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleObjectsEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -158,7 +159,7 @@ class SimpleObjectsEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SimpleObjectsEntity(someData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimplePropsEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimplePropsEntityImpl.kt index 399433e63d95..505a339bdb66 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimplePropsEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimplePropsEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -283,7 +284,7 @@ class SimplePropsEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SimplePropsEntity(text, list, set, map, bool, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleSealedClassEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleSealedClassEntityImpl.kt index 961827fe05db..bbadae4786cb 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleSealedClassEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleSealedClassEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -179,7 +180,7 @@ class SimpleSealedClassEntityData : WorkspaceEntityData override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SimpleSealedClassEntity(text, someData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetEnumEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetEnumEntityImpl.kt index 8335f0dd7e4c..ec9b432f124a 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetEnumEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetEnumEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -157,7 +158,7 @@ class SubsetEnumEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SubsetEnumEntity(someEnum, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetSealedClassEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetSealedClassEntityImpl.kt index 498cb6959d83..12520ab3b0b9 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetSealedClassEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetSealedClassEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.cacheVersi 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 @@ -159,7 +160,7 @@ class SubsetSealedClassEntityData : WorkspaceEntityData override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SubsetSealedClassEntity(someData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/AnotherOneToManyRefEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/AnotherOneToManyRefEntityImpl.kt index 7d4e98faaa89..b9d68ec9db82 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/AnotherOneToManyRefEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/AnotherOneToManyRefEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -18,6 +19,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 @GeneratedCodeApiVersion(2) @@ -132,15 +134,16 @@ open class AnotherOneToManyRefEntityImpl(private val dataSource: AnotherOneToMan } - override var parentEntity: OneToManyRefEntity + override var parentEntity: OneToManyRefEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as OneToManyRefEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? OneToManyRefEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToManyRefEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToManyRefEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToManyRefEntity.Builder } } set(value) { @@ -229,9 +232,9 @@ class AnotherOneToManyRefEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return AnotherOneToManyRefEntity(version, someData, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/AnotherOneToOneRefEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/AnotherOneToOneRefEntityImpl.kt index 102c248af315..b043252e9a56 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/AnotherOneToOneRefEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/AnotherOneToOneRefEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -18,6 +19,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) @@ -148,15 +150,16 @@ open class AnotherOneToOneRefEntityImpl(private val dataSource: AnotherOneToOneR changedProperty.add("boolean") } - override var parentEntity: OneToOneRefEntity + override var parentEntity: OneToOneRefEntity.Builder get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToManyParent(PARENTENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(false, - PARENTENTITY_CONNECTION_ID)]!! as OneToOneRefEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getParentBuilder(PARENTENTITY_CONNECTION_ID, this) as? OneToOneRefEntity.Builder) + ?: (this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToOneRefEntity.Builder) } else { - this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToOneRefEntity + this.entityLinks[EntityLink(false, PARENTENTITY_CONNECTION_ID)]!! as OneToOneRefEntity.Builder } } set(value) { @@ -232,9 +235,9 @@ class AnotherOneToOneRefEntityData : WorkspaceEntityData): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return AnotherOneToOneRefEntity(someString, boolean, entitySource) { - parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } + parents.filterIsInstance().singleOrNull()?.let { this.parentEntity = it } } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropEntityImpl.kt index 5602b3e7f7c5..54680eb3070f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropEntityImpl.kt @@ -164,7 +164,7 @@ class ChangedComputablePropEntityData : WorkspaceEntityData.WithCalculableSymbol override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChangedComputablePropEntity(text, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropsOrderEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropsOrderEntityImpl.kt index 1f6c8f4a2da9..6c206385fd87 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropsOrderEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropsOrderEntityImpl.kt @@ -226,7 +226,7 @@ class ChangedComputablePropsOrderEntityData : WorkspaceEntityData.WithCalculable override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChangedComputablePropsOrderEntity(someKey, names, value, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedEnumNameEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedEnumNameEntityImpl.kt index f36341c823fc..389a27689ba3 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedEnumNameEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedEnumNameEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -158,7 +159,7 @@ class ChangedEnumNameEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChangedEnumNameEntity(someEnum, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedPropsOrderEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedPropsOrderEntityImpl.kt index 156fe503efab..87c6e12e5cf2 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedPropsOrderEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedPropsOrderEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -244,7 +245,7 @@ class ChangedPropsOrderEntityData : WorkspaceEntityData override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChangedPropsOrderEntity(version, string, data, list, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedValueTypeEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedValueTypeEntityImpl.kt index b89dffb0303c..6ffd6aadecd0 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedValueTypeEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedValueTypeEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -227,7 +228,7 @@ class ChangedValueTypeEntityData : WorkspaceEntityData() override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ChangedValueTypeEntity(type, someKey, text, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ComputablePropEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ComputablePropEntityImpl.kt index 99f140e677d8..9cd96efee8cc 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ComputablePropEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ComputablePropEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -223,7 +224,7 @@ class ComputablePropEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return ComputablePropEntity(list, value, computableText, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/DefaultPropEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/DefaultPropEntityImpl.kt index 27abd2cc3041..e31299b6b8fc 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/DefaultPropEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/DefaultPropEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -223,7 +224,7 @@ class DefaultPropEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return DefaultPropEntity(someString, someList, constInt, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/EnumPropsEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/EnumPropsEntityImpl.kt index cb89ec812283..e245bd0a3305 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/EnumPropsEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/EnumPropsEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -157,7 +158,7 @@ class EnumPropsEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return EnumPropsEntity(someEnum, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/KeyPropEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/KeyPropEntityImpl.kt index f0debe7ce566..d00c248ec257 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/KeyPropEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/KeyPropEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -196,7 +197,7 @@ class KeyPropEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return KeyPropEntity(someInt, text, url, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NotNullToNullEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NotNullToNullEntityImpl.kt index 3f23d0ad7884..b79d6ebd5120 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NotNullToNullEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NotNullToNullEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -217,7 +218,7 @@ class NotNullToNullEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return NotNullToNullEntity(notNullList, entitySource) { this.nullInt = this@NotNullToNullEntityData.nullInt this.notNullString = this@NotNullToNullEntityData.notNullString diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NullToNotNullEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NullToNotNullEntityImpl.kt index 46f8841e86ab..685714570e4f 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NullToNotNullEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NullToNotNullEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -188,7 +189,7 @@ class NullToNotNullEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return NullToNotNullEntity(nullString, notNullBoolean, notNullInt, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToManyRefEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToManyRefEntityImpl.kt index 0cb62e6abb73..eef5b8135edc 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToManyRefEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToManyRefEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToOneChild 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 @GeneratedCodeApiVersion(2) @@ -124,15 +126,17 @@ open class OneToManyRefEntityImpl(private val dataSource: OneToManyRefEntityData } - override var anotherEntity: AnotherOneToManyRefEntity? + override var anotherEntity: AnotherOneToManyRefEntity.Builder? get() { val _diff = diff return if (_diff != null) { - _diff.extractOneToOneChild(ANOTHERENTITY_CONNECTION_ID, this) ?: this.entityLinks[EntityLink(true, - ANOTHERENTITY_CONNECTION_ID)] as? AnotherOneToManyRefEntity + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getOneChildBuilder(ANOTHERENTITY_CONNECTION_ID, + this) as? AnotherOneToManyRefEntity.Builder) + ?: (this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? AnotherOneToManyRefEntity.Builder) } else { - this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? AnotherOneToManyRefEntity + this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? AnotherOneToManyRefEntity.Builder } } set(value) { @@ -202,7 +206,7 @@ class OneToManyRefEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OneToManyRefEntity(someData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToOneRefEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToOneRefEntityImpl.kt index ea5cdee68a5a..d2fc764dc407 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToOneRefEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToOneRefEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -18,6 +19,7 @@ import com.intellij.platform.workspace.storage.impl.extractOneToManyChildren 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 @GeneratedCodeApiVersion(2) @@ -150,18 +152,18 @@ open class OneToOneRefEntityImpl(private val dataSource: OneToOneRefEntityData) // List of non-abstract referenced types var _anotherEntity: List? = emptyList() - override var anotherEntity: List + override var anotherEntity: List get() { // Getter of the list of non-abstract referenced types val _diff = diff return if (_diff != null) { - _diff.extractOneToManyChildren(ANOTHERENTITY_CONNECTION_ID, - this)!!.toList() + (this.entityLinks[EntityLink(true, - ANOTHERENTITY_CONNECTION_ID)] as? List - ?: emptyList()) + @OptIn(EntityStorageInstrumentationApi::class) + ((_diff as MutableEntityStorageInstrumentation).getManyChildrenBuilders(ANOTHERENTITY_CONNECTION_ID, + this)!!.toList() as List) + + (this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? List ?: emptyList()) } else { - this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? List ?: emptyList() + this.entityLinks[EntityLink(true, ANOTHERENTITY_CONNECTION_ID)] as? List ?: emptyList() } } set(value) { @@ -240,7 +242,7 @@ class OneToOneRefEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return OneToOneRefEntity(version, text, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleObjectsEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleObjectsEntityImpl.kt index fcdb50842186..f818c8d0546a 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleObjectsEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleObjectsEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -158,7 +159,7 @@ class SimpleObjectsEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SimpleObjectsEntity(someData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimplePropsEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimplePropsEntityImpl.kt index c85b33eaebc1..3ebcef7e55b1 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimplePropsEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimplePropsEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -283,7 +284,7 @@ class SimplePropsEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SimplePropsEntity(text, list, set, map, bool, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleSealedClassEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleSealedClassEntityImpl.kt index d883710d5830..790dc385db0c 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleSealedClassEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleSealedClassEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -179,7 +180,7 @@ class SimpleSealedClassEntityData : WorkspaceEntityData override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SimpleSealedClassEntity(text, someData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetEnumEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetEnumEntityImpl.kt index 7e66213abb3c..60bff623f848 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetEnumEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetEnumEntityImpl.kt @@ -4,6 +4,7 @@ package com.intellij.platform.workspace.storage.testEntities.entities.currentVer 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 @@ -157,7 +158,7 @@ class SubsetEnumEntityData : WorkspaceEntityData() { override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SubsetEnumEntity(someEnum, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetSealedClassEntityImpl.kt b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetSealedClassEntityImpl.kt index bb7ebbc60de3..3c03cc080e51 100644 --- a/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetSealedClassEntityImpl.kt +++ b/platform/workspace/storage/testEntities/gen/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetSealedClassEntityImpl.kt @@ -159,7 +159,7 @@ class SubsetSealedClassEntityData : WorkspaceEntityData override fun deserialize(de: EntityInformation.Deserializer) { } - override fun createDetachedEntity(parents: List): WorkspaceEntity { + override fun createDetachedEntity(parents: List>): WorkspaceEntity.Builder<*> { return SubsetSealedClassEntity(someData, entitySource) { } } diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToAbstractParent.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToAbstractParent.kt index 2718442e969c..3e87f575fbde 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToAbstractParent.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToAbstractParent.kt @@ -18,9 +18,9 @@ interface ChildWithExtensionParent : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildWithExtensionParent, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String + var data: String } companion object : EntityType() { @@ -31,7 +31,7 @@ interface ChildWithExtensionParent : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildWithExtensionParent { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -50,8 +50,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(ChildWithExtensionParent.Builder::class.java, entity, modification) } -var ChildWithExtensionParent.Builder.parent: AbstractParentEntity? - by WorkspaceEntity.extension() +var ChildWithExtensionParent.Builder.parent: AbstractParentEntity.Builder? + by WorkspaceEntity.extensionBuilder(AbstractParentEntity::class.java) //endregion @Abstract @@ -61,10 +61,10 @@ interface AbstractParentEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AbstractParentEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var child: ChildWithExtensionParent? + var data: String + var child: ChildWithExtensionParent.Builder? } companion object : EntityType>() { @@ -75,7 +75,7 @@ interface AbstractParentEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AbstractParentEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -89,10 +89,10 @@ interface AbstractParentEntity : WorkspaceEntity { interface SpecificParent : AbstractParentEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SpecificParent, AbstractParentEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, AbstractParentEntity.Builder { override var entitySource: EntitySource override var data: String - override var child: ChildWithExtensionParent? + override var child: ChildWithExtensionParent.Builder? } companion object : EntityType(AbstractParentEntity) { @@ -103,7 +103,7 @@ interface SpecificParent : AbstractParentEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SpecificParent { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToChild.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToChild.kt index 911ac53bef17..06bc60fab593 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToChild.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToChild.kt @@ -2,11 +2,6 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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.Abstract import com.intellij.platform.workspace.storage.annotations.Child @@ -15,9 +10,9 @@ interface ParentWithExtensionEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ParentWithExtensionEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String + var data: String } companion object : EntityType() { @@ -28,7 +23,7 @@ interface ParentWithExtensionEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ParentWithExtensionEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -47,8 +42,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(ParentWithExtensionEntity.Builder::class.java, entity, modification) } -var ParentWithExtensionEntity.Builder.child: @Child AbstractChildEntity? - by WorkspaceEntity.extension() +var ParentWithExtensionEntity.Builder.child: @Child AbstractChildEntity.Builder? + by WorkspaceEntity.extensionBuilder(AbstractChildEntity::class.java) //endregion @Abstract @@ -58,10 +53,10 @@ interface AbstractChildEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AbstractChildEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var parent: ParentWithExtensionEntity + var data: String + var parent: ParentWithExtensionEntity.Builder } companion object : EntityType>() { @@ -72,7 +67,7 @@ interface AbstractChildEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AbstractChildEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -86,10 +81,10 @@ interface AbstractChildEntity : WorkspaceEntity { interface SpecificChildEntity : AbstractChildEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SpecificChildEntity, AbstractChildEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, AbstractChildEntity.Builder { override var entitySource: EntitySource override var data: String - override var parent: ParentWithExtensionEntity + override var parent: ParentWithExtensionEntity.Builder } companion object : EntityType(AbstractChildEntity) { @@ -100,7 +95,7 @@ interface SpecificChildEntity : AbstractChildEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SpecificChildEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToParent.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToParent.kt index 11610b740ff2..e537e3c10e3f 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToParent.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/AbstractExtensionToParent.kt @@ -11,10 +11,10 @@ interface ParentWithLinkToAbstractChild : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ParentWithLinkToAbstractChild, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var child: AbstractChildWithLinkToParentEntity? + var data: String + var child: AbstractChildWithLinkToParentEntity.Builder? } companion object : EntityType() { @@ -25,7 +25,7 @@ interface ParentWithLinkToAbstractChild : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ParentWithLinkToAbstractChild { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -51,9 +51,9 @@ interface AbstractChildWithLinkToParentEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AbstractChildWithLinkToParentEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String + var data: String } companion object : EntityType>() { @@ -64,7 +64,7 @@ interface AbstractChildWithLinkToParentEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AbstractChildWithLinkToParentEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -76,14 +76,14 @@ interface AbstractChildWithLinkToParentEntity : WorkspaceEntity { } //region generated code -var AbstractChildWithLinkToParentEntity.Builder.parent: ParentWithLinkToAbstractChild? - by WorkspaceEntity.extension() +var AbstractChildWithLinkToParentEntity.Builder.parent: ParentWithLinkToAbstractChild.Builder? + by WorkspaceEntity.extensionBuilder(ParentWithLinkToAbstractChild::class.java) //endregion interface SpecificChildWithLinkToParentEntity : AbstractChildWithLinkToParentEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SpecificChildWithLinkToParentEntity, AbstractChildWithLinkToParentEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, AbstractChildWithLinkToParentEntity.Builder { override var entitySource: EntitySource override var data: String } @@ -96,7 +96,7 @@ interface SpecificChildWithLinkToParentEntity : AbstractChildWithLinkToParentEnt data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SpecificChildWithLinkToParentEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/Abstraction.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/Abstraction.kt index fcd0eff0bcb1..4f38fcc8ae90 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/Abstraction.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/Abstraction.kt @@ -2,6 +2,11 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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.Abstract import com.intellij.platform.workspace.storage.annotations.Child @@ -15,10 +20,10 @@ interface HeadAbstractionEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : HeadAbstractionEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var child: CompositeBaseEntity? + var data: String + var child: CompositeBaseEntity.Builder? } companion object : EntityType() { @@ -29,7 +34,7 @@ interface HeadAbstractionEntity : WorkspaceEntityWithSymbolicId { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): HeadAbstractionEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -58,9 +63,9 @@ interface BaseEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : BaseEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositeBaseEntity? + var parentEntity: CompositeBaseEntity.Builder? } companion object : EntityType>() { @@ -70,7 +75,7 @@ interface BaseEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): BaseEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -89,11 +94,11 @@ interface CompositeBaseEntity : BaseEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : CompositeBaseEntity, BaseEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, BaseEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositeBaseEntity? - override var children: List - override var parent: HeadAbstractionEntity? + override var parentEntity: CompositeBaseEntity.Builder? + var children: List> + var parent: HeadAbstractionEntity.Builder? } companion object : EntityType>(BaseEntity) { @@ -103,7 +108,7 @@ interface CompositeBaseEntity : BaseEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): CompositeBaseEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -119,10 +124,10 @@ interface MiddleEntity : BaseEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : MiddleEntity, BaseEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, BaseEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositeBaseEntity? - override var property: String + override var parentEntity: CompositeBaseEntity.Builder? + var property: String } companion object : EntityType(BaseEntity) { @@ -133,7 +138,7 @@ interface MiddleEntity : BaseEntity { property: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): MiddleEntity { + ): Builder { val builder = builder() builder.property = property builder.entitySource = entitySource @@ -159,11 +164,11 @@ fun MutableEntityStorage.modifyEntity( interface LeftEntity : CompositeBaseEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : LeftEntity, CompositeBaseEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, CompositeBaseEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositeBaseEntity? - override var children: List - override var parent: HeadAbstractionEntity? + override var parentEntity: CompositeBaseEntity.Builder? + override var children: List> + override var parent: HeadAbstractionEntity.Builder? } companion object : EntityType(CompositeBaseEntity) { @@ -173,7 +178,7 @@ interface LeftEntity : CompositeBaseEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): LeftEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -198,11 +203,11 @@ fun MutableEntityStorage.modifyEntity( interface RightEntity : CompositeBaseEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : RightEntity, CompositeBaseEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, CompositeBaseEntity.Builder { override var entitySource: EntitySource - override var parentEntity: CompositeBaseEntity? - override var children: List - override var parent: HeadAbstractionEntity? + override var parentEntity: CompositeBaseEntity.Builder? + override var children: List> + override var parent: HeadAbstractionEntity.Builder? } companion object : EntityType(CompositeBaseEntity) { @@ -212,7 +217,7 @@ interface RightEntity : CompositeBaseEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): RightEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ChainAbstract.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ChainAbstract.kt index d041d078330f..6a65318ca2bf 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ChainAbstract.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ChainAbstract.kt @@ -16,9 +16,9 @@ interface ParentChainEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ParentChainEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var root: CompositeAbstractEntity? + var root: CompositeAbstractEntity.Builder? } companion object : EntityType() { @@ -28,7 +28,7 @@ interface ParentChainEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ParentChainEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -55,9 +55,9 @@ interface SimpleAbstractEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SimpleAbstractEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentInList: CompositeAbstractEntity? + var parentInList: CompositeAbstractEntity.Builder? } companion object : EntityType>() { @@ -67,7 +67,7 @@ interface SimpleAbstractEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SimpleAbstractEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -86,11 +86,11 @@ interface CompositeAbstractEntity : SimpleAbstractEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : CompositeAbstractEntity, SimpleAbstractEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, SimpleAbstractEntity.Builder { override var entitySource: EntitySource - override var parentInList: CompositeAbstractEntity? - override var children: List - override var parentEntity: ParentChainEntity? + override var parentInList: CompositeAbstractEntity.Builder? + var children: List> + var parentEntity: ParentChainEntity.Builder? } companion object : EntityType>(SimpleAbstractEntity) { @@ -100,7 +100,7 @@ interface CompositeAbstractEntity : SimpleAbstractEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): CompositeAbstractEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -114,11 +114,11 @@ interface CompositeAbstractEntity : SimpleAbstractEntity { interface CompositeChildAbstractEntity : CompositeAbstractEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : CompositeChildAbstractEntity, CompositeAbstractEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, CompositeAbstractEntity.Builder { override var entitySource: EntitySource - override var parentInList: CompositeAbstractEntity? - override var children: List - override var parentEntity: ParentChainEntity? + override var parentInList: CompositeAbstractEntity.Builder? + override var children: List> + override var parentEntity: ParentChainEntity.Builder? } companion object : EntityType(CompositeAbstractEntity) { @@ -128,7 +128,7 @@ interface CompositeChildAbstractEntity : CompositeAbstractEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): CompositeChildAbstractEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -151,9 +151,9 @@ fun MutableEntityStorage.modifyEntity( interface SimpleChildAbstractEntity : SimpleAbstractEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SimpleChildAbstractEntity, SimpleAbstractEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, SimpleAbstractEntity.Builder { override var entitySource: EntitySource - override var parentInList: CompositeAbstractEntity? + override var parentInList: CompositeAbstractEntity.Builder? } companion object : EntityType(SimpleAbstractEntity) { @@ -163,7 +163,7 @@ interface SimpleChildAbstractEntity : SimpleAbstractEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SimpleChildAbstractEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ChainedEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ChainedEntity.kt index fb7ef3d15e71..d2889b6d7d71 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ChainedEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ChainedEntity.kt @@ -15,9 +15,9 @@ interface ChainedParentEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChainedParentEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var child: List + var child: List } companion object : EntityType() { @@ -27,7 +27,7 @@ interface ChainedParentEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChainedParentEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -54,12 +54,12 @@ interface ChainedEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChainedEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var parent: ChainedEntity? - override var child: ChainedEntity? - override var generalParent: ChainedParentEntity? + var data: String + var parent: ChainedEntity.Builder? + var child: ChainedEntity.Builder? + var generalParent: ChainedParentEntity.Builder? } companion object : EntityType() { @@ -70,7 +70,7 @@ interface ChainedEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChainedEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/CollectionEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/CollectionEntity.kt index 9498e84eeaa7..023076df97ec 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/CollectionEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/CollectionEntity.kt @@ -17,10 +17,10 @@ interface CollectionFieldEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : CollectionFieldEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var versions: MutableSet - override var names: MutableList + var versions: MutableSet + var names: MutableList } companion object : EntityType() { @@ -32,7 +32,7 @@ interface CollectionFieldEntity : WorkspaceEntity { names: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): CollectionFieldEntity { + ): Builder { val builder = builder() builder.versions = versions.toMutableWorkspaceSet() builder.names = names.toMutableWorkspaceList() diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/DefaultValueEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/DefaultValueEntity.kt index 19e5a2fd6122..8acd407d4aa1 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/DefaultValueEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/DefaultValueEntity.kt @@ -19,11 +19,11 @@ interface DefaultValueEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : DefaultValueEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var name: String - override var isGenerated: Boolean - override var anotherName: String + var name: String + var isGenerated: Boolean + var anotherName: String } companion object : EntityType() { @@ -34,7 +34,7 @@ interface DefaultValueEntity: WorkspaceEntity { name: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): DefaultValueEntity { + ): Builder { val builder = builder() builder.name = name builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/EntititesWithPersistentId.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/EntititesWithPersistentId.kt index 2d1770f142c4..f62c52dae2e2 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/EntititesWithPersistentId.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/EntititesWithPersistentId.kt @@ -18,9 +18,9 @@ interface FirstEntityWithPId : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : FirstEntityWithPId, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String + var data: String } companion object : EntityType() { @@ -31,7 +31,7 @@ interface FirstEntityWithPId : WorkspaceEntityWithSymbolicId { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): FirstEntityWithPId { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -61,9 +61,9 @@ interface SecondEntityWithPId : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SecondEntityWithPId, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String + var data: String } companion object : EntityType() { @@ -74,7 +74,7 @@ interface SecondEntityWithPId : WorkspaceEntityWithSymbolicId { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SecondEntityWithPId { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntity.kt index e979f71329a0..50c0f9816da9 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntity.kt @@ -2,11 +2,6 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -15,9 +10,9 @@ interface MainEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : MainEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var x: String + var x: String } companion object : EntityType() { @@ -28,7 +23,7 @@ interface MainEntity : WorkspaceEntity { x: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): MainEntity { + ): Builder { val builder = builder() builder.x = x builder.entitySource = entitySource @@ -48,8 +43,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(MainEntity.Builder::class.java, entity, modification) } -var MainEntity.Builder.child: @Child AttachedEntity? - by WorkspaceEntity.extension() +var MainEntity.Builder.child: @Child AttachedEntity.Builder? + by WorkspaceEntity.extensionBuilder(AttachedEntity::class.java) //endregion interface AttachedEntity : WorkspaceEntity { @@ -58,10 +53,10 @@ interface AttachedEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AttachedEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var ref: MainEntity - override var data: String + var ref: MainEntity.Builder + var data: String } companion object : EntityType() { @@ -72,7 +67,7 @@ interface AttachedEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AttachedEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityList.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityList.kt index 332d0e88b52c..41b84234f226 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityList.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityList.kt @@ -2,11 +2,6 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -15,9 +10,9 @@ interface MainEntityList : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : MainEntityList, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var x: String + var x: String } companion object : EntityType() { @@ -28,7 +23,7 @@ interface MainEntityList : WorkspaceEntity { x: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): MainEntityList { + ): Builder { val builder = builder() builder.x = x builder.entitySource = entitySource @@ -47,8 +42,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(MainEntityList.Builder::class.java, entity, modification) } -var MainEntityList.Builder.child: @Child List - by WorkspaceEntity.extension() +var MainEntityList.Builder.child: @Child List + by WorkspaceEntity.extensionBuilder(AttachedEntityList::class.java) //endregion interface AttachedEntityList : WorkspaceEntity { @@ -57,10 +52,10 @@ interface AttachedEntityList : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AttachedEntityList, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var ref: MainEntityList? - override var data: String + var ref: MainEntityList.Builder? + var data: String } companion object : EntityType() { @@ -71,7 +66,7 @@ interface AttachedEntityList : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AttachedEntityList { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityParentList.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityParentList.kt index f5d8fe9d1dc7..74198665b417 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityParentList.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityParentList.kt @@ -2,11 +2,6 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -16,10 +11,10 @@ interface MainEntityParentList : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : MainEntityParentList, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var x: String - override var children: List + var x: String + var children: List } companion object : EntityType() { @@ -30,7 +25,7 @@ interface MainEntityParentList : WorkspaceEntity { x: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): MainEntityParentList { + ): Builder { val builder = builder() builder.x = x builder.entitySource = entitySource @@ -56,9 +51,9 @@ interface AttachedEntityParentList : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AttachedEntityParentList, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String + var data: String } companion object : EntityType() { @@ -69,7 +64,7 @@ interface AttachedEntityParentList : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AttachedEntityParentList { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -89,8 +84,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(AttachedEntityParentList.Builder::class.java, entity, modification) } -var AttachedEntityParentList.Builder.ref: MainEntityParentList? - by WorkspaceEntity.extension() +var AttachedEntityParentList.Builder.ref: MainEntityParentList.Builder? + by WorkspaceEntity.extensionBuilder(MainEntityParentList::class.java) //endregion val AttachedEntityParentList.ref: MainEntityParentList? diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityToParent.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityToParent.kt index c2254967565a..559a62ae661e 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityToParent.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ExtensionFieldEntityToParent.kt @@ -2,11 +2,6 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -17,11 +12,11 @@ interface MainEntityToParent : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : MainEntityToParent, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var x: String - override var child: AttachedEntityToParent? - override var childNullableParent: AttachedEntityToNullableParent? + var x: String + var child: AttachedEntityToParent.Builder? + var childNullableParent: AttachedEntityToNullableParent.Builder? } companion object : EntityType() { @@ -32,7 +27,7 @@ interface MainEntityToParent : WorkspaceEntity { x: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): MainEntityToParent { + ): Builder { val builder = builder() builder.x = x builder.entitySource = entitySource @@ -58,9 +53,9 @@ interface AttachedEntityToParent : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AttachedEntityToParent, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String + var data: String } companion object : EntityType() { @@ -71,7 +66,7 @@ interface AttachedEntityToParent : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AttachedEntityToParent { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -91,8 +86,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(AttachedEntityToParent.Builder::class.java, entity, modification) } -var AttachedEntityToParent.Builder.ref: MainEntityToParent - by WorkspaceEntity.extension() +var AttachedEntityToParent.Builder.ref: MainEntityToParent.Builder + by WorkspaceEntity.extensionBuilder(MainEntityToParent::class.java) //endregion val AttachedEntityToParent.ref: MainEntityToParent @@ -104,9 +99,9 @@ interface AttachedEntityToNullableParent: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AttachedEntityToNullableParent, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String + var data: String } companion object : EntityType() { @@ -117,7 +112,7 @@ interface AttachedEntityToNullableParent: WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AttachedEntityToNullableParent { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -136,8 +131,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(AttachedEntityToNullableParent.Builder::class.java, entity, modification) } -var AttachedEntityToNullableParent.Builder.nullableRef: MainEntityToParent? - by WorkspaceEntity.extension() +var AttachedEntityToNullableParent.Builder.nullableRef: MainEntityToParent.Builder? + by WorkspaceEntity.extensionBuilder(MainEntityToParent::class.java) //endregion val AttachedEntityToNullableParent.nullableRef: MainEntityToParent? diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/FinalFieldsEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/FinalFieldsEntity.kt index 91578ba823cf..14f22faad6bf 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/FinalFieldsEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/FinalFieldsEntity.kt @@ -31,11 +31,11 @@ interface FinalFieldsEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : FinalFieldsEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var descriptor: AnotherDataClass - override var description: String - override var anotherVersion: Int + var descriptor: AnotherDataClass + var description: String + var anotherVersion: Int } companion object : EntityType() { @@ -46,7 +46,7 @@ interface FinalFieldsEntity: WorkspaceEntity { descriptor: AnotherDataClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): FinalFieldsEntity { + ): Builder { val builder = builder() builder.descriptor = descriptor builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/JpsLike.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/JpsLike.kt index 6fb4017614a3..dd2f8fc3f850 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/JpsLike.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/JpsLike.kt @@ -20,11 +20,11 @@ interface ModuleTestEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ModuleTestEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var name: String - override var contentRoots: List - override var facets: List + var name: String + var contentRoots: List + var facets: List } companion object : EntityType() { @@ -35,7 +35,7 @@ interface ModuleTestEntity : WorkspaceEntityWithSymbolicId { name: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ModuleTestEntity { + ): Builder { val builder = builder() builder.name = name builder.entitySource = entitySource @@ -62,11 +62,11 @@ interface ContentRootTestEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ContentRootTestEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var module: ModuleTestEntity - override var sourceRootOrder: SourceRootTestOrderEntity? - override var sourceRoots: List + var module: ModuleTestEntity.Builder + var sourceRootOrder: SourceRootTestOrderEntity.Builder? + var sourceRoots: List } companion object : EntityType() { @@ -76,7 +76,7 @@ interface ContentRootTestEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ContentRootTestEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -94,8 +94,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(ContentRootTestEntity.Builder::class.java, entity, modification) } -var ContentRootTestEntity.Builder.projectModelTestEntity: ProjectModelTestEntity? - by WorkspaceEntity.extension() +var ContentRootTestEntity.Builder.projectModelTestEntity: ProjectModelTestEntity.Builder? + by WorkspaceEntity.extensionBuilder(ProjectModelTestEntity::class.java) //endregion interface SourceRootTestOrderEntity : WorkspaceEntity { @@ -104,10 +104,10 @@ interface SourceRootTestOrderEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SourceRootTestOrderEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var contentRoot: ContentRootTestEntity + var data: String + var contentRoot: ContentRootTestEntity.Builder } companion object : EntityType() { @@ -118,7 +118,7 @@ interface SourceRootTestOrderEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SourceRootTestOrderEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -144,10 +144,10 @@ interface SourceRootTestEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SourceRootTestEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var contentRoot: ContentRootTestEntity + var data: String + var contentRoot: ContentRootTestEntity.Builder } companion object : EntityType() { @@ -158,7 +158,7 @@ interface SourceRootTestEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SourceRootTestEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -198,11 +198,11 @@ interface FacetTestEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : FacetTestEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var moreData: String - override var module: ModuleTestEntity + var data: String + var moreData: String + var module: ModuleTestEntity.Builder } companion object : EntityType() { @@ -214,7 +214,7 @@ interface FacetTestEntity : WorkspaceEntityWithSymbolicId { moreData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): FacetTestEntity { + ): Builder { val builder = builder() builder.data = data builder.moreData = moreData diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/KeyFieldEntities.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/KeyFieldEntities.kt index 7e7c583d7773..2cfd09045ed2 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/KeyFieldEntities.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/KeyFieldEntities.kt @@ -18,11 +18,11 @@ interface KeyParent : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : KeyParent, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var keyField: String - override var notKeyField: String - override var children: List + var keyField: String + var notKeyField: String + var children: List } companion object : EntityType() { @@ -34,7 +34,7 @@ interface KeyParent : WorkspaceEntity { notKeyField: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): KeyParent { + ): Builder { val builder = builder() builder.keyField = keyField builder.notKeyField = notKeyField @@ -63,10 +63,10 @@ interface KeyChild : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : KeyChild, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var parentEntity: KeyParent + var data: String + var parentEntity: KeyParent.Builder } companion object : EntityType() { @@ -77,7 +77,7 @@ interface KeyChild : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): KeyChild { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/LinkedListEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/LinkedListEntity.kt index 9c63931491d1..3b9574b406aa 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/LinkedListEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/LinkedListEntity.kt @@ -2,6 +2,11 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 data class LinkedListEntityId(val name: String) : SymbolicEntityId { @@ -18,10 +23,10 @@ interface LinkedListEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : LinkedListEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var myName: String - override var next: LinkedListEntityId + var myName: String + var next: LinkedListEntityId } companion object : EntityType() { @@ -33,7 +38,7 @@ interface LinkedListEntity : WorkspaceEntityWithSymbolicId { next: LinkedListEntityId, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): LinkedListEntity { + ): Builder { val builder = builder() builder.myName = myName builder.next = next @@ -54,3 +59,4 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(LinkedListEntity.Builder::class.java, entity, modification) } //endregion + diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/MultipleAbstract.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/MultipleAbstract.kt index 9ea7cf096b2d..7ea7ac77f475 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/MultipleAbstract.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/MultipleAbstract.kt @@ -16,9 +16,9 @@ interface ParentAbEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ParentAbEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var children: List + var children: List> } companion object : EntityType() { @@ -28,7 +28,7 @@ interface ParentAbEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ParentAbEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -56,10 +56,10 @@ interface ChildAbstractBaseEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildAbstractBaseEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var commonData: String - override var parentEntity: ParentAbEntity + var commonData: String + var parentEntity: ParentAbEntity.Builder } companion object : EntityType>() { @@ -70,7 +70,7 @@ interface ChildAbstractBaseEntity : WorkspaceEntity { commonData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildAbstractBaseEntity { + ): Builder { val builder = builder() builder.commonData = commonData builder.entitySource = entitySource @@ -87,11 +87,11 @@ interface ChildFirstEntity : ChildAbstractBaseEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildFirstEntity, ChildAbstractBaseEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, ChildAbstractBaseEntity.Builder { override var entitySource: EntitySource override var commonData: String - override var parentEntity: ParentAbEntity - override var firstData: String + override var parentEntity: ParentAbEntity.Builder + var firstData: String } companion object : EntityType(ChildAbstractBaseEntity) { @@ -103,7 +103,7 @@ interface ChildFirstEntity : ChildAbstractBaseEntity { firstData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildFirstEntity { + ): Builder { val builder = builder() builder.commonData = commonData builder.firstData = firstData @@ -134,11 +134,11 @@ interface ChildSecondEntity : ChildAbstractBaseEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildSecondEntity, ChildAbstractBaseEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, ChildAbstractBaseEntity.Builder { override var entitySource: EntitySource override var commonData: String - override var parentEntity: ParentAbEntity - override var secondData: String + override var parentEntity: ParentAbEntity.Builder + var secondData: String } companion object : EntityType(ChildAbstractBaseEntity) { @@ -150,7 +150,7 @@ interface ChildSecondEntity : ChildAbstractBaseEntity { secondData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildSecondEntity { + ): Builder { val builder = builder() builder.commonData = commonData builder.secondData = secondData diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/OneToOne.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/OneToOne.kt index 272ea3ac6d8d..5d95ba438856 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/OneToOne.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/OneToOne.kt @@ -2,6 +2,11 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -16,11 +21,11 @@ interface OoParentEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OoParentEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentProperty: String - override var child: OoChildEntity? - override var anotherChild: OoChildWithNullableParentEntity? + var parentProperty: String + var child: OoChildEntity.Builder? + var anotherChild: OoChildWithNullableParentEntity.Builder? } companion object : EntityType() { @@ -31,7 +36,7 @@ interface OoParentEntity : WorkspaceEntity { parentProperty: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OoParentEntity { + ): Builder { val builder = builder() builder.parentProperty = parentProperty builder.entitySource = entitySource @@ -62,10 +67,10 @@ interface OoChildEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OoChildEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childProperty: String - override var parentEntity: OoParentEntity + var childProperty: String + var parentEntity: OoParentEntity.Builder } companion object : EntityType() { @@ -76,7 +81,7 @@ interface OoChildEntity : WorkspaceEntity { childProperty: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OoChildEntity { + ): Builder { val builder = builder() builder.childProperty = childProperty builder.entitySource = entitySource @@ -104,9 +109,9 @@ interface OoChildWithNullableParentEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OoChildWithNullableParentEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentEntity: OoParentEntity? + var parentEntity: OoParentEntity.Builder? } companion object : EntityType() { @@ -116,7 +121,7 @@ interface OoChildWithNullableParentEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OoChildWithNullableParentEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -154,11 +159,11 @@ interface OoParentWithPidEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OoParentWithPidEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentProperty: String - override var childOne: OoChildForParentWithPidEntity? - override var childThree: OoChildAlsoWithPidEntity? + var parentProperty: String + var childOne: OoChildForParentWithPidEntity.Builder? + var childThree: OoChildAlsoWithPidEntity.Builder? } companion object : EntityType() { @@ -169,7 +174,7 @@ interface OoParentWithPidEntity : WorkspaceEntityWithSymbolicId { parentProperty: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OoParentWithPidEntity { + ): Builder { val builder = builder() builder.parentProperty = parentProperty builder.entitySource = entitySource @@ -199,10 +204,10 @@ interface OoChildForParentWithPidEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OoChildForParentWithPidEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childProperty: String - override var parentEntity: OoParentWithPidEntity + var childProperty: String + var parentEntity: OoParentWithPidEntity.Builder } companion object : EntityType() { @@ -213,7 +218,7 @@ interface OoChildForParentWithPidEntity : WorkspaceEntity { childProperty: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OoChildForParentWithPidEntity { + ): Builder { val builder = builder() builder.childProperty = childProperty builder.entitySource = entitySource @@ -244,10 +249,10 @@ interface OoChildAlsoWithPidEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OoChildAlsoWithPidEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childProperty: String - override var parentEntity: OoParentWithPidEntity + var childProperty: String + var parentEntity: OoParentWithPidEntity.Builder } companion object : EntityType() { @@ -258,7 +263,7 @@ interface OoChildAlsoWithPidEntity : WorkspaceEntityWithSymbolicId { childProperty: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OoChildAlsoWithPidEntity { + ): Builder { val builder = builder() builder.childProperty = childProperty builder.entitySource = entitySource @@ -288,10 +293,10 @@ interface OoParentWithoutPidEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OoParentWithoutPidEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentProperty: String - override var childOne: OoChildWithPidEntity? + var parentProperty: String + var childOne: OoChildWithPidEntity.Builder? } companion object : EntityType() { @@ -302,7 +307,7 @@ interface OoParentWithoutPidEntity : WorkspaceEntity { parentProperty: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OoParentWithoutPidEntity { + ): Builder { val builder = builder() builder.parentProperty = parentProperty builder.entitySource = entitySource @@ -339,10 +344,10 @@ interface OoChildWithPidEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OoChildWithPidEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childProperty: String - override var parentEntity: OoParentWithoutPidEntity + var childProperty: String + var parentEntity: OoParentWithoutPidEntity.Builder } companion object : EntityType() { @@ -353,7 +358,7 @@ interface OoChildWithPidEntity : WorkspaceEntityWithSymbolicId { childProperty: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OoChildWithPidEntity { + ): Builder { val builder = builder() builder.childProperty = childProperty builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOne.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOne.kt index d27789ea64a6..b9778e51903a 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOne.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/OptionalOneToOne.kt @@ -14,9 +14,9 @@ interface OptionalOneToOneParentEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OptionalOneToOneParentEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var child: OptionalOneToOneChildEntity? + var child: OptionalOneToOneChildEntity.Builder? } companion object : EntityType() { @@ -26,7 +26,7 @@ interface OptionalOneToOneParentEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OptionalOneToOneParentEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -51,10 +51,10 @@ interface OptionalOneToOneChildEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OptionalOneToOneChildEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var parent: OptionalOneToOneParentEntity? + var data: String + var parent: OptionalOneToOneParentEntity.Builder? } companion object : EntityType() { @@ -65,7 +65,7 @@ interface OptionalOneToOneChildEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OptionalOneToOneChildEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/Parent.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/Parent.kt index c0f021feddeb..d58d8ed26f8f 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/Parent.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/Parent.kt @@ -19,12 +19,12 @@ interface XParentEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : XParentEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentProperty: String - override var children: List - override var optionalChildren: List - override var childChild: List + var parentProperty: String + var children: List + var optionalChildren: List + var childChild: List } companion object : EntityType() { @@ -35,7 +35,7 @@ interface XParentEntity : WorkspaceEntity { parentProperty: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): XParentEntity { + ): Builder { val builder = builder() builder.parentProperty = parentProperty builder.entitySource = entitySource @@ -68,12 +68,12 @@ interface XChildEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : XChildEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childProperty: String - override var dataClass: DataClassX? - override var parentEntity: XParentEntity - override var childChild: List + var childProperty: String + var dataClass: DataClassX? + var parentEntity: XParentEntity.Builder + var childChild: List } companion object : EntityType() { @@ -84,7 +84,7 @@ interface XChildEntity : WorkspaceEntity { childProperty: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): XChildEntity { + ): Builder { val builder = builder() builder.childProperty = childProperty builder.entitySource = entitySource @@ -111,10 +111,10 @@ interface XChildWithOptionalParentEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : XChildWithOptionalParentEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childProperty: String - override var optionalParent: XParentEntity? + var childProperty: String + var optionalParent: XParentEntity.Builder? } companion object : EntityType() { @@ -125,7 +125,7 @@ interface XChildWithOptionalParentEntity : WorkspaceEntity { childProperty: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): XChildWithOptionalParentEntity { + ): Builder { val builder = builder() builder.childProperty = childProperty builder.entitySource = entitySource @@ -152,10 +152,10 @@ interface XChildChildEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : XChildChildEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parent1: XParentEntity - override var parent2: XChildEntity + var parent1: XParentEntity.Builder + var parent2: XChildEntity.Builder } companion object : EntityType() { @@ -165,7 +165,7 @@ interface XChildChildEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): XChildChildEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndChild.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndChild.kt index fc3cea633d80..43519f816780 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndChild.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndChild.kt @@ -2,6 +2,11 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -13,10 +18,10 @@ interface ParentEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ParentEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentData: String - override var child: ChildEntity? + var parentData: String + var child: ChildEntity.Builder? } companion object : EntityType() { @@ -27,7 +32,7 @@ interface ParentEntity : WorkspaceEntity { parentData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ParentEntity { + ): Builder { val builder = builder() builder.parentData = parentData builder.entitySource = entitySource @@ -56,10 +61,10 @@ interface ChildEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childData: String - override var parentEntity: ParentEntity + var childData: String + var parentEntity: ParentEntity.Builder } companion object : EntityType() { @@ -70,7 +75,7 @@ interface ChildEntity : WorkspaceEntity { childData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildEntity { + ): Builder { val builder = builder() builder.childData = childData builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndChildWithNulls.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndChildWithNulls.kt index 0ff5218b2ef4..b2ae5d99eb29 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndChildWithNulls.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndChildWithNulls.kt @@ -2,11 +2,6 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,10 +13,10 @@ interface ParentWithNulls : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ParentWithNulls, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentData: String - override var child: ChildWithNulls? + var parentData: String + var child: ChildWithNulls.Builder? } companion object : EntityType() { @@ -32,7 +27,7 @@ interface ParentWithNulls : WorkspaceEntity { parentData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ParentWithNulls { + ): Builder { val builder = builder() builder.parentData = parentData builder.entitySource = entitySource @@ -58,9 +53,9 @@ interface ChildWithNulls : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildWithNulls, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childData: String + var childData: String } companion object : EntityType() { @@ -71,7 +66,7 @@ interface ChildWithNulls : WorkspaceEntity { childData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildWithNulls { + ): Builder { val builder = builder() builder.childData = childData builder.entitySource = entitySource @@ -91,8 +86,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(ChildWithNulls.Builder::class.java, entity, modification) } -var ChildWithNulls.Builder.parentEntity: ParentWithNulls? - by WorkspaceEntity.extension() +var ChildWithNulls.Builder.parentEntity: ParentWithNulls.Builder? + by WorkspaceEntity.extensionBuilder(ParentWithNulls::class.java) //endregion val ChildWithNulls.parentEntity: ParentWithNulls? diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndMultipleChildren.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndMultipleChildren.kt index 085a32190f9b..83801f5b13e0 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndMultipleChildren.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/ParentAndMultipleChildren.kt @@ -16,10 +16,10 @@ interface ParentMultipleEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ParentMultipleEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentData: String - override var children: List + var parentData: String + var children: List } companion object : EntityType() { @@ -30,7 +30,7 @@ interface ParentMultipleEntity : WorkspaceEntity { parentData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ParentMultipleEntity { + ): Builder { val builder = builder() builder.parentData = parentData builder.entitySource = entitySource @@ -58,10 +58,10 @@ interface ChildMultipleEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildMultipleEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childData: String - override var parentEntity: ParentMultipleEntity + var childData: String + var parentEntity: ParentMultipleEntity.Builder } companion object : EntityType() { @@ -72,7 +72,7 @@ interface ChildMultipleEntity : WorkspaceEntity { childData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildMultipleEntity { + ): Builder { val builder = builder() builder.childData = childData builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/RiderTestEntities.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/RiderTestEntities.kt index af3b07e4d99d..dabf81f912f5 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/RiderTestEntities.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/RiderTestEntities.kt @@ -22,13 +22,13 @@ interface ProjectModelTestEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ProjectModelTestEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var info: String - override var descriptor: Descriptor - override var parentEntity: ProjectModelTestEntity? - override var childrenEntities: List - override var contentRoot: ContentRootTestEntity? + var info: String + var descriptor: Descriptor + var parentEntity: ProjectModelTestEntity.Builder? + var childrenEntities: List + var contentRoot: ContentRootTestEntity.Builder? } companion object : EntityType() { @@ -40,7 +40,7 @@ interface ProjectModelTestEntity : WorkspaceEntity { descriptor: Descriptor, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ProjectModelTestEntity { + ): Builder { val builder = builder() builder.info = info builder.descriptor = descriptor diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntity.kt index 028dc24d5ac6..7ec6aa69ffef 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SampleEntity.kt @@ -29,16 +29,16 @@ interface SampleEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SampleEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var booleanProperty: Boolean - override var stringProperty: String - override var stringListProperty: MutableList - override var stringMapProperty: Map - override var fileProperty: VirtualFileUrl - override var children: List - override var nullableData: String? - override var randomUUID: UUID? + var booleanProperty: Boolean + var stringProperty: String + var stringListProperty: MutableList + var stringMapProperty: Map + var fileProperty: VirtualFileUrl + var children: List + var nullableData: String? + var randomUUID: UUID? } companion object : EntityType() { @@ -53,7 +53,7 @@ interface SampleEntity : WorkspaceEntity { fileProperty: VirtualFileUrl, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SampleEntity { + ): Builder { val builder = builder() builder.booleanProperty = booleanProperty builder.stringProperty = stringProperty @@ -84,10 +84,10 @@ interface ChildSampleEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildSampleEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var parentEntity: SampleEntity? + var data: String + var parentEntity: SampleEntity.Builder? } companion object : EntityType() { @@ -98,7 +98,7 @@ interface ChildSampleEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildSampleEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -140,9 +140,9 @@ interface SecondSampleEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SecondSampleEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var intProperty: Int + var intProperty: Int } companion object : EntityType() { @@ -153,7 +153,7 @@ interface SecondSampleEntity : WorkspaceEntity { intProperty: Int, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SecondSampleEntity { + ): Builder { val builder = builder() builder.intProperty = intProperty builder.entitySource = entitySource @@ -180,10 +180,10 @@ interface SourceEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SourceEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var children: List + var data: String + var children: List } companion object : EntityType() { @@ -194,7 +194,7 @@ interface SourceEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SourceEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -221,10 +221,10 @@ interface ChildSourceEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildSourceEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var parentEntity: SourceEntity + var data: String + var parentEntity: SourceEntity.Builder } companion object : EntityType() { @@ -235,7 +235,7 @@ interface ChildSourceEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildSourceEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -265,9 +265,9 @@ interface SymbolicIdEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SymbolicIdEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String + var data: String } companion object : EntityType() { @@ -278,7 +278,7 @@ interface SymbolicIdEntity : WorkspaceEntityWithSymbolicId { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SymbolicIdEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SampleWithSymbolicIdEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SampleWithSymbolicIdEntity.kt index 24b1bf48fbcd..4bb66aed7ba8 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SampleWithSymbolicIdEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SampleWithSymbolicIdEntity.kt @@ -26,15 +26,15 @@ interface SampleWithSymbolicIdEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SampleWithSymbolicIdEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var booleanProperty: Boolean - override var stringProperty: String - override var stringListProperty: MutableList - override var stringMapProperty: Map - override var fileProperty: VirtualFileUrl - override var children: List - override var nullableData: String? + var booleanProperty: Boolean + var stringProperty: String + var stringListProperty: MutableList + var stringMapProperty: Map + var fileProperty: VirtualFileUrl + var children: List + var nullableData: String? } companion object : EntityType() { @@ -49,7 +49,7 @@ interface SampleWithSymbolicIdEntity : WorkspaceEntityWithSymbolicId { fileProperty: VirtualFileUrl, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SampleWithSymbolicIdEntity { + ): Builder { val builder = builder() builder.booleanProperty = booleanProperty builder.stringProperty = stringProperty @@ -85,10 +85,10 @@ interface ChildWpidSampleEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildWpidSampleEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var parentEntity: SampleWithSymbolicIdEntity? + var data: String + var parentEntity: SampleWithSymbolicIdEntity.Builder? } companion object : EntityType() { @@ -99,7 +99,7 @@ interface ChildWpidSampleEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildWpidSampleEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SecondEntities.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SecondEntities.kt index d817b2d8fda0..e58a61578bbf 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SecondEntities.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SecondEntities.kt @@ -18,11 +18,11 @@ interface SampleEntity2 : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SampleEntity2, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var boolData: Boolean - override var optionalData: String? + var data: String + var boolData: Boolean + var optionalData: String? } companion object : EntityType() { @@ -34,7 +34,7 @@ interface SampleEntity2 : WorkspaceEntity { boolData: Boolean, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SampleEntity2 { + ): Builder { val builder = builder() builder.data = data builder.boolData = boolData @@ -64,12 +64,12 @@ interface VFUEntity2 : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : VFUEntity2, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var filePath: VirtualFileUrl? - override var directoryPath: VirtualFileUrl - override var notNullRoots: MutableList + var data: String + var filePath: VirtualFileUrl? + var directoryPath: VirtualFileUrl + var notNullRoots: MutableList } companion object : EntityType() { @@ -82,7 +82,7 @@ interface VFUEntity2 : WorkspaceEntity { notNullRoots: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): VFUEntity2 { + ): Builder { val builder = builder() builder.data = data builder.directoryPath = directoryPath diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SelfLinkedEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SelfLinkedEntity.kt index f6a0e67dcf82..87849ab60a62 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SelfLinkedEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SelfLinkedEntity.kt @@ -15,9 +15,9 @@ interface SelfLinkedEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SelfLinkedEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentEntity: SelfLinkedEntity? + var parentEntity: SelfLinkedEntity.Builder? } companion object : EntityType() { @@ -27,7 +27,7 @@ interface SelfLinkedEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SelfLinkedEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -46,8 +46,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(SelfLinkedEntity.Builder::class.java, entity, modification) } -var SelfLinkedEntity.Builder.children: @Child List - by WorkspaceEntity.extension() +var SelfLinkedEntity.Builder.children: @Child List + by WorkspaceEntity.extensionBuilder(SelfLinkedEntity::class.java) //endregion val SelfLinkedEntity.children: List<@Child SelfLinkedEntity> diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SingleAbstract.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SingleAbstract.kt index 9866f642674b..e06aaeeada6a 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SingleAbstract.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SingleAbstract.kt @@ -16,9 +16,9 @@ interface ParentSingleAbEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ParentSingleAbEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var child: ChildSingleAbstractBaseEntity? + var child: ChildSingleAbstractBaseEntity.Builder? } companion object : EntityType() { @@ -28,7 +28,7 @@ interface ParentSingleAbEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ParentSingleAbEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -56,10 +56,10 @@ interface ChildSingleAbstractBaseEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildSingleAbstractBaseEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var commonData: String - override var parentEntity: ParentSingleAbEntity + var commonData: String + var parentEntity: ParentSingleAbEntity.Builder } companion object : EntityType>() { @@ -70,7 +70,7 @@ interface ChildSingleAbstractBaseEntity : WorkspaceEntity { commonData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildSingleAbstractBaseEntity { + ): Builder { val builder = builder() builder.commonData = commonData builder.entitySource = entitySource @@ -87,11 +87,11 @@ interface ChildSingleFirstEntity : ChildSingleAbstractBaseEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildSingleFirstEntity, ChildSingleAbstractBaseEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, ChildSingleAbstractBaseEntity.Builder { override var entitySource: EntitySource override var commonData: String - override var parentEntity: ParentSingleAbEntity - override var firstData: String + override var parentEntity: ParentSingleAbEntity.Builder + var firstData: String } companion object : EntityType(ChildSingleAbstractBaseEntity) { @@ -103,7 +103,7 @@ interface ChildSingleFirstEntity : ChildSingleAbstractBaseEntity { firstData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildSingleFirstEntity { + ): Builder { val builder = builder() builder.commonData = commonData builder.firstData = firstData @@ -130,11 +130,11 @@ interface ChildSingleSecondEntity : ChildSingleAbstractBaseEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildSingleSecondEntity, ChildSingleAbstractBaseEntity.Builder, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder, ChildSingleAbstractBaseEntity.Builder { override var entitySource: EntitySource override var commonData: String - override var parentEntity: ParentSingleAbEntity - override var secondData: String + override var parentEntity: ParentSingleAbEntity.Builder + var secondData: String } companion object : EntityType(ChildSingleAbstractBaseEntity) { @@ -146,7 +146,7 @@ interface ChildSingleSecondEntity : ChildSingleAbstractBaseEntity { secondData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildSingleSecondEntity { + ): Builder { val builder = builder() builder.commonData = commonData builder.secondData = secondData diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SubChildren.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SubChildren.kt index e026f8dd5800..11e23cf0687e 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SubChildren.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/SubChildren.kt @@ -22,10 +22,10 @@ interface ParentSubEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ParentSubEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentData: String - override var child: ChildSubEntity? + var parentData: String + var child: ChildSubEntity.Builder? } companion object : EntityType() { @@ -36,7 +36,7 @@ interface ParentSubEntity : WorkspaceEntity { parentData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ParentSubEntity { + ): Builder { val builder = builder() builder.parentData = parentData builder.entitySource = entitySource @@ -65,10 +65,10 @@ interface ChildSubEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildSubEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentEntity: ParentSubEntity - override var child: ChildSubSubEntity? + var parentEntity: ParentSubEntity.Builder + var child: ChildSubSubEntity.Builder? } companion object : EntityType() { @@ -78,7 +78,7 @@ interface ChildSubEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildSubEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -105,10 +105,10 @@ interface ChildSubSubEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildSubSubEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentEntity: ChildSubEntity - override var childData: String + var parentEntity: ChildSubEntity.Builder + var childData: String } companion object : EntityType() { @@ -119,7 +119,7 @@ interface ChildSubSubEntity : WorkspaceEntity { childData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildSubSubEntity { + ): Builder { val builder = builder() builder.childData = childData builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/TreeEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/TreeEntity.kt index 11ae9aaed59c..872e0f99a997 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/TreeEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/TreeEntity.kt @@ -18,11 +18,11 @@ interface TreeEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : TreeEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var children: List - override var parentEntity: TreeEntity? + var data: String + var children: List + var parentEntity: TreeEntity.Builder? } companion object : EntityType() { @@ -33,7 +33,7 @@ interface TreeEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): TreeEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentEntity.kt index 52b06d3e6fd2..2e7a9334c3f0 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/TreeMultiparentEntity.kt @@ -19,10 +19,10 @@ interface TreeMultiparentRootEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : TreeMultiparentRootEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var children: List + var data: String + var children: List } companion object : EntityType() { @@ -33,7 +33,7 @@ interface TreeMultiparentRootEntity : WorkspaceEntityWithSymbolicId { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): TreeMultiparentRootEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -62,12 +62,12 @@ interface TreeMultiparentLeafEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : TreeMultiparentLeafEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var mainParent: TreeMultiparentRootEntity? - override var leafParent: TreeMultiparentLeafEntity? - override var children: List + var data: String + var mainParent: TreeMultiparentRootEntity.Builder? + var leafParent: TreeMultiparentLeafEntity.Builder? + var children: List } companion object : EntityType() { @@ -78,7 +78,7 @@ interface TreeMultiparentLeafEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): TreeMultiparentLeafEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/UnknownFieldEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/UnknownFieldEntity.kt index b970976a3871..b96cd0bf3a2d 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/UnknownFieldEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/UnknownFieldEntity.kt @@ -16,9 +16,9 @@ interface UnknownFieldEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : UnknownFieldEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: Date + var data: Date } companion object : EntityType() { @@ -29,7 +29,7 @@ interface UnknownFieldEntity : WorkspaceEntity { data: Date, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): UnknownFieldEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithAssertConsistency.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithAssertConsistency.kt index 0e8b78b937da..8d56d85bef09 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithAssertConsistency.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithAssertConsistency.kt @@ -2,6 +2,11 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 // ------------------- Entity with consistency assertion -------------------------------- @@ -11,9 +16,9 @@ interface AssertConsistencyEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AssertConsistencyEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var passCheck: Boolean + var passCheck: Boolean } companion object : EntityType() { @@ -24,7 +29,7 @@ interface AssertConsistencyEntity : WorkspaceEntity { passCheck: Boolean, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AssertConsistencyEntity { + ): Builder { val builder = builder() builder.passCheck = passCheck builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithNullsMultiple.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithNullsMultiple.kt index 21bd3656e8b0..f77c9675b1e8 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithNullsMultiple.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithNullsMultiple.kt @@ -2,11 +2,6 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -18,10 +13,10 @@ interface ParentWithNullsMultiple : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ParentWithNullsMultiple, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentData: String - override var children: List + var parentData: String + var children: List } companion object : EntityType() { @@ -32,7 +27,7 @@ interface ParentWithNullsMultiple : WorkspaceEntity { parentData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ParentWithNullsMultiple { + ): Builder { val builder = builder() builder.parentData = parentData builder.entitySource = entitySource @@ -58,9 +53,9 @@ interface ChildWithNullsMultiple : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildWithNullsMultiple, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childData: String + var childData: String } companion object : EntityType() { @@ -71,7 +66,7 @@ interface ChildWithNullsMultiple : WorkspaceEntity { childData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildWithNullsMultiple { + ): Builder { val builder = builder() builder.childData = childData builder.entitySource = entitySource @@ -91,8 +86,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(ChildWithNullsMultiple.Builder::class.java, entity, modification) } -var ChildWithNullsMultiple.Builder.parent: ParentWithNullsMultiple? - by WorkspaceEntity.extension() +var ChildWithNullsMultiple.Builder.parent: ParentWithNullsMultiple.Builder? + by WorkspaceEntity.extensionBuilder(ParentWithNullsMultiple::class.java) //endregion val ChildWithNullsMultiple.parent: ParentWithNullsMultiple? diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithNullsMultipleOpposite.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithNullsMultipleOpposite.kt index dc37f6b84fdd..072a55f6bf31 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithNullsMultipleOpposite.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithNullsMultipleOpposite.kt @@ -2,11 +2,6 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -15,9 +10,9 @@ interface ParentWithNullsOppositeMultiple : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ParentWithNullsOppositeMultiple, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentData: String + var parentData: String } companion object : EntityType() { @@ -28,7 +23,7 @@ interface ParentWithNullsOppositeMultiple : WorkspaceEntity { parentData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ParentWithNullsOppositeMultiple { + ): Builder { val builder = builder() builder.parentData = parentData builder.entitySource = entitySource @@ -48,8 +43,8 @@ fun MutableEntityStorage.modifyEntity( return modifyEntity(ParentWithNullsOppositeMultiple.Builder::class.java, entity, modification) } -var ParentWithNullsOppositeMultiple.Builder.children: @Child List - by WorkspaceEntity.extension() +var ParentWithNullsOppositeMultiple.Builder.children: @Child List + by WorkspaceEntity.extensionBuilder(ChildWithNullsOppositeMultiple::class.java) //endregion @@ -60,10 +55,10 @@ interface ChildWithNullsOppositeMultiple : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChildWithNullsOppositeMultiple, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childData: String - override var parentEntity: ParentWithNullsOppositeMultiple? + var childData: String + var parentEntity: ParentWithNullsOppositeMultiple.Builder? } companion object : EntityType() { @@ -74,7 +69,7 @@ interface ChildWithNullsOppositeMultiple : WorkspaceEntity { childData: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChildWithNullsOppositeMultiple { + ): Builder { val builder = builder() builder.childData = childData builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithPersistentId.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithPersistentId.kt index ba4326739206..7ed2d45a47de 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithPersistentId.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithPersistentId.kt @@ -55,9 +55,9 @@ interface OneEntityWithSymbolicId : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OneEntityWithSymbolicId, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var myName: String + var myName: String } companion object : EntityType() { @@ -68,7 +68,7 @@ interface OneEntityWithSymbolicId : WorkspaceEntityWithSymbolicId { myName: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OneEntityWithSymbolicId { + ): Builder { val builder = builder() builder.myName = myName builder.entitySource = entitySource @@ -111,22 +111,22 @@ interface EntityWithSoftLinks : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : EntityWithSoftLinks, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var link: OneSymbolicId - override var manyLinks: MutableList - override var optionalLink: OneSymbolicId? - override var inContainer: Container - override var inOptionalContainer: Container? - override var inContainerList: MutableList - override var deepContainer: MutableList - override var sealedContainer: SealedContainer - override var listSealedContainer: MutableList - override var justProperty: String - override var justNullableProperty: String? - override var justListProperty: MutableList - override var deepSealedClass: DeepSealedOne - override var children: List + var link: OneSymbolicId + var manyLinks: MutableList + var optionalLink: OneSymbolicId? + var inContainer: Container + var inOptionalContainer: Container? + var inContainerList: MutableList + var deepContainer: MutableList + var sealedContainer: SealedContainer + var listSealedContainer: MutableList + var justProperty: String + var justNullableProperty: String? + var justListProperty: MutableList + var deepSealedClass: DeepSealedOne + var children: List } companion object : EntityType() { @@ -146,7 +146,7 @@ interface EntityWithSoftLinks : WorkspaceEntity { deepSealedClass: DeepSealedOne, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): EntityWithSoftLinks { + ): Builder { val builder = builder() builder.link = link builder.manyLinks = manyLinks.toMutableWorkspaceList() @@ -181,9 +181,9 @@ interface SoftLinkReferencedChild : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SoftLinkReferencedChild, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentEntity: EntityWithSoftLinks + var parentEntity: EntityWithSoftLinks.Builder } companion object : EntityType() { @@ -193,7 +193,7 @@ interface SoftLinkReferencedChild : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SoftLinkReferencedChild { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithSealedEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithSealedEntity.kt index 86d5a0294531..0b923c8ebb80 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithSealedEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithSealedEntity.kt @@ -15,10 +15,10 @@ interface WithSealedEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : WithSealedEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var classes: MutableList - override var interfaces: MutableList + var classes: MutableList + var interfaces: MutableList } companion object : EntityType() { @@ -30,7 +30,7 @@ interface WithSealedEntity : WorkspaceEntity { interfaces: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): WithSealedEntity { + ): Builder { val builder = builder() builder.classes = classes.toMutableWorkspaceList() builder.interfaces = interfaces.toMutableWorkspaceList() diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithSoftLinkEntityData.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithSoftLinkEntityData.kt index 2ea37e72a902..046894607684 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithSoftLinkEntityData.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/WithSoftLinkEntityData.kt @@ -2,6 +2,11 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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 @@ -40,11 +45,11 @@ interface NamedEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : NamedEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var myName: String - override var additionalProperty: String? - override var children: List + var myName: String + var additionalProperty: String? + var children: List } companion object : EntityType() { @@ -55,7 +60,7 @@ interface NamedEntity : WorkspaceEntityWithSymbolicId { myName: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): NamedEntity { + ): Builder { val builder = builder() builder.myName = myName builder.entitySource = entitySource @@ -90,10 +95,10 @@ interface NamedChildEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : NamedChildEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var childProperty: String - override var parentEntity: NamedEntity + var childProperty: String + var parentEntity: NamedEntity.Builder } companion object : EntityType() { @@ -104,7 +109,7 @@ interface NamedChildEntity : WorkspaceEntity { childProperty: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): NamedChildEntity { + ): Builder { val builder = builder() builder.childProperty = childProperty builder.entitySource = entitySource @@ -133,9 +138,9 @@ interface WithSoftLinkEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : WithSoftLinkEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var link: NameId + var link: NameId } companion object : EntityType() { @@ -146,7 +151,7 @@ interface WithSoftLinkEntity : WorkspaceEntity { link: NameId, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): WithSoftLinkEntity { + ): Builder { val builder = builder() builder.link = link builder.entitySource = entitySource @@ -172,9 +177,9 @@ interface ComposedLinkEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ComposedLinkEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var link: ComposedId + var link: ComposedId } companion object : EntityType() { @@ -185,7 +190,7 @@ interface ComposedLinkEntity : WorkspaceEntity { link: ComposedId, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ComposedLinkEntity { + ): Builder { val builder = builder() builder.link = link builder.entitySource = entitySource @@ -216,10 +221,10 @@ interface WithListSoftLinksEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : WithListSoftLinksEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var myName: String - override var links: MutableList + var myName: String + var links: MutableList } companion object : EntityType() { @@ -231,7 +236,7 @@ interface WithListSoftLinksEntity : WorkspaceEntityWithSymbolicId { links: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): WithListSoftLinksEntity { + ): Builder { val builder = builder() builder.myName = myName builder.links = links.toMutableWorkspaceList() @@ -264,10 +269,10 @@ interface ComposedIdSoftRefEntity : WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ComposedIdSoftRefEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var myName: String - override var link: NameId + var myName: String + var link: NameId } companion object : EntityType() { @@ -279,7 +284,7 @@ interface ComposedIdSoftRefEntity : WorkspaceEntityWithSymbolicId { link: NameId, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ComposedIdSoftRefEntity { + ): Builder { val builder = builder() builder.myName = myName builder.link = link diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropEntity.kt index a295095a5fdd..3b56b36e291d 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropEntity.kt @@ -15,9 +15,9 @@ interface ChangedComputablePropEntity: WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChangedComputablePropEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var text: String + var text: String } companion object : EntityType() { @@ -28,7 +28,7 @@ interface ChangedComputablePropEntity: WorkspaceEntityWithSymbolicId { text: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChangedComputablePropEntity { + ): Builder { val builder = builder() builder.text = text builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropsOrderEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropsOrderEntity.kt index 412dbbf30806..63bea3823ae0 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropsOrderEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedComputablePropsOrderEntity.kt @@ -23,11 +23,11 @@ interface ChangedComputablePropsOrderEntity: WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChangedComputablePropsOrderEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someKey: Int - override var names: MutableList - override var value: Int + var someKey: Int + var names: MutableList + var value: Int } companion object : EntityType() { @@ -40,7 +40,7 @@ interface ChangedComputablePropsOrderEntity: WorkspaceEntityWithSymbolicId { value: Int, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChangedComputablePropsOrderEntity { + ): Builder { val builder = builder() builder.someKey = someKey builder.names = names.toMutableWorkspaceList() diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedEnumNameEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedEnumNameEntity.kt index 0e618c1d95d5..ee0c63bf6690 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedEnumNameEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedEnumNameEntity.kt @@ -13,9 +13,9 @@ interface ChangedEnumNameEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChangedEnumNameEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someEnum: ChangedEnumNameEnum + var someEnum: ChangedEnumNameEnum } companion object : EntityType() { @@ -26,7 +26,7 @@ interface ChangedEnumNameEntity: WorkspaceEntity { someEnum: ChangedEnumNameEnum, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChangedEnumNameEntity { + ): Builder { val builder = builder() builder.someEnum = someEnum builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedPropsOrderEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedPropsOrderEntity.kt index 6073b87bdbd9..e14cfd1984b0 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedPropsOrderEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedPropsOrderEntity.kt @@ -18,12 +18,12 @@ interface ChangedPropsOrderEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChangedPropsOrderEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var version: Int - override var string: String - override var list: MutableList> - override var data: ChangedPropsOrderDataClass + var version: Int + var string: String + var list: MutableList> + var data: ChangedPropsOrderDataClass } companion object : EntityType() { @@ -37,7 +37,7 @@ interface ChangedPropsOrderEntity: WorkspaceEntity { data: ChangedPropsOrderDataClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChangedPropsOrderEntity { + ): Builder { val builder = builder() builder.version = version builder.string = string diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedValueTypeEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedValueTypeEntity.kt index d32cae545477..3084bec95a85 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedValueTypeEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ChangedValueTypeEntity.kt @@ -16,11 +16,11 @@ interface ChangedValueTypeEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChangedValueTypeEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var type: String - override var someKey: Int - override var text: MutableList + var type: String + var someKey: Int + var text: MutableList } companion object : EntityType() { @@ -33,7 +33,7 @@ interface ChangedValueTypeEntity: WorkspaceEntity { text: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChangedValueTypeEntity { + ): Builder { val builder = builder() builder.type = type builder.someKey = someKey diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ComputablePropEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ComputablePropEntity.kt index 90b7f4ebfe64..1f5cba149362 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ComputablePropEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/ComputablePropEntity.kt @@ -17,10 +17,10 @@ interface ComputablePropEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ComputablePropEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var list: MutableList, String>> - override var value: Int + var list: MutableList, String>> + var value: Int } companion object : EntityType() { @@ -32,7 +32,7 @@ interface ComputablePropEntity: WorkspaceEntity { value: Int, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ComputablePropEntity { + ): Builder { val builder = builder() builder.list = list.toMutableWorkspaceList() builder.value = value diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/DefaultPropEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/DefaultPropEntity.kt index 8cd1e8de5d40..ff73e24eda33 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/DefaultPropEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/DefaultPropEntity.kt @@ -19,11 +19,11 @@ interface DefaultPropEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : DefaultPropEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someString: String - override var someList: MutableList - override var constInt: Int + var someString: String + var someList: MutableList + var constInt: Int } companion object : EntityType() { @@ -35,7 +35,7 @@ interface DefaultPropEntity: WorkspaceEntity { someList: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): DefaultPropEntity { + ): Builder { val builder = builder() builder.someString = someString builder.someList = someList.toMutableWorkspaceList() diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/EnumPropsEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/EnumPropsEntity.kt index 4a47edaaa467..4b146b1a9ffd 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/EnumPropsEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/EnumPropsEntity.kt @@ -14,9 +14,9 @@ interface EnumPropsEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : EnumPropsEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someEnum: EnumPropsEnum + var someEnum: EnumPropsEnum } companion object : EntityType() { @@ -27,7 +27,7 @@ interface EnumPropsEntity: WorkspaceEntity { someEnum: EnumPropsEnum, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): EnumPropsEntity { + ): Builder { val builder = builder() builder.someEnum = someEnum builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/KeyPropEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/KeyPropEntity.kt index ba917eeb4c22..1242ac883d0b 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/KeyPropEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/KeyPropEntity.kt @@ -18,11 +18,11 @@ interface KeyPropEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : KeyPropEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someInt: Int - override var text: String - override var url: VirtualFileUrl + var someInt: Int + var text: String + var url: VirtualFileUrl } companion object : EntityType() { @@ -35,7 +35,7 @@ interface KeyPropEntity: WorkspaceEntity { url: VirtualFileUrl, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): KeyPropEntity { + ): Builder { val builder = builder() builder.someInt = someInt builder.text = text diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NotNullToNullEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NotNullToNullEntity.kt index 5e0e9c37e571..07ab7216a38b 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NotNullToNullEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NotNullToNullEntity.kt @@ -17,11 +17,11 @@ interface NotNullToNullEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : NotNullToNullEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var nullInt: Int? - override var notNullString: String - override var notNullList: MutableList + var nullInt: Int? + var notNullString: String + var notNullList: MutableList } companion object : EntityType() { @@ -33,7 +33,7 @@ interface NotNullToNullEntity: WorkspaceEntity { notNullList: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): NotNullToNullEntity { + ): Builder { val builder = builder() builder.notNullString = notNullString builder.notNullList = notNullList.toMutableWorkspaceList() diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NullToNotNullEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NullToNotNullEntity.kt index b4f1287ef0e5..6e1cc633a9ee 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NullToNotNullEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/NullToNotNullEntity.kt @@ -15,11 +15,11 @@ interface NullToNotNullEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : NullToNotNullEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var nullString: String? - override var notNullBoolean: Boolean - override var notNullInt: Int + var nullString: String? + var notNullBoolean: Boolean + var notNullInt: Int } companion object : EntityType() { @@ -31,7 +31,7 @@ interface NullToNotNullEntity: WorkspaceEntity { notNullInt: Int, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): NullToNotNullEntity { + ): Builder { val builder = builder() builder.notNullBoolean = notNullBoolean builder.notNullInt = notNullInt diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToManyRefEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToManyRefEntity.kt index a4e2d996b35c..484f94f6cfe4 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToManyRefEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToManyRefEntity.kt @@ -15,10 +15,10 @@ interface OneToManyRefEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OneToManyRefEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someData: OneToManyRefDataClass - override var anotherEntity: List + var someData: OneToManyRefDataClass + var anotherEntity: List } companion object : EntityType() { @@ -29,7 +29,7 @@ interface OneToManyRefEntity: WorkspaceEntity { someData: OneToManyRefDataClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OneToManyRefEntity { + ): Builder { val builder = builder() builder.someData = someData builder.entitySource = entitySource @@ -56,11 +56,11 @@ interface AnotherOneToManyRefEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AnotherOneToManyRefEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentEntity: OneToManyRefEntity - override var version: Int - override var someData: OneToManyRefDataClass + var parentEntity: OneToManyRefEntity.Builder + var version: Int + var someData: OneToManyRefDataClass } companion object : EntityType() { @@ -72,7 +72,7 @@ interface AnotherOneToManyRefEntity: WorkspaceEntity { someData: OneToManyRefDataClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AnotherOneToManyRefEntity { + ): Builder { val builder = builder() builder.version = version builder.someData = someData diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToOneRefEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToOneRefEntity.kt index 5b72c8fff3d3..5c97c11164dc 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToOneRefEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/OneToOneRefEntity.kt @@ -16,11 +16,11 @@ interface OneToOneRefEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OneToOneRefEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var version: Int - override var text: String - override var anotherEntity: AnotherOneToOneRefEntity? + var version: Int + var text: String + var anotherEntity: AnotherOneToOneRefEntity.Builder? } companion object : EntityType() { @@ -32,7 +32,7 @@ interface OneToOneRefEntity: WorkspaceEntity { text: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OneToOneRefEntity { + ): Builder { val builder = builder() builder.version = version builder.text = text @@ -60,11 +60,11 @@ interface AnotherOneToOneRefEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AnotherOneToOneRefEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someString: String - override var boolean: Boolean - override var parentEntity: OneToOneRefEntity + var someString: String + var boolean: Boolean + var parentEntity: OneToOneRefEntity.Builder } companion object : EntityType() { @@ -76,7 +76,7 @@ interface AnotherOneToOneRefEntity: WorkspaceEntity { boolean: Boolean, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AnotherOneToOneRefEntity { + ): Builder { val builder = builder() builder.someString = someString builder.boolean = boolean diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleObjectsEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleObjectsEntity.kt index a2941d2c5c44..98e42cd48c0e 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleObjectsEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleObjectsEntity.kt @@ -14,9 +14,9 @@ interface SimpleObjectsEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SimpleObjectsEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someData: SimpleObjectsSealedClass + var someData: SimpleObjectsSealedClass } companion object : EntityType() { @@ -27,7 +27,7 @@ interface SimpleObjectsEntity: WorkspaceEntity { someData: SimpleObjectsSealedClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SimpleObjectsEntity { + ): Builder { val builder = builder() builder.someData = someData builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimplePropsEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimplePropsEntity.kt index 7f749319b6b5..b3d1a8375fc3 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimplePropsEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimplePropsEntity.kt @@ -19,13 +19,13 @@ interface SimplePropsEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SimplePropsEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var text: String - override var list: MutableList - override var set: MutableSet> - override var map: Map, List> - override var bool: Boolean + var text: String + var list: MutableList + var set: MutableSet> + var map: Map, List> + var bool: Boolean } companion object : EntityType() { @@ -40,7 +40,7 @@ interface SimplePropsEntity: WorkspaceEntity { bool: Boolean, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SimplePropsEntity { + ): Builder { val builder = builder() builder.text = text builder.list = list.toMutableWorkspaceList() diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleSealedClassEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleSealedClassEntity.kt index 1e2e78b15589..2bfaf384b02c 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleSealedClassEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SimpleSealedClassEntity.kt @@ -15,10 +15,10 @@ interface SimpleSealedClassEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SimpleSealedClassEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var text: String - override var someData: SimpleSealedClass + var text: String + var someData: SimpleSealedClass } companion object : EntityType() { @@ -30,7 +30,7 @@ interface SimpleSealedClassEntity: WorkspaceEntity { someData: SimpleSealedClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SimpleSealedClassEntity { + ): Builder { val builder = builder() builder.text = text builder.someData = someData diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetEnumEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetEnumEntity.kt index e25b479884c7..0a00e3350009 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetEnumEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetEnumEntity.kt @@ -14,9 +14,9 @@ interface SubsetEnumEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SubsetEnumEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someEnum: SubsetEnumEnum + var someEnum: SubsetEnumEnum } companion object : EntityType() { @@ -27,7 +27,7 @@ interface SubsetEnumEntity: WorkspaceEntity { someEnum: SubsetEnumEnum, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SubsetEnumEntity { + ): Builder { val builder = builder() builder.someEnum = someEnum builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetSealedClassEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetSealedClassEntity.kt index 7a11354d5937..32f278ae1cec 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetSealedClassEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/cacheVersion/SubsetSealedClassEntity.kt @@ -15,9 +15,9 @@ interface SubsetSealedClassEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SubsetSealedClassEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someData: SubsetSealedClass + var someData: SubsetSealedClass } companion object : EntityType() { @@ -28,7 +28,7 @@ interface SubsetSealedClassEntity: WorkspaceEntity { someData: SubsetSealedClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SubsetSealedClassEntity { + ): Builder { val builder = builder() builder.someData = someData builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropEntity.kt index 331e0bd471b1..10742ec09d64 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropEntity.kt @@ -16,9 +16,9 @@ interface ChangedComputablePropEntity: WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChangedComputablePropEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var text: String + var text: String } companion object : EntityType() { @@ -29,7 +29,7 @@ interface ChangedComputablePropEntity: WorkspaceEntityWithSymbolicId { text: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChangedComputablePropEntity { + ): Builder { val builder = builder() builder.text = text builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropsOrderEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropsOrderEntity.kt index 4aa5ed84fd98..2d5f9508582c 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropsOrderEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedComputablePropsOrderEntity.kt @@ -24,11 +24,11 @@ interface ChangedComputablePropsOrderEntity: WorkspaceEntityWithSymbolicId { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChangedComputablePropsOrderEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someKey: Int - override var names: MutableList - override var value: Int + var someKey: Int + var names: MutableList + var value: Int } companion object : EntityType() { @@ -41,7 +41,7 @@ interface ChangedComputablePropsOrderEntity: WorkspaceEntityWithSymbolicId { value: Int, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChangedComputablePropsOrderEntity { + ): Builder { val builder = builder() builder.someKey = someKey builder.names = names.toMutableWorkspaceList() diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedEnumNameEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedEnumNameEntity.kt index 87e1e2fbd2fb..cb7ff581bc1d 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedEnumNameEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedEnumNameEntity.kt @@ -13,9 +13,9 @@ interface ChangedEnumNameEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChangedEnumNameEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someEnum: ChangedEnumNameEnum + var someEnum: ChangedEnumNameEnum } companion object : EntityType() { @@ -26,7 +26,7 @@ interface ChangedEnumNameEntity: WorkspaceEntity { someEnum: ChangedEnumNameEnum, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChangedEnumNameEntity { + ): Builder { val builder = builder() builder.someEnum = someEnum builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedPropsOrderEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedPropsOrderEntity.kt index e8912b814283..2c2f37f9a5f7 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedPropsOrderEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedPropsOrderEntity.kt @@ -18,12 +18,12 @@ interface ChangedPropsOrderEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChangedPropsOrderEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var version: Int - override var string: String - override var data: ChangedPropsOrderDataClass - override var list: MutableList> + var version: Int + var string: String + var data: ChangedPropsOrderDataClass + var list: MutableList> } companion object : EntityType() { @@ -37,7 +37,7 @@ interface ChangedPropsOrderEntity: WorkspaceEntity { list: List>, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChangedPropsOrderEntity { + ): Builder { val builder = builder() builder.version = version builder.string = string diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedValueTypeEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedValueTypeEntity.kt index 147e522dc9a9..7986ad7c2357 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedValueTypeEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ChangedValueTypeEntity.kt @@ -16,11 +16,11 @@ interface ChangedValueTypeEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ChangedValueTypeEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var type: String - override var someKey: String - override var text: MutableList + var type: String + var someKey: String + var text: MutableList } companion object : EntityType() { @@ -33,7 +33,7 @@ interface ChangedValueTypeEntity: WorkspaceEntity { text: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ChangedValueTypeEntity { + ): Builder { val builder = builder() builder.type = type builder.someKey = someKey diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ComputablePropEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ComputablePropEntity.kt index c06c949a6ea3..afeb09e4d6c3 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ComputablePropEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/ComputablePropEntity.kt @@ -16,11 +16,11 @@ interface ComputablePropEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ComputablePropEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var list: MutableList, String>> - override var value: Int - override var computableText: String + var list: MutableList, String>> + var value: Int + var computableText: String } companion object : EntityType() { @@ -33,7 +33,7 @@ interface ComputablePropEntity: WorkspaceEntity { computableText: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ComputablePropEntity { + ): Builder { val builder = builder() builder.list = list.toMutableWorkspaceList() builder.value = value diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/DefaultPropEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/DefaultPropEntity.kt index f1250da59588..4610ef9ed1a9 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/DefaultPropEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/DefaultPropEntity.kt @@ -17,11 +17,11 @@ interface DefaultPropEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : DefaultPropEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someString: String - override var someList: MutableList - override var constInt: Int + var someString: String + var someList: MutableList + var constInt: Int } companion object : EntityType() { @@ -34,7 +34,7 @@ interface DefaultPropEntity: WorkspaceEntity { constInt: Int, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): DefaultPropEntity { + ): Builder { val builder = builder() builder.someString = someString builder.someList = someList.toMutableWorkspaceList() diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/EnumPropsEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/EnumPropsEntity.kt index e7854033d5bf..46cc0fd2cb77 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/EnumPropsEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/EnumPropsEntity.kt @@ -14,9 +14,9 @@ interface EnumPropsEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : EnumPropsEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someEnum: EnumPropsEnum + var someEnum: EnumPropsEnum } companion object : EntityType() { @@ -27,7 +27,7 @@ interface EnumPropsEntity: WorkspaceEntity { someEnum: EnumPropsEnum, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): EnumPropsEntity { + ): Builder { val builder = builder() builder.someEnum = someEnum builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/KeyPropEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/KeyPropEntity.kt index 6415ee18a7ed..554c2e4d7015 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/KeyPropEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/KeyPropEntity.kt @@ -17,11 +17,11 @@ interface KeyPropEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : KeyPropEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someInt: Int - override var text: String - override var url: VirtualFileUrl + var someInt: Int + var text: String + var url: VirtualFileUrl } companion object : EntityType() { @@ -34,7 +34,7 @@ interface KeyPropEntity: WorkspaceEntity { url: VirtualFileUrl, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): KeyPropEntity { + ): Builder { val builder = builder() builder.someInt = someInt builder.text = text diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NotNullToNullEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NotNullToNullEntity.kt index 2a48ffeed968..45dd2c3cea8f 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NotNullToNullEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NotNullToNullEntity.kt @@ -17,11 +17,11 @@ interface NotNullToNullEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : NotNullToNullEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var nullInt: Int? - override var notNullString: String? - override var notNullList: MutableList + var nullInt: Int? + var notNullString: String? + var notNullList: MutableList } companion object : EntityType() { @@ -32,7 +32,7 @@ interface NotNullToNullEntity: WorkspaceEntity { notNullList: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): NotNullToNullEntity { + ): Builder { val builder = builder() builder.notNullList = notNullList.toMutableWorkspaceList() builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NullToNotNullEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NullToNotNullEntity.kt index dbaee0a89f12..c40d3fd02918 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NullToNotNullEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/NullToNotNullEntity.kt @@ -15,11 +15,11 @@ interface NullToNotNullEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : NullToNotNullEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var nullString: String - override var notNullBoolean: Boolean - override var notNullInt: Int + var nullString: String + var notNullBoolean: Boolean + var notNullInt: Int } companion object : EntityType() { @@ -32,7 +32,7 @@ interface NullToNotNullEntity: WorkspaceEntity { notNullInt: Int, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): NullToNotNullEntity { + ): Builder { val builder = builder() builder.nullString = nullString builder.notNullBoolean = notNullBoolean diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToManyRefEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToManyRefEntity.kt index e05fd9ff4e86..60b07b4fc70d 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToManyRefEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToManyRefEntity.kt @@ -15,10 +15,10 @@ interface OneToManyRefEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OneToManyRefEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someData: OneToManyRefDataClass - override var anotherEntity: AnotherOneToManyRefEntity? + var someData: OneToManyRefDataClass + var anotherEntity: AnotherOneToManyRefEntity.Builder? } companion object : EntityType() { @@ -29,7 +29,7 @@ interface OneToManyRefEntity: WorkspaceEntity { someData: OneToManyRefDataClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OneToManyRefEntity { + ): Builder { val builder = builder() builder.someData = someData builder.entitySource = entitySource @@ -56,11 +56,11 @@ interface AnotherOneToManyRefEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AnotherOneToManyRefEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var parentEntity: OneToManyRefEntity - override var version: Int - override var someData: OneToManyRefDataClass + var parentEntity: OneToManyRefEntity.Builder + var version: Int + var someData: OneToManyRefDataClass } companion object : EntityType() { @@ -72,7 +72,7 @@ interface AnotherOneToManyRefEntity: WorkspaceEntity { someData: OneToManyRefDataClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AnotherOneToManyRefEntity { + ): Builder { val builder = builder() builder.version = version builder.someData = someData diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToOneRefEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToOneRefEntity.kt index db1196db444e..3832dde46914 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToOneRefEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/OneToOneRefEntity.kt @@ -16,11 +16,11 @@ interface OneToOneRefEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OneToOneRefEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var version: Int - override var text: String - override var anotherEntity: List + var version: Int + var text: String + var anotherEntity: List } companion object : EntityType() { @@ -32,7 +32,7 @@ interface OneToOneRefEntity: WorkspaceEntity { text: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OneToOneRefEntity { + ): Builder { val builder = builder() builder.version = version builder.text = text @@ -60,11 +60,11 @@ interface AnotherOneToOneRefEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : AnotherOneToOneRefEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someString: String - override var boolean: Boolean - override var parentEntity: OneToOneRefEntity + var someString: String + var boolean: Boolean + var parentEntity: OneToOneRefEntity.Builder } companion object : EntityType() { @@ -76,7 +76,7 @@ interface AnotherOneToOneRefEntity: WorkspaceEntity { boolean: Boolean, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): AnotherOneToOneRefEntity { + ): Builder { val builder = builder() builder.someString = someString builder.boolean = boolean diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleObjectsEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleObjectsEntity.kt index e76876ecd321..6dab878255a5 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleObjectsEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleObjectsEntity.kt @@ -14,9 +14,9 @@ interface SimpleObjectsEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SimpleObjectsEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someData: SimpleObjectsSealedClass + var someData: SimpleObjectsSealedClass } companion object : EntityType() { @@ -27,7 +27,7 @@ interface SimpleObjectsEntity: WorkspaceEntity { someData: SimpleObjectsSealedClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SimpleObjectsEntity { + ): Builder { val builder = builder() builder.someData = someData builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimplePropsEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimplePropsEntity.kt index 413825595d8c..67dae700db74 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimplePropsEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimplePropsEntity.kt @@ -19,13 +19,13 @@ interface SimplePropsEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SimplePropsEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var text: String - override var list: MutableList - override var set: MutableSet> - override var map: Map, List> - override var bool: Boolean + var text: String + var list: MutableList + var set: MutableSet> + var map: Map, List> + var bool: Boolean } companion object : EntityType() { @@ -40,7 +40,7 @@ interface SimplePropsEntity: WorkspaceEntity { bool: Boolean, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SimplePropsEntity { + ): Builder { val builder = builder() builder.text = text builder.list = list.toMutableWorkspaceList() diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleSealedClassEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleSealedClassEntity.kt index 5c8663c5d8b1..e2d6f8c903e9 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleSealedClassEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SimpleSealedClassEntity.kt @@ -15,10 +15,10 @@ interface SimpleSealedClassEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SimpleSealedClassEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var text: String - override var someData: SimpleSealedClass + var text: String + var someData: SimpleSealedClass } companion object : EntityType() { @@ -30,7 +30,7 @@ interface SimpleSealedClassEntity: WorkspaceEntity { someData: SimpleSealedClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SimpleSealedClassEntity { + ): Builder { val builder = builder() builder.text = text builder.someData = someData diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetEnumEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetEnumEntity.kt index 4c0d669b955b..5272c8b88014 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetEnumEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetEnumEntity.kt @@ -14,9 +14,9 @@ interface SubsetEnumEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SubsetEnumEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someEnum: SubsetEnumEnum + var someEnum: SubsetEnumEnum } companion object : EntityType() { @@ -27,7 +27,7 @@ interface SubsetEnumEntity: WorkspaceEntity { someEnum: SubsetEnumEnum, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SubsetEnumEntity { + ): Builder { val builder = builder() builder.someEnum = someEnum builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetSealedClassEntity.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetSealedClassEntity.kt index b82226355b32..2399ce85ef3c 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetSealedClassEntity.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/currentVersion/SubsetSealedClassEntity.kt @@ -14,9 +14,9 @@ interface SubsetSealedClassEntity: WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SubsetSealedClassEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var someData: SubsetSealedClass + var someData: SubsetSealedClass } companion object : EntityType() { @@ -27,7 +27,7 @@ interface SubsetSealedClassEntity: WorkspaceEntity { someData: SubsetSealedClass, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SubsetSealedClassEntity { + ): Builder { val builder = builder() builder.someData = someData builder.entitySource = entitySource diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/primitiveEntities.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/primitiveEntities.kt index 541e47809a69..864a41370b19 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/primitiveEntities.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/primitiveEntities.kt @@ -15,9 +15,9 @@ interface BooleanEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : BooleanEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: Boolean + var data: Boolean } companion object : EntityType() { @@ -28,7 +28,7 @@ interface BooleanEntity : WorkspaceEntity { data: Boolean, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): BooleanEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -54,9 +54,9 @@ interface IntEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : IntEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: Int + var data: Int } companion object : EntityType() { @@ -67,7 +67,7 @@ interface IntEntity : WorkspaceEntity { data: Int, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): IntEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -93,9 +93,9 @@ interface StringEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : StringEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String + var data: String } companion object : EntityType() { @@ -106,7 +106,7 @@ interface StringEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): StringEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -132,9 +132,9 @@ interface ListEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ListEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: MutableList + var data: MutableList } companion object : EntityType() { @@ -145,7 +145,7 @@ interface ListEntity : WorkspaceEntity { data: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ListEntity { + ): Builder { val builder = builder() builder.data = data.toMutableWorkspaceList() builder.entitySource = entitySource @@ -172,9 +172,9 @@ interface OptionalIntEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OptionalIntEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: Int? + var data: Int? } companion object : EntityType() { @@ -184,7 +184,7 @@ interface OptionalIntEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OptionalIntEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) @@ -210,9 +210,9 @@ interface OptionalStringEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : OptionalStringEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String? + var data: String? } companion object : EntityType() { @@ -222,7 +222,7 @@ interface OptionalStringEntity : WorkspaceEntity { operator fun invoke( entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): OptionalStringEntity { + ): Builder { val builder = builder() builder.entitySource = entitySource init?.invoke(builder) diff --git a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/vfu.kt b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/vfu.kt index bcab3fc0ed5e..f69b4f2f841b 100644 --- a/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/vfu.kt +++ b/platform/workspace/storage/testEntities/testSrc/com/intellij/platform/workspace/storage/testEntities/entities/vfu.kt @@ -2,6 +2,11 @@ package com.intellij.platform.workspace.storage.testEntities.entities 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.impl.containers.toMutableWorkspaceList import com.intellij.platform.workspace.storage.impl.containers.toMutableWorkspaceSet import com.intellij.platform.workspace.storage.url.VirtualFileUrl @@ -13,10 +18,10 @@ interface VFUEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : VFUEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var fileProperty: VirtualFileUrl + var data: String + var fileProperty: VirtualFileUrl } companion object : EntityType() { @@ -28,7 +33,7 @@ interface VFUEntity : WorkspaceEntity { fileProperty: VirtualFileUrl, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): VFUEntity { + ): Builder { val builder = builder() builder.data = data builder.fileProperty = fileProperty @@ -57,11 +62,11 @@ interface VFUWithTwoPropertiesEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : VFUWithTwoPropertiesEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var fileProperty: VirtualFileUrl - override var secondFileProperty: VirtualFileUrl + var data: String + var fileProperty: VirtualFileUrl + var secondFileProperty: VirtualFileUrl } companion object : EntityType() { @@ -74,7 +79,7 @@ interface VFUWithTwoPropertiesEntity : WorkspaceEntity { secondFileProperty: VirtualFileUrl, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): VFUWithTwoPropertiesEntity { + ): Builder { val builder = builder() builder.data = data builder.fileProperty = fileProperty @@ -103,10 +108,10 @@ interface NullableVFUEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : NullableVFUEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var fileProperty: VirtualFileUrl? + var data: String + var fileProperty: VirtualFileUrl? } companion object : EntityType() { @@ -117,7 +122,7 @@ interface NullableVFUEntity : WorkspaceEntity { data: String, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): NullableVFUEntity { + ): Builder { val builder = builder() builder.data = data builder.entitySource = entitySource @@ -144,10 +149,10 @@ interface ListVFUEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : ListVFUEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var fileProperty: MutableList + var data: String + var fileProperty: MutableList } companion object : EntityType() { @@ -159,7 +164,7 @@ interface ListVFUEntity : WorkspaceEntity { fileProperty: List, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): ListVFUEntity { + ): Builder { val builder = builder() builder.data = data builder.fileProperty = fileProperty.toMutableWorkspaceList() @@ -187,10 +192,10 @@ interface SetVFUEntity : WorkspaceEntity { //region generated code @GeneratedCodeApiVersion(2) - interface Builder : SetVFUEntity, WorkspaceEntity.Builder { + interface Builder : WorkspaceEntity.Builder { override var entitySource: EntitySource - override var data: String - override var fileProperty: MutableSet + var data: String + var fileProperty: MutableSet } companion object : EntityType() { @@ -202,7 +207,7 @@ interface SetVFUEntity : WorkspaceEntity { fileProperty: Set, entitySource: EntitySource, init: (Builder.() -> Unit)? = null, - ): SetVFUEntity { + ): Builder { val builder = builder() builder.data = data builder.fileProperty = fileProperty.toMutableWorkspaceSet()