From 0859f60d5752f1d6726903807aa025caa2126640 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Thu, 1 Jun 2023 09:00:23 +0200 Subject: [PATCH 01/33] Fix wrong version number for local build (#630) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d6a2e2fb6..ec98c688a 100644 --- a/build.gradle +++ b/build.gradle @@ -105,7 +105,7 @@ if (ciBuild) { println "##teamcity[buildNumber '${version}']" } else { println "Local build detected, version will be SNAPSHOT" - version = "2020.3-SNAPSHOT" + version = ext.mpsMajor + "." + ext.mpsMinor + "-SNAPSHOT" } def userHome = System.properties['user.home'] From 8ba22c8cfb5c728c8a34fd54b1c45bdbb49f3eac Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Thu, 29 Jun 2023 13:41:37 +0200 Subject: [PATCH 02/33] Add a Changelog to document user-facing changes --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..c02e88979 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,6 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month. From be1622789c96542c82a54b205c012c3e80c154da Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Thu, 29 Jun 2023 13:45:09 +0200 Subject: [PATCH 03/33] Minor:passive->active wording --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c02e88979..249de8967 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -All notable changes to this project will be documented in this file. +All notable changes to this project are documented in this file. Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month. From 3bde22bbf24efecdbc77f6b6db416ff5e2238681 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 28 Jul 2023 15:34:16 +0200 Subject: [PATCH 04/33] Remove build script block dependency to old nexus. (cherry picked from commit 19722d108a1dee7f014d8fa4da9927ad5ef773a4) --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index ec98c688a..2024d0664 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,6 @@ buildscript { repositories { mavenLocal() maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' } - maven { url 'https://projects.itemis.de/nexus/content/repositories/mbeddr' } } dependencies { classpath('de.itemis.mps:mps-gradle-plugin:1.7+') From 9a141280359a38b0756de9bc8eaa333993f3931b Mon Sep 17 00:00:00 2001 From: Alexei Quapp Date: Mon, 31 Jul 2023 22:17:45 +0200 Subject: [PATCH 05/33] Fix build for windows `replaceAll()` was removing all `\` in paths on windows leading to wrong paths --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2024d0664..4a6949ea7 100644 --- a/build.gradle +++ b/build.gradle @@ -248,7 +248,7 @@ tasks.register("checkModulePaths") { def project = new XmlParser().parse(file) def invalidModules = project.component.projectModules.modulePath.'@path'.findAll { - def path = it.replaceAll("\\\$PROJECT_DIR\\\$","$rootDir/code") + def path = it.replace("\$PROJECT_DIR\$","$rootDir/code") return !(new File(path).exists()) } From 15cd0e73d368c28fc3176b02bd4918ee473851e7 Mon Sep 17 00:00:00 2001 From: KemalSoysal Date: Mon, 31 Jul 2023 17:22:21 +0200 Subject: [PATCH 06/33] remove old nexus repository and update usage according to https://github.com/mbeddr/mps-gradle-plugin/tree/v1.x#configuring-the-plugin-repository (cherry picked from commit a009734eab91b151b7ad68a555c221ec6a45cad8) --- build.gradle | 11 +++-------- settings.gradle | 8 ++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 4a6949ea7..6b85f2e3e 100644 --- a/build.gradle +++ b/build.gradle @@ -4,13 +4,10 @@ buildscript { mavenLocal() maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' } } - dependencies { - classpath('de.itemis.mps:mps-gradle-plugin:1.7+') - } } - plugins { - id "com.github.breadmoirai.github-release" version "2.4.1" + id 'de.itemis.mps.gradle.common' version '1.13.+' + id "com.github.breadmoirai.github-release" version "2.4.1" } apply plugin: 'maven-publish' @@ -73,9 +70,7 @@ if (!project.hasProperty('nexusUsername')) { logger.info 'Repository username: {}', project.nexusUsername ext.dependencyRepositories = [ - 'https://artifacts.itemis.cloud/repository/maven-mps/', - 'https://projects.itemis.de/nexus/content/repositories/mbeddr', - 'https://projects.itemis.de/nexus/content/repositories/mbeddr_snapshots', + 'https://artifacts.itemis.cloud/repository/maven-mps/' ] // Dependency versions diff --git a/settings.gradle b/settings.gradle index 2c8227381..6b94ae198 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,9 @@ +pluginManagement { + repositories { + maven { url 'https://artifacts.itemis.cloud/repository/maven-mps' } + + // Need to manually include the default Gradle plugin portal repository when overriding the defaults. + gradlePluginPortal() + } +} rootProject.name = 'MPS-extensions' From 68211a894492cc5f92e18283ab2dcb5a7b7b05ca Mon Sep 17 00:00:00 2001 From: KemalSoysal Date: Tue, 1 Aug 2023 11:40:09 +0200 Subject: [PATCH 07/33] adopt changes encouraged by @sergej-koscejev in comments https://github.com/JetBrains/MPS-extensions/pull/651#discussion_r1280303825 and https://github.com/JetBrains/MPS-extensions/pull/651#pullrequestreview-1556476923 (cherry picked from commit d313aeb5022196a8a09f5cedb8a0131e8d5ff70e) --- build.gradle | 7 ------- settings.gradle | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 6b85f2e3e..69c3b88c9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,3 @@ -//will pull the groovy classes/types from nexus to the classpath -buildscript { - repositories { - mavenLocal() - maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' } - } -} plugins { id 'de.itemis.mps.gradle.common' version '1.13.+' id "com.github.breadmoirai.github-release" version "2.4.1" diff --git a/settings.gradle b/settings.gradle index 6b94ae198..4022c47ef 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,6 @@ pluginManagement { repositories { + mavenLocal() maven { url 'https://artifacts.itemis.cloud/repository/maven-mps' } // Need to manually include the default Gradle plugin portal repository when overriding the defaults. From e3cea993849300b170ee5da1cca0c8b93e7d2ea9 Mon Sep 17 00:00:00 2001 From: KemalSoysal Date: Tue, 1 Aug 2023 11:55:23 +0200 Subject: [PATCH 08/33] adopt changes encouraged by @sergej-koscejev in comment https://github.com/JetBrains/MPS-extensions/pull/651/files#r1280383908 (cherry picked from commit 484ed05ec3786a07a158af9738d501bea22f1dbb) --- settings.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 4022c47ef..6b94ae198 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ pluginManagement { repositories { - mavenLocal() maven { url 'https://artifacts.itemis.cloud/repository/maven-mps' } // Need to manually include the default Gradle plugin portal repository when overriding the defaults. From 801b5b602b0b64ee72539ed9acb5775da9a26f52 Mon Sep 17 00:00:00 2001 From: Alexei Quapp Date: Tue, 1 Aug 2023 21:25:13 +0200 Subject: [PATCH 09/33] Executed rerunnable migrations --- .../models/de.itemis.mps.extensions.build.mps | 246 ++++++++++++++++++ .../generator/template/main@generator.mps | 2 +- .../mps/editor/diagram/runtime/jgraph.mps | 2 +- ...e.itemis.model.merge.diamond.structure.mps | 1 + .../de.itemis.model.merge.mpl | 1 + .../de.itemis.model.merge.structure.mps | 2 +- ...is.model.simple.demo.collection.keeper.mpl | 1 + ...imple.demo.collection.keeper.structure.mps | 2 +- ...de.itemis.model.simple.demo.collection.mpl | 1 + ...model.simple.demo.collection.structure.mps | 2 +- .../de.itemis.model.simple.demo.reference.mpl | 1 + ....model.simple.demo.reference.structure.mps | 2 +- .../itemis/mps/selection/runtime/plugin.mps | 2 +- .../de.q60.mps.shadowmodels.runtime.msd | 1 - .../models/engine.mps | 1 - ....itemis.model.merge.simple.demo.plugin.mps | 28 +- .../mbeddr/mpsutil/treenotation/runtime.mps | 2 +- .../generator/template/main@generator.mps | 2 +- 18 files changed, 275 insertions(+), 24 deletions(-) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index a0156cd96..acb6f5bbf 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -969,6 +969,25 @@ + + + + + + + + + + + + + + + + + + + @@ -5850,6 +5869,22 @@ + + + + + + + + + + + + + + + + @@ -7169,6 +7204,22 @@ + + + + + + + + + + + + + + + + @@ -7351,6 +7402,22 @@ + + + + + + + + + + + + + + + + @@ -12002,6 +12069,22 @@ + + + + + + + + + + + + + + + + @@ -12092,6 +12175,22 @@ + + + + + + + + + + + + + + + + @@ -15208,6 +15307,22 @@ + + + + + + + + + + + + + + + + @@ -15362,6 +15477,22 @@ + + + + + + + + + + + + + + + + @@ -15406,6 +15537,22 @@ + + + + + + + + + + + + + + + + @@ -15455,6 +15602,22 @@ + + + + + + + + + + + + + + + + @@ -15504,6 +15667,22 @@ + + + + + + + + + + + + + + + + @@ -15705,6 +15884,22 @@ + + + + + + + + + + + + + + + + @@ -15771,6 +15966,25 @@ + + + + + + + + + + + + + + + + + + + @@ -15999,6 +16213,22 @@ + + + + + + + + + + + + + + + + @@ -16537,6 +16767,22 @@ + + + + + + + + + + + + + + + + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps index 48c800533..3ddc7bc62 100755 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps @@ -2,7 +2,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps index bcfd777b7..f7f9bd8aa 100755 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps @@ -13,7 +13,7 @@ - + diff --git a/code/languages/de.itemis.model.merge.diamond/models/de.itemis.model.merge.diamond.structure.mps b/code/languages/de.itemis.model.merge.diamond/models/de.itemis.model.merge.diamond.structure.mps index 77895b741..bc0e45fb4 100644 --- a/code/languages/de.itemis.model.merge.diamond/models/de.itemis.model.merge.diamond.structure.mps +++ b/code/languages/de.itemis.model.merge.diamond/models/de.itemis.model.merge.diamond.structure.mps @@ -3,6 +3,7 @@ + diff --git a/code/languages/de.itemis.model.merge/de.itemis.model.merge.mpl b/code/languages/de.itemis.model.merge/de.itemis.model.merge.mpl index 26d07d3a9..ed2edd555 100644 --- a/code/languages/de.itemis.model.merge/de.itemis.model.merge.mpl +++ b/code/languages/de.itemis.model.merge/de.itemis.model.merge.mpl @@ -127,6 +127,7 @@ + diff --git a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps index e65b0ae2b..d83c979a7 100644 --- a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps +++ b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps @@ -2,7 +2,7 @@ - + diff --git a/code/languages/de.itemis.model.simple.demo.collection.keeper/de.itemis.model.simple.demo.collection.keeper.mpl b/code/languages/de.itemis.model.simple.demo.collection.keeper/de.itemis.model.simple.demo.collection.keeper.mpl index 35dee1657..8bdb41186 100644 --- a/code/languages/de.itemis.model.simple.demo.collection.keeper/de.itemis.model.simple.demo.collection.keeper.mpl +++ b/code/languages/de.itemis.model.simple.demo.collection.keeper/de.itemis.model.simple.demo.collection.keeper.mpl @@ -27,6 +27,7 @@ + diff --git a/code/languages/de.itemis.model.simple.demo.collection.keeper/models/de.itemis.model.simple.demo.collection.keeper.structure.mps b/code/languages/de.itemis.model.simple.demo.collection.keeper/models/de.itemis.model.simple.demo.collection.keeper.structure.mps index 350f6b162..408ca1087 100644 --- a/code/languages/de.itemis.model.simple.demo.collection.keeper/models/de.itemis.model.simple.demo.collection.keeper.structure.mps +++ b/code/languages/de.itemis.model.simple.demo.collection.keeper/models/de.itemis.model.simple.demo.collection.keeper.structure.mps @@ -3,7 +3,7 @@ - + diff --git a/code/languages/de.itemis.model.simple.demo.collection/de.itemis.model.simple.demo.collection.mpl b/code/languages/de.itemis.model.simple.demo.collection/de.itemis.model.simple.demo.collection.mpl index eeb5a92c1..888921883 100644 --- a/code/languages/de.itemis.model.simple.demo.collection/de.itemis.model.simple.demo.collection.mpl +++ b/code/languages/de.itemis.model.simple.demo.collection/de.itemis.model.simple.demo.collection.mpl @@ -27,6 +27,7 @@ + diff --git a/code/languages/de.itemis.model.simple.demo.collection/models/de.itemis.model.simple.demo.collection.structure.mps b/code/languages/de.itemis.model.simple.demo.collection/models/de.itemis.model.simple.demo.collection.structure.mps index b186d52fb..06c854361 100644 --- a/code/languages/de.itemis.model.simple.demo.collection/models/de.itemis.model.simple.demo.collection.structure.mps +++ b/code/languages/de.itemis.model.simple.demo.collection/models/de.itemis.model.simple.demo.collection.structure.mps @@ -2,7 +2,7 @@ - + diff --git a/code/languages/de.itemis.model.simple.demo.reference/de.itemis.model.simple.demo.reference.mpl b/code/languages/de.itemis.model.simple.demo.reference/de.itemis.model.simple.demo.reference.mpl index 6e273cad3..8b55f5720 100644 --- a/code/languages/de.itemis.model.simple.demo.reference/de.itemis.model.simple.demo.reference.mpl +++ b/code/languages/de.itemis.model.simple.demo.reference/de.itemis.model.simple.demo.reference.mpl @@ -37,6 +37,7 @@ + diff --git a/code/languages/de.itemis.model.simple.demo.reference/models/de.itemis.model.simple.demo.reference.structure.mps b/code/languages/de.itemis.model.simple.demo.reference/models/de.itemis.model.simple.demo.reference.structure.mps index c4f8f63d3..b0c8be2ef 100644 --- a/code/languages/de.itemis.model.simple.demo.reference/models/de.itemis.model.simple.demo.reference.structure.mps +++ b/code/languages/de.itemis.model.simple.demo.reference/models/de.itemis.model.simple.demo.reference.structure.mps @@ -3,7 +3,7 @@ - + diff --git a/code/mouseselection/solutions/de.itemis.mps.selection.runtime/models/de/itemis/mps/selection/runtime/plugin.mps b/code/mouseselection/solutions/de.itemis.mps.selection.runtime/models/de/itemis/mps/selection/runtime/plugin.mps index 82a2fc624..cb2c58cca 100644 --- a/code/mouseselection/solutions/de.itemis.mps.selection.runtime/models/de/itemis/mps/selection/runtime/plugin.mps +++ b/code/mouseselection/solutions/de.itemis.mps.selection.runtime/models/de/itemis/mps/selection/runtime/plugin.mps @@ -4,7 +4,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd index 21ab4cff0..0c1300e11 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd @@ -41,7 +41,6 @@ - diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps index 575392ada..b1352e4e3 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps @@ -10,7 +10,6 @@ - diff --git a/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps b/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps index 9117d3eb0..cfffa84d8 100644 --- a/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps +++ b/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps @@ -777,22 +777,24 @@ - - - - - - - - - - - + + + + + - - + + + + + + + + + + diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps b/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps index ebf1da75e..ee777c45d 100755 --- a/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps +++ b/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps @@ -7,7 +7,7 @@ - + diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation/generator/template/main@generator.mps b/code/treenotation/com.mbeddr.mpsutil.treenotation/generator/template/main@generator.mps index 09f3964cb..9d9db2acf 100755 --- a/code/treenotation/com.mbeddr.mpsutil.treenotation/generator/template/main@generator.mps +++ b/code/treenotation/com.mbeddr.mpsutil.treenotation/generator/template/main@generator.mps @@ -3,7 +3,7 @@ - + From 4d7b610d5b094c4145008bb4a41496c673f104bb Mon Sep 17 00:00:00 2001 From: Alexei Quapp Date: Fri, 4 Aug 2023 15:01:11 +0200 Subject: [PATCH 10/33] Execute needed migrations via migration-manager - Force Save Project - Update Dependencies Versions in Descriptors --- .../models/de/itemis/mps/editor/diagram/sandbox.mps | 2 +- .../models/de.itemis.mps.editor.htmlcell.demolang.editor.mps | 2 +- .../de.itemis.mps.editor.htmlcell.mpl | 1 - .../de.itemis.mps.linenumbers/de.itemis.mps.linenumbers.msd | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.sandbox/models/de/itemis/mps/editor/diagram/sandbox.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.sandbox/models/de/itemis/mps/editor/diagram/sandbox.mps index 2acaec137..498270be9 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.sandbox/models/de/itemis/mps/editor/diagram/sandbox.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.sandbox/models/de/itemis/mps/editor/diagram/sandbox.mps @@ -1016,7 +1016,7 @@ - + diff --git a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/models/de.itemis.mps.editor.htmlcell.demolang.editor.mps b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/models/de.itemis.mps.editor.htmlcell.demolang.editor.mps index 753970f8e..ef3666bde 100644 --- a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/models/de.itemis.mps.editor.htmlcell.demolang.editor.mps +++ b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/models/de.itemis.mps.editor.htmlcell.demolang.editor.mps @@ -164,7 +164,7 @@ - + diff --git a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/de.itemis.mps.editor.htmlcell.mpl b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/de.itemis.mps.editor.htmlcell.mpl index 633bbe393..6eff7f9cb 100644 --- a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/de.itemis.mps.editor.htmlcell.mpl +++ b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/de.itemis.mps.editor.htmlcell.mpl @@ -72,7 +72,6 @@ - diff --git a/code/linenumbers/de.itemis.mps.linenumbers/de.itemis.mps.linenumbers.msd b/code/linenumbers/de.itemis.mps.linenumbers/de.itemis.mps.linenumbers.msd index 83c8ded9b..9985d534d 100644 --- a/code/linenumbers/de.itemis.mps.linenumbers/de.itemis.mps.linenumbers.msd +++ b/code/linenumbers/de.itemis.mps.linenumbers/de.itemis.mps.linenumbers.msd @@ -27,7 +27,6 @@ - From 6026a634225d9250550d8dfaca0f8a812c384a31 Mon Sep 17 00:00:00 2001 From: Alexei Quapp Date: Fri, 4 Aug 2023 15:10:08 +0200 Subject: [PATCH 11/33] Executed rerunnable migrations (2021.2) --- .../languageModels/editor.mps | 20 +++- .../mps/editor/diagram/runtime/jgraph.mps | 2 +- .../grammarcells/sandboxlang/editor.mps | 95 +++++++++++++++---- ...e.itemis.model.merge.baselang.behavior.mps | 2 +- ...de.itemis.model.merge.baselang.mergers.mps | 2 +- ...is.model.merge.baselang.sandbox.plugin.mps | 2 +- ...de.itemis.model.merge.diamond.behavior.mps | 2 +- .../models/de.itemis.model.merge.behavior.mps | 2 +- ...is.model.simple.demo.children.behavior.mps | 2 +- ...is.model.simple.demo.property.behavior.mps | 2 +- ...s.model.simple.demo.reference.behavior.mps | 2 +- .../de/itemis/mps/editor/math/runtime.mps | 2 +- .../mpsutil/projectview/runtime/tree.mps | 2 +- .../de.itemis.model.merge.runtime.runtime.mps | 2 +- ....itemis.model.merge.simple.demo.plugin.mps | 2 +- ...mis.model.merge.simple.demo.test@tests.mps | 2 +- .../de.itemis.model.merge.test.gen@tests.mps | 2 +- .../de.itemis.model.merge.test.plugin.mps | 2 +- .../de.itemis.model.merge.test.plugin2.mps | 2 +- ...de.itemis.model.merge.test.test1@tests.mps | 2 +- .../de.itemis.model.merge.test.util.mps | 2 +- .../mbeddr/mpsutil/treenotation/runtime.mps | 2 +- 22 files changed, 112 insertions(+), 43 deletions(-) diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps index d9fd600a7..b204883ea 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps @@ -976,7 +976,10 @@ - + + + + @@ -1108,7 +1111,10 @@ - + + + + @@ -1247,7 +1253,10 @@ - + + + + @@ -1379,7 +1388,10 @@ - + + + + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps index ff9aebb8e..a3729fb81 100755 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps @@ -13,7 +13,7 @@ - + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps index 5cae43f1a..9fc5da824 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps @@ -547,7 +547,10 @@ - + + + + @@ -558,7 +561,10 @@ - + + + + @@ -588,7 +594,10 @@ - + + + + @@ -689,7 +698,10 @@ - + + + + @@ -709,7 +721,10 @@ - + + + + @@ -729,7 +744,10 @@ - + + + + @@ -1204,7 +1222,10 @@ - + + + + @@ -1224,7 +1245,10 @@ - + + + + @@ -1375,7 +1399,10 @@ - + + + + @@ -1395,7 +1422,10 @@ - + + + + @@ -1651,7 +1681,10 @@ - + + + + @@ -1671,7 +1704,10 @@ - + + + + @@ -1725,7 +1761,10 @@ - + + + + @@ -1745,7 +1784,10 @@ - + + + + @@ -1804,7 +1846,10 @@ - + + + + @@ -1824,7 +1869,10 @@ - + + + + @@ -1866,7 +1914,10 @@ - + + + + @@ -1894,7 +1945,10 @@ - + + + + @@ -1914,7 +1968,10 @@ - + + + + diff --git a/code/languages/de.itemis.model.merge.baselang/models/de.itemis.model.merge.baselang.behavior.mps b/code/languages/de.itemis.model.merge.baselang/models/de.itemis.model.merge.baselang.behavior.mps index 9fc012026..3ac953211 100644 --- a/code/languages/de.itemis.model.merge.baselang/models/de.itemis.model.merge.baselang.behavior.mps +++ b/code/languages/de.itemis.model.merge.baselang/models/de.itemis.model.merge.baselang.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.mergers.mps b/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.mergers.mps index e3324c4dc..3263fe122 100644 --- a/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.mergers.mps +++ b/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.mergers.mps @@ -4,7 +4,7 @@ - + diff --git a/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.sandbox.plugin.mps b/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.sandbox.plugin.mps index 1f291995b..7ba4d5039 100644 --- a/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.sandbox.plugin.mps +++ b/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.sandbox.plugin.mps @@ -2,7 +2,7 @@ - + diff --git a/code/languages/de.itemis.model.merge.diamond/models/de.itemis.model.merge.diamond.behavior.mps b/code/languages/de.itemis.model.merge.diamond/models/de.itemis.model.merge.diamond.behavior.mps index edb62d122..655d6af1c 100644 --- a/code/languages/de.itemis.model.merge.diamond/models/de.itemis.model.merge.diamond.behavior.mps +++ b/code/languages/de.itemis.model.merge.diamond/models/de.itemis.model.merge.diamond.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.behavior.mps b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.behavior.mps index 1a0c51ced..88c5ae11d 100644 --- a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.behavior.mps +++ b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/code/languages/de.itemis.model.simple.demo.children/models/de.itemis.model.simple.demo.children.behavior.mps b/code/languages/de.itemis.model.simple.demo.children/models/de.itemis.model.simple.demo.children.behavior.mps index 769d3220c..508c0bf3f 100644 --- a/code/languages/de.itemis.model.simple.demo.children/models/de.itemis.model.simple.demo.children.behavior.mps +++ b/code/languages/de.itemis.model.simple.demo.children/models/de.itemis.model.simple.demo.children.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/code/languages/de.itemis.model.simple.demo.property/models/de.itemis.model.simple.demo.property.behavior.mps b/code/languages/de.itemis.model.simple.demo.property/models/de.itemis.model.simple.demo.property.behavior.mps index 242f216d3..a49a90b83 100644 --- a/code/languages/de.itemis.model.simple.demo.property/models/de.itemis.model.simple.demo.property.behavior.mps +++ b/code/languages/de.itemis.model.simple.demo.property/models/de.itemis.model.simple.demo.property.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/code/languages/de.itemis.model.simple.demo.reference/models/de.itemis.model.simple.demo.reference.behavior.mps b/code/languages/de.itemis.model.simple.demo.reference/models/de.itemis.model.simple.demo.reference.behavior.mps index be9513065..5654928a9 100644 --- a/code/languages/de.itemis.model.simple.demo.reference/models/de.itemis.model.simple.demo.reference.behavior.mps +++ b/code/languages/de.itemis.model.simple.demo.reference/models/de.itemis.model.simple.demo.reference.behavior.mps @@ -3,7 +3,7 @@ - + diff --git a/code/math/solutions/de.itemis.mps.editor.math.runtime/models/de/itemis/mps/editor/math/runtime.mps b/code/math/solutions/de.itemis.mps.editor.math.runtime/models/de/itemis/mps/editor/math/runtime.mps index 1392728f0..0cb1d1312 100644 --- a/code/math/solutions/de.itemis.mps.editor.math.runtime/models/de/itemis/mps/editor/math/runtime.mps +++ b/code/math/solutions/de.itemis.mps.editor.math.runtime/models/de/itemis/mps/editor/math/runtime.mps @@ -5,7 +5,7 @@ - + diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps index d4c0a5548..e695e9e1c 100755 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps @@ -6,7 +6,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps index 45856613d..e40700e69 100644 --- a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps +++ b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps @@ -3,7 +3,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps b/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps index 8e02a9a2c..b501e7db3 100644 --- a/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps +++ b/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps @@ -5,7 +5,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.test@tests.mps b/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.test@tests.mps index 2a5d315eb..1d9b545f7 100644 --- a/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.test@tests.mps +++ b/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.test@tests.mps @@ -4,7 +4,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps index 4c4bce857..d42f93c2c 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps @@ -6,7 +6,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps index 546384e03..cd9d033e5 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps @@ -4,7 +4,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin2.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin2.mps index c68387946..a4685bc83 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin2.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin2.mps @@ -5,7 +5,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.test1@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.test1@tests.mps index a4663d30c..686a2b104 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.test1@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.test1@tests.mps @@ -4,7 +4,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps index 01214095d..5fbc3b24c 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps @@ -7,7 +7,7 @@ - + diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps b/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps index bedae828e..ef46052e3 100755 --- a/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps +++ b/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps @@ -8,7 +8,7 @@ - + From 9f5f4312ac0ee94feff806b82b850839ebc7c30a Mon Sep 17 00:00:00 2001 From: dbinkele Date: Thu, 7 Sep 2023 14:10:36 +0200 Subject: [PATCH 12/33] Adds testcases for checking order of lists (#659) --- .../models/de.itemis.mps.extensions.build.mps | 15 + .../tests.de.itemis.mps.modelmerger.msd | 1 + .../de.itemis.model.merge.test.msd | 7 + .../de.itemis.model.merge.test.gen@tests.mps | 1250 +++++++++++++++++ .../de.itemis.model.merge.test.plugin.mps | 230 +++ .../de.itemis.model.merge.test.util.mps | 57 + 6 files changed, 1560 insertions(+) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index acb6f5bbf..228a8ca04 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -15779,6 +15779,21 @@ + + + + + + + + + + + + + + + diff --git a/code/modelmerger/solutions/tests.de.itemis.mps.modelmerger/tests.de.itemis.mps.modelmerger.msd b/code/modelmerger/solutions/tests.de.itemis.mps.modelmerger/tests.de.itemis.mps.modelmerger.msd index 3bef0da53..73d297e0c 100644 --- a/code/modelmerger/solutions/tests.de.itemis.mps.modelmerger/tests.de.itemis.mps.modelmerger.msd +++ b/code/modelmerger/solutions/tests.de.itemis.mps.modelmerger/tests.de.itemis.mps.modelmerger.msd @@ -17,6 +17,7 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) d119cd03-ed7e-477f-adb6-22a3d2e6ea77(test.de.itemis.mps.modelmerger.testlanguage) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) diff --git a/code/solutions/de.itemis.model.merge.test/de.itemis.model.merge.test.msd b/code/solutions/de.itemis.model.merge.test/de.itemis.model.merge.test.msd index 010b71007..d38c0cae3 100644 --- a/code/solutions/de.itemis.model.merge.test/de.itemis.model.merge.test.msd +++ b/code/solutions/de.itemis.model.merge.test/de.itemis.model.merge.test.msd @@ -21,9 +21,13 @@ c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) aa8cbd62-5e1f-4d0b-a6e2-189711774c91(de.itemis.model.merge.runtime) e50b0500-6fd7-4c7f-a730-9d841358ca2b(de.itemis.model.simple.demo.property) + d119cd03-ed7e-477f-adb6-22a3d2e6ea77(test.de.itemis.mps.modelmerger.testlanguage) + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 17d34773-aaeb-4315-92e6-9e0314373a68(de.itemis.model.merge.baselang.sandbox) + @@ -40,6 +44,7 @@ + @@ -47,6 +52,7 @@ + @@ -61,6 +67,7 @@ + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps index 4ec78f60a..bb3170deb 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps @@ -8,6 +8,8 @@ + + @@ -17,9 +19,22 @@ + + + + + + + + + + + + + @@ -37,6 +52,13 @@ + + + + + + + @@ -53,6 +75,10 @@ + + + + @@ -61,6 +87,7 @@ + @@ -77,6 +104,7 @@ + @@ -89,6 +117,9 @@ + + + @@ -107,6 +138,9 @@ + + + @@ -148,6 +182,19 @@ + + + + + + + + + + + + + @@ -160,16 +207,38 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -194,6 +263,9 @@ + + + @@ -203,6 +275,14 @@ + + + + + + + + @@ -225,6 +305,7 @@ + @@ -2419,5 +2500,1174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps index 55c2cb9e9..067682da8 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps @@ -9,6 +9,8 @@ + + @@ -155,6 +157,7 @@ + @@ -915,5 +918,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps index e5971c3a7..4b635e8fd 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps @@ -21,6 +21,7 @@ + @@ -41,6 +42,9 @@ + + + @@ -670,6 +674,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -699,6 +742,20 @@ + + + + + + + + + + + + + + From 87db59d351c280287524ed68a245fd8cc74271ac Mon Sep 17 00:00:00 2001 From: dbinkele Date: Thu, 7 Sep 2023 15:02:20 +0200 Subject: [PATCH 13/33] Adds further testcases for checking order of lists (#659) --- .../de.itemis.model.merge.test.gen@tests.mps | 871 ++++++++++++++++++ .../de.itemis.model.merge.test.plugin.mps | 227 +++++ 2 files changed, 1098 insertions(+) diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps index bb3170deb..682599b0f 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps @@ -28,6 +28,7 @@ + @@ -75,6 +76,9 @@ + + + @@ -269,6 +273,7 @@ + @@ -2502,6 +2507,7 @@ + @@ -3265,6 +3271,7 @@ + @@ -3669,5 +3676,869 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps index 067682da8..25859683b 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps @@ -1145,5 +1145,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 641537336967cf0a4c74be80f57f173769ca0b26 Mon Sep 17 00:00:00 2001 From: dbinkele Date: Tue, 19 Sep 2023 16:01:17 +0200 Subject: [PATCH 14/33] Code cosmetics (#659) --- .../models/de.itemis.mps.extensions.build.mps | 5 ++ .../de.itemis.model.merge.test.gen@tests.mps | 83 ++++++++----------- 2 files changed, 40 insertions(+), 48 deletions(-) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 228a8ca04..1d3f6aa86 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -16163,6 +16163,11 @@ + + + + + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps index 682599b0f..4430d505f 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps @@ -2512,40 +2512,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2629,6 +2595,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2637,21 +2634,11 @@ - - - - - - - + + - - - - - - - + + From 9dd88c06f783e64012207430c28c466f22171bd3 Mon Sep 17 00:00:00 2001 From: dbinkele Date: Wed, 27 Sep 2023 09:45:32 +0200 Subject: [PATCH 15/33] Fixing some usability glichtes (#659) --- .../models/de.itemis.model.merge.structure.mps | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps index d83c979a7..cb6b00f30 100644 --- a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps +++ b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps @@ -224,7 +224,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -305,17 +305,17 @@ - + - + - + From 8bb80040127b8b2437ad70a310e3fc5094404099 Mon Sep 17 00:00:00 2001 From: dbinkele Date: Thu, 28 Sep 2023 14:30:58 +0200 Subject: [PATCH 16/33] Change the behavior of list merge in Modelmerger (#659) --- .../de.itemis.model.merge.runtime.runtime.mps | 451 +++++++++++++++++- .../de.itemis.model.merge.test.gen@tests.mps | 36 +- .../de.itemis.model.merge.test.util.mps | 56 --- 3 files changed, 453 insertions(+), 90 deletions(-) diff --git a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps index c418fc3ae..d155f9f95 100644 --- a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps +++ b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps @@ -412,13 +412,20 @@ + + + + + + + @@ -2009,6 +2016,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -2053,6 +2084,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2084,6 +2143,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2105,6 +2263,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2139,12 +2334,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -2164,7 +2397,7 @@ - + @@ -2178,6 +2411,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps index 4430d505f..4fb9306f8 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps @@ -28,7 +28,6 @@ - @@ -76,9 +75,6 @@ - - - @@ -3899,30 +3895,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -3991,6 +3963,10 @@ + + + + @@ -4006,10 +3982,6 @@ - - - - diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps index 4b635e8fd..d9b71c00a 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps @@ -21,7 +21,6 @@ - @@ -42,9 +41,6 @@ - - - @@ -674,44 +670,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -742,20 +700,6 @@ - - - - - - - - - - - - - - From 6907bab0309eda8cced27c910d68fbeb53325c98 Mon Sep 17 00:00:00 2001 From: dbinkele Date: Thu, 5 Oct 2023 16:26:22 +0200 Subject: [PATCH 17/33] Change the behavior of list merge in Modelmerger cntd + test (#659) --- .../models/de.itemis.mps.extensions.build.mps | 5 + .../de.itemis.model.merge.runtime.runtime.mps | 228 +++- .../de.itemis.model.merge.test.msd | 1 + .../de.itemis.model.merge.test.gen@tests.mps | 1173 +++++++---------- 4 files changed, 711 insertions(+), 696 deletions(-) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 1d3f6aa86..73f44dfea 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -15794,6 +15794,11 @@ + + + + + diff --git a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps index d155f9f95..8749e9ee3 100644 --- a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps +++ b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps @@ -419,6 +419,7 @@ + @@ -2016,6 +2017,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2155,7 +2190,7 @@ - + @@ -2169,37 +2204,179 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - + + + + + + + + + + - - + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + @@ -2218,7 +2395,7 @@ - + @@ -2447,8 +2624,11 @@ - - + + + + + diff --git a/code/solutions/de.itemis.model.merge.test/de.itemis.model.merge.test.msd b/code/solutions/de.itemis.model.merge.test/de.itemis.model.merge.test.msd index d38c0cae3..269ba4704 100644 --- a/code/solutions/de.itemis.model.merge.test/de.itemis.model.merge.test.msd +++ b/code/solutions/de.itemis.model.merge.test/de.itemis.model.merge.test.msd @@ -24,6 +24,7 @@ d119cd03-ed7e-477f-adb6-22a3d2e6ea77(test.de.itemis.mps.modelmerger.testlanguage) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 17d34773-aaeb-4315-92e6-9e0314373a68(de.itemis.model.merge.baselang.sandbox) + ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps index 4fb9306f8..28462c698 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps @@ -26,8 +26,8 @@ - - + + @@ -62,6 +62,7 @@ + @@ -72,6 +73,7 @@ + @@ -79,6 +81,7 @@ + @@ -128,6 +131,9 @@ + + + @@ -141,6 +147,7 @@ + @@ -219,6 +226,9 @@ + + + @@ -2526,82 +2536,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -2610,13 +2554,11 @@ - - - - - - - + + + + + @@ -2627,15 +2569,21 @@ - - - + + + + + + + + + @@ -3152,105 +3100,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3265,13 +3114,11 @@ - - - - - - - + + + + + @@ -3282,13 +3129,11 @@ - - - - - - - + + + + + @@ -3311,79 +3156,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3400,6 +3178,15 @@ + + + + + + + + + @@ -3559,105 +3346,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3672,13 +3360,11 @@ - - - - - - - + + + + + @@ -3689,13 +3375,11 @@ - - - - - - - + + + + + @@ -3719,78 +3403,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3807,6 +3424,15 @@ + + + + + + + + + @@ -3988,105 +3614,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4101,13 +3628,11 @@ - - - - - - - + + + + + @@ -4118,13 +3643,11 @@ - - - - - - - + + + + + @@ -4147,79 +3670,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4236,6 +3692,15 @@ + + + + + + + + + @@ -4399,105 +3864,469 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - - + + - - + + - - - + + + - + - + - - - + + + - - + + - - + + - - + + - - - + + - - - + + + + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c678458bb40ae8dceeca7a6b6d5fc4512a77c5e2 Mon Sep 17 00:00:00 2001 From: dbinkele Date: Fri, 6 Oct 2023 09:30:29 +0200 Subject: [PATCH 18/33] Adds 'Dataflow'-Aspect to 'ModelMergerExpression' (#659) --- .../de.itemis.model.merge.baselang.mpl | 2 + ...e.itemis.model.merge.baselang.dataFlow.mps | 73 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 code/languages/de.itemis.model.merge.baselang/models/de.itemis.model.merge.baselang.dataFlow.mps diff --git a/code/languages/de.itemis.model.merge.baselang/de.itemis.model.merge.baselang.mpl b/code/languages/de.itemis.model.merge.baselang/de.itemis.model.merge.baselang.mpl index 295d48f39..e1546b4df 100644 --- a/code/languages/de.itemis.model.merge.baselang/de.itemis.model.merge.baselang.mpl +++ b/code/languages/de.itemis.model.merge.baselang/de.itemis.model.merge.baselang.mpl @@ -89,6 +89,8 @@ + + diff --git a/code/languages/de.itemis.model.merge.baselang/models/de.itemis.model.merge.baselang.dataFlow.mps b/code/languages/de.itemis.model.merge.baselang/models/de.itemis.model.merge.baselang.dataFlow.mps new file mode 100644 index 000000000..2a51e5f74 --- /dev/null +++ b/code/languages/de.itemis.model.merge.baselang/models/de.itemis.model.merge.baselang.dataFlow.mps @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6ac7d88bb48f023c6fc82b4ddc67925258375a9b Mon Sep 17 00:00:00 2001 From: dbinkele Date: Fri, 6 Oct 2023 09:45:41 +0200 Subject: [PATCH 19/33] Adds ModelMergerTest for checking prefix (#659) --- .../de.itemis.model.merge.test.gen@tests.mps | 275 ++++++++++++++++++ 1 file changed, 275 insertions(+) diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps index 28462c698..b3d4af76b 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps @@ -4328,5 +4328,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a941a04ede2fdb192604f3507611daf0ee01de40 Mon Sep 17 00:00:00 2001 From: dbinkele Date: Fri, 6 Oct 2023 09:46:43 +0200 Subject: [PATCH 20/33] Altering ModelMergerTest for checking prefix (#659) --- .../models/de.itemis.model.merge.test.gen@tests.mps | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps index b3d4af76b..0d84906c8 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps @@ -4557,14 +4557,14 @@ - - - - + + + + From d0a26ccaf036143d1e32802e642a459bfdb5ea3e Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Tue, 17 Oct 2023 09:04:23 +0200 Subject: [PATCH 21/33] Comment MetaCollectionManager for readability (#659) The comments illustrate how the merge algorithm is "biased" towards the right list. --- .../de.itemis.model.merge.runtime.runtime.mps | 1056 +++++++++++------ 1 file changed, 678 insertions(+), 378 deletions(-) diff --git a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps index 8749e9ee3..842d590ab 100644 --- a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps +++ b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps @@ -2035,7 +2035,7 @@ - + @@ -2066,6 +2066,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2117,394 +2199,581 @@ - - - - - - + + + + + + - - - - + - + + + + + + + - - + + - - + + - - + + - - + + - - - - - - + + + + + + - + - + - + - + - + - - - - + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + + + - - - - - - + + + - - - + + + - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -2661,7 +2930,7 @@ - + @@ -2670,7 +2939,7 @@ - + @@ -2734,74 +3003,40 @@ - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -2852,6 +3087,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 880960f4b42a12672e49e16d3646387c2bd98e35 Mon Sep 17 00:00:00 2001 From: dbinkele Date: Tue, 17 Oct 2023 09:49:24 +0200 Subject: [PATCH 22/33] Updating comment (#659) --- .../de.itemis.model.merge.runtime.runtime.mps | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps index 842d590ab..e237f57c2 100644 --- a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps +++ b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps @@ -2256,7 +2256,7 @@ - + @@ -2327,7 +2327,7 @@ - + @@ -2850,7 +2850,7 @@ - + @@ -2996,7 +2996,7 @@ - + @@ -3074,7 +3074,7 @@ - + @@ -3090,17 +3090,17 @@ - - - - - - + - + + + + + + @@ -3143,9 +3143,9 @@ - + - + From df330c7ec5b318f853aa84b581fe92ff7a63c8dd Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Tue, 17 Oct 2023 09:56:14 +0200 Subject: [PATCH 23/33] Remove bogus comment (#659) Elements are never implicitly dropped. --- .../de.itemis.model.merge.runtime.runtime.mps | 41 +------------------ 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps index e237f57c2..e670c71a3 100644 --- a/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps +++ b/code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps @@ -20,14 +20,14 @@ - + - + @@ -3003,43 +3003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 8d42420bc3910a325d94ece11a31d4bd6a5e6d8a Mon Sep 17 00:00:00 2001 From: Sascha Lisson Date: Wed, 25 Oct 2023 11:30:58 +0200 Subject: [PATCH 24/33] diagram: handle Ctrl+A when editing a cell inside the diagram --- .../mps/editor/diagram/runtime/plugin.mps | 268 ++++++++++++++++++ 1 file changed, 268 insertions(+) diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps index 6ae74561c..b3e1cb4b8 100755 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps @@ -29,6 +29,7 @@ + @@ -45,6 +46,7 @@ + @@ -113,6 +115,9 @@ + + + @@ -180,12 +185,16 @@ + + + + @@ -630,6 +639,13 @@ + + + + + + + @@ -1277,6 +1293,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,5 +1966,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5c645e72fae50af14654b507b17cf6a524dcee4a Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Fri, 10 Nov 2023 11:30:21 +0100 Subject: [PATCH 25/33] Fix build and extend functionality of select all plugin function --- .../mps/editor/diagram/runtime/jgraph.mps | 18 ++++++ .../mps/editor/diagram/runtime/plugin.mps | 58 ++++++++++++++----- 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps index f7f9bd8aa..d0fc7c393 100755 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps @@ -59129,6 +59129,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps index b3e1cb4b8..56e0e9db2 100755 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps @@ -235,6 +235,11 @@ + + + + + @@ -1361,23 +1366,48 @@ - - + + - - + + - - - + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1395,7 +1425,7 @@ - + @@ -1457,7 +1487,7 @@ - + @@ -1480,7 +1510,7 @@ - + @@ -1492,7 +1522,7 @@ - + From 8cb631e812fd4e3094cbae0a4aa18327106bf83a Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Fri, 10 Nov 2023 12:16:35 +0100 Subject: [PATCH 26/33] Fix catch-all case to properly run select all action --- .../mps/editor/diagram/runtime/plugin.mps | 182 +++++++++--------- 1 file changed, 93 insertions(+), 89 deletions(-) diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps index 56e0e9db2..49984b9d9 100755 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps @@ -129,6 +129,10 @@ + + + + @@ -242,6 +246,7 @@ + @@ -1414,117 +1419,116 @@ - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + - - - - - - From b09332f676c447ef61b8c802c598dac286014404 Mon Sep 17 00:00:00 2001 From: dbinkele Date: Wed, 15 Nov 2023 16:37:01 +0100 Subject: [PATCH 27/33] Fix selectAll-Logic --- .../editor/diagram/demoentities/sandbox.mps | 16 +- .../mps/editor/diagram/runtime/plugin.mps | 272 +++++++++++++----- 2 files changed, 207 insertions(+), 81 deletions(-) diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps index 543ee1ebd..c9de7c464 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps @@ -139,8 +139,8 @@ - - + + @@ -149,8 +149,8 @@ - - + + @@ -159,8 +159,8 @@ - - + + @@ -169,8 +169,8 @@ - - + + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps index 49984b9d9..2a9eed125 100755 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps @@ -30,6 +30,7 @@ + @@ -157,6 +158,7 @@ + @@ -196,6 +198,9 @@ + + + @@ -211,6 +216,9 @@ + + + @@ -1419,68 +1427,15 @@ - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1503,30 +1458,116 @@ - - - - - + + + + + + + + + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1534,6 +1575,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2c08c3fe4594cc52aa7ff3914125fd031f369dbe Mon Sep 17 00:00:00 2001 From: dbinkele Date: Wed, 15 Nov 2023 16:48:08 +0100 Subject: [PATCH 28/33] fix model import --- .../models/de/itemis/mps/editor/diagram/runtime/plugin.mps | 1 - 1 file changed, 1 deletion(-) diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps index 2a9eed125..4919b5aac 100755 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps @@ -30,7 +30,6 @@ - From 8c5277a6790e375f020b2b760ec9024536a1e020 Mon Sep 17 00:00:00 2001 From: Sascha Lisson Date: Tue, 21 Nov 2023 14:49:44 +0100 Subject: [PATCH 29/33] fix(celllayout): additional horizontal cell was generated around optional cells The generator of the MPS editor language generates an additional collection cell around cells inside an alternation cell that also have a rendering condition. The problem with that is, that it has a horizontal layout which breaks surrounding indent layouts. --- .../models/de.itemis.mps.extensions.build.mps | 10 + .../grammarcells/sandboxlang/editor.mps | 29 ++ .../grammarcells/sandboxlang/structure.mps | 14 + .../generator/template/main@generator.mps | 374 ++++++++++++++++-- .../com.mbeddr.mpsutil.grammarcells.tests.msd | 7 + .../mpsutil/grammarcells/tests@tests.mps | 295 ++++++++++++++ 6 files changed, 695 insertions(+), 34 deletions(-) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 73f44dfea..b9243883e 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -14456,6 +14456,16 @@ + + + + + + + + + + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps index c74969413..70d778bd5 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps @@ -932,6 +932,9 @@ + + + @@ -1976,5 +1979,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps index 0a302460d..fa6d0df74 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps @@ -816,5 +816,19 @@ + + + + + + + + + + + + + + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps index bccb33362..1ff8c68cd 100755 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps @@ -18916,49 +18916,355 @@ - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - + + + - - - - - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/com.mbeddr.mpsutil.grammarcells.tests.msd b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/com.mbeddr.mpsutil.grammarcells.tests.msd index e52538ffc..af8c12a08 100644 --- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/com.mbeddr.mpsutil.grammarcells.tests.msd +++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/com.mbeddr.mpsutil.grammarcells.tests.msd @@ -16,6 +16,8 @@ 5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + a257f68c-93a3-47b0-838b-6905dd9c20f6(com.mbeddr.mpsutil.grammarcells.sandboxlang) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) @@ -23,9 +25,12 @@ + + + @@ -37,8 +42,10 @@ + + diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps index c4a7fd7a6..bab13a473 100644 --- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps +++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps @@ -9,6 +9,7 @@ + @@ -19,6 +20,9 @@ + + + @@ -154,6 +158,11 @@ + + + + + @@ -252,6 +261,9 @@ + + + @@ -2976,5 +2988,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 166e5d6f9d22989185b8077aa8748fb02d9ced8e Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 11 Dec 2023 22:04:27 +0100 Subject: [PATCH 30/33] Run migrations --- .../com.mbeddr.mpsutil.grammarcells.tests.msd | 2 +- .../models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps | 2 +- .../models/org.modelix.model.mpsadapters.mps.mps | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/com.mbeddr.mpsutil.grammarcells.tests.msd b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/com.mbeddr.mpsutil.grammarcells.tests.msd index af8c12a08..ca1302268 100644 --- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/com.mbeddr.mpsutil.grammarcells.tests.msd +++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/com.mbeddr.mpsutil.grammarcells.tests.msd @@ -30,7 +30,7 @@ - + diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps index bab13a473..9529731db 100644 --- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps +++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps @@ -9,7 +9,7 @@ - + diff --git a/code/model-api/org.modelix.model.mpsadapters/models/org.modelix.model.mpsadapters.mps.mps b/code/model-api/org.modelix.model.mpsadapters/models/org.modelix.model.mpsadapters.mps.mps index 49173a551..b29ad9e7f 100644 --- a/code/model-api/org.modelix.model.mpsadapters/models/org.modelix.model.mpsadapters.mps.mps +++ b/code/model-api/org.modelix.model.mpsadapters/models/org.modelix.model.mpsadapters.mps.mps @@ -37,7 +37,7 @@ - + From f59b242208a2da976e9e25afce2748bf28954011 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 11 Dec 2023 22:27:46 +0100 Subject: [PATCH 31/33] Update to MPS 2021.3.5 --- build.gradle | 2 +- scripts/build.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 31484f9bf..335e563bf 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ ext.dependencyRepositories = [ // major version, e.g. '2021.1', '2021.2' ext.mpsMajor = '2021.3' // optional minor/bugfix number (not added to the final build version) -ext.mpsMinor = '3' +ext.mpsMinor = '5' // e.g. Beta, EAP, RC ext.mpsReleaseType = '' diff --git a/scripts/build.xml b/scripts/build.xml index c9d27fac2..708fc9550 100644 --- a/scripts/build.xml +++ b/scripts/build.xml @@ -180,6 +180,9 @@ + + + From 780a2410884ffe34135a271e2812ee1f1316184a Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 11 Dec 2023 22:27:55 +0100 Subject: [PATCH 32/33] Update the build script --- .../models/de.itemis.mps.extensions.build.mps | 50 +++++++++++-------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 5943f60c0..2da9f5332 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -14735,6 +14735,11 @@ + + + + + @@ -16068,6 +16073,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -16437,6 +16462,11 @@ + + + + + @@ -17022,31 +17052,11 @@ - - - - - - - - - - - - - - - - - - - - From 718d26137b951a13d18b4b6d36cb1ad63a771528 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 11 Dec 2023 22:28:30 +0100 Subject: [PATCH 33/33] Update the readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f071030a..b9c37bab6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # MPS Extensions -![≤ JetBrains MPS 2021.3.3](https://img.shields.io/badge/JetBrains%20MPS-%E2%89%A42021.3.3-orange) +![≤ JetBrains MPS 2021.3.5](https://img.shields.io/badge/JetBrains%20MPS-%E2%89%A42021.3.5-orange) The MPS extensions aim to ease language development within MPS. They are maintained by itemis, JetBrains, and the open source community, and its development is closely aligned with the development of MPS.