Skip to content

Commit 42f3acd

Browse files
bochkarevkointellij-monorepo-bot
authored andcommitted
[workspace model] IJPL-895 Stabilization of entity generation in tests
- Regenerate Workspace Model code for the whole IntelliJ - IJPL-177108 change properties order in ModuleSettingsFacetBridgeEntity (API breakage for BSP) - IJPL-14740 Run the test for the whole module, not for each package in the module - do not include entity source inheritors from other modules - generator tests: Refactor IntelliJ generation test, fix missing libraries for various modules, ignore workspace.storage.testEntities, add code generator tests for packages, open classes - treat open classes as abstract in K2, fix package for kotlin.ByteArray in K2 MetadataBuilder - sort enum entries in metadata and fix cache test - fix and move WorkspaceModelJsonDumpTest - fix IntelliJ Workspace Code Update action (use K1) - do not exclude node_modules dir in javascript plugin in tests Merge-request: IJ-MR-155397 Merged-by: Kirill Bochkarev <[email protected]> GitOrigin-RevId: 861f59ad002a63d493824318dff73d5483c31e60
1 parent 0781a8b commit 42f3acd

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/gen/com/intellij/lang/jsgraphql/javascript/workspace/impl/GraphQLNodeModulesEntityImpl.kt renamed to gen/com/intellij/lang/jsgraphql/javascript/workspace/impl/GraphQLNodeModulesEntityImpl.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import com.intellij.platform.workspace.storage.url.VirtualFileUrl
2222
@GeneratedCodeApiVersion(3)
2323
@GeneratedCodeImplVersion(6)
2424
@OptIn(WorkspaceEntityInternalApi::class)
25-
internal class GraphQLNodeModulesEntityImpl(private val dataSource: GraphQLNodeModulesEntityData) : GraphQLNodeModulesEntity, WorkspaceEntityBase(
26-
dataSource) {
25+
internal class GraphQLNodeModulesEntityImpl(private val dataSource: GraphQLNodeModulesEntityData) : GraphQLNodeModulesEntity,
26+
WorkspaceEntityBase(dataSource) {
2727

2828
private companion object {
2929

@@ -50,8 +50,8 @@ internal class GraphQLNodeModulesEntityImpl(private val dataSource: GraphQLNodeM
5050
}
5151

5252

53-
internal class Builder(result: GraphQLNodeModulesEntityData?) : ModifiableWorkspaceEntityBase<GraphQLNodeModulesEntity, GraphQLNodeModulesEntityData>(
54-
result), GraphQLNodeModulesEntity.Builder {
53+
internal class Builder(result: GraphQLNodeModulesEntityData?) :
54+
ModifiableWorkspaceEntityBase<GraphQLNodeModulesEntity, GraphQLNodeModulesEntityData>(result), GraphQLNodeModulesEntity.Builder {
5555
internal constructor() : this(GraphQLNodeModulesEntityData())
5656

5757
override fun applyToBuilder(builder: MutableEntityStorage) {
@@ -170,7 +170,8 @@ internal class GraphQLNodeModulesEntityData : WorkspaceEntityData<GraphQLNodeMod
170170

171171
override fun getMetadata(): EntityMetadata {
172172
return MetadataStorageImpl.getMetadataByTypeFqn(
173-
"com.intellij.lang.jsgraphql.javascript.workspace.GraphQLNodeModulesEntity") as EntityMetadata
173+
"com.intellij.lang.jsgraphql.javascript.workspace.GraphQLNodeModulesEntity"
174+
) as EntityMetadata
174175
}
175176

176177
override fun clone(): GraphQLNodeModulesEntityData {

src/gen/com/intellij/lang/jsgraphql/javascript/workspace/impl/MetadataStorageImpl.kt renamed to gen/com/intellij/lang/jsgraphql/javascript/workspace/impl/MetadataStorageImpl.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ import com.intellij.platform.workspace.storage.metadata.model.ValueTypeMetadata
1212
internal object MetadataStorageImpl: MetadataStorageBase() {
1313
override fun initializeMetadata() {
1414
val primitiveTypeSetNotNullable = ValueTypeMetadata.SimpleType.PrimitiveType(isNullable = false, type = "Set")
15-
15+
1616
var typeMetadata: StorageTypeMetadata
17-
17+
1818
typeMetadata = FinalClassMetadata.ObjectMetadata(fqName = "com.intellij.lang.jsgraphql.javascript.workspace.GraphQLNodeModulesEntitySource", properties = listOf(OwnPropertyMetadata(isComputable = false, isKey = false, isOpen = false, name = "virtualFileUrl", valueType = ValueTypeMetadata.SimpleType.CustomType(isNullable = true, typeMetadata = FinalClassMetadata.KnownClass(fqName = "com.intellij.platform.workspace.storage.url.VirtualFileUrl")), withDefault = false)), supertypes = listOf("com.intellij.platform.workspace.storage.EntitySource"))
19-
19+
2020
addMetadata(typeMetadata)
21-
21+
2222
typeMetadata = EntityMetadata(fqName = "com.intellij.lang.jsgraphql.javascript.workspace.GraphQLNodeModulesEntity", entityDataFqName = "com.intellij.lang.jsgraphql.javascript.workspace.impl.GraphQLNodeModulesEntityData", supertypes = listOf("com.intellij.platform.workspace.storage.WorkspaceEntity"), properties = listOf(OwnPropertyMetadata(isComputable = false, isKey = false, isOpen = false, name = "entitySource", valueType = ValueTypeMetadata.SimpleType.CustomType(isNullable = false, typeMetadata = FinalClassMetadata.KnownClass(fqName = "com.intellij.platform.workspace.storage.EntitySource")), withDefault = false),
2323
OwnPropertyMetadata(isComputable = false, isKey = false, isOpen = false, name = "roots", valueType = ValueTypeMetadata.ParameterizedType(generics = listOf(ValueTypeMetadata.SimpleType.CustomType(isNullable = false, typeMetadata = FinalClassMetadata.KnownClass(fqName = "com.intellij.platform.workspace.storage.url.VirtualFileUrl"))), primitive = primitiveTypeSetNotNullable), withDefault = false)), extProperties = listOf(), isAbstract = false)
24-
24+
2525
addMetadata(typeMetadata)
2626
}
2727

intellij.graphql.iml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
88
<sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
99
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
10-
<sourceFolder url="file://$MODULE_DIR$/src/gen" isTestSource="false" generated="true" />
1110
<sourceFolder url="file://$MODULE_DIR$/test-resources" type="java-test-resource" />
1211
<excludeFolder url="file://$MODULE_DIR$/build" />
1312
</content>

0 commit comments

Comments
 (0)