fix(mps-sync-plugin): persist whether a connection should be used for a specific repository only

When a new connection is added via `IModelSyncService.addServer` a repository ID can optionally be
provided and then the connection is only used for that repository and the JWT token will usually
also only be valid for that repository.
The `modelix.xml` previously didn't make this distinction and when the state was reloaded from disk
a previously global connection turned into a repository scoped one.

Author: slisson

mps-sync-plugin3/src/main/kotlin/org/modelix/mps/sync3/ModelSyncService.kt

@@ -192,7 +192,12 @@ class ModelSyncService(val project: Project) :
                 bindings.map { bindingEntry ->
                     Element("binding").also {
                         it.children.add(Element("enabled").also { it.text = bindingEntry.value.enabled.toString() })
-                        it.children.add(Element("url").also { it.text = bindingEntry.key.connectionProperties.url })
+                        it.children.add(
+                            Element("url").also {
+                                it.text = bindingEntry.key.connectionProperties.url
+                                it.setAttribute("repositoryScoped", "${bindingEntry.key.connectionProperties.repositoryId != null}")
+                            },
+                        )
                         bindingEntry.key.connectionProperties.oauthClientId?.let { oauthClientId ->
                             it.children.add(Element("oauthClientId").also { it.text = oauthClientId })
                         }
@@ -214,7 +219,7 @@ class ModelSyncService(val project: Project) :
                         BindingId(
                             connectionProperties = ModelServerConnectionProperties(
                                 url = element.getChild("url")?.text ?: return@mapNotNull null,
-                                repositoryId = repositoryId,
+                                repositoryId = repositoryId.takeIf { element.getChild("url")?.getAttribute("repositoryScoped")?.value != "false" },
                                 oauthClientId = element.getChild("oauthClientId")?.text,
                                 oauthClientSecret = element.getChild("oauthClientSecret")?.text,
                             ),
@@ -288,7 +293,7 @@ class ModelSyncService(val project: Project) :
             val id = BindingId(connection.properties, branchRef)
             updateBindingState(id) { oldBinding ->
                 BindingState(
-                    versionHash = lastSyncedVersionHash ?: oldBinding?.versionHash,
+                    versionHash = lastSyncedVersionHash ?: oldBinding.versionHash,
                     enabled = true,
                 )
             }

mps-sync-plugin3/src/test/kotlin/org/modelix/mps/sync3/ProjectSyncTest.kt

@@ -549,7 +549,7 @@ class ProjectSyncTest : MPSTestBase() {
               <component name="modelix-sync">
                 <binding>
                   <enabled>true</enabled>
-                  <url>http://localhost:$port</url>
+                  <url repositoryScoped="false">http://localhost:$port</url>
                   <repository>${branchRef.repositoryId.id}</repository>
                   <branch>${branchRef.branchName}</branch>
                   <versionHash>${version1.getContentHash()}</versionHash>