From 25ce160a7f0c4f901420605f16b64e13c97e8034 Mon Sep 17 00:00:00 2001
From: Michael Huster <mhuster@itemis.com>
Date: Mon, 30 Oct 2023 16:44:59 +0100
Subject: [PATCH 01/10] fix(bulk-model-sync-gradle): add missing
 includedModules checks for model-server tasks

---
 .../sync/bulk/gradle/ModelSyncGradlePlugin.kt |  4 +++
 .../gradle/tasks/ExportFromModelServer.kt     | 27 ++++++++++++++++---
 .../gradle/tasks/ImportIntoModelServer.kt     | 14 ++++++++--
 .../org/modelix/model/sync/bulk/Util.kt       | 15 +++++++++++
 4 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/ModelSyncGradlePlugin.kt b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/ModelSyncGradlePlugin.kt
index f88ac0e839..2a48bb9758 100644
--- a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/ModelSyncGradlePlugin.kt
+++ b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/ModelSyncGradlePlugin.kt
@@ -113,6 +113,8 @@ class ModelSyncGradlePlugin : Plugin<Project> {
             it.repositoryId.set(serverSource.repositoryId)
             it.branchName.set(serverSource.branchName)
             it.revision.set(serverSource.revision)
+            it.includedModules.set(syncDirection.includedModules)
+            it.includedModulePrefixes.set(syncDirection.includedModulePrefixes)
         }
         return exportFromModelServer
     }
@@ -173,6 +175,8 @@ class ModelSyncGradlePlugin : Plugin<Project> {
             it.url.set(serverTarget.url)
             it.repositoryId.set(serverTarget.repositoryId)
             it.branchName.set(serverTarget.branchName)
+            it.includedModules.set(syncDirection.includedModules)
+            it.includedModulePrefixes.set(syncDirection.includedModulePrefixes)
         }
 
         project.tasks.register("runSync${syncDirection.name.replaceFirstChar { it.uppercaseChar() }}") {
diff --git a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
index 1f76faceef..2398fd4ca6 100644
--- a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
+++ b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
@@ -20,6 +20,7 @@ import kotlinx.coroutines.runBlocking
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
@@ -28,6 +29,7 @@ import org.gradle.api.tasks.TaskAction
 import org.modelix.model.ModelFacade
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.api.IBranch
+import org.modelix.model.api.INode
 import org.modelix.model.api.PBranch
 import org.modelix.model.api.getRootNode
 import org.modelix.model.client2.IModelClientV2
@@ -36,6 +38,7 @@ import org.modelix.model.client2.ModelClientV2PlatformSpecificBuilder
 import org.modelix.model.client2.getReplicatedModel
 import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.sync.bulk.ModelExporter
+import org.modelix.model.sync.bulk.isModuleIncluded
 import javax.inject.Inject
 
 abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : DefaultTask() {
@@ -58,6 +61,12 @@ abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : De
     @OutputDirectory
     val outputDir: DirectoryProperty = of.directoryProperty()
 
+    @Input
+    val includedModules: ListProperty<String> = of.listProperty(String::class.java)
+
+    @Input
+    val includedModulePrefixes: ListProperty<String> = of.listProperty(String::class.java)
+
     @TaskAction
     fun export() {
         val client = ModelClientV2PlatformSpecificBuilder()
@@ -76,15 +85,27 @@ abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : De
             val root = branch.getRootNode()
             logger.info("Got root node: {}", root)
             val outputDir = outputDir.get().asFile
-            root.allChildren.forEach {
-                val nameRole = BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name
-                val fileName = it.getPropertyValue(nameRole)
+
+            getIncludedModules(root).forEach {
+                val fileName = it.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name)
                 val outputFile = outputDir.resolve("$fileName.json")
                 ModelExporter(it).export(outputFile)
             }
         }
     }
 
+    private fun getIncludedModules(root: INode): Iterable<INode> {
+        val nameRole = BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name
+
+        return root.allChildren.filter {
+            val isModule = it.concept == BuiltinLanguages.MPSRepositoryConcepts.Module
+            val moduleName = it.getPropertyValue(nameRole) ?: return@filter false
+            val isIncluded = isModuleIncluded(moduleName, includedModules.get(), includedModulePrefixes.get())
+
+            isModule && isIncluded
+        }
+    }
+
     private fun getBranchByRepoIdAndBranch(client: ModelClientV2): IBranch {
         val repoId = RepositoryId(repositoryId.get())
         val branchRef = ModelFacade.createBranchReference(repoId, branchName.get())
diff --git a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt
index 12fef823a2..c2f0981956 100644
--- a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt
+++ b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt
@@ -20,6 +20,7 @@ import kotlinx.coroutines.runBlocking
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.Input
@@ -35,6 +36,7 @@ import org.modelix.model.client2.runWrite
 import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.sync.bulk.ModelImporter
 import org.modelix.model.sync.bulk.importFilesAsRootChildren
+import org.modelix.model.sync.bulk.isModuleIncluded
 import javax.inject.Inject
 
 abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : DefaultTask() {
@@ -55,6 +57,12 @@ abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : De
     @Input
     val registeredLanguages: SetProperty<ILanguage> = of.setProperty(ILanguage::class.java)
 
+    @Input
+    val includedModules: ListProperty<String> = of.listProperty(String::class.java)
+
+    @Input
+    val includedModulePrefixes: ListProperty<String> = of.listProperty(String::class.java)
+
     @TaskAction
     fun import() {
         registeredLanguages.get().forEach {
@@ -66,8 +74,10 @@ abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : De
 
         val branchRef = ModelFacade.createBranchReference(repoId, branchName.get())
         val client = ModelClientV2PlatformSpecificBuilder().url(url.get()).build()
-        val files = inputDir.listFiles()?.filter { it.extension == "json" }
-        if (files.isNullOrEmpty()) error("no json files found")
+        val files = inputDir.listFiles()?.filter {
+            it.extension == "json" && isModuleIncluded(it.nameWithoutExtension, includedModules.get(), includedModulePrefixes.get())
+        }
+        if (files.isNullOrEmpty()) error("no json files found for included modules")
 
         runBlocking {
             client.init()
diff --git a/bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/Util.kt b/bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/Util.kt
index 8ef875d147..42106f89d0 100644
--- a/bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/Util.kt
+++ b/bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/Util.kt
@@ -21,6 +21,21 @@ import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.data.ModelData
 import org.modelix.model.data.NodeData
 
+/**
+ * Helper-method used by the gradle plugin and the MPS solution.
+ * Checks if a module is included in the sync.
+ *
+ * @param moduleName name of the module to be checked
+ * @param includedModules collection of included module names
+ * @param includedPrefixes collection of included module name prefixes
+ */
+fun isModuleIncluded(moduleName: String, includedModules: Collection<String>, includedPrefixes: Collection<String>): Boolean {
+    val includedDirectly = includedModules.contains(moduleName)
+    val includedByPrefix = includedPrefixes.any { prefix -> moduleName.startsWith(prefix) }
+
+    return includedDirectly || includedByPrefix
+}
+
 fun mergeModelData(models: Collection<ModelData>): ModelData {
     return ModelData(root = NodeData(children = models.map { it.root }))
 }

From a08eb31eccb240bbedbb6dbd34481b4ee429308d Mon Sep 17 00:00:00 2001
From: Michael Huster <mhuster@itemis.com>
Date: Mon, 30 Oct 2023 16:48:15 +0100
Subject: [PATCH 02/10] fix(bulk-model-sync-gradle): change includedModules
 property type to set

---
 .../model/sync/bulk/gradle/tasks/ExportFromModelServer.kt   | 6 +++---
 .../model/sync/bulk/gradle/tasks/GenerateAntScriptForMps.kt | 6 +++---
 .../model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt   | 5 ++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
index 2398fd4ca6..0476b3b874 100644
--- a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
+++ b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
@@ -20,8 +20,8 @@ import kotlinx.coroutines.runBlocking
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.model.ObjectFactory
-import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
+import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputDirectory
@@ -62,10 +62,10 @@ abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : De
     val outputDir: DirectoryProperty = of.directoryProperty()
 
     @Input
-    val includedModules: ListProperty<String> = of.listProperty(String::class.java)
+    val includedModules: SetProperty<String> = of.setProperty(String::class.java)
 
     @Input
-    val includedModulePrefixes: ListProperty<String> = of.listProperty(String::class.java)
+    val includedModulePrefixes: SetProperty<String> = of.setProperty(String::class.java)
 
     @TaskAction
     fun export() {
diff --git a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/GenerateAntScriptForMps.kt b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/GenerateAntScriptForMps.kt
index 96bd0cc8ff..f6a9cd3098 100644
--- a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/GenerateAntScriptForMps.kt
+++ b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/GenerateAntScriptForMps.kt
@@ -19,8 +19,8 @@ package org.modelix.model.sync.bulk.gradle.tasks
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.model.ObjectFactory
-import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
+import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
@@ -55,10 +55,10 @@ abstract class GenerateAntScriptForMps @Inject constructor(of: ObjectFactory) :
     val antScriptFile: RegularFileProperty = of.fileProperty()
 
     @Input
-    val includedModules: ListProperty<String> = of.listProperty(String::class.java)
+    val includedModules: SetProperty<String> = of.setProperty(String::class.java)
 
     @Input
-    val includedModulePrefixes: ListProperty<String> = of.listProperty(String::class.java)
+    val includedModulePrefixes: SetProperty<String> = of.setProperty(String::class.java)
 
     @Optional
     @Input
diff --git a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt
index c2f0981956..a73f85d861 100644
--- a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt
+++ b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt
@@ -20,7 +20,6 @@ import kotlinx.coroutines.runBlocking
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.model.ObjectFactory
-import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.Input
@@ -58,10 +57,10 @@ abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : De
     val registeredLanguages: SetProperty<ILanguage> = of.setProperty(ILanguage::class.java)
 
     @Input
-    val includedModules: ListProperty<String> = of.listProperty(String::class.java)
+    val includedModules: SetProperty<String> = of.setProperty(String::class.java)
 
     @Input
-    val includedModulePrefixes: ListProperty<String> = of.listProperty(String::class.java)
+    val includedModulePrefixes: SetProperty<String> = of.setProperty(String::class.java)
 
     @TaskAction
     fun import() {

From 7bb204024271d9cfe8f5134f47a2d621f0239c4d Mon Sep 17 00:00:00 2001
From: Michael Huster <mhuster@itemis.com>
Date: Mon, 6 Nov 2023 10:15:46 +0100
Subject: [PATCH 03/10] refactor(bulk-model-sync-solution): use new helper
 method and mps string type

---
 .../org.modelix.mps.model.sync.bulk.mps       | 151 ++++--------------
 1 file changed, 29 insertions(+), 122 deletions(-)

diff --git a/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps b/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps
index cd810dde78..2fb7c75c5d 100644
--- a/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps
+++ b/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps
@@ -7,7 +7,7 @@
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
   <imports>
-    <import index="zxfz" ref="ac6b4971-2a89-49fb-9c30-c2f0e85de741/java:org.modelix.model.mpsadapters(org.modelix.model.sync.mps/)" />
+    <import index="zxfz" ref="ac6b4971-2a89-49fb-9c30-c2f0e85de741/java:org.modelix.model.mpsadapters(org.modelix.mps.model.sync.bulk/)" />
     <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
@@ -18,7 +18,6 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -54,7 +53,6 @@
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -63,6 +61,7 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="1225271369338" name="jetbrains.mps.baseLanguage.structure.IsEmptyOperation" flags="nn" index="17RlXB" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -145,9 +144,6 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
-        <child id="540871147943773366" name="argument" index="25WWJ7" />
-      </concept>
       <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
         <child id="1226511765987" name="elementType" index="2hN53Y" />
       </concept>
@@ -163,7 +159,6 @@
       <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
         <reference id="1153944258490" name="variable" index="2Gs0qQ" />
       </concept>
-      <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
@@ -171,7 +166,6 @@
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
-      <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
     </language>
   </registry>
   <node concept="312cEu" id="5s5xg7sH9bO">
@@ -194,9 +188,7 @@
         <node concept="3cpWs8" id="2SradnRkH3Z" role="3cqZAp">
           <node concept="3cpWsn" id="2SradnRkH40" role="3cpWs9">
             <property role="TrG5h" value="rawIncludedModuleNames" />
-            <node concept="3uibUv" id="2SradnRkH41" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
+            <node concept="17QB3L" id="2lDJgzjQu_0" role="1tU5fm" />
             <node concept="2YIFZM" id="7gc0jqT4GSp" role="33vP2m">
               <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
               <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
@@ -209,9 +201,7 @@
         <node concept="3cpWs8" id="2SradnRlqmi" role="3cqZAp">
           <node concept="3cpWsn" id="2SradnRlqmj" role="3cpWs9">
             <property role="TrG5h" value="rawIncludedModulePrefixes" />
-            <node concept="3uibUv" id="2SradnRlqmk" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
+            <node concept="17QB3L" id="2lDJgzjQvEi" role="1tU5fm" />
             <node concept="2YIFZM" id="4fksUHVn$LA" role="33vP2m">
               <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
               <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
@@ -226,9 +216,7 @@
           <node concept="3cpWsn" id="7gc0jqT4mjC" role="3cpWs9">
             <property role="TrG5h" value="includedModuleNames" />
             <node concept="2hMVRd" id="7gc0jqT4uB6" role="1tU5fm">
-              <node concept="3uibUv" id="7gc0jqT4uTS" role="2hN53Y">
-                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-              </node>
+              <node concept="17QB3L" id="2lDJgzjQwgR" role="2hN53Y" />
             </node>
             <node concept="3K4zz7" id="2SradnRkSc6" role="33vP2m">
               <node concept="2OqwBi" id="2SradnRlZz8" role="3K4Cdx">
@@ -238,10 +226,8 @@
                 <node concept="17RlXB" id="2SradnRm0jD" role="2OqNvi" />
               </node>
               <node concept="2ShNRf" id="2SradnRl0qt" role="3K4E3e">
-                <node concept="2i4dXS" id="2SradnRlg1Z" role="2ShVmc">
-                  <node concept="3uibUv" id="2SradnRlV5h" role="HW$YZ">
-                    <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                  </node>
+                <node concept="2i4dXS" id="2lDJgzjQ$03" role="2ShVmc">
+                  <node concept="17QB3L" id="2lDJgzjQ$05" role="HW$YZ" />
                 </node>
               </node>
               <node concept="2ShNRf" id="2SradnRlgUS" role="3K4GZi">
@@ -257,9 +243,7 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3uibUv" id="2SradnRlXJ7" role="HW$YZ">
-                    <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                  </node>
+                  <node concept="17QB3L" id="2lDJgzjQ$TF" role="HW$YZ" />
                 </node>
               </node>
             </node>
@@ -269,9 +253,7 @@
           <node concept="3cpWsn" id="4fksUHVnsUd" role="3cpWs9">
             <property role="TrG5h" value="includedModulePrefixes" />
             <node concept="2hMVRd" id="4fksUHVnsU6" role="1tU5fm">
-              <node concept="3uibUv" id="4fksUHVntr0" role="2hN53Y">
-                <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-              </node>
+              <node concept="17QB3L" id="2lDJgzjQ_Rh" role="2hN53Y" />
             </node>
             <node concept="3K4zz7" id="2SradnRlAIm" role="33vP2m">
               <node concept="2OqwBi" id="2SradnRm240" role="3K4Cdx">
@@ -282,9 +264,7 @@
               </node>
               <node concept="2ShNRf" id="2SradnRlDCi" role="3K4E3e">
                 <node concept="2i4dXS" id="2SradnRlEl5" role="2ShVmc">
-                  <node concept="3uibUv" id="2SradnRlOlQ" role="HW$YZ">
-                    <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                  </node>
+                  <node concept="17QB3L" id="2lDJgzjQAUz" role="HW$YZ" />
                 </node>
               </node>
               <node concept="2ShNRf" id="2SradnRlFgG" role="3K4GZi">
@@ -300,9 +280,7 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3uibUv" id="2SradnRlS8a" role="HW$YZ">
-                    <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                  </node>
+                  <node concept="17QB3L" id="2lDJgzjQDvM" role="HW$YZ" />
                 </node>
               </node>
             </node>
@@ -366,55 +344,23 @@
                         <node concept="3zZkjj" id="4fksUHVmpxv" role="2OqNvi">
                           <node concept="1bVj0M" id="4fksUHVmpxx" role="23t8la">
                             <node concept="3clFbS" id="4fksUHVmpxy" role="1bW5cS">
-                              <node concept="3clFbF" id="2SradnRjRES" role="3cqZAp">
-                                <node concept="22lmx$" id="2SradnRjREP" role="3clFbG">
-                                  <node concept="2OqwBi" id="4fksUHVnRwl" role="3uHU7B">
-                                    <node concept="37vLTw" id="4fksUHVnQyV" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="7gc0jqT4mjC" resolve="includedModuleNames" />
+                              <node concept="3clFbF" id="2lDJgzjQhdr" role="3cqZAp">
+                                <node concept="2YIFZM" id="2lDJgzjQk5s" role="3clFbG">
+                                  <ref role="37wK5l" to="vgv4:~UtilKt.isModuleIncluded(java.lang.String,java.util.Collection,java.util.Collection)" resolve="isModuleIncluded" />
+                                  <ref role="1Pybhc" to="vgv4:~UtilKt" resolve="UtilKt" />
+                                  <node concept="2OqwBi" id="2lDJgzjQl$d" role="37wK5m">
+                                    <node concept="37vLTw" id="2lDJgzjQkCt" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="4fksUHVmpxz" resolve="module" />
                                     </node>
-                                    <node concept="3JPx81" id="4fksUHVnSBp" role="2OqNvi">
-                                      <node concept="2OqwBi" id="4fksUHVnTK5" role="25WWJ7">
-                                        <node concept="37vLTw" id="4fksUHVnTcb" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="4fksUHVmpxz" resolve="module" />
-                                        </node>
-                                        <node concept="liA8E" id="4fksUHVnU_X" role="2OqNvi">
-                                          <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
-                                        </node>
-                                      </node>
+                                    <node concept="liA8E" id="2lDJgzjQmca" role="2OqNvi">
+                                      <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
                                     </node>
                                   </node>
-                                  <node concept="2OqwBi" id="2SradnRk7nQ" role="3uHU7w">
-                                    <node concept="37vLTw" id="2SradnRk5YL" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="4fksUHVnsUd" resolve="includedModulePrefixes" />
-                                    </node>
-                                    <node concept="2HwmR7" id="2SradnRk8cO" role="2OqNvi">
-                                      <node concept="1bVj0M" id="2SradnRk8cQ" role="23t8la">
-                                        <node concept="3clFbS" id="2SradnRk8cR" role="1bW5cS">
-                                          <node concept="3clFbF" id="2SradnRk8Ot" role="3cqZAp">
-                                            <node concept="2OqwBi" id="2SradnRkbiA" role="3clFbG">
-                                              <node concept="2OqwBi" id="2SradnRk9S6" role="2Oq$k0">
-                                                <node concept="37vLTw" id="2SradnRk8Os" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="4fksUHVmpxz" resolve="module" />
-                                                </node>
-                                                <node concept="liA8E" id="2SradnRkawH" role="2OqNvi">
-                                                  <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
-                                                </node>
-                                              </node>
-                                              <node concept="liA8E" id="2SradnRkcr8" role="2OqNvi">
-                                                <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
-                                                <node concept="37vLTw" id="2SradnRkd3L" role="37wK5m">
-                                                  <ref role="3cqZAo" node="2SradnRk8cS" resolve="prefix" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="Rh6nW" id="2SradnRk8cS" role="1bW2Oz">
-                                          <property role="TrG5h" value="prefix" />
-                                          <node concept="2jxLKc" id="2SradnRk8cT" role="1tU5fm" />
-                                        </node>
-                                      </node>
-                                    </node>
+                                  <node concept="37vLTw" id="2lDJgzjQnja" role="37wK5m">
+                                    <ref role="3cqZAo" node="7gc0jqT4mjC" resolve="includedModuleNames" />
+                                  </node>
+                                  <node concept="37vLTw" id="2lDJgzjQoTw" role="37wK5m">
+                                    <ref role="3cqZAo" node="4fksUHVnsUd" resolve="includedModulePrefixes" />
                                   </node>
                                 </node>
                               </node>
@@ -428,6 +374,7 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbH" id="2lDJgzjQHci" role="3cqZAp" />
                   <node concept="3cpWs8" id="4fksUHVmaF6" role="3cqZAp">
                     <node concept="3cpWsn" id="4fksUHVmaF7" role="3cpWs9">
                       <property role="TrG5h" value="current" />
@@ -456,9 +403,7 @@
                   <node concept="3cpWs8" id="7gc0jqT0r$G" role="3cqZAp">
                     <node concept="3cpWsn" id="7gc0jqT0r$H" role="3cpWs9">
                       <property role="TrG5h" value="outputPath" />
-                      <node concept="3uibUv" id="7gc0jqT0r$I" role="1tU5fm">
-                        <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                      </node>
+                      <node concept="17QB3L" id="2lDJgzjQE_v" role="1tU5fm" />
                       <node concept="2YIFZM" id="7gc0jqT0rV3" role="33vP2m">
                         <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                         <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
@@ -469,39 +414,6 @@
                     </node>
                   </node>
                   <node concept="3clFbH" id="4fksUHVmGpo" role="3cqZAp" />
-                  <node concept="3clFbF" id="4fksUHVn4TE" role="3cqZAp">
-                    <node concept="2OqwBi" id="4fksUHVn5Z$" role="3clFbG">
-                      <node concept="10M0yZ" id="4fksUHVn5nR" role="2Oq$k0">
-                        <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
-                        <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
-                      </node>
-                      <node concept="liA8E" id="4fksUHVn6kH" role="2OqNvi">
-                        <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
-                        <node concept="3cpWs3" id="4fksUHVnfWv" role="37wK5m">
-                          <node concept="3cpWs3" id="4fksUHVndDk" role="3uHU7B">
-                            <node concept="3cpWs3" id="4fksUHVnctU" role="3uHU7B">
-                              <node concept="Xl_RD" id="4fksUHVn6LK" role="3uHU7B">
-                                <property role="Xl_RC" value="Included " />
-                              </node>
-                              <node concept="37vLTw" id="4fksUHVnjpB" role="3uHU7w">
-                                <ref role="3cqZAo" node="4fksUHVmU9V" resolve="numSelectedModules" />
-                              </node>
-                            </node>
-                            <node concept="Xl_RD" id="4fksUHVndbB" role="3uHU7w">
-                              <property role="Xl_RC" value=" modules out of " />
-                            </node>
-                          </node>
-                          <node concept="2OqwBi" id="4fksUHVnicC" role="3uHU7w">
-                            <node concept="37vLTw" id="4fksUHVnhAI" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4fksUHVmfGv" resolve="allModules" />
-                            </node>
-                            <node concept="34oBXx" id="4fksUHVniOE" role="2OqNvi" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="4fksUHVn4fp" role="3cqZAp" />
                   <node concept="2Gpval" id="7gc0jqT4L4n" role="3cqZAp">
                     <node concept="2GrKxI" id="7gc0jqT4L4p" role="2Gsz3X">
                       <property role="TrG5h" value="module" />
@@ -673,9 +585,7 @@
         <node concept="3cpWs8" id="7gc0jqT1xFZ" role="3cqZAp">
           <node concept="3cpWsn" id="7gc0jqT1xG0" role="3cpWs9">
             <property role="TrG5h" value="inputPath" />
-            <node concept="3uibUv" id="7gc0jqT1xG1" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
+            <node concept="17QB3L" id="2lDJgzjQFcq" role="1tU5fm" />
             <node concept="2YIFZM" id="7gc0jqT1xG2" role="33vP2m">
               <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
               <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
@@ -908,9 +818,7 @@
         <node concept="3cpWs8" id="7gc0jqT1yAa" role="3cqZAp">
           <node concept="3cpWsn" id="7gc0jqT1yAb" role="3cpWs9">
             <property role="TrG5h" value="repoPath" />
-            <node concept="3uibUv" id="7gc0jqT1yAc" role="1tU5fm">
-              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-            </node>
+            <node concept="17QB3L" id="2lDJgzjQFNE" role="1tU5fm" />
             <node concept="2YIFZM" id="7gc0jqT1yAd" role="33vP2m">
               <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
               <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
@@ -926,7 +834,6 @@
             <node concept="3uibUv" id="7gc0jqT1$nG" role="1tU5fm">
               <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
             </node>
-            <node concept="10Nm6u" id="7gc0jqT1$tF" role="33vP2m" />
           </node>
         </node>
         <node concept="3J1_TO" id="7gc0jqT1yES" role="3cqZAp">

From e70c101a36e0be0ba34e7de7d9225ac92947fd98 Mon Sep 17 00:00:00 2001
From: Michael Huster <mhuster@itemis.com>
Date: Mon, 6 Nov 2023 11:29:32 +0100
Subject: [PATCH 04/10] fix(bulk-model-sync-solution): enforce included check
 during mps import

---
 .../org.modelix.mps.model.sync.bulk.mps       | 262 +++++++++++-------
 1 file changed, 168 insertions(+), 94 deletions(-)

diff --git a/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps b/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps
index 2fb7c75c5d..1196090636 100644
--- a/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps
+++ b/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps
@@ -60,15 +60,16 @@
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
-      <concept id="1225271369338" name="jetbrains.mps.baseLanguage.structure.IsEmptyOperation" flags="nn" index="17RlXB" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
         <child id="1164879685961" name="throwsItem" index="Sfmx6" />
         <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
@@ -164,6 +165,7 @@
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -185,102 +187,38 @@
           </node>
         </node>
         <node concept="3clFbH" id="2SradnRkF0Z" role="3cqZAp" />
-        <node concept="3cpWs8" id="2SradnRkH3Z" role="3cqZAp">
-          <node concept="3cpWsn" id="2SradnRkH40" role="3cpWs9">
-            <property role="TrG5h" value="rawIncludedModuleNames" />
-            <node concept="17QB3L" id="2lDJgzjQu_0" role="1tU5fm" />
-            <node concept="2YIFZM" id="7gc0jqT4GSp" role="33vP2m">
-              <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-              <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
-              <node concept="Xl_RD" id="7gc0jqT4H9m" role="37wK5m">
-                <property role="Xl_RC" value="modelix.mps.model.sync.bulk.output.modules" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2SradnRlqmi" role="3cqZAp">
-          <node concept="3cpWsn" id="2SradnRlqmj" role="3cpWs9">
-            <property role="TrG5h" value="rawIncludedModulePrefixes" />
-            <node concept="17QB3L" id="2lDJgzjQvEi" role="1tU5fm" />
-            <node concept="2YIFZM" id="4fksUHVn$LA" role="33vP2m">
-              <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-              <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
-              <node concept="Xl_RD" id="4fksUHVn_pH" role="37wK5m">
-                <property role="Xl_RC" value="modelix.mps.model.sync.bulk.output.modules.prefixes" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7gc0jqT4mbW" role="3cqZAp" />
         <node concept="3cpWs8" id="7gc0jqT4mj_" role="3cqZAp">
           <node concept="3cpWsn" id="7gc0jqT4mjC" role="3cpWs9">
             <property role="TrG5h" value="includedModuleNames" />
             <node concept="2hMVRd" id="7gc0jqT4uB6" role="1tU5fm">
               <node concept="17QB3L" id="2lDJgzjQwgR" role="2hN53Y" />
             </node>
-            <node concept="3K4zz7" id="2SradnRkSc6" role="33vP2m">
-              <node concept="2OqwBi" id="2SradnRlZz8" role="3K4Cdx">
-                <node concept="37vLTw" id="2SradnRkSJb" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2SradnRkH40" resolve="rawIncludedModuleNames" />
-                </node>
-                <node concept="17RlXB" id="2SradnRm0jD" role="2OqNvi" />
-              </node>
-              <node concept="2ShNRf" id="2SradnRl0qt" role="3K4E3e">
-                <node concept="2i4dXS" id="2lDJgzjQ$03" role="2ShVmc">
-                  <node concept="17QB3L" id="2lDJgzjQ$05" role="HW$YZ" />
-                </node>
-              </node>
-              <node concept="2ShNRf" id="2SradnRlgUS" role="3K4GZi">
-                <node concept="2i4dXS" id="2SradnRlhKc" role="2ShVmc">
-                  <node concept="2OqwBi" id="2SradnRlkpe" role="I$8f6">
-                    <node concept="37vLTw" id="2SradnRljr_" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2SradnRkH40" resolve="rawIncludedModuleNames" />
-                    </node>
-                    <node concept="liA8E" id="2SradnRllaH" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
-                      <node concept="Xl_RD" id="2SradnRlm7$" role="37wK5m">
-                        <property role="Xl_RC" value="," />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="17QB3L" id="2lDJgzjQ$TF" role="HW$YZ" />
+            <node concept="1rXfSq" id="2lDJgzjRj62" role="33vP2m">
+              <ref role="37wK5l" node="2lDJgzjQTsz" resolve="parseRawPropertySet" />
+              <node concept="2YIFZM" id="7gc0jqT4GSp" role="37wK5m">
+                <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
+                <node concept="Xl_RD" id="7gc0jqT4H9m" role="37wK5m">
+                  <property role="Xl_RC" value="modelix.mps.model.sync.bulk.output.modules" />
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="2lDJgzjRt0Q" role="3cqZAp" />
         <node concept="3cpWs8" id="4fksUHVnsUa" role="3cqZAp">
           <node concept="3cpWsn" id="4fksUHVnsUd" role="3cpWs9">
             <property role="TrG5h" value="includedModulePrefixes" />
             <node concept="2hMVRd" id="4fksUHVnsU6" role="1tU5fm">
               <node concept="17QB3L" id="2lDJgzjQ_Rh" role="2hN53Y" />
             </node>
-            <node concept="3K4zz7" id="2SradnRlAIm" role="33vP2m">
-              <node concept="2OqwBi" id="2SradnRm240" role="3K4Cdx">
-                <node concept="37vLTw" id="2SradnRlBk9" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2SradnRlqmj" resolve="rawIncludedModulePrefixes" />
-                </node>
-                <node concept="17RlXB" id="2SradnRm31P" role="2OqNvi" />
-              </node>
-              <node concept="2ShNRf" id="2SradnRlDCi" role="3K4E3e">
-                <node concept="2i4dXS" id="2SradnRlEl5" role="2ShVmc">
-                  <node concept="17QB3L" id="2lDJgzjQAUz" role="HW$YZ" />
-                </node>
-              </node>
-              <node concept="2ShNRf" id="2SradnRlFgG" role="3K4GZi">
-                <node concept="2i4dXS" id="2SradnRlG8I" role="2ShVmc">
-                  <node concept="2OqwBi" id="2SradnRlITX" role="I$8f6">
-                    <node concept="37vLTw" id="2SradnRlHSO" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2SradnRlqmj" resolve="rawIncludedModulePrefixes" />
-                    </node>
-                    <node concept="liA8E" id="2SradnRlJMh" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
-                      <node concept="Xl_RD" id="2SradnRlKrV" role="37wK5m">
-                        <property role="Xl_RC" value="," />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="17QB3L" id="2lDJgzjQDvM" role="HW$YZ" />
+            <node concept="1rXfSq" id="2lDJgzjRoYH" role="33vP2m">
+              <ref role="37wK5l" node="2lDJgzjQTsz" resolve="parseRawPropertySet" />
+              <node concept="2YIFZM" id="4fksUHVn$LA" role="37wK5m">
+                <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
+                <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                <node concept="Xl_RD" id="4fksUHVn_pH" role="37wK5m">
+                  <property role="Xl_RC" value="modelix.mps.model.sync.bulk.output.modules.prefixes" />
                 </node>
               </node>
             </node>
@@ -581,6 +519,43 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="2lDJgzjQK9y" role="3cqZAp" />
+        <node concept="3cpWs8" id="2lDJgzjQK_5" role="3cqZAp">
+          <node concept="3cpWsn" id="2lDJgzjQK_8" role="3cpWs9">
+            <property role="TrG5h" value="includedModuleNames" />
+            <node concept="2hMVRd" id="2lDJgzjRzIM" role="1tU5fm">
+              <node concept="17QB3L" id="2lDJgzjRzIN" role="2hN53Y" />
+            </node>
+            <node concept="1rXfSq" id="2lDJgzjRzZA" role="33vP2m">
+              <ref role="37wK5l" node="2lDJgzjQTsz" resolve="parseRawPropertySet" />
+              <node concept="2YIFZM" id="2lDJgzjR$FE" role="37wK5m">
+                <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
+                <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                <node concept="Xl_RD" id="2lDJgzjR$Xm" role="37wK5m">
+                  <property role="Xl_RC" value="modelix.mps.model.sync.bulk.input.modules" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2lDJgzjRAle" role="3cqZAp">
+          <node concept="3cpWsn" id="2lDJgzjRAlh" role="3cpWs9">
+            <property role="TrG5h" value="includedModulePrefixes" />
+            <node concept="2hMVRd" id="2lDJgzjRAla" role="1tU5fm">
+              <node concept="17QB3L" id="2lDJgzjRAC6" role="2hN53Y" />
+            </node>
+            <node concept="1rXfSq" id="2lDJgzjRCxk" role="33vP2m">
+              <ref role="37wK5l" node="2lDJgzjQTsz" resolve="parseRawPropertySet" />
+              <node concept="2YIFZM" id="2lDJgzjQQ52" role="37wK5m">
+                <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
+                <node concept="Xl_RD" id="2lDJgzjQQl$" role="37wK5m">
+                  <property role="Xl_RC" value="modelix.mps.model.sync.bulk.input.modules.prefixes" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbH" id="7gc0jqT1Ain" role="3cqZAp" />
         <node concept="3cpWs8" id="7gc0jqT1xFZ" role="3cqZAp">
           <node concept="3cpWsn" id="7gc0jqT1xG0" role="3cpWs9">
@@ -622,7 +597,69 @@
               <ref role="37wK5l" to="lui2:~ModelAccess.runWriteInEDT(java.lang.Runnable)" resolve="runWriteInEDT" />
               <node concept="1bVj0M" id="2rlXDkQJYC6" role="37wK5m">
                 <node concept="3clFbS" id="2rlXDkQJYC7" role="1bW5cS">
-                  <node concept="3clFbH" id="5hPHAtnv11y" role="3cqZAp" />
+                  <node concept="3cpWs8" id="2lDJgzjRSyT" role="3cqZAp">
+                    <node concept="3cpWsn" id="2lDJgzjRSyW" role="3cpWs9">
+                      <property role="TrG5h" value="includedModules" />
+                      <node concept="2OqwBi" id="2lDJgzjRY1L" role="33vP2m">
+                        <node concept="2ShNRf" id="2lDJgzjRTWx" role="2Oq$k0">
+                          <node concept="Tc6Ow" id="2lDJgzjRTWi" role="2ShVmc">
+                            <node concept="3uibUv" id="2lDJgzjRTWj" role="HW$YZ">
+                              <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                            </node>
+                            <node concept="2OqwBi" id="2lDJgzjRWGE" role="I$8f6">
+                              <node concept="2OqwBi" id="2lDJgzjRVIL" role="2Oq$k0">
+                                <node concept="37vLTw" id="2lDJgzjRV5l" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="7gc0jqT1ApC" resolve="repoAsNode" />
+                                </node>
+                                <node concept="liA8E" id="2lDJgzjRWjY" role="2OqNvi">
+                                  <ref role="37wK5l" to="zxfz:~MPSRepositoryAsNode.getRepository()" resolve="getRepository" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="2lDJgzjRX6x" role="2OqNvi">
+                                <ref role="37wK5l" to="lui2:~SRepository.getModules()" resolve="getModules" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3zZkjj" id="2lDJgzjRYQG" role="2OqNvi">
+                          <node concept="1bVj0M" id="2lDJgzjRYQI" role="23t8la">
+                            <node concept="3clFbS" id="2lDJgzjRYQJ" role="1bW5cS">
+                              <node concept="3clFbF" id="2lDJgzjRZhs" role="3cqZAp">
+                                <node concept="2YIFZM" id="2lDJgzjRZPl" role="3clFbG">
+                                  <ref role="37wK5l" to="vgv4:~UtilKt.isModuleIncluded(java.lang.String,java.util.Collection,java.util.Collection)" resolve="isModuleIncluded" />
+                                  <ref role="1Pybhc" to="vgv4:~UtilKt" resolve="UtilKt" />
+                                  <node concept="2OqwBi" id="2lDJgzjS0YY" role="37wK5m">
+                                    <node concept="37vLTw" id="2lDJgzjS0qj" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="2lDJgzjRYQK" resolve="it" />
+                                    </node>
+                                    <node concept="liA8E" id="2lDJgzjS1zd" role="2OqNvi">
+                                      <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
+                                    </node>
+                                  </node>
+                                  <node concept="37vLTw" id="2lDJgzjS2uV" role="37wK5m">
+                                    <ref role="3cqZAo" node="2lDJgzjQK_8" resolve="includedModuleNames" />
+                                  </node>
+                                  <node concept="37vLTw" id="2lDJgzjS3_s" role="37wK5m">
+                                    <ref role="3cqZAo" node="2lDJgzjRAlh" resolve="includedModulePrefixes" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="Rh6nW" id="2lDJgzjRYQK" role="1bW2Oz">
+                              <property role="TrG5h" value="it" />
+                              <node concept="2jxLKc" id="2lDJgzjRYQL" role="1tU5fm" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="A3Dl8" id="2lDJgzjS3SW" role="1tU5fm">
+                        <node concept="3uibUv" id="2lDJgzjS3SZ" role="A3Ik2">
+                          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="2lDJgzjRSgq" role="3cqZAp" />
                   <node concept="3clFbF" id="5hPHAtnuWei" role="3cqZAp">
                     <node concept="2OqwBi" id="5hPHAtnuWES" role="3clFbG">
                       <node concept="37vLTw" id="5hPHAtnuWeg" role="2Oq$k0">
@@ -636,19 +673,6 @@
                               <node concept="2GrKxI" id="2rlXDkQJYPQ" role="2Gsz3X">
                                 <property role="TrG5h" value="module" />
                               </node>
-                              <node concept="2OqwBi" id="2rlXDkQJZ_J" role="2GsD0m">
-                                <node concept="2OqwBi" id="2rlXDkQJZ8x" role="2Oq$k0">
-                                  <node concept="37vLTw" id="2rlXDkQJYWE" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="7gc0jqT1ApC" resolve="repoAsNode" />
-                                  </node>
-                                  <node concept="liA8E" id="2rlXDkQJZiN" role="2OqNvi">
-                                    <ref role="37wK5l" to="zxfz:~MPSRepositoryAsNode.getRepository()" resolve="getRepository" />
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="2rlXDkQJZK3" role="2OqNvi">
-                                  <ref role="37wK5l" to="lui2:~SRepository.getModules()" resolve="getModules" />
-                                </node>
-                              </node>
                               <node concept="3clFbS" id="2rlXDkQJYPU" role="2LFqv$">
                                 <node concept="3cpWs8" id="2rlXDkQK1M3" role="3cqZAp">
                                   <node concept="3cpWsn" id="2rlXDkQK1M4" role="3cpWs9">
@@ -733,6 +757,9 @@
                                   </node>
                                 </node>
                               </node>
+                              <node concept="37vLTw" id="2lDJgzjS8UB" role="2GsD0m">
+                                <ref role="3cqZAo" node="2lDJgzjRSyW" resolve="includedModules" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -807,6 +834,53 @@
       <node concept="3cqZAl" id="7gc0jqT1xGe" role="3clF45" />
       <node concept="3Tm1VV" id="7gc0jqT1xGf" role="1B3o_S" />
     </node>
+    <node concept="2tJIrI" id="2lDJgzjQRVX" role="jymVt" />
+    <node concept="2YIFZL" id="2lDJgzjQTsz" role="jymVt">
+      <property role="TrG5h" value="parseRawPropertySet" />
+      <node concept="3clFbS" id="2lDJgzjQTsA" role="3clF47">
+        <node concept="3cpWs6" id="2lDJgzjQTB$" role="3cqZAp">
+          <node concept="3K4zz7" id="2lDJgzjQUoQ" role="3cqZAk">
+            <node concept="2ShNRf" id="2lDJgzjQUr_" role="3K4E3e">
+              <node concept="2i4dXS" id="2lDJgzjR9jS" role="2ShVmc">
+                <node concept="17QB3L" id="2lDJgzjR9vO" role="HW$YZ" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="2lDJgzjR9yg" role="3K4GZi">
+              <node concept="2i4dXS" id="2lDJgzjR9Uv" role="2ShVmc">
+                <node concept="17QB3L" id="2lDJgzjRcaf" role="HW$YZ" />
+                <node concept="2OqwBi" id="2lDJgzjRdyg" role="I$8f6">
+                  <node concept="37vLTw" id="2lDJgzjRd8B" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2lDJgzjQTDT" resolve="rawProperty" />
+                  </node>
+                  <node concept="liA8E" id="2lDJgzjRdZk" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
+                    <node concept="Xl_RD" id="2lDJgzjRe8y" role="37wK5m">
+                      <property role="Xl_RC" value="," />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2lDJgzjQU27" role="3K4Cdx">
+              <node concept="37vLTw" id="2lDJgzjQTMG" role="2Oq$k0">
+                <ref role="3cqZAo" node="2lDJgzjQTDT" resolve="rawProperty" />
+              </node>
+              <node concept="liA8E" id="2lDJgzjQU84" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.isEmpty()" resolve="isEmpty" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="2lDJgzjQS$Q" role="1B3o_S" />
+      <node concept="2hMVRd" id="2lDJgzjQSJG" role="3clF45">
+        <node concept="17QB3L" id="2lDJgzjQSKQ" role="2hN53Y" />
+      </node>
+      <node concept="37vLTG" id="2lDJgzjQTDT" role="3clF46">
+        <property role="TrG5h" value="rawProperty" />
+        <node concept="17QB3L" id="2lDJgzjQTDS" role="1tU5fm" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="7gc0jqT1xEc" role="jymVt" />
     <node concept="2YIFZL" id="7gc0jqT1yfO" role="jymVt">
       <property role="TrG5h" value="getRepositoryAsNode" />

From 2c3e5f30e074bb565b06662fdc37503b9f839f1e Mon Sep 17 00:00:00 2001
From: Michael Huster <mhuster@itemis.com>
Date: Mon, 6 Nov 2023 11:44:32 +0100
Subject: [PATCH 05/10] fix(bulk-model-sync-solution): add missing progress
 indicator for mps import

---
 .../org.modelix.mps.model.sync.bulk.mps       | 147 ++++++++++++++----
 1 file changed, 116 insertions(+), 31 deletions(-)

diff --git a/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps b/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps
index 1196090636..2b307fb1b2 100644
--- a/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps
+++ b/bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps
@@ -53,6 +53,7 @@
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -165,7 +166,6 @@
         <child id="1237731803878" name="copyFrom" index="I$8f6" />
       </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
-      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
     </language>
@@ -269,7 +269,7 @@
                   </node>
                   <node concept="3cpWs8" id="4fksUHVmlQt" role="3cqZAp">
                     <node concept="3cpWsn" id="4fksUHVmlQu" role="3cpWs9">
-                      <property role="TrG5h" value="selectedModules" />
+                      <property role="TrG5h" value="includedModules" />
                       <node concept="A3Dl8" id="4fksUHVmA3p" role="1tU5fm">
                         <node concept="3uibUv" id="4fksUHVmA3q" role="A3Ik2">
                           <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
@@ -316,9 +316,7 @@
                   <node concept="3cpWs8" id="4fksUHVmaF6" role="3cqZAp">
                     <node concept="3cpWsn" id="4fksUHVmaF7" role="3cpWs9">
                       <property role="TrG5h" value="current" />
-                      <node concept="3uibUv" id="4fksUHVmaF8" role="1tU5fm">
-                        <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
-                      </node>
+                      <node concept="10Oyi0" id="2lDJgzjSuJd" role="1tU5fm" />
                       <node concept="3cmrfG" id="4fksUHVmcgw" role="33vP2m">
                         <property role="3cmrfH" value="0" />
                       </node>
@@ -327,12 +325,10 @@
                   <node concept="3cpWs8" id="4fksUHVmU9U" role="3cqZAp">
                     <node concept="3cpWsn" id="4fksUHVmU9V" role="3cpWs9">
                       <property role="TrG5h" value="numSelectedModules" />
-                      <node concept="3uibUv" id="4fksUHVmU9W" role="1tU5fm">
-                        <ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
-                      </node>
+                      <node concept="10Oyi0" id="2lDJgzjSvzj" role="1tU5fm" />
                       <node concept="2OqwBi" id="4fksUHVmX5E" role="33vP2m">
                         <node concept="37vLTw" id="4fksUHVmWvN" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4fksUHVmlQu" resolve="selectedModules" />
+                          <ref role="3cqZAo" node="4fksUHVmlQu" resolve="includedModules" />
                         </node>
                         <node concept="34oBXx" id="4fksUHVmXOu" role="2OqNvi" />
                       </node>
@@ -489,7 +485,7 @@
                       </node>
                     </node>
                     <node concept="37vLTw" id="4fksUHVnkAq" role="2GsD0m">
-                      <ref role="3cqZAo" node="4fksUHVmlQu" resolve="selectedModules" />
+                      <ref role="3cqZAo" node="4fksUHVmlQu" resolve="includedModules" />
                     </node>
                   </node>
                 </node>
@@ -597,30 +593,33 @@
               <ref role="37wK5l" to="lui2:~ModelAccess.runWriteInEDT(java.lang.Runnable)" resolve="runWriteInEDT" />
               <node concept="1bVj0M" id="2rlXDkQJYC6" role="37wK5m">
                 <node concept="3clFbS" id="2rlXDkQJYC7" role="1bW5cS">
+                  <node concept="3cpWs8" id="2lDJgzjSjy6" role="3cqZAp">
+                    <node concept="3cpWsn" id="2lDJgzjSjy9" role="3cpWs9">
+                      <property role="TrG5h" value="allModules" />
+                      <node concept="A3Dl8" id="2lDJgzjSjy3" role="1tU5fm">
+                        <node concept="3uibUv" id="2lDJgzjSkax" role="A3Ik2">
+                          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="2lDJgzjSnOX" role="33vP2m">
+                        <node concept="2OqwBi" id="2lDJgzjSmV3" role="2Oq$k0">
+                          <node concept="37vLTw" id="2lDJgzjSm90" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7gc0jqT1ApC" resolve="repoAsNode" />
+                          </node>
+                          <node concept="liA8E" id="2lDJgzjSnou" role="2OqNvi">
+                            <ref role="37wK5l" to="zxfz:~MPSRepositoryAsNode.getRepository()" resolve="getRepository" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="2lDJgzjSohl" role="2OqNvi">
+                          <ref role="37wK5l" to="lui2:~SRepository.getModules()" resolve="getModules" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3cpWs8" id="2lDJgzjRSyT" role="3cqZAp">
                     <node concept="3cpWsn" id="2lDJgzjRSyW" role="3cpWs9">
                       <property role="TrG5h" value="includedModules" />
                       <node concept="2OqwBi" id="2lDJgzjRY1L" role="33vP2m">
-                        <node concept="2ShNRf" id="2lDJgzjRTWx" role="2Oq$k0">
-                          <node concept="Tc6Ow" id="2lDJgzjRTWi" role="2ShVmc">
-                            <node concept="3uibUv" id="2lDJgzjRTWj" role="HW$YZ">
-                              <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-                            </node>
-                            <node concept="2OqwBi" id="2lDJgzjRWGE" role="I$8f6">
-                              <node concept="2OqwBi" id="2lDJgzjRVIL" role="2Oq$k0">
-                                <node concept="37vLTw" id="2lDJgzjRV5l" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="7gc0jqT1ApC" resolve="repoAsNode" />
-                                </node>
-                                <node concept="liA8E" id="2lDJgzjRWjY" role="2OqNvi">
-                                  <ref role="37wK5l" to="zxfz:~MPSRepositoryAsNode.getRepository()" resolve="getRepository" />
-                                </node>
-                              </node>
-                              <node concept="liA8E" id="2lDJgzjRX6x" role="2OqNvi">
-                                <ref role="37wK5l" to="lui2:~SRepository.getModules()" resolve="getModules" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
                         <node concept="3zZkjj" id="2lDJgzjRYQG" role="2OqNvi">
                           <node concept="1bVj0M" id="2lDJgzjRYQI" role="23t8la">
                             <node concept="3clFbS" id="2lDJgzjRYQJ" role="1bW5cS">
@@ -651,6 +650,9 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="37vLTw" id="2lDJgzjSseQ" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2lDJgzjSjy9" resolve="allModules" />
+                        </node>
                       </node>
                       <node concept="A3Dl8" id="2lDJgzjS3SW" role="1tU5fm">
                         <node concept="3uibUv" id="2lDJgzjS3SZ" role="A3Ik2">
@@ -659,7 +661,29 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbH" id="2lDJgzjRSgq" role="3cqZAp" />
+                  <node concept="3clFbH" id="2lDJgzjS$Fc" role="3cqZAp" />
+                  <node concept="3cpWs8" id="2lDJgzjSu2F" role="3cqZAp">
+                    <node concept="3cpWsn" id="2lDJgzjSu2I" role="3cpWs9">
+                      <property role="TrG5h" value="current" />
+                      <node concept="10Oyi0" id="2lDJgzjSu2E" role="1tU5fm" />
+                      <node concept="3cmrfG" id="2lDJgzjSy9m" role="33vP2m">
+                        <property role="3cmrfH" value="0" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs8" id="2lDJgzjS_2K" role="3cqZAp">
+                    <node concept="3cpWsn" id="2lDJgzjS_2N" role="3cpWs9">
+                      <property role="TrG5h" value="numIncludedModules" />
+                      <node concept="10Oyi0" id="2lDJgzjS_2I" role="1tU5fm" />
+                      <node concept="2OqwBi" id="2lDJgzjSBUK" role="33vP2m">
+                        <node concept="37vLTw" id="2lDJgzjSBeB" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2lDJgzjRSyW" resolve="includedModules" />
+                        </node>
+                        <node concept="34oBXx" id="2lDJgzjSCpO" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="2lDJgzjSiIn" role="3cqZAp" />
                   <node concept="3clFbF" id="5hPHAtnuWei" role="3cqZAp">
                     <node concept="2OqwBi" id="5hPHAtnuWES" role="3clFbG">
                       <node concept="37vLTw" id="5hPHAtnuWeg" role="2Oq$k0">
@@ -674,6 +698,67 @@
                                 <property role="TrG5h" value="module" />
                               </node>
                               <node concept="3clFbS" id="2rlXDkQJYPU" role="2LFqv$">
+                                <node concept="3clFbF" id="2lDJgzjSD7j" role="3cqZAp">
+                                  <node concept="d57v9" id="2lDJgzjSH$S" role="3clFbG">
+                                    <node concept="3cmrfG" id="2lDJgzjSHUR" role="37vLTx">
+                                      <property role="3cmrfH" value="1" />
+                                    </node>
+                                    <node concept="37vLTw" id="2lDJgzjSD7h" role="37vLTJ">
+                                      <ref role="3cqZAo" node="2lDJgzjSu2I" resolve="current" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbH" id="2lDJgzjSI$p" role="3cqZAp" />
+                                <node concept="3clFbF" id="2lDJgzjSJPT" role="3cqZAp">
+                                  <node concept="2OqwBi" id="2lDJgzjSJPU" role="3clFbG">
+                                    <node concept="10M0yZ" id="2lDJgzjSJPV" role="2Oq$k0">
+                                      <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                                      <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+                                    </node>
+                                    <node concept="liA8E" id="2lDJgzjSJPW" role="2OqNvi">
+                                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                                      <node concept="3cpWs3" id="2lDJgzjSJPX" role="37wK5m">
+                                        <node concept="Xl_RD" id="2lDJgzjSJPY" role="3uHU7w">
+                                          <property role="Xl_RC" value="'" />
+                                        </node>
+                                        <node concept="3cpWs3" id="2lDJgzjSJPZ" role="3uHU7B">
+                                          <node concept="3cpWs3" id="2lDJgzjSJQ0" role="3uHU7B">
+                                            <node concept="Xl_RD" id="2lDJgzjSJQ1" role="3uHU7w">
+                                              <property role="Xl_RC" value=": '" />
+                                            </node>
+                                            <node concept="3cpWs3" id="2lDJgzjSJQ2" role="3uHU7B">
+                                              <node concept="3cpWs3" id="2lDJgzjSJQ3" role="3uHU7B">
+                                                <node concept="3cpWs3" id="2lDJgzjSJQ4" role="3uHU7B">
+                                                  <node concept="Xl_RD" id="2lDJgzjSJQ5" role="3uHU7B">
+                                                    <property role="Xl_RC" value="Importing module " />
+                                                  </node>
+                                                  <node concept="37vLTw" id="2lDJgzjSJQ6" role="3uHU7w">
+                                                    <ref role="3cqZAo" node="2lDJgzjSu2I" resolve="current" />
+                                                  </node>
+                                                </node>
+                                                <node concept="Xl_RD" id="2lDJgzjSJQ7" role="3uHU7w">
+                                                  <property role="Xl_RC" value=" of " />
+                                                </node>
+                                              </node>
+                                              <node concept="37vLTw" id="2lDJgzjSJQ8" role="3uHU7w">
+                                                <ref role="3cqZAo" node="2lDJgzjS_2N" resolve="numIncludedModules" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="2OqwBi" id="2lDJgzjSJQ9" role="3uHU7w">
+                                            <node concept="2GrUjf" id="2lDJgzjSJQa" role="2Oq$k0">
+                                              <ref role="2Gs0qQ" node="2rlXDkQJYPQ" resolve="module" />
+                                            </node>
+                                            <node concept="liA8E" id="2lDJgzjSJQb" role="2OqNvi">
+                                              <ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbH" id="2lDJgzjSIU$" role="3cqZAp" />
                                 <node concept="3cpWs8" id="2rlXDkQK1M3" role="3cqZAp">
                                   <node concept="3cpWsn" id="2rlXDkQK1M4" role="3cpWs9">
                                     <property role="TrG5h" value="moduleFile" />

From d2ae392afd76127079e28108454e7629bb82262a Mon Sep 17 00:00:00 2001
From: Michael Huster <mhuster@itemis.com>
Date: Mon, 6 Nov 2023 12:45:30 +0100
Subject: [PATCH 06/10] test(bulk-model-sync-gradle): fix test setup for pull
 direction

---
 bulk-model-sync-gradle-test/build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bulk-model-sync-gradle-test/build.gradle.kts b/bulk-model-sync-gradle-test/build.gradle.kts
index 1ac317c3eb..871804bca3 100644
--- a/bulk-model-sync-gradle-test/build.gradle.kts
+++ b/bulk-model-sync-gradle-test/build.gradle.kts
@@ -107,6 +107,7 @@ modelSync {
         }
     }
     direction("testPull") {
+        includeModule("GraphSolution")
         fromModelServer {
             url = "http://0.0.0.0:${Main.DEFAULT_PORT}/v2"
             repositoryId = "ci-test"

From 25ca9bcfab5300085251fc625830886e2e00fbec Mon Sep 17 00:00:00 2001
From: Michael Huster <mhuster@itemis.com>
Date: Tue, 7 Nov 2023 15:51:13 +0100
Subject: [PATCH 07/10] fix(bulk-model-sync-gradle): close client after model
 server export

---
 .../model/sync/bulk/gradle/tasks/ExportFromModelServer.kt        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
index 0476b3b874..d0840e2a52 100644
--- a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
+++ b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
@@ -92,6 +92,7 @@ abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : De
                 ModelExporter(it).export(outputFile)
             }
         }
+        client.close()
     }
 
     private fun getIncludedModules(root: INode): Iterable<INode> {

From 012a0eaae57ef365de37bb51302f0e2e29e8bda6 Mon Sep 17 00:00:00 2001
From: Michael Huster <mhuster@itemis.com>
Date: Tue, 7 Nov 2023 15:52:00 +0100
Subject: [PATCH 08/10] fix(bulk-model-sync-gradle): correctly check for module
 instances

---
 .../model/sync/bulk/gradle/tasks/ExportFromModelServer.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
index d0840e2a52..3adc680e61 100644
--- a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
+++ b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
@@ -99,7 +99,7 @@ abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : De
         val nameRole = BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name
 
         return root.allChildren.filter {
-            val isModule = it.concept == BuiltinLanguages.MPSRepositoryConcepts.Module
+            val isModule = it.concept?.getUID() == BuiltinLanguages.MPSRepositoryConcepts.Module.getUID()
             val moduleName = it.getPropertyValue(nameRole) ?: return@filter false
             val isIncluded = isModuleIncluded(moduleName, includedModules.get(), includedModulePrefixes.get())
 

From c338e8b0a8e58f32a0111405cf7e4861e37ebb66 Mon Sep 17 00:00:00 2001
From: Michael Huster <mhuster@itemis.com>
Date: Thu, 9 Nov 2023 09:05:27 +0100
Subject: [PATCH 09/10] docs(bulk-model-sync-lib): remove usage hint

---
 .../src/commonMain/kotlin/org/modelix/model/sync/bulk/Util.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/Util.kt b/bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/Util.kt
index 42106f89d0..c0f6db3f27 100644
--- a/bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/Util.kt
+++ b/bulk-model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/bulk/Util.kt
@@ -22,7 +22,6 @@ import org.modelix.model.data.ModelData
 import org.modelix.model.data.NodeData
 
 /**
- * Helper-method used by the gradle plugin and the MPS solution.
  * Checks if a module is included in the sync.
  *
  * @param moduleName name of the module to be checked

From 4b60d3599820aa30db6aa965b25b60dc43cf056f Mon Sep 17 00:00:00 2001
From: Michael Huster <mhuster@itemis.com>
Date: Thu, 9 Nov 2023 09:10:59 +0100
Subject: [PATCH 10/10] fix(bulk-model-sync-gradle): use kotlin io use instead
 of closing client manually

---
 .../gradle/tasks/ExportFromModelServer.kt     | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
index 3adc680e61..3a613e8d22 100644
--- a/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
+++ b/bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt
@@ -69,30 +69,30 @@ abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : De
 
     @TaskAction
     fun export() {
-        val client = ModelClientV2PlatformSpecificBuilder()
+        val modelClient = ModelClientV2PlatformSpecificBuilder()
             .url(url.get())
             .build()
+        modelClient.use { client ->
+            runBlocking { client.init() }
 
-        runBlocking { client.init() }
-
-        val branch = if (revision.isPresent) {
-            getBranchByRevision(client)
-        } else {
-            getBranchByRepoIdAndBranch(client)
-        }
+            val branch = if (revision.isPresent) {
+                getBranchByRevision(client)
+            } else {
+                getBranchByRepoIdAndBranch(client)
+            }
 
-        branch.runRead {
-            val root = branch.getRootNode()
-            logger.info("Got root node: {}", root)
-            val outputDir = outputDir.get().asFile
+            branch.runRead {
+                val root = branch.getRootNode()
+                logger.info("Got root node: {}", root)
+                val outputDir = outputDir.get().asFile
 
-            getIncludedModules(root).forEach {
-                val fileName = it.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name)
-                val outputFile = outputDir.resolve("$fileName.json")
-                ModelExporter(it).export(outputFile)
+                getIncludedModules(root).forEach {
+                    val fileName = it.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name)
+                    val outputFile = outputDir.resolve("$fileName.json")
+                    ModelExporter(it).export(outputFile)
+                }
             }
         }
-        client.close()
     }
 
     private fun getIncludedModules(root: INode): Iterable<INode> {