From de4bdaea3255e7f9770e53e3828b79dd07fdb3b7 Mon Sep 17 00:00:00 2001 From: Michael Vlassiev Date: Mon, 30 Jan 2023 11:42:48 +0300 Subject: [PATCH 01/30] test --- build.gradle | 8 +- .../projectview/runtime/tree/highlighter.mps | 161 ++++++++++-------- 2 files changed, 98 insertions(+), 71 deletions(-) diff --git a/build.gradle b/build.gradle index 47125598a..22383782f 100644 --- a/build.gradle +++ b/build.gradle @@ -51,10 +51,10 @@ if (ext.has('java11_home')) { } else { def expected = JavaVersion.VERSION_11 if (JavaVersion.current() != expected) { - throw new GradleException("This build script requires Java 11 but you are currently using ${JavaVersion.current()}.\nWhat you can do:\n" - + " * Use project property java11_home to point to the Java 11 JDK.\n" - + " * Use environment variable JAVA11_HOME to point to the Java 11 JDK\n" - + " * Run Gradle using Java 11") +// throw new GradleException("This build script requires Java 11 but you are currently using ${JavaVersion.current()}.\nWhat you can do:\n" +// + " * Use project property java11_home to point to the Java 11 JDK.\n" +// + " * Use environment variable JAVA11_HOME to point to the Java 11 JDK\n" +// + " * Run Gradle using Java 11") } jdk_home = System.getProperty('java.home') } diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps index 16fe92e7b..ec3195411 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps @@ -315,6 +315,13 @@ + + + + + + + @@ -8201,15 +8208,19 @@ - - - - - - - + + + + + + + + + + + + - @@ -8294,60 +8305,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -8848,13 +8867,17 @@ - - - - - - - + + + + + + + + + + + @@ -8941,13 +8964,17 @@ - - - - - - - + + + + + + + + + + + From 6a946863e82aa977c7eb53eeeb3c3f6eef43f24e Mon Sep 17 00:00:00 2001 From: Michael Vlassiev Date: Mon, 6 Feb 2023 10:31:15 +0300 Subject: [PATCH 02/30] test: 3rd-part.jar replaced with app.jar, fix build.xml --- build.allScripts/build.xml | 1 + .../models/de.itemis.mps.extensions.build.mps | 12 ++++++------ .../solutions/MPS.ThirdParty/MPS.ThirdParty.msd | 4 ++-- scripts/build.xml | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/build.allScripts/build.xml b/build.allScripts/build.xml index 15ab94bc1..e3395046b 100644 --- a/build.allScripts/build.xml +++ b/build.allScripts/build.xml @@ -157,6 +157,7 @@ + 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 4e50b5d18..8ef60ba73 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 @@ -931,12 +931,12 @@ - - - + + + - - + + @@ -14119,7 +14119,7 @@ - + diff --git a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd index be36cfdf9..aff6291c4 100644 --- a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd +++ b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/scripts/build.xml b/scripts/build.xml index c9d27fac2..08642b696 100644 --- a/scripts/build.xml +++ b/scripts/build.xml @@ -199,6 +199,7 @@ + From ea1323e55b829ce8d46614da5838f63b6aae0f12 Mon Sep 17 00:00:00 2001 From: Michael Vlassiev Date: Mon, 6 Feb 2023 15:49:22 +0300 Subject: [PATCH 03/30] test: fix MPS.Generator dependency --- .../models/de.itemis.mps.extensions.build.mps | 5 +++++ .../de.itemis.model.merge.runtime.msd | 2 ++ .../models/de.itemis.model.merge.runtime.runtime.mps | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) 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 8ef60ba73..a67157cc4 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 @@ -7042,6 +7042,11 @@ + + + + + diff --git a/code/solutions/de.itemis.model.merge.runtime/de.itemis.model.merge.runtime.msd b/code/solutions/de.itemis.model.merge.runtime/de.itemis.model.merge.runtime.msd index e3a5e2f68..5ade07e46 100644 --- a/code/solutions/de.itemis.model.merge.runtime/de.itemis.model.merge.runtime.msd +++ b/code/solutions/de.itemis.model.merge.runtime/de.itemis.model.merge.runtime.msd @@ -22,6 +22,7 @@ 446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator) @@ -39,6 +40,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 3d814504b..0d52e430f 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 @@ -32,7 +32,7 @@ - + From 117d8da9899a284bf94ff4f41bd5cd7484580e68 Mon Sep 17 00:00:00 2001 From: Michael Vlassiev Date: Wed, 8 Feb 2023 14:12:15 +0300 Subject: [PATCH 04/30] test: rebuild allScripts --- scripts/build.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/build.xml b/scripts/build.xml index 08642b696..1cadf9b93 100644 --- a/scripts/build.xml +++ b/scripts/build.xml @@ -31,7 +31,6 @@ - @@ -118,7 +117,6 @@ - @@ -144,6 +142,7 @@ + @@ -180,6 +179,9 @@ + + + From 9bc39d3ea27e70b3115a1c351b341dca2b396e12 Mon Sep 17 00:00:00 2001 From: Michael Vlassiev Date: Fri, 10 Feb 2023 01:35:26 +0300 Subject: [PATCH 05/30] test: comment out using of deprecated style apply --- .../generator/template/main@generator.mps | 317 ++++++++++-------- 1 file changed, 184 insertions(+), 133 deletions(-) diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps index 28c15acac..5c2e6cb23 100755 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist/generator/template/main@generator.mps @@ -371,6 +371,13 @@ + + + + + + + @@ -2704,90 +2711,112 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - @@ -5972,89 +6001,111 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + From b25c131e4ab59d3d23dac88f8f8c0070627fd154 Mon Sep 17 00:00:00 2001 From: Michael Vlassiev Date: Fri, 10 Feb 2023 04:38:19 +0300 Subject: [PATCH 06/30] test: Fix link --- .../com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps index ec3195411..129c34b64 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps @@ -5269,7 +5269,7 @@ - + From 5dd601e17fca7bfafe2ea425e18e0cdd33acf169 Mon Sep 17 00:00:00 2001 From: Michael Vlassiev Date: Fri, 10 Feb 2023 04:55:58 +0300 Subject: [PATCH 07/30] test: Fix MPSTree.getTreeModel() --- .../models/com/mbeddr/mpsutil/projectview/runtime/tree.mps | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 625bfdfc5..eec5f8884 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 @@ -1400,7 +1400,7 @@ - + @@ -9108,7 +9108,7 @@ - + @@ -9553,7 +9553,7 @@ - + From 8070748a623a528df1feb0f6207ed0f262fb734e Mon Sep 17 00:00:00 2001 From: Michael Vlassiev Date: Fri, 10 Feb 2023 14:07:44 +0300 Subject: [PATCH 08/30] test: Fix Project#getProjectFile() --- .../de/slisson/mps/tables/runtime/cells.mps | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps index 2780b4d3e..b0879e6d3 100644 --- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps +++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps @@ -30314,27 +30314,36 @@ - - - - - - - - - - + + + + + - - + + + + + + + + + + + + + + + + + + + - - - - - + + From f32fcd8a002115fdc5c40b63d609cad4661ff3d1 Mon Sep 17 00:00:00 2001 From: Michael Vlassiev Date: Fri, 10 Feb 2023 15:15:22 +0300 Subject: [PATCH 09/30] Test: Fix MPSTree.getModel() -> getDFTreeModel() --- .../de.q60.mps.shadowmodels.runtime/models/plugin.mps | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/plugin.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/plugin.mps index 15ae91ba7..dcd350280 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/plugin.mps +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/plugin.mps @@ -2122,7 +2122,7 @@ - + @@ -2369,7 +2369,7 @@ - + @@ -2447,7 +2447,7 @@ - + @@ -2558,7 +2558,7 @@ - + From 9fc8b7613890e55eb3259032fef8811d62e6a3a8 Mon Sep 17 00:00:00 2001 From: Michael Vlassiev Date: Tue, 21 Feb 2023 15:56:37 +0300 Subject: [PATCH 10/30] Test: Temporary disable IntentionsSupport/LightBulbMenu reflection to allow editing --- .../com/mbeddr/mpsutil/intentions/runtime.mps | 296 +++++++++--------- 1 file changed, 154 insertions(+), 142 deletions(-) diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps index 466244a87..8e343e10d 100644 --- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps +++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps @@ -334,65 +334,69 @@ - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -400,81 +404,85 @@ + + - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -482,41 +490,45 @@ + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + + + - - - - - - + + + - - - - From e8ce3015abe0aa7adf06bb6ae8925530c60e27fe Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 12 May 2023 23:05:31 +0200 Subject: [PATCH 11/30] Update build script --- build.gradle | 263 ++++++++------------------------------------------- 1 file changed, 37 insertions(+), 226 deletions(-) diff --git a/build.gradle b/build.gradle index 22383782f..0793fe591 100644 --- a/build.gradle +++ b/build.gradle @@ -6,13 +6,12 @@ buildscript { maven { url 'https://projects.itemis.de/nexus/content/repositories/mbeddr' } } dependencies { - classpath('de.itemis.mps:mps-gradle-plugin:1.7+') - //classpath("org.modelix.mpsbuild:gradle-plugin:1.0.+") + classpath('de.itemis.mps:mps-gradle-plugin:1.13+') } } plugins { - id "co.riiid.gradle" version "0.4.2" + id "com.github.breadmoirai.github-release" version "2.4.1" } apply plugin: 'maven-publish' @@ -30,6 +29,12 @@ wrapper { distributionType 'all' } +apply plugin: 'download-jbr' + +downloadJbr { + jbrVersion = '17.0.6-b653.34' +} + // detect if we are in a CI build if (project.hasProperty("forceCI")) { ext.ciBuild = true @@ -42,31 +47,6 @@ if (project.hasProperty("forceCI")) { } } -def jdk_home - -if (ext.has('java11_home')) { - jdk_home = ext.get('java11_home') -} else if (System.getenv('JB_JAVA11_HOME') != null) { - jdk_home = System.getenv('JB_JAVA11_HOME') -} else { - def expected = JavaVersion.VERSION_11 - if (JavaVersion.current() != expected) { -// throw new GradleException("This build script requires Java 11 but you are currently using ${JavaVersion.current()}.\nWhat you can do:\n" -// + " * Use project property java11_home to point to the Java 11 JDK.\n" -// + " * Use environment variable JAVA11_HOME to point to the Java 11 JDK\n" -// + " * Run Gradle using Java 11") - } - jdk_home = System.getProperty('java.home') -} - -// Check JDK location -if (!new File(jdk_home, "lib").exists()) { - throw new GradleException("Unable to locate JDK home folder. Detected folder is: $jdk_home") -} - -ext.jdk_home = jdk_home -logger.info 'Using JDK at {}', jdk_home - // Default repository credentials if (!project.hasProperty('nexusUsername')) { ext.nexusUsername = '' @@ -82,9 +62,9 @@ ext.dependencyRepositories = [ // Dependency versions // major version, e.g. '2021.1', '2021.2' -ext.mpsMajor = '2021.3' +ext.mpsMajor = '2022.3' // optional minor/bugfix number (not added to the final build version) -ext.mpsMinor = '2' +ext.mpsMinor = '' // e.g. Beta, EAP, RC ext.mpsReleaseType = '' @@ -106,7 +86,7 @@ if (ciBuild) { println "##teamcity[buildNumber '${version}']" } else { println "Local build detected, version will be SNAPSHOT" - version = "1.0-SNAPSHOT" + version = "2022.3-SNAPSHOT" } def userHome = System.properties['user.home'] @@ -172,9 +152,8 @@ configurations { } dependencies { - def modelixCoreVersion = "1.5.4" + def modelixCoreVersion = "1.10.3" modelApi("org.modelix:model-api:$modelixCoreVersion") - modelApi("org.modelix:metamodel-generator:$modelixCoreVersion") } task copyModelApi() { @@ -239,13 +218,30 @@ File scriptFile(String relativePath) { def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.pluginVersion, ext.skipUnmodifiedModels] +afterEvaluate { + project.ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = tasks.getByName('downloadJbr').javaExecutable + def jdk_home = null + if (ext.has('java17_home')) { + jdk_home = ext.get('java17_home') + } else if (System.getenv('JB_JAVA17_HOME') != null) { + jdk_home = System.getenv('JB_JAVA17_HOME') + } + if(jdk_home != null) { + if (!new File(jdk_home, "lib").exists()) { + throw new GradleException("Unable to locate JDK home folder. Detected folder is: $jdk_home") + } else { + ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = new File(jdk_home, 'bin/java') + } + } +} + // enables https://github.com/mbeddr/mps-gradle-plugin#providing-global-defaults ext["itemis.mps.gradle.ant.defaultScriptArgs"] = defaultScriptArgs ext["itemis.mps.gradle.ant.defaultScriptClasspath"] = buildScriptClasspath -ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = new File(jdk_home, 'bin/java') task build_allScripts(type: BuildLanguages, dependsOn: [ + 'downloadJbr', resolveMps, copyModelApi, ]) { @@ -404,203 +400,18 @@ if (rootProject.hasProperty("nightly_build")) { } -github { +githubRelease { owner = 'jetbrains' repo = 'MPS-extensions' token = rootProject.findProperty("github.token") ?: "empty" tagName = releaseTagName targetCommitish = GitBasedVersioning.getGitCommitHash() - name = releaseName body = releaseNotes prerelease = rootProject.hasProperty("nightly_build") - assets = packageExtensions.outputs.files.files.collect {it.path} -} - -githubRelease.dependsOn packageExtensions - -/* -group "io.github.jetbrains.mps-extensions" -apply plugin: "modelix-gradle-mpsbuild-plugin" - -mpsBuild { - dependsOn(copyModelApi) - - mpsVersion("$mpsVersion") - stubs("org.apache.commons:commons-math3:3.6.1") - search("code") - - publication("shadowmodels") { - module("de.q60.mps.polymorphicfunctions") - module("de.q60.mps.polymorphicfunctions.runtime") - module("de.q60.mps.shadowmodels.debugview") - module("de.q60.mps.shadowmodels.devkit") -// module("de.q60.mps.shadowmodels.examples.blext") -// module("de.q60.mps.shadowmodels.examples.entities") -// module("de.q60.mps.shadowmodels.examples.input") -// module("de.q60.mps.shadowmodels.examples.statemachine") - module("de.q60.mps.shadowmodels.gen.afterPF") - module("de.q60.mps.shadowmodels.gen.desugar") - module("de.q60.mps.shadowmodels.gen.typesystem") - module("de.q60.mps.shadowmodels.genplan") - module("de.q60.mps.shadowmodels.modelcheck.runtime") - module("de.q60.mps.shadowmodels.repository") - module("de.q60.mps.shadowmodels.runtime") - module("de.q60.mps.shadowmodels.runtimelang") - module("de.q60.mps.shadowmodels.target.editor") - module("de.q60.mps.shadowmodels.target.text") - module("de.q60.mps.shadowmodels.transformation") - module("de.q60.mps.shadowmodels.util") - module("de.q60.mps.explorer") - module("de.q60.mps.explorer.impl") - module("de.q60.mps.incremental") - module("de.q60.mps.incremental.runtime") - } - - publication("diagram") { - module("de.itemis.mps.editor.diagram") - module("de.itemis.mps.editor.diagram.devkit") - module("de.itemis.mps.editor.diagram.layout") - module("de.itemis.mps.editor.diagram.runtime") - module("de.itemis.mps.editor.diagram.shapes") - module("de.itemis.mps.editor.diagram.styles") - } - - publication("grammarcells") { - module("com.mbeddr.mpsutil.grammarcells") - module("com.mbeddr.mpsutil.grammarcells.runtime") - module("com.mbeddr.mpsutil.grammarcells.runtimelang") - } - - publication("projectview") { - module("com.mbeddr.mpsutil.projectview") - module("com.mbeddr.mpsutil.projectview.runtime") - module("com.mbeddr.mpsutil.projectview.vcs") - module("com.mbeddr.mpsutil.projectview.views") - } - - publication("treenotation") { - module("com.mbeddr.mpsutil.treenotation") - module("com.mbeddr.mpsutil.treenotation.runtime") - module("com.mbeddr.mpsutil.treenotation.styles") - } - - publication("math") { - module("de.itemis.mps.editor.math") - module("de.itemis.mps.editor.math.notations") - module("de.itemis.mps.editor.math.runtime") - module("de.itemis.mps.editor.math.symbols") - } - - publication("blutil") { - module("com.mbeddr.mpsutil.blutil") - module("com.mbeddr.mpsutil.blutil.genutil") - module("com.mbeddr.mpsutil.blutil.genutil.rt") - module("com.mbeddr.mpsutil.blutil.rt") - } - - publication("plaintextgen") { - module("com.dslfoundry.plaintextflow") - module("com.dslfoundry.plaintextgen") - } - - publication("deprecated") { - module("de.itemis.mps.modelmerger") - module("de.itemis.mps.modelmerger.runtime") - } - - publication("libraries") { - //module("com.fasterxml.jackson") - module("org.apache.commons") - } - - publication("modellisteners") { - module("com.mbeddr.mpsutil.modellisteners") - module("com.mbeddr.mpsutil.modellisteners.runtime") - } - - publication("other") { - module("com.dslfoundry.langvis.plugin") - module("com.mbeddr.mpsutil.intentions") - module("com.mbeddr.mpsutil.intentions.runtime") - module("com.mbeddr.mpsutil.serializer.xml") -// module("de.itemis.mps.extensions.build") - module("de.itemis.mps.nativelibs") - module("de.itemis.mps.nodeversioning") - module("de.itemis.mps.nodeversioning.runtime") - module("de.itemis.mps.selection.intentions") - module("de.itemis.mps.selection.runtime") - module("de.q60.mps.collections.libs") - module("de.q60.mps.logging.runtime") - module("de.q60.mps.util") -// module("de.q60.mps.virtualinterfaces") -// module("de.q60.mps.virtualinterfaces.devkit") -// module("de.q60.mps.virtualinterfaces.genplan") - } - - publication("mouselistener") { - module("de.itemis.mps.mouselistener.runtime") - } - - publication("modelmerge") { - module("de.itemis.model.merge") - module("de.itemis.model.merge.baselang") - module("de.itemis.model.merge.runtime") - } - - publication("cellfactory") { - module("de.slisson.mps.richtext.customcell") - } - - publication("other-editors") { - module("de.itemis.mps.editor.dropdown") - module("de.itemis.mps.editor.dropdown.runtime") - module("de.itemis.mps.editor.enumeration") - module("de.itemis.mps.editor.enumeration.runtime") - module("de.itemis.mps.editor.bool") - module("de.itemis.mps.editor.bool.runtime") - module("com.mbeddr.mpsutil.editor.querylist") - module("com.mbeddr.mpsutil.editor.querylist.runtime") - } - - publication("collapsible") { - module("de.itemis.mps.editor.collapsible") - module("de.itemis.mps.editor.collapsible.runtime") - } - - publication("celllayout") { - module("de.itemis.mps.editor.celllayout") - module("de.itemis.mps.editor.celllayout.runtime") - module("de.itemis.mps.editor.celllayout.styles") - } - - publication("hacks") { - module("de.slisson.mps.hacks.editor") - module("de.slisson.mps.hacks.xmodelgen") - module("de.slisson.mps.reflection") - module("de.slisson.mps.reflection.runtime") - } - - publication("conditional-editor") { - module("de.slisson.mps.conditionalEditor") - module("de.slisson.mps.conditionalEditor.hints") - module("de.slisson.mps.conditionalEditor.runtime") - } - - publication("richtext") { - module("de.slisson.mps.richtext") - module("de.slisson.mps.editor.multiline") - module("de.slisson.mps.editor.multiline.runtime") - } - - publication("tables") { - module("de.slisson.mps.tables") - module("de.slisson.mps.tables.runtime") - } - - publication("model-api") { - module("org.modelix.model.api") - module("org.modelix.model.mpsadapters") - module("org.modelix.model.repositoryconcepts") - } + releaseAssets = packageExtensions.outputs.files.files.collect {it.path} + dryRun = false } -*/ \ No newline at end of file + +tasks.named('githubRelease').configure { + dependsOn packageExtensions +} \ No newline at end of file From f2142e91081aea8b36bd7c7375f7d3622bfab921 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 12 May 2023 23:24:21 +0200 Subject: [PATCH 12/30] Run migrations again --- code/.mps/migration.xml | 4 +++- code/.mps/modules.xml | 2 +- .../org.apache.commons/org.apache.commons.msd | 2 +- .../com.mbeddr.mpsutil.blutil.genutil.mpl | 5 ++--- .../languages/com.mbeddr.mpsutil.blutil/blutil.mpl | 11 +++-------- .../solutions/com.mbeddr.mpsutil.blutil.rt.msd | 2 +- .../com.mbeddr.mpsutil.blutil.genutil.rt.msd | 2 +- .../test.com.mbeddr.mpsutil.blutil.genutil.lang.mpl | 5 ++--- .../test.com.mbeddr.mpsutil.blutil.genutil.msd | 2 +- .../test.ts.conceptswitch/test.ts.conceptswitch.msd | 2 +- code/blutil/tests/test.ts.match/match.msd | 2 +- code/build/solutions/allScripts/allScripts.msd | 2 +- .../de.itemis.mps.extensions.build.msd | 2 +- .../de.itemis.mps.editor.celllayout.styles.mpl | 2 +- .../de.itemis.mps.editor.celllayout.sandboxlang.mpl | 2 +- .../de.itemis.mps.editor.celllayout.mpl | 9 ++------- .../test.de.itemis.mps.editor.celllayout.lang.mpl | 2 +- .../de.itemis.mps.editor.celllayout.sandbox.msd | 2 +- .../de.itemis.mps.editor.celllayout.runtime.msd | 2 +- .../de.slisson.mps.editor.celllayout.msd | 2 +- .../test.de.itemis.mps.editor.celllayout.msd | 2 +- .../de.slisson.mps.conditionalEditor.demolang.mpl | 2 +- .../de.slisson.mps.conditionalEditor.hints.mpl | 2 +- .../de.slisson.mps.conditionalEditor.mpl | 9 ++------- .../de.slisson.mps.conditionalEditor.runtime.msd | 2 +- .../de.slisson.mps.conditionalEditor.sandbox.msd | 2 +- .../de.itemis.mps.editor.diagram.demo.activity.mpl | 2 +- .../de.itemis.mps.editor.diagram.demo.callgraph.mpl | 2 +- .../de.itemis.mps.editor.diagram.demoentities.mpl | 2 +- .../de.itemis.mps.editor.diagram.demolang.mpl | 4 ++-- .../de.itemis.mps.editor.diagram.layout.mpl | 2 +- .../de.itemis.mps.editor.diagram.styles.mpl | 2 +- .../de.itemis.mps.editor.diagram.mpl | 9 ++------- .../test.de.itemis.mps.editor.diagram.lang.mpl | 2 +- ...emis.mps.editor.diagram.demo.activity.sandbox.msd | 2 +- ...temis.mps.editor.diagram.demoentities.sandbox.msd | 2 +- .../de.itemis.mps.editor.diagram.runtime.msd | 2 +- .../de.itemis.mps.editor.diagram.sandbox.msd | 2 +- .../models/de/itemis/mps/editor/diagram/sandbox.mps | 2 +- .../de.itemis.mps.editor.diagram.shapes.msd | 2 +- .../test.de.itemis.mps.editor.diagram.solution.msd | 2 +- .../com.mbeddr.mpsutil.grammarcells.runtimelang.mpl | 2 +- .../com.mbeddr.mpsutil.grammarcells.sandboxlang.mpl | 2 +- .../com.mbeddr.mpsutil.grammarcells.mpl | 10 ++-------- .../com.mbeddr.mpsutil.grammarcells.runtime.msd | 2 +- .../com.mbeddr.mpsutil.grammarcells.sandbox.msd | 2 +- .../com.mbeddr.mpsutil.grammarcells.tests.msd | 2 +- .../de.itemis.mps.nativelibs.mpl | 4 ++-- .../de.slisson.mps.hacks.xmodelgen.mpl | 2 +- .../de.slisson.mps.reflection.mpl | 6 +++--- .../de.itemis.mps.nativelibs.loader.msd | 3 +-- .../de.slisson.mps.hacks.editor.msd | 2 +- .../de.slisson.mps.reflection.runtime.msd | 2 +- .../de.itemis.mps.editor.htmlcell.demolang.mpl | 2 +- ...de.itemis.mps.editor.htmlcell.demolang.editor.mps | 2 +- .../de.itemis.mps.editor.htmlcell.mpl | 9 ++------- .../de.itemis.mps.editor.htmlcell.sandbox.msd | 2 +- .../de.itemis.mps.editor.htmlcell.runtime.msd | 2 +- .../com.mbeddr.mpsutil.intentions.runtime.msd | 2 +- .../com.mbeddr.mpsutil.intentions.mpl | 8 +++++--- .../com.mbeddr.mpsutil.intentions.sandboxlang.mpl | 4 ++-- .../de.itemis.model.merge.baselang.mpl | 5 ++--- .../de.itemis.model.merge.baselang.sandbox.msd | 2 +- .../de.itemis.model.merge.diamond.mpl | 2 +- .../de.itemis.model.merge.simple.demo.annotated.mpl | 2 +- .../de.itemis.model.merge/de.itemis.model.merge.mpl | 9 ++------- .../models/de.itemis.model.merge.behavior.mps | 2 +- .../de.itemis.model.simple.demo.children.mpl | 2 +- ...de.itemis.model.simple.demo.collection.keeper.mpl | 2 +- .../de.itemis.model.simple.demo.collection.mpl | 2 +- .../de.itemis.model.simple.demo.property.mpl | 2 +- .../de.itemis.model.simple.demo.reference.mpl | 2 +- .../com.dslfoundry.langvis.demolang.mpl | 2 +- .../com.dslfoundry.langvis.demo.msd | 2 +- .../com.dslfoundry.langvis.plugin.msd | 2 +- .../de.itemis.mps.linenumbers.msd | 2 +- .../de.itemis.mps.editor.math.demolang.mpl | 2 +- .../de.itemis.mps.editor.math.java.mpl | 7 +++---- .../de.itemis.mps.editor.math.notations.mpl | 9 ++------- .../de.itemis.mps.editor.math.mpl | 9 ++------- .../de.itemis.mps.editor.math.runtime.msd | 2 +- .../de.itemis.mps.editor.math.sandbox.msd | 2 +- .../de.itemis.mps.editor.math.symbols.msd | 2 +- .../org.modelix.model.api/org.modelix.model.api.msd | 2 +- .../org.modelix.model.mpsadapters.msd | 2 +- .../org.modelix.model.repositoryconcepts.mpl | 2 +- .../test.org.modelix.model.mpsadapters.msd | 2 +- .../com.mbeddr.mpsutil.modellisteners.runtime.msd | 2 +- .../com.mbeddr.mpsutil.modellisteners.sandbox.msd | 2 +- ...com.mbeddr.mpsutil.modellisteners.sandboxlang.mpl | 2 +- .../com.mbeddr.mpsutil.modellisteners.mpl | 10 ++-------- .../de.itemis.mps.modelmerger.mpl | 9 ++------- .../sandbox/de.itemis.mps.modelmerger.testhelper.msd | 2 +- .../test.de.itemis.mps.modelmerger.testlanguage.mpl | 2 +- .../de.itemis.mps.modelmerger.runtime.msd | 2 +- .../tests.de.itemis.mps.modelmerger.msd | 2 +- .../de.itemis.mps.selection.intentions.mpl | 5 ++--- .../de.itemis.mps.selection.runtime.msd | 2 +- code/multiline/languages/demolang/demolang.mpl | 2 +- code/multiline/languages/multiline/multiline.mpl | 9 ++------- .../runtime.msd | 2 +- .../de.slisson.mps.editor.multiline.sandbox.msd | 2 +- .../de.itemis.mps.nodeversioning.mpl | 2 +- .../de.itemis.mps.nodeversioning.runtime.msd | 2 +- .../de.itemis.mps.nodeversioning.test.msd | 2 +- .../com.dslfoundry.plaintextflow.mpl | 4 ++-- ...om.dslfoundry.plaintextgen.example.nestedlist.mpl | 4 ++-- .../com.dslfoundry.plaintextgen.example.testlang.mpl | 4 ++-- .../com.dslfoundry.plaintextgen.mpl | 2 +- ...undry.plaintextgen.example.nestedlist.sandbox.msd | 2 +- ...dslfoundry.plaintextgen.example.plaintextflow.msd | 2 +- ...foundry.plaintextgen.example.testlang.sandbox.msd | 2 +- .../com.mbeddr.mpsutil.projectview.runtime.msd | 4 +++- .../com/mbeddr/mpsutil/projectview/runtime.mps | 2 +- .../com/mbeddr/mpsutil/projectview/runtime/tree.mps | 2 +- .../com.mbeddr.mpsutil.projectview.vcs.msd | 2 +- .../com.mbeddr.mpsutil.projectview.views.msd | 2 +- .../com.mbeddr.mpsutil.projectview.mpl | 10 +++------- .../com.mbeddr.mpsutil.editor.querylist.demolang.mpl | 2 +- .../com.mbeddr.mpsutil.editor.querylist.runtime.msd | 2 +- .../com.mbeddr.mpsutil.editor.querylist.sandbox.msd | 2 +- .../com.mbeddr.mpsutil.editor.querylist.mpl | 9 ++------- .../de.slisson.richtext.customcell.mpl | 9 ++------- code/richtext/languages/javadoc/javadoc.mpl | 2 +- code/richtext/languages/richtext/richtext.mpl | 2 +- .../de.slisson.mps.richtext.sandbox.msd | 2 +- .../de.q60.mps.explorer.impl.msd | 2 +- .../de.q60.mps.explorer/de.q60.mps.explorer.msd | 2 +- .../shadowmodels/de.q60.mps.util/de.q60.mps.util.msd | 2 +- .../de.q60.mps.incremental.sandboxlang.mpl | 2 +- .../de.q60.mps.incremental.mpl | 7 +++---- .../de.q60.mps.polymorphicfunctions.sandboxlang.mpl | 2 +- .../de.q60.mps.polymorphicfunctions.mpl | 10 +++------- .../de.q60.mps.shadowmodels.examples.blext.mpl | 2 +- .../de.q60.mps.shadowmodels.examples.editor.mpl | 2 +- .../de.q60.mps.shadowmodels.examples.entities.mpl | 2 +- ...de.q60.mps.shadowmodels.examples.statemachine.mpl | 2 +- .../de.q60.mps.shadowmodels.gen.afterPF.mpl | 5 ++--- .../de.q60.mps.shadowmodels.gen.desugar.mpl | 5 ++--- .../de.q60.mps.shadowmodels.gen.typesystem.mpl | 5 +++-- .../de.q60.mps.shadowmodels.repository.mpl | 2 +- .../de.q60.mps.shadowmodels.runtimelang.mpl | 2 +- .../de.q60.mps.shadowmodels.target.editor.mpl | 2 +- .../de.q60.mps.shadowmodels.target.text.mpl | 2 +- .../de.q60.mps.shadowmodels.transformation.mpl | 12 ++++-------- .../de.q60.mps.shadowmodels.util.mpl | 9 ++------- .../de.q60.mps.virtualinterfaces.sandboxlang.mpl | 2 +- .../de.q60.mps.virtualinterfaces.mpl | 12 ++---------- .../de.q60.mps.collections.libs.msd | 2 +- ...q60.mps.genplan.virutalinterfaces_incremental.msd | 2 +- .../de.q60.mps.incremental.runtime.msd | 2 +- .../models/de.q60.mps.incremental.runtime.mps | 6 +++--- .../de.q60.mps.incremental.sandbox.msd | 2 +- .../de.q60.mps.logging.runtime.msd | 2 +- .../de.q60.mps.polymorphicfunctions.runtime.msd | 2 +- .../de.q60.mps.polymorphicfunctions.sandbox.msd | 2 +- .../de.q60.mps.shadowmodels.debugview.msd | 2 +- .../de.q60.mps.shadowmodels.examples.input.msd | 2 +- ...q60.mps.shadowmodels.examples.javainterpreter.msd | 3 +-- .../de.q60.mps.shadowmodels.examples.output.msd | 2 +- .../de.q60.mps.shadowmodels.genplan.msd | 2 +- .../de.q60.mps.shadowmodels.modelcheck.runtime.msd | 2 +- .../de.q60.mps.shadowmodels.runtime.msd | 2 +- .../de.q60.mps.virtualinterfaces.genplan.msd | 2 +- .../de.q60.mps.virtualinterfaces.sandbox.msd | 2 +- .../test.de.q60.mps.incremental.runtime.msd | 2 +- .../test.de.q60.mps.shadowmodels.examples.msd | 2 +- .../test.de.q60.mps.shadowmodels.runtime.msd | 2 +- .../com.mbeddr.mpsutil.intentions.sandbox.msd | 2 +- .../de.itemis.model.merge.runtime.msd | 2 +- .../models/de.itemis.model.merge.runtime.runtime.mps | 4 ++-- .../de.itemis.model.merge.simple.demo.msd | 2 +- .../de.itemis.model.merge.test.integration.msd | 2 +- .../de.itemis.model.merge.test.msd | 2 +- .../de.slisson.mps.structurecheck.mpl | 11 +++-------- .../de.slisson.mps.structurecheck.runtime.msd | 2 +- .../de.slisson.mps.structurecheck.sandbox.msd | 2 +- .../de.slisson.mps.tables.demolang.mpl | 2 +- .../de.slisson.mps.tables/de.slisson.mps.tables.mpl | 9 ++------- .../runtime/de.slisson.mps.tables.runtime.msd | 2 +- .../sandbox/de.slisson.mps.tables.sandbox.msd | 2 +- .../de.slisson.mps.testutils.msd | 2 +- .../test.de.slisson.mps.tables.msd | 2 +- .../de.itemis.mps.tooltips.runtime.msd | 2 +- .../com.mbeddr.mpsutil.treenotation.runtime.msd | 2 +- .../com.mbeddr.mpsutil.treenotation.sandbox.msd | 2 +- .../com.mbeddr.mpsutil.treenotation.sandboxlang.mpl | 2 +- .../com.mbeddr.mpsutil.treenotation.styles.mpl | 2 +- .../com.mbeddr.mpsutil.treenotation.mpl | 8 ++------ .../com.mbeddr.mpsutil.serializer.xml.msd | 2 +- .../de.itemis.mps.noderversioning.sandbox.msd | 2 +- .../de.itemis.mps.editor.bool.demolang.mpl | 2 +- .../de.itemis.mps.editor.bool.mpl | 9 ++------- .../de.itemis.mps.editor.collapsible.testlang.mpl | 2 +- .../de.itemis.mps.editor.collapsible.mpl | 9 ++------- .../de.itemis.mps.editor.dropdown.demolang.mpl | 2 +- .../de.itemis.mps.editor.dropdown.mpl | 9 ++------- .../de.itemis.mps.editor.enumeration.demolang.mpl | 2 +- .../de.itemis.mps.editor.enumeration.mpl | 9 ++------- .../de.itemis.mps.editor.enumeration.runtime.msd | 2 +- .../de.itemis.mps.editor.enumeration.sandbox.msd | 2 +- .../de.itemis.mps.editor.bool.runtime.msd | 2 +- .../de.itemis.mps.editor.bool.sandbox.msd | 2 +- .../de.itemis.mps.editor.collapsible.runtime.msd | 2 +- .../de.itemis.mps.editor.dropdown.runtime.msd | 2 +- .../de.itemis.mps.editor.dropdown.sandbox.msd | 2 +- .../de.itemis.mps.mouselistener.runtime.msd | 2 +- 207 files changed, 270 insertions(+), 404 deletions(-) diff --git a/code/.mps/migration.xml b/code/.mps/migration.xml index 345bfc32f..1710be715 100644 --- a/code/.mps/migration.xml +++ b/code/.mps/migration.xml @@ -8,6 +8,8 @@ - + + + \ No newline at end of file diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml index dd5198732..e691ec6e5 100644 --- a/code/.mps/modules.xml +++ b/code/.mps/modules.xml @@ -61,6 +61,7 @@ + @@ -167,7 +168,6 @@ - diff --git a/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd b/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd index 2ba17feb8..292568925 100644 --- a/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd +++ b/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd @@ -12,7 +12,7 @@ - + diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl b/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl index e7534a281..089020ccb 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -56,7 +56,6 @@ - diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl index 27175900a..5449abe11 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -38,6 +38,7 @@ + @@ -61,8 +62,6 @@ - - @@ -71,19 +70,15 @@ - - - - diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd index 23aaeb456..df793d9ae 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd @@ -6,7 +6,7 @@ - + diff --git a/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd b/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd index 5d9f802dd..82248ef76 100644 --- a/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd +++ b/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd @@ -6,7 +6,7 @@ - + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil.lang/test.com.mbeddr.mpsutil.blutil.genutil.lang.mpl b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil.lang/test.com.mbeddr.mpsutil.blutil.genutil.lang.mpl index bc6dc535e..45b1a20c8 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil.lang/test.com.mbeddr.mpsutil.blutil.genutil.lang.mpl +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil.lang/test.com.mbeddr.mpsutil.blutil.genutil.lang.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -52,7 +52,6 @@ - diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil/test.com.mbeddr.mpsutil.blutil.genutil.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil/test.com.mbeddr.mpsutil.blutil.genutil.msd index 394bef17a..23ac98aa5 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil/test.com.mbeddr.mpsutil.blutil.genutil.msd +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil/test.com.mbeddr.mpsutil.blutil.genutil.msd @@ -6,7 +6,7 @@ - + diff --git a/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd b/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd index 180ab1618..ee4a48a6a 100644 --- a/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd +++ b/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd @@ -6,7 +6,7 @@ - + diff --git a/code/blutil/tests/test.ts.match/match.msd b/code/blutil/tests/test.ts.match/match.msd index 2231c2941..c3c39536a 100644 --- a/code/blutil/tests/test.ts.match/match.msd +++ b/code/blutil/tests/test.ts.match/match.msd @@ -6,7 +6,7 @@ - + diff --git a/code/build/solutions/allScripts/allScripts.msd b/code/build/solutions/allScripts/allScripts.msd index 8f8c68dfc..9d2426793 100644 --- a/code/build/solutions/allScripts/allScripts.msd +++ b/code/build/solutions/allScripts/allScripts.msd @@ -6,7 +6,7 @@ - + diff --git a/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd b/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd index 097ecd1c1..ddfac9870 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd +++ b/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd @@ -6,7 +6,7 @@ - + diff --git a/code/celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.styles.mpl b/code/celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.styles.mpl index 1b163b167..d01d2b177 100644 --- a/code/celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.styles.mpl +++ b/code/celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.styles.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/celllayout/languages/de.itemis.mps.editor.celllayout.sandboxlang/de.itemis.mps.editor.celllayout.sandboxlang.mpl b/code/celllayout/languages/de.itemis.mps.editor.celllayout.sandboxlang/de.itemis.mps.editor.celllayout.sandboxlang.mpl index 03e350fe7..ca3cb30dd 100644 --- a/code/celllayout/languages/de.itemis.mps.editor.celllayout.sandboxlang/de.itemis.mps.editor.celllayout.sandboxlang.mpl +++ b/code/celllayout/languages/de.itemis.mps.editor.celllayout.sandboxlang/de.itemis.mps.editor.celllayout.sandboxlang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/celllayout/languages/de.itemis.mps.editor.celllayout/de.itemis.mps.editor.celllayout.mpl b/code/celllayout/languages/de.itemis.mps.editor.celllayout/de.itemis.mps.editor.celllayout.mpl index c92216ce7..e21195df4 100644 --- a/code/celllayout/languages/de.itemis.mps.editor.celllayout/de.itemis.mps.editor.celllayout.mpl +++ b/code/celllayout/languages/de.itemis.mps.editor.celllayout/de.itemis.mps.editor.celllayout.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -60,8 +60,6 @@ - - @@ -71,11 +69,9 @@ - - @@ -85,7 +81,6 @@ - diff --git a/code/celllayout/languages/test.de.itemis.mps.editor.celllayout.lang/test.de.itemis.mps.editor.celllayout.lang.mpl b/code/celllayout/languages/test.de.itemis.mps.editor.celllayout.lang/test.de.itemis.mps.editor.celllayout.lang.mpl index 2e15d9b4d..b2c18fa3c 100644 --- a/code/celllayout/languages/test.de.itemis.mps.editor.celllayout.lang/test.de.itemis.mps.editor.celllayout.lang.mpl +++ b/code/celllayout/languages/test.de.itemis.mps.editor.celllayout.lang/test.de.itemis.mps.editor.celllayout.lang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/celllayout/solutions/de.itemis.mps.editor.celllayout.sandbox/de.itemis.mps.editor.celllayout.sandbox.msd b/code/celllayout/solutions/de.itemis.mps.editor.celllayout.sandbox/de.itemis.mps.editor.celllayout.sandbox.msd index af5627d30..a91c8b357 100644 --- a/code/celllayout/solutions/de.itemis.mps.editor.celllayout.sandbox/de.itemis.mps.editor.celllayout.sandbox.msd +++ b/code/celllayout/solutions/de.itemis.mps.editor.celllayout.sandbox/de.itemis.mps.editor.celllayout.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/de.itemis.mps.editor.celllayout.runtime.msd b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/de.itemis.mps.editor.celllayout.runtime.msd index e5dcf2496..b47b18d2f 100644 --- a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/de.itemis.mps.editor.celllayout.runtime.msd +++ b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/de.itemis.mps.editor.celllayout.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd b/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd index c1c4cbc24..3f05da885 100644 --- a/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd +++ b/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd @@ -6,7 +6,7 @@ - + diff --git a/code/celllayout/solutions/test.de.itemis.mps.editor.celllayout.runtime/test.de.itemis.mps.editor.celllayout.msd b/code/celllayout/solutions/test.de.itemis.mps.editor.celllayout.runtime/test.de.itemis.mps.editor.celllayout.msd index 5958b4cb3..6bafc37d3 100644 --- a/code/celllayout/solutions/test.de.itemis.mps.editor.celllayout.runtime/test.de.itemis.mps.editor.celllayout.msd +++ b/code/celllayout/solutions/test.de.itemis.mps.editor.celllayout.runtime/test.de.itemis.mps.editor.celllayout.msd @@ -6,7 +6,7 @@ - + diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/de.slisson.mps.conditionalEditor.demolang.mpl b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/de.slisson.mps.conditionalEditor.demolang.mpl index 62f8b8a5b..87b109f56 100644 --- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/de.slisson.mps.conditionalEditor.demolang.mpl +++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/de.slisson.mps.conditionalEditor.demolang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.hints/de.slisson.mps.conditionalEditor.hints.mpl b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.hints/de.slisson.mps.conditionalEditor.hints.mpl index 04ee6f5c7..cd64b5f44 100644 --- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.hints/de.slisson.mps.conditionalEditor.hints.mpl +++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.hints/de.slisson.mps.conditionalEditor.hints.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.mpl b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.mpl index 6bd4203f1..09f2a5096 100644 --- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.mpl +++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -64,8 +64,6 @@ - - @@ -75,11 +73,9 @@ - - @@ -89,7 +85,6 @@ - diff --git a/code/conditional-editor/solutions/de.slisson.mps.conditionalEditor.runtime/de.slisson.mps.conditionalEditor.runtime.msd b/code/conditional-editor/solutions/de.slisson.mps.conditionalEditor.runtime/de.slisson.mps.conditionalEditor.runtime.msd index c41ce2638..f57b2bf18 100644 --- a/code/conditional-editor/solutions/de.slisson.mps.conditionalEditor.runtime/de.slisson.mps.conditionalEditor.runtime.msd +++ b/code/conditional-editor/solutions/de.slisson.mps.conditionalEditor.runtime/de.slisson.mps.conditionalEditor.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/conditional-editor/solutions/de.slisson.mps.conditionalEditor.sandbox/de.slisson.mps.conditionalEditor.sandbox.msd b/code/conditional-editor/solutions/de.slisson.mps.conditionalEditor.sandbox/de.slisson.mps.conditionalEditor.sandbox.msd index e41ea7a17..e7bd55716 100644 --- a/code/conditional-editor/solutions/de.slisson.mps.conditionalEditor.sandbox/de.slisson.mps.conditionalEditor.sandbox.msd +++ b/code/conditional-editor/solutions/de.slisson.mps.conditionalEditor.sandbox/de.slisson.mps.conditionalEditor.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/de.itemis.mps.editor.diagram.demo.activity.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/de.itemis.mps.editor.diagram.demo.activity.mpl index 9b6eeeaf0..3a9e6500c 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/de.itemis.mps.editor.diagram.demo.activity.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/de.itemis.mps.editor.diagram.demo.activity.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/de.itemis.mps.editor.diagram.demo.callgraph.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/de.itemis.mps.editor.diagram.demo.callgraph.mpl index 16fa82b50..9a44cafde 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/de.itemis.mps.editor.diagram.demo.callgraph.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/de.itemis.mps.editor.diagram.demo.callgraph.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/de.itemis.mps.editor.diagram.demoentities.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/de.itemis.mps.editor.diagram.demoentities.mpl index 9fc73b75b..2f255aec2 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/de.itemis.mps.editor.diagram.demoentities.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/de.itemis.mps.editor.diagram.demoentities.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/de.itemis.mps.editor.diagram.demolang.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/de.itemis.mps.editor.diagram.demolang.mpl index 5ab8df452..2144294bf 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/de.itemis.mps.editor.diagram.demolang.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/de.itemis.mps.editor.diagram.demolang.mpl @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.layout/de.itemis.mps.editor.diagram.layout.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram.layout/de.itemis.mps.editor.diagram.layout.mpl index 280716a68..a58691e56 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.layout/de.itemis.mps.editor.diagram.layout.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.layout/de.itemis.mps.editor.diagram.layout.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.styles/de.itemis.mps.editor.diagram.styles.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram.styles/de.itemis.mps.editor.diagram.styles.mpl index ad11e607a..bbf1d02da 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.styles/de.itemis.mps.editor.diagram.styles.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.styles/de.itemis.mps.editor.diagram.styles.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl index 0e1dde80c..e53046324 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -68,8 +68,6 @@ - - @@ -85,13 +83,11 @@ - - @@ -102,7 +98,6 @@ - diff --git a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/test.de.itemis.mps.editor.diagram.lang.mpl b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/test.de.itemis.mps.editor.diagram.lang.mpl index 5c677944b..1f2664f6d 100644 --- a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/test.de.itemis.mps.editor.diagram.lang.mpl +++ b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/test.de.itemis.mps.editor.diagram.lang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.activity.sandbox/de.itemis.mps.editor.diagram.demo.activity.sandbox.msd b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.activity.sandbox/de.itemis.mps.editor.diagram.demo.activity.sandbox.msd index 62b7cae02..b8fccac72 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.activity.sandbox/de.itemis.mps.editor.diagram.demo.activity.sandbox.msd +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.activity.sandbox/de.itemis.mps.editor.diagram.demo.activity.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/de.itemis.mps.editor.diagram.demoentities.sandbox.msd b/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/de.itemis.mps.editor.diagram.demoentities.sandbox.msd index 03c031058..ff59a1198 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/de.itemis.mps.editor.diagram.demoentities.sandbox.msd +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/de.itemis.mps.editor.diagram.demoentities.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd index 5aa166882..83851168d 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd @@ -17,7 +17,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.sandbox/de.itemis.mps.editor.diagram.sandbox.msd b/code/diagram/solutions/de.itemis.mps.editor.diagram.sandbox/de.itemis.mps.editor.diagram.sandbox.msd index 2f2d07d69..ec201d888 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.sandbox/de.itemis.mps.editor.diagram.sandbox.msd +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.sandbox/de.itemis.mps.editor.diagram.sandbox.msd @@ -6,7 +6,7 @@ - + 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 eaca8113d..d1ef48a8e 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/diagram/solutions/de.itemis.mps.editor.diagram.shapes/de.itemis.mps.editor.diagram.shapes.msd b/code/diagram/solutions/de.itemis.mps.editor.diagram.shapes/de.itemis.mps.editor.diagram.shapes.msd index eaf6d9e1e..d6ca8366f 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.shapes/de.itemis.mps.editor.diagram.shapes.msd +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.shapes/de.itemis.mps.editor.diagram.shapes.msd @@ -6,7 +6,7 @@ - + diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd index 1f41163fe..3f7e4a925 100644 --- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd +++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd @@ -6,7 +6,7 @@ - + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.runtimelang/com.mbeddr.mpsutil.grammarcells.runtimelang.mpl b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.runtimelang/com.mbeddr.mpsutil.grammarcells.runtimelang.mpl index 2fa1fa465..511b69943 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.runtimelang/com.mbeddr.mpsutil.grammarcells.runtimelang.mpl +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.runtimelang/com.mbeddr.mpsutil.grammarcells.runtimelang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/com.mbeddr.mpsutil.grammarcells.sandboxlang.mpl b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/com.mbeddr.mpsutil.grammarcells.sandboxlang.mpl index 0c2ffbe68..e2eed9175 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/com.mbeddr.mpsutil.grammarcells.sandboxlang.mpl +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/com.mbeddr.mpsutil.grammarcells.sandboxlang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.mpl b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.mpl index 827eea838..797e3469b 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.mpl +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/com.mbeddr.mpsutil.grammarcells.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -75,8 +75,6 @@ - - @@ -87,15 +85,12 @@ - - - @@ -108,7 +103,6 @@ - diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/com.mbeddr.mpsutil.grammarcells.runtime.msd b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/com.mbeddr.mpsutil.grammarcells.runtime.msd index cdfe575b8..46cbacbb7 100644 --- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/com.mbeddr.mpsutil.grammarcells.runtime.msd +++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/com.mbeddr.mpsutil.grammarcells.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.sandbox/com.mbeddr.mpsutil.grammarcells.sandbox.msd b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.sandbox/com.mbeddr.mpsutil.grammarcells.sandbox.msd index a86aa5587..2bc95a0bb 100644 --- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.sandbox/com.mbeddr.mpsutil.grammarcells.sandbox.msd +++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.sandbox/com.mbeddr.mpsutil.grammarcells.sandbox.msd @@ -6,7 +6,7 @@ - + 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 b0943103a..88709ee64 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 @@ -6,7 +6,7 @@ - + diff --git a/code/hacks/languages/de.itemis.mps.nativelibs/de.itemis.mps.nativelibs.mpl b/code/hacks/languages/de.itemis.mps.nativelibs/de.itemis.mps.nativelibs.mpl index 53aa36527..77948b3b5 100644 --- a/code/hacks/languages/de.itemis.mps.nativelibs/de.itemis.mps.nativelibs.mpl +++ b/code/hacks/languages/de.itemis.mps.nativelibs/de.itemis.mps.nativelibs.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/de.slisson.mps.hacks.xmodelgen.mpl b/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/de.slisson.mps.hacks.xmodelgen.mpl index 7aaeddcc8..004bd2c70 100644 --- a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/de.slisson.mps.hacks.xmodelgen.mpl +++ b/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/de.slisson.mps.hacks.xmodelgen.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl b/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl index 18bf451c3..9181f20a4 100644 --- a/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl +++ b/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -31,6 +31,7 @@ + @@ -55,7 +56,6 @@ - diff --git a/code/hacks/solutions/de.itemis.mps.nativelibs.loader/de.itemis.mps.nativelibs.loader.msd b/code/hacks/solutions/de.itemis.mps.nativelibs.loader/de.itemis.mps.nativelibs.loader.msd index 6f03d6ae6..460d788f5 100644 --- a/code/hacks/solutions/de.itemis.mps.nativelibs.loader/de.itemis.mps.nativelibs.loader.msd +++ b/code/hacks/solutions/de.itemis.mps.nativelibs.loader/de.itemis.mps.nativelibs.loader.msd @@ -6,8 +6,7 @@ - - + diff --git a/code/hacks/solutions/de.slisson.mps.hacks.editor/de.slisson.mps.hacks.editor.msd b/code/hacks/solutions/de.slisson.mps.hacks.editor/de.slisson.mps.hacks.editor.msd index 0e671c71b..c4715ffb3 100644 --- a/code/hacks/solutions/de.slisson.mps.hacks.editor/de.slisson.mps.hacks.editor.msd +++ b/code/hacks/solutions/de.slisson.mps.hacks.editor/de.slisson.mps.hacks.editor.msd @@ -6,7 +6,7 @@ - + diff --git a/code/hacks/solutions/de.slisson.mps.reflection.runtime/de.slisson.mps.reflection.runtime.msd b/code/hacks/solutions/de.slisson.mps.reflection.runtime/de.slisson.mps.reflection.runtime.msd index 6ce0a94bd..dbb595834 100644 --- a/code/hacks/solutions/de.slisson.mps.reflection.runtime/de.slisson.mps.reflection.runtime.msd +++ b/code/hacks/solutions/de.slisson.mps.reflection.runtime/de.slisson.mps.reflection.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl index d800b6006..699ef7ec9 100644 --- a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl +++ b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl @@ -6,7 +6,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 05039bb84..694c58c38 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 @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -58,8 +58,6 @@ - - @@ -70,12 +68,10 @@ - - @@ -85,7 +81,6 @@ - diff --git a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/sandbox/de.itemis.mps.editor.htmlcell.sandbox.msd b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/sandbox/de.itemis.mps.editor.htmlcell.sandbox.msd index 419ed6825..07e3e8da4 100644 --- a/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/sandbox/de.itemis.mps.editor.htmlcell.sandbox.msd +++ b/code/htmlcell/languages/de.itemis.mps.editor.htmlcell/sandbox/de.itemis.mps.editor.htmlcell.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/htmlcell/solutions/de.itemis.mps.editor.htmlcell.runtime/de.itemis.mps.editor.htmlcell.runtime.msd b/code/htmlcell/solutions/de.itemis.mps.editor.htmlcell.runtime/de.itemis.mps.editor.htmlcell.runtime.msd index 92dab2e86..5b22e8be7 100644 --- a/code/htmlcell/solutions/de.itemis.mps.editor.htmlcell.runtime/de.itemis.mps.editor.htmlcell.runtime.msd +++ b/code/htmlcell/solutions/de.itemis.mps.editor.htmlcell.runtime/de.itemis.mps.editor.htmlcell.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd index 7add2c943..931da96c9 100644 --- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd +++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions/com.mbeddr.mpsutil.intentions.mpl b/code/intentionsmenu/com.mbeddr.mpsutil.intentions/com.mbeddr.mpsutil.intentions.mpl index 8c1bd1665..e46681b12 100644 --- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions/com.mbeddr.mpsutil.intentions.mpl +++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions/com.mbeddr.mpsutil.intentions.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -31,6 +31,7 @@ + @@ -56,8 +57,8 @@ + - @@ -130,6 +131,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl index 1a82e4f32..e5e134d2f 100644 --- a/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl +++ b/code/languages/com.mbeddr.mpsutil.intentions.sandboxlang/com.mbeddr.mpsutil.intentions.sandboxlang.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + 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 8d1acd607..4849696cb 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 @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -56,7 +56,6 @@ - diff --git a/code/languages/de.itemis.model.merge.baselang/sandbox/de.itemis.model.merge.baselang.sandbox.msd b/code/languages/de.itemis.model.merge.baselang/sandbox/de.itemis.model.merge.baselang.sandbox.msd index 20394bbbf..f54415a23 100644 --- a/code/languages/de.itemis.model.merge.baselang/sandbox/de.itemis.model.merge.baselang.sandbox.msd +++ b/code/languages/de.itemis.model.merge.baselang/sandbox/de.itemis.model.merge.baselang.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/languages/de.itemis.model.merge.diamond/de.itemis.model.merge.diamond.mpl b/code/languages/de.itemis.model.merge.diamond/de.itemis.model.merge.diamond.mpl index a856c70b6..7bf00b57d 100644 --- a/code/languages/de.itemis.model.merge.diamond/de.itemis.model.merge.diamond.mpl +++ b/code/languages/de.itemis.model.merge.diamond/de.itemis.model.merge.diamond.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/languages/de.itemis.model.merge.simple.demo.annotated/de.itemis.model.merge.simple.demo.annotated.mpl b/code/languages/de.itemis.model.merge.simple.demo.annotated/de.itemis.model.merge.simple.demo.annotated.mpl index 736effce3..bed6c4d45 100644 --- a/code/languages/de.itemis.model.merge.simple.demo.annotated/de.itemis.model.merge.simple.demo.annotated.mpl +++ b/code/languages/de.itemis.model.merge.simple.demo.annotated/de.itemis.model.merge.simple.demo.annotated.mpl @@ -6,7 +6,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 514421f6f..40c6c9254 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 @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -59,8 +59,6 @@ - - @@ -68,11 +66,9 @@ - - @@ -80,7 +76,6 @@ - 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 f3059455f..4f3ed3102 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 @@ -19,7 +19,7 @@ - + diff --git a/code/languages/de.itemis.model.simple.demo.children/de.itemis.model.simple.demo.children.mpl b/code/languages/de.itemis.model.simple.demo.children/de.itemis.model.simple.demo.children.mpl index 974705050..3df9ad5c5 100644 --- a/code/languages/de.itemis.model.simple.demo.children/de.itemis.model.simple.demo.children.mpl +++ b/code/languages/de.itemis.model.simple.demo.children/de.itemis.model.simple.demo.children.mpl @@ -6,7 +6,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 2e1c529a8..2a4cb3a79 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 @@ -6,7 +6,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 9b104a583..063f2d284 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 @@ -6,7 +6,7 @@ - + diff --git a/code/languages/de.itemis.model.simple.demo.property/de.itemis.model.simple.demo.property.mpl b/code/languages/de.itemis.model.simple.demo.property/de.itemis.model.simple.demo.property.mpl index a47af5c2e..a0f5a8d82 100644 --- a/code/languages/de.itemis.model.simple.demo.property/de.itemis.model.simple.demo.property.mpl +++ b/code/languages/de.itemis.model.simple.demo.property/de.itemis.model.simple.demo.property.mpl @@ -6,7 +6,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 c312155fb..dc7a0f973 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 @@ -6,7 +6,7 @@ - + diff --git a/code/langvis/languages/com.dslfoundry.langvis.demolang/com.dslfoundry.langvis.demolang.mpl b/code/langvis/languages/com.dslfoundry.langvis.demolang/com.dslfoundry.langvis.demolang.mpl index c31f78ec1..126ee83e1 100644 --- a/code/langvis/languages/com.dslfoundry.langvis.demolang/com.dslfoundry.langvis.demolang.mpl +++ b/code/langvis/languages/com.dslfoundry.langvis.demolang/com.dslfoundry.langvis.demolang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/langvis/solutions/com.dslfoundry.langvis.demo/com.dslfoundry.langvis.demo.msd b/code/langvis/solutions/com.dslfoundry.langvis.demo/com.dslfoundry.langvis.demo.msd index f1e1606f6..d0d45ccac 100644 --- a/code/langvis/solutions/com.dslfoundry.langvis.demo/com.dslfoundry.langvis.demo.msd +++ b/code/langvis/solutions/com.dslfoundry.langvis.demo/com.dslfoundry.langvis.demo.msd @@ -6,7 +6,7 @@ - + diff --git a/code/langvis/solutions/com.dslfoundry.langvis.plugin/com.dslfoundry.langvis.plugin.msd b/code/langvis/solutions/com.dslfoundry.langvis.plugin/com.dslfoundry.langvis.plugin.msd index d2a4fd5a3..5cf019685 100644 --- a/code/langvis/solutions/com.dslfoundry.langvis.plugin/com.dslfoundry.langvis.plugin.msd +++ b/code/langvis/solutions/com.dslfoundry.langvis.plugin/com.dslfoundry.langvis.plugin.msd @@ -6,7 +6,7 @@ - + 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 e02b19650..19f4f3292 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 @@ -6,7 +6,7 @@ - + diff --git a/code/math/languages/de.itemis.mps.editor.math.demolang/de.itemis.mps.editor.math.demolang.mpl b/code/math/languages/de.itemis.mps.editor.math.demolang/de.itemis.mps.editor.math.demolang.mpl index 9b0e60cb2..d20686195 100644 --- a/code/math/languages/de.itemis.mps.editor.math.demolang/de.itemis.mps.editor.math.demolang.mpl +++ b/code/math/languages/de.itemis.mps.editor.math.demolang/de.itemis.mps.editor.math.demolang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/math/languages/de.itemis.mps.editor.math.java/de.itemis.mps.editor.math.java.mpl b/code/math/languages/de.itemis.mps.editor.math.java/de.itemis.mps.editor.math.java.mpl index f193a54b2..2d2e3bc91 100644 --- a/code/math/languages/de.itemis.mps.editor.math.java/de.itemis.mps.editor.math.java.mpl +++ b/code/math/languages/de.itemis.mps.editor.math.java/de.itemis.mps.editor.math.java.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -29,6 +29,7 @@ + @@ -50,11 +51,9 @@ - - diff --git a/code/math/languages/de.itemis.mps.editor.math.notations/de.itemis.mps.editor.math.notations.mpl b/code/math/languages/de.itemis.mps.editor.math.notations/de.itemis.mps.editor.math.notations.mpl index fb547af9a..3d6042cdf 100644 --- a/code/math/languages/de.itemis.mps.editor.math.notations/de.itemis.mps.editor.math.notations.mpl +++ b/code/math/languages/de.itemis.mps.editor.math.notations/de.itemis.mps.editor.math.notations.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -62,8 +62,6 @@ - - @@ -74,11 +72,9 @@ - - @@ -88,7 +84,6 @@ - diff --git a/code/math/languages/de.itemis.mps.editor.math/de.itemis.mps.editor.math.mpl b/code/math/languages/de.itemis.mps.editor.math/de.itemis.mps.editor.math.mpl index 4f5e8ee39..1e3a0f363 100644 --- a/code/math/languages/de.itemis.mps.editor.math/de.itemis.mps.editor.math.mpl +++ b/code/math/languages/de.itemis.mps.editor.math/de.itemis.mps.editor.math.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -63,8 +63,6 @@ - - @@ -72,11 +70,9 @@ - - @@ -87,7 +83,6 @@ - diff --git a/code/math/solutions/de.itemis.mps.editor.math.runtime/de.itemis.mps.editor.math.runtime.msd b/code/math/solutions/de.itemis.mps.editor.math.runtime/de.itemis.mps.editor.math.runtime.msd index f0b424b0e..17e3aee78 100644 --- a/code/math/solutions/de.itemis.mps.editor.math.runtime/de.itemis.mps.editor.math.runtime.msd +++ b/code/math/solutions/de.itemis.mps.editor.math.runtime/de.itemis.mps.editor.math.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/math/solutions/de.itemis.mps.editor.math.sandbox/de.itemis.mps.editor.math.sandbox.msd b/code/math/solutions/de.itemis.mps.editor.math.sandbox/de.itemis.mps.editor.math.sandbox.msd index 49919bc51..4f29a3b52 100644 --- a/code/math/solutions/de.itemis.mps.editor.math.sandbox/de.itemis.mps.editor.math.sandbox.msd +++ b/code/math/solutions/de.itemis.mps.editor.math.sandbox/de.itemis.mps.editor.math.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/math/solutions/de.itemis.mps.editor.math.symbols/de.itemis.mps.editor.math.symbols.msd b/code/math/solutions/de.itemis.mps.editor.math.symbols/de.itemis.mps.editor.math.symbols.msd index 9914a42dd..1396f0a7f 100644 --- a/code/math/solutions/de.itemis.mps.editor.math.symbols/de.itemis.mps.editor.math.symbols.msd +++ b/code/math/solutions/de.itemis.mps.editor.math.symbols/de.itemis.mps.editor.math.symbols.msd @@ -6,7 +6,7 @@ - + diff --git a/code/model-api/org.modelix.model.api/org.modelix.model.api.msd b/code/model-api/org.modelix.model.api/org.modelix.model.api.msd index b2be98033..828ee6391 100644 --- a/code/model-api/org.modelix.model.api/org.modelix.model.api.msd +++ b/code/model-api/org.modelix.model.api/org.modelix.model.api.msd @@ -13,7 +13,7 @@ - + diff --git a/code/model-api/org.modelix.model.mpsadapters/org.modelix.model.mpsadapters.msd b/code/model-api/org.modelix.model.mpsadapters/org.modelix.model.mpsadapters.msd index 26e4c0417..f8e6b64b1 100644 --- a/code/model-api/org.modelix.model.mpsadapters/org.modelix.model.mpsadapters.msd +++ b/code/model-api/org.modelix.model.mpsadapters/org.modelix.model.mpsadapters.msd @@ -6,7 +6,7 @@ - + diff --git a/code/model-api/org.modelix.model.repositoryconcepts/org.modelix.model.repositoryconcepts.mpl b/code/model-api/org.modelix.model.repositoryconcepts/org.modelix.model.repositoryconcepts.mpl index 727b6ee59..d4e44155a 100644 --- a/code/model-api/org.modelix.model.repositoryconcepts/org.modelix.model.repositoryconcepts.mpl +++ b/code/model-api/org.modelix.model.repositoryconcepts/org.modelix.model.repositoryconcepts.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/model-api/test.org.modelix.model.mpsadapters/test.org.modelix.model.mpsadapters.msd b/code/model-api/test.org.modelix.model.mpsadapters/test.org.modelix.model.mpsadapters.msd index 8f2349057..dcaeb09f7 100644 --- a/code/model-api/test.org.modelix.model.mpsadapters/test.org.modelix.model.mpsadapters.msd +++ b/code/model-api/test.org.modelix.model.mpsadapters/test.org.modelix.model.mpsadapters.msd @@ -6,7 +6,7 @@ - + diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/com.mbeddr.mpsutil.modellisteners.runtime.msd b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/com.mbeddr.mpsutil.modellisteners.runtime.msd index 489b52109..e137b1e06 100644 --- a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/com.mbeddr.mpsutil.modellisteners.runtime.msd +++ b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/com.mbeddr.mpsutil.modellisteners.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandbox/com.mbeddr.mpsutil.modellisteners.sandbox.msd b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandbox/com.mbeddr.mpsutil.modellisteners.sandbox.msd index 461c2d60b..30d1fe1c9 100644 --- a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandbox/com.mbeddr.mpsutil.modellisteners.sandbox.msd +++ b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandbox/com.mbeddr.mpsutil.modellisteners.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/com.mbeddr.mpsutil.modellisteners.sandboxlang.mpl b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/com.mbeddr.mpsutil.modellisteners.sandboxlang.mpl index e53b1c327..26ec597e3 100644 --- a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/com.mbeddr.mpsutil.modellisteners.sandboxlang.mpl +++ b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/com.mbeddr.mpsutil.modellisteners.sandboxlang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners/com.mbeddr.mpsutil.modellisteners.mpl b/code/modellisteners/com.mbeddr.mpsutil.modellisteners/com.mbeddr.mpsutil.modellisteners.mpl index 977eb20c9..d062cacb2 100644 --- a/code/modellisteners/com.mbeddr.mpsutil.modellisteners/com.mbeddr.mpsutil.modellisteners.mpl +++ b/code/modellisteners/com.mbeddr.mpsutil.modellisteners/com.mbeddr.mpsutil.modellisteners.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -49,20 +49,14 @@ - - - - - - diff --git a/code/modelmerger/languages/de.itemis.mps.modelmerger/de.itemis.mps.modelmerger.mpl b/code/modelmerger/languages/de.itemis.mps.modelmerger/de.itemis.mps.modelmerger.mpl index 07ea5c5f9..f7f62b7c7 100644 --- a/code/modelmerger/languages/de.itemis.mps.modelmerger/de.itemis.mps.modelmerger.mpl +++ b/code/modelmerger/languages/de.itemis.mps.modelmerger/de.itemis.mps.modelmerger.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -57,19 +57,15 @@ - - - - @@ -78,7 +74,6 @@ - diff --git a/code/modelmerger/languages/de.itemis.mps.modelmerger/sandbox/de.itemis.mps.modelmerger.testhelper.msd b/code/modelmerger/languages/de.itemis.mps.modelmerger/sandbox/de.itemis.mps.modelmerger.testhelper.msd index 758f65c53..d562f63ad 100644 --- a/code/modelmerger/languages/de.itemis.mps.modelmerger/sandbox/de.itemis.mps.modelmerger.testhelper.msd +++ b/code/modelmerger/languages/de.itemis.mps.modelmerger/sandbox/de.itemis.mps.modelmerger.testhelper.msd @@ -6,7 +6,7 @@ - + diff --git a/code/modelmerger/languages/test.de.itemis.mps.modelmerger.testlanguage/test.de.itemis.mps.modelmerger.testlanguage.mpl b/code/modelmerger/languages/test.de.itemis.mps.modelmerger.testlanguage/test.de.itemis.mps.modelmerger.testlanguage.mpl index 4408a0a95..05bbd5b2e 100644 --- a/code/modelmerger/languages/test.de.itemis.mps.modelmerger.testlanguage/test.de.itemis.mps.modelmerger.testlanguage.mpl +++ b/code/modelmerger/languages/test.de.itemis.mps.modelmerger.testlanguage/test.de.itemis.mps.modelmerger.testlanguage.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/modelmerger/solutions/de.itemis.mps.modelmerger.runtime/de.itemis.mps.modelmerger.runtime.msd b/code/modelmerger/solutions/de.itemis.mps.modelmerger.runtime/de.itemis.mps.modelmerger.runtime.msd index dd8dfb656..815222d38 100644 --- a/code/modelmerger/solutions/de.itemis.mps.modelmerger.runtime/de.itemis.mps.modelmerger.runtime.msd +++ b/code/modelmerger/solutions/de.itemis.mps.modelmerger.runtime/de.itemis.mps.modelmerger.runtime.msd @@ -6,7 +6,7 @@ - + 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 d990415fb..2d13f19b5 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 @@ -6,7 +6,7 @@ - + diff --git a/code/mouseselection/languages/de.itemis.mps.selection.intentions/de.itemis.mps.selection.intentions.mpl b/code/mouseselection/languages/de.itemis.mps.selection.intentions/de.itemis.mps.selection.intentions.mpl index 52bf1dcdd..d6515cb91 100644 --- a/code/mouseselection/languages/de.itemis.mps.selection.intentions/de.itemis.mps.selection.intentions.mpl +++ b/code/mouseselection/languages/de.itemis.mps.selection.intentions/de.itemis.mps.selection.intentions.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -53,7 +53,6 @@ - diff --git a/code/mouseselection/solutions/de.itemis.mps.selection.runtime/de.itemis.mps.selection.runtime.msd b/code/mouseselection/solutions/de.itemis.mps.selection.runtime/de.itemis.mps.selection.runtime.msd index 324d7d291..827fccbea 100644 --- a/code/mouseselection/solutions/de.itemis.mps.selection.runtime/de.itemis.mps.selection.runtime.msd +++ b/code/mouseselection/solutions/de.itemis.mps.selection.runtime/de.itemis.mps.selection.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/multiline/languages/demolang/demolang.mpl b/code/multiline/languages/demolang/demolang.mpl index 77444ee72..0f91a6470 100644 --- a/code/multiline/languages/demolang/demolang.mpl +++ b/code/multiline/languages/demolang/demolang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/multiline/languages/multiline/multiline.mpl b/code/multiline/languages/multiline/multiline.mpl index 78f15440c..026ad88a4 100644 --- a/code/multiline/languages/multiline/multiline.mpl +++ b/code/multiline/languages/multiline/multiline.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -57,8 +57,6 @@ - - @@ -69,12 +67,10 @@ - - @@ -84,7 +80,6 @@ - diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/runtime.msd b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/runtime.msd index a0bd8ba48..dbacef00b 100644 --- a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/runtime.msd +++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/runtime.msd @@ -9,7 +9,7 @@ - + diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.sandbox/de.slisson.mps.editor.multiline.sandbox.msd b/code/multiline/solutions/de.slisson.mps.editor.multiline.sandbox/de.slisson.mps.editor.multiline.sandbox.msd index 73f8be8b2..e860c7f02 100644 --- a/code/multiline/solutions/de.slisson.mps.editor.multiline.sandbox/de.slisson.mps.editor.multiline.sandbox.msd +++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.sandbox/de.slisson.mps.editor.multiline.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/nodeversioning/languages/de.itemis.mps.nodeversioning/de.itemis.mps.nodeversioning.mpl b/code/nodeversioning/languages/de.itemis.mps.nodeversioning/de.itemis.mps.nodeversioning.mpl index 81db00467..436f74088 100644 --- a/code/nodeversioning/languages/de.itemis.mps.nodeversioning/de.itemis.mps.nodeversioning.mpl +++ b/code/nodeversioning/languages/de.itemis.mps.nodeversioning/de.itemis.mps.nodeversioning.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd b/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd index e4c8773cf..d1a51c66b 100644 --- a/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd +++ b/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/nodeversioning/tests/de.itemis.mps.nodeversioning.test/de.itemis.mps.nodeversioning.test.msd b/code/nodeversioning/tests/de.itemis.mps.nodeversioning.test/de.itemis.mps.nodeversioning.test.msd index 3b05807ba..9aec938d7 100644 --- a/code/nodeversioning/tests/de.itemis.mps.nodeversioning.test/de.itemis.mps.nodeversioning.test.msd +++ b/code/nodeversioning/tests/de.itemis.mps.nodeversioning.test/de.itemis.mps.nodeversioning.test.msd @@ -6,7 +6,7 @@ - + diff --git a/code/plaintextgen/languages/com.dslfoundry.plaintextflow/com.dslfoundry.plaintextflow.mpl b/code/plaintextgen/languages/com.dslfoundry.plaintextflow/com.dslfoundry.plaintextflow.mpl index 17a8fee95..56a0d77ac 100644 --- a/code/plaintextgen/languages/com.dslfoundry.plaintextflow/com.dslfoundry.plaintextflow.mpl +++ b/code/plaintextgen/languages/com.dslfoundry.plaintextflow/com.dslfoundry.plaintextflow.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/code/plaintextgen/languages/com.dslfoundry.plaintextgen.example.nestedlist/com.dslfoundry.plaintextgen.example.nestedlist.mpl b/code/plaintextgen/languages/com.dslfoundry.plaintextgen.example.nestedlist/com.dslfoundry.plaintextgen.example.nestedlist.mpl index 6116aafbe..c806f7cdd 100644 --- a/code/plaintextgen/languages/com.dslfoundry.plaintextgen.example.nestedlist/com.dslfoundry.plaintextgen.example.nestedlist.mpl +++ b/code/plaintextgen/languages/com.dslfoundry.plaintextgen.example.nestedlist/com.dslfoundry.plaintextgen.example.nestedlist.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/code/plaintextgen/languages/com.dslfoundry.plaintextgen.example.testlang/com.dslfoundry.plaintextgen.example.testlang.mpl b/code/plaintextgen/languages/com.dslfoundry.plaintextgen.example.testlang/com.dslfoundry.plaintextgen.example.testlang.mpl index 531dd4927..f6d2b0e55 100644 --- a/code/plaintextgen/languages/com.dslfoundry.plaintextgen.example.testlang/com.dslfoundry.plaintextgen.example.testlang.mpl +++ b/code/plaintextgen/languages/com.dslfoundry.plaintextgen.example.testlang/com.dslfoundry.plaintextgen.example.testlang.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/code/plaintextgen/languages/com.dslfoundry.plaintextgen/com.dslfoundry.plaintextgen.mpl b/code/plaintextgen/languages/com.dslfoundry.plaintextgen/com.dslfoundry.plaintextgen.mpl index a3ec468d6..fa7cfb5b4 100644 --- a/code/plaintextgen/languages/com.dslfoundry.plaintextgen/com.dslfoundry.plaintextgen.mpl +++ b/code/plaintextgen/languages/com.dslfoundry.plaintextgen/com.dslfoundry.plaintextgen.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.nestedlist.sandbox/com.dslfoundry.plaintextgen.example.nestedlist.sandbox.msd b/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.nestedlist.sandbox/com.dslfoundry.plaintextgen.example.nestedlist.sandbox.msd index d1975ed32..4f1ee0fa8 100644 --- a/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.nestedlist.sandbox/com.dslfoundry.plaintextgen.example.nestedlist.sandbox.msd +++ b/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.nestedlist.sandbox/com.dslfoundry.plaintextgen.example.nestedlist.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.plaintextflow/com.dslfoundry.plaintextgen.example.plaintextflow.msd b/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.plaintextflow/com.dslfoundry.plaintextgen.example.plaintextflow.msd index e78899613..ca028b38c 100644 --- a/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.plaintextflow/com.dslfoundry.plaintextgen.example.plaintextflow.msd +++ b/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.plaintextflow/com.dslfoundry.plaintextgen.example.plaintextflow.msd @@ -6,7 +6,7 @@ - + diff --git a/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.testlang.sandbox/com.dslfoundry.plaintextgen.example.testlang.sandbox.msd b/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.testlang.sandbox/com.dslfoundry.plaintextgen.example.testlang.sandbox.msd index dffc7fce2..53ae90769 100644 --- a/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.testlang.sandbox/com.dslfoundry.plaintextgen.example.testlang.sandbox.msd +++ b/code/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.testlang.sandbox/com.dslfoundry.plaintextgen.example.testlang.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd index 6b961e87b..69cf9e1de 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd @@ -6,7 +6,7 @@ - + @@ -24,6 +24,7 @@ a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime) d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime) 215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator) + f647e48e-4568-4f4c-b48a-1546492c6a2e(org.jdom) @@ -59,6 +60,7 @@ + diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps index c1fd462b7..5bf7d32ca 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps @@ -26,8 +26,8 @@ - + 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 6bfef35bf..90ec6b89f 100644 --- 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 @@ -51,7 +51,6 @@ - @@ -83,6 +82,7 @@ + diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.vcs/com.mbeddr.mpsutil.projectview.vcs.msd b/code/projectview/com.mbeddr.mpsutil.projectview.vcs/com.mbeddr.mpsutil.projectview.vcs.msd index d0b45bf2f..399c25d3f 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.vcs/com.mbeddr.mpsutil.projectview.vcs.msd +++ b/code/projectview/com.mbeddr.mpsutil.projectview.vcs/com.mbeddr.mpsutil.projectview.vcs.msd @@ -6,7 +6,7 @@ - + diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.views/com.mbeddr.mpsutil.projectview.views.msd b/code/projectview/com.mbeddr.mpsutil.projectview.views/com.mbeddr.mpsutil.projectview.views.msd index 36e68af55..8f083eb3a 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.views/com.mbeddr.mpsutil.projectview.views.msd +++ b/code/projectview/com.mbeddr.mpsutil.projectview.views/com.mbeddr.mpsutil.projectview.views.msd @@ -6,7 +6,7 @@ - + diff --git a/code/projectview/com.mbeddr.mpsutil.projectview/com.mbeddr.mpsutil.projectview.mpl b/code/projectview/com.mbeddr.mpsutil.projectview/com.mbeddr.mpsutil.projectview.mpl index 4b4442317..e780fd76d 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview/com.mbeddr.mpsutil.projectview.mpl +++ b/code/projectview/com.mbeddr.mpsutil.projectview/com.mbeddr.mpsutil.projectview.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -32,6 +32,7 @@ + @@ -58,8 +59,6 @@ - - @@ -68,11 +67,9 @@ - - @@ -81,7 +78,6 @@ - diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/com.mbeddr.mpsutil.editor.querylist.demolang.mpl b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/com.mbeddr.mpsutil.editor.querylist.demolang.mpl index b662a7478..235c99127 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/com.mbeddr.mpsutil.editor.querylist.demolang.mpl +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/com.mbeddr.mpsutil.editor.querylist.demolang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd index 50302ebf8..e07f95c97 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/com.mbeddr.mpsutil.editor.querylist.sandbox.msd b/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/com.mbeddr.mpsutil.editor.querylist.sandbox.msd index 181b5bcc1..76768e1b8 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/com.mbeddr.mpsutil.editor.querylist.sandbox.msd +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.sandbox/com.mbeddr.mpsutil.editor.querylist.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.mpl b/code/querylist/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.mpl index 1235131f6..92bf3f29f 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.mpl +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist/com.mbeddr.mpsutil.editor.querylist.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -64,8 +64,6 @@ - - @@ -74,12 +72,10 @@ - - @@ -89,7 +85,6 @@ - diff --git a/code/richtext/languages/de.slisson.richtext.customcell/de.slisson.richtext.customcell.mpl b/code/richtext/languages/de.slisson.richtext.customcell/de.slisson.richtext.customcell.mpl index e740267ba..0ca97d7ea 100644 --- a/code/richtext/languages/de.slisson.richtext.customcell/de.slisson.richtext.customcell.mpl +++ b/code/richtext/languages/de.slisson.richtext.customcell/de.slisson.richtext.customcell.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -56,19 +56,15 @@ - - - - @@ -78,7 +74,6 @@ - diff --git a/code/richtext/languages/javadoc/javadoc.mpl b/code/richtext/languages/javadoc/javadoc.mpl index 8839f2ad7..63a546fb3 100644 --- a/code/richtext/languages/javadoc/javadoc.mpl +++ b/code/richtext/languages/javadoc/javadoc.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/richtext/languages/richtext/richtext.mpl b/code/richtext/languages/richtext/richtext.mpl index 46edce068..e938d26f4 100644 --- a/code/richtext/languages/richtext/richtext.mpl +++ b/code/richtext/languages/richtext/richtext.mpl @@ -7,7 +7,7 @@ - + diff --git a/code/richtext/solutions/de.slisson.mps.richtext.sandbox/de.slisson.mps.richtext.sandbox.msd b/code/richtext/solutions/de.slisson.mps.richtext.sandbox/de.slisson.mps.richtext.sandbox.msd index 2fcc69797..2af57a37a 100644 --- a/code/richtext/solutions/de.slisson.mps.richtext.sandbox/de.slisson.mps.richtext.sandbox.msd +++ b/code/richtext/solutions/de.slisson.mps.richtext.sandbox/de.slisson.mps.richtext.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/de.q60.mps.explorer.impl/de.q60.mps.explorer.impl.msd b/code/shadowmodels/de.q60.mps.explorer.impl/de.q60.mps.explorer.impl.msd index 0259c35b4..c92e55733 100644 --- a/code/shadowmodels/de.q60.mps.explorer.impl/de.q60.mps.explorer.impl.msd +++ b/code/shadowmodels/de.q60.mps.explorer.impl/de.q60.mps.explorer.impl.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/de.q60.mps.explorer/de.q60.mps.explorer.msd b/code/shadowmodels/de.q60.mps.explorer/de.q60.mps.explorer.msd index 508983e1c..d3efa354d 100644 --- a/code/shadowmodels/de.q60.mps.explorer/de.q60.mps.explorer.msd +++ b/code/shadowmodels/de.q60.mps.explorer/de.q60.mps.explorer.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/de.q60.mps.util/de.q60.mps.util.msd b/code/shadowmodels/de.q60.mps.util/de.q60.mps.util.msd index df80e8bb3..0007ecd46 100644 --- a/code/shadowmodels/de.q60.mps.util/de.q60.mps.util.msd +++ b/code/shadowmodels/de.q60.mps.util/de.q60.mps.util.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.incremental.sandboxlang/de.q60.mps.incremental.sandboxlang.mpl b/code/shadowmodels/languages/de.q60.mps.incremental.sandboxlang/de.q60.mps.incremental.sandboxlang.mpl index 802a4d088..0043ee1da 100644 --- a/code/shadowmodels/languages/de.q60.mps.incremental.sandboxlang/de.q60.mps.incremental.sandboxlang.mpl +++ b/code/shadowmodels/languages/de.q60.mps.incremental.sandboxlang/de.q60.mps.incremental.sandboxlang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.incremental/de.q60.mps.incremental.mpl b/code/shadowmodels/languages/de.q60.mps.incremental/de.q60.mps.incremental.mpl index 999e6a15b..e021800a5 100644 --- a/code/shadowmodels/languages/de.q60.mps.incremental/de.q60.mps.incremental.mpl +++ b/code/shadowmodels/languages/de.q60.mps.incremental/de.q60.mps.incremental.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -31,6 +31,7 @@ + @@ -55,12 +56,10 @@ - - diff --git a/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions.sandboxlang/de.q60.mps.polymorphicfunctions.sandboxlang.mpl b/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions.sandboxlang/de.q60.mps.polymorphicfunctions.sandboxlang.mpl index af9dad0ae..71782cc6d 100644 --- a/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions.sandboxlang/de.q60.mps.polymorphicfunctions.sandboxlang.mpl +++ b/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions.sandboxlang/de.q60.mps.polymorphicfunctions.sandboxlang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/de.q60.mps.polymorphicfunctions.mpl b/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/de.q60.mps.polymorphicfunctions.mpl index 8d2d91f85..a1fcd4c4b 100644 --- a/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/de.q60.mps.polymorphicfunctions.mpl +++ b/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/de.q60.mps.polymorphicfunctions.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -33,6 +33,7 @@ + @@ -58,7 +59,6 @@ - @@ -66,19 +66,15 @@ - - - - diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.blext/de.q60.mps.shadowmodels.examples.blext.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.blext/de.q60.mps.shadowmodels.examples.blext.mpl index 1b1cacff5..9e6f968aa 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.blext/de.q60.mps.shadowmodels.examples.blext.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.blext/de.q60.mps.shadowmodels.examples.blext.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.editor/de.q60.mps.shadowmodels.examples.editor.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.editor/de.q60.mps.shadowmodels.examples.editor.mpl index 1ce3ab35a..6d5deec27 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.editor/de.q60.mps.shadowmodels.examples.editor.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.editor/de.q60.mps.shadowmodels.examples.editor.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.entities/de.q60.mps.shadowmodels.examples.entities.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.entities/de.q60.mps.shadowmodels.examples.entities.mpl index 7d5551333..16da90d5c 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.entities/de.q60.mps.shadowmodels.examples.entities.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.entities/de.q60.mps.shadowmodels.examples.entities.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.statemachine/de.q60.mps.shadowmodels.examples.statemachine.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.statemachine/de.q60.mps.shadowmodels.examples.statemachine.mpl index f320cb40e..c9212b604 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.statemachine/de.q60.mps.shadowmodels.examples.statemachine.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.statemachine/de.q60.mps.shadowmodels.examples.statemachine.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.afterPF/de.q60.mps.shadowmodels.gen.afterPF.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.afterPF/de.q60.mps.shadowmodels.gen.afterPF.mpl index 7b2221944..c495dab82 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.afterPF/de.q60.mps.shadowmodels.gen.afterPF.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.afterPF/de.q60.mps.shadowmodels.gen.afterPF.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -62,7 +62,6 @@ - diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.desugar/de.q60.mps.shadowmodels.gen.desugar.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.desugar/de.q60.mps.shadowmodels.gen.desugar.mpl index 513b00b8b..0d51e3b40 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.desugar/de.q60.mps.shadowmodels.gen.desugar.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.desugar/de.q60.mps.shadowmodels.gen.desugar.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -54,7 +54,6 @@ - diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.typesystem/de.q60.mps.shadowmodels.gen.typesystem.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.typesystem/de.q60.mps.shadowmodels.gen.typesystem.mpl index 8fe8bbc76..bee269087 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.typesystem/de.q60.mps.shadowmodels.gen.typesystem.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.gen.typesystem/de.q60.mps.shadowmodels.gen.typesystem.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -64,6 +64,7 @@ + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.repository/de.q60.mps.shadowmodels.repository.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.repository/de.q60.mps.shadowmodels.repository.mpl index 89027cdec..9e295d537 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.repository/de.q60.mps.shadowmodels.repository.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.repository/de.q60.mps.shadowmodels.repository.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.runtimelang/de.q60.mps.shadowmodels.runtimelang.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.runtimelang/de.q60.mps.shadowmodels.runtimelang.mpl index f44dfc8c0..c14d41f3d 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.runtimelang/de.q60.mps.shadowmodels.runtimelang.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.runtimelang/de.q60.mps.shadowmodels.runtimelang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.target.editor/de.q60.mps.shadowmodels.target.editor.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.target.editor/de.q60.mps.shadowmodels.target.editor.mpl index a33c33af1..447c72f99 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.target.editor/de.q60.mps.shadowmodels.target.editor.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.target.editor/de.q60.mps.shadowmodels.target.editor.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.target.text/de.q60.mps.shadowmodels.target.text.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.target.text/de.q60.mps.shadowmodels.target.text.mpl index 5a021ab08..777818c0d 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.target.text/de.q60.mps.shadowmodels.target.text.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.target.text/de.q60.mps.shadowmodels.target.text.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/de.q60.mps.shadowmodels.transformation.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/de.q60.mps.shadowmodels.transformation.mpl index 36c2531d9..3212423a7 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/de.q60.mps.shadowmodels.transformation.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/de.q60.mps.shadowmodels.transformation.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -41,6 +41,7 @@ + @@ -67,8 +68,6 @@ - - @@ -80,19 +79,15 @@ - - - - @@ -207,6 +202,7 @@ + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/de.q60.mps.shadowmodels.util.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/de.q60.mps.shadowmodels.util.mpl index eacbc6e83..b8d591f27 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/de.q60.mps.shadowmodels.util.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.util/de.q60.mps.shadowmodels.util.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -57,19 +57,15 @@ - - - - @@ -79,7 +75,6 @@ - diff --git a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/de.q60.mps.virtualinterfaces.sandboxlang.mpl b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/de.q60.mps.virtualinterfaces.sandboxlang.mpl index 7dbe4fd21..089149b38 100644 --- a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/de.q60.mps.virtualinterfaces.sandboxlang.mpl +++ b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/de.q60.mps.virtualinterfaces.sandboxlang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/de.q60.mps.virtualinterfaces.mpl b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/de.q60.mps.virtualinterfaces.mpl index 35c56680f..95c74c7e1 100644 --- a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/de.q60.mps.virtualinterfaces.mpl +++ b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/de.q60.mps.virtualinterfaces.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -51,22 +51,14 @@ - - - - - - - - diff --git a/code/shadowmodels/solutions/de.q60.mps.collections.libs/de.q60.mps.collections.libs.msd b/code/shadowmodels/solutions/de.q60.mps.collections.libs/de.q60.mps.collections.libs.msd index 199d9d698..9557f5589 100644 --- a/code/shadowmodels/solutions/de.q60.mps.collections.libs/de.q60.mps.collections.libs.msd +++ b/code/shadowmodels/solutions/de.q60.mps.collections.libs/de.q60.mps.collections.libs.msd @@ -10,7 +10,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.genplan.virutalinterfaces_incremental/de.q60.mps.genplan.virutalinterfaces_incremental.msd b/code/shadowmodels/solutions/de.q60.mps.genplan.virutalinterfaces_incremental/de.q60.mps.genplan.virutalinterfaces_incremental.msd index c13e518e0..56d25a69c 100644 --- a/code/shadowmodels/solutions/de.q60.mps.genplan.virutalinterfaces_incremental/de.q60.mps.genplan.virutalinterfaces_incremental.msd +++ b/code/shadowmodels/solutions/de.q60.mps.genplan.virutalinterfaces_incremental/de.q60.mps.genplan.virutalinterfaces_incremental.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.incremental.runtime/de.q60.mps.incremental.runtime.msd b/code/shadowmodels/solutions/de.q60.mps.incremental.runtime/de.q60.mps.incremental.runtime.msd index 4538888cf..01d2a275c 100644 --- a/code/shadowmodels/solutions/de.q60.mps.incremental.runtime/de.q60.mps.incremental.runtime.msd +++ b/code/shadowmodels/solutions/de.q60.mps.incremental.runtime/de.q60.mps.incremental.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.incremental.runtime/models/de.q60.mps.incremental.runtime.mps b/code/shadowmodels/solutions/de.q60.mps.incremental.runtime/models/de.q60.mps.incremental.runtime.mps index 1bf5b30f6..83c1ec149 100644 --- a/code/shadowmodels/solutions/de.q60.mps.incremental.runtime/models/de.q60.mps.incremental.runtime.mps +++ b/code/shadowmodels/solutions/de.q60.mps.incremental.runtime/models/de.q60.mps.incremental.runtime.mps @@ -18,9 +18,9 @@ - - - + + + diff --git a/code/shadowmodels/solutions/de.q60.mps.incremental.sandbox/de.q60.mps.incremental.sandbox.msd b/code/shadowmodels/solutions/de.q60.mps.incremental.sandbox/de.q60.mps.incremental.sandbox.msd index b4da4df2b..00b1b0807 100644 --- a/code/shadowmodels/solutions/de.q60.mps.incremental.sandbox/de.q60.mps.incremental.sandbox.msd +++ b/code/shadowmodels/solutions/de.q60.mps.incremental.sandbox/de.q60.mps.incremental.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.logging.runtime/de.q60.mps.logging.runtime.msd b/code/shadowmodels/solutions/de.q60.mps.logging.runtime/de.q60.mps.logging.runtime.msd index c9b8ce585..07d64ed46 100644 --- a/code/shadowmodels/solutions/de.q60.mps.logging.runtime/de.q60.mps.logging.runtime.msd +++ b/code/shadowmodels/solutions/de.q60.mps.logging.runtime/de.q60.mps.logging.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/de.q60.mps.polymorphicfunctions.runtime.msd b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/de.q60.mps.polymorphicfunctions.runtime.msd index 62e88034b..f55c61827 100644 --- a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/de.q60.mps.polymorphicfunctions.runtime.msd +++ b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/de.q60.mps.polymorphicfunctions.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.sandbox/de.q60.mps.polymorphicfunctions.sandbox.msd b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.sandbox/de.q60.mps.polymorphicfunctions.sandbox.msd index 69cab7dca..0c7cab44d 100644 --- a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.sandbox/de.q60.mps.polymorphicfunctions.sandbox.msd +++ b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.sandbox/de.q60.mps.polymorphicfunctions.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.debugview/de.q60.mps.shadowmodels.debugview.msd b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.debugview/de.q60.mps.shadowmodels.debugview.msd index 91c5c6156..e28417765 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.debugview/de.q60.mps.shadowmodels.debugview.msd +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.debugview/de.q60.mps.shadowmodels.debugview.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.input/de.q60.mps.shadowmodels.examples.input.msd b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.input/de.q60.mps.shadowmodels.examples.input.msd index 76cc286c8..39da191f6 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.input/de.q60.mps.shadowmodels.examples.input.msd +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.input/de.q60.mps.shadowmodels.examples.input.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/de.q60.mps.shadowmodels.examples.javainterpreter.msd b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/de.q60.mps.shadowmodels.examples.javainterpreter.msd index 3dbca39ef..1593826bf 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/de.q60.mps.shadowmodels.examples.javainterpreter.msd +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.javainterpreter/de.q60.mps.shadowmodels.examples.javainterpreter.msd @@ -6,7 +6,7 @@ - + @@ -61,7 +61,6 @@ - diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.output/de.q60.mps.shadowmodels.examples.output.msd b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.output/de.q60.mps.shadowmodels.examples.output.msd index 0e30c8d5c..a629666b4 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.output/de.q60.mps.shadowmodels.examples.output.msd +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.output/de.q60.mps.shadowmodels.examples.output.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.genplan/de.q60.mps.shadowmodels.genplan.msd b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.genplan/de.q60.mps.shadowmodels.genplan.msd index 461a64bac..fd4ec2c14 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.genplan/de.q60.mps.shadowmodels.genplan.msd +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.genplan/de.q60.mps.shadowmodels.genplan.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.modelcheck.runtime/de.q60.mps.shadowmodels.modelcheck.runtime.msd b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.modelcheck.runtime/de.q60.mps.shadowmodels.modelcheck.runtime.msd index d59fe1aa4..9aa164392 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.modelcheck.runtime/de.q60.mps.shadowmodels.modelcheck.runtime.msd +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.modelcheck.runtime/de.q60.mps.shadowmodels.modelcheck.runtime.msd @@ -6,7 +6,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 e03477f00..09ac86369 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 @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.genplan/de.q60.mps.virtualinterfaces.genplan.msd b/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.genplan/de.q60.mps.virtualinterfaces.genplan.msd index f977983d4..fec7faa43 100644 --- a/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.genplan/de.q60.mps.virtualinterfaces.genplan.msd +++ b/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.genplan/de.q60.mps.virtualinterfaces.genplan.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.sandbox/de.q60.mps.virtualinterfaces.sandbox.msd b/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.sandbox/de.q60.mps.virtualinterfaces.sandbox.msd index 06727c2e6..20f3c0225 100644 --- a/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.sandbox/de.q60.mps.virtualinterfaces.sandbox.msd +++ b/code/shadowmodels/solutions/de.q60.mps.virtualinterfaces.sandbox/de.q60.mps.virtualinterfaces.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/test.de.q60.mps.incremental.runtime/test.de.q60.mps.incremental.runtime.msd b/code/shadowmodels/solutions/test.de.q60.mps.incremental.runtime/test.de.q60.mps.incremental.runtime.msd index 9eec939d7..698aaf43a 100644 --- a/code/shadowmodels/solutions/test.de.q60.mps.incremental.runtime/test.de.q60.mps.incremental.runtime.msd +++ b/code/shadowmodels/solutions/test.de.q60.mps.incremental.runtime/test.de.q60.mps.incremental.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.examples/test.de.q60.mps.shadowmodels.examples.msd b/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.examples/test.de.q60.mps.shadowmodels.examples.msd index 6f8ab204d..a6f6137ce 100644 --- a/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.examples/test.de.q60.mps.shadowmodels.examples.msd +++ b/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.examples/test.de.q60.mps.shadowmodels.examples.msd @@ -6,7 +6,7 @@ - + diff --git a/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.runtime/test.de.q60.mps.shadowmodels.runtime.msd b/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.runtime/test.de.q60.mps.shadowmodels.runtime.msd index d656c71cf..ddc43a388 100644 --- a/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.runtime/test.de.q60.mps.shadowmodels.runtime.msd +++ b/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.runtime/test.de.q60.mps.shadowmodels.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/solutions/com.mbeddr.mpsutil.intentions.sandbox/com.mbeddr.mpsutil.intentions.sandbox.msd b/code/solutions/com.mbeddr.mpsutil.intentions.sandbox/com.mbeddr.mpsutil.intentions.sandbox.msd index 347ca4775..fb2863950 100644 --- a/code/solutions/com.mbeddr.mpsutil.intentions.sandbox/com.mbeddr.mpsutil.intentions.sandbox.msd +++ b/code/solutions/com.mbeddr.mpsutil.intentions.sandbox/com.mbeddr.mpsutil.intentions.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.runtime/de.itemis.model.merge.runtime.msd b/code/solutions/de.itemis.model.merge.runtime/de.itemis.model.merge.runtime.msd index 5ade07e46..2f3f308d2 100644 --- a/code/solutions/de.itemis.model.merge.runtime/de.itemis.model.merge.runtime.msd +++ b/code/solutions/de.itemis.model.merge.runtime/de.itemis.model.merge.runtime.msd @@ -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 960acf373..291687cb5 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 @@ - + - + diff --git a/code/solutions/de.itemis.model.merge.simple.demo/de.itemis.model.merge.simple.demo.msd b/code/solutions/de.itemis.model.merge.simple.demo/de.itemis.model.merge.simple.demo.msd index cf16cc0d2..25c7bc58e 100644 --- a/code/solutions/de.itemis.model.merge.simple.demo/de.itemis.model.merge.simple.demo.msd +++ b/code/solutions/de.itemis.model.merge.simple.demo/de.itemis.model.merge.simple.demo.msd @@ -6,7 +6,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.test.integration/de.itemis.model.merge.test.integration.msd b/code/solutions/de.itemis.model.merge.test.integration/de.itemis.model.merge.test.integration.msd index f6e204344..78f61d799 100644 --- a/code/solutions/de.itemis.model.merge.test.integration/de.itemis.model.merge.test.integration.msd +++ b/code/solutions/de.itemis.model.merge.test.integration/de.itemis.model.merge.test.integration.msd @@ -6,7 +6,7 @@ - + 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 e81595513..51bdae574 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 @@ -6,7 +6,7 @@ - + diff --git a/code/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl b/code/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl index e428f3bc3..40198191c 100644 --- a/code/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl +++ b/code/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -30,6 +30,7 @@ + @@ -50,21 +51,15 @@ - - - - - - diff --git a/code/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/de.slisson.mps.structurecheck.runtime.msd b/code/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/de.slisson.mps.structurecheck.runtime.msd index 111c00f16..92383753b 100644 --- a/code/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/de.slisson.mps.structurecheck.runtime.msd +++ b/code/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/de.slisson.mps.structurecheck.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/de.slisson.mps.structurecheck.sandbox.msd b/code/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/de.slisson.mps.structurecheck.sandbox.msd index d5f988bb7..ce7fec976 100644 --- a/code/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/de.slisson.mps.structurecheck.sandbox.msd +++ b/code/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/de.slisson.mps.structurecheck.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables.demolang/de.slisson.mps.tables.demolang.mpl b/code/tables/languages/de.slisson.mps.tables.demolang/de.slisson.mps.tables.demolang.mpl index 42e03ffff..9e9475db1 100644 --- a/code/tables/languages/de.slisson.mps.tables.demolang/de.slisson.mps.tables.demolang.mpl +++ b/code/tables/languages/de.slisson.mps.tables.demolang/de.slisson.mps.tables.demolang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables/de.slisson.mps.tables.mpl b/code/tables/languages/de.slisson.mps.tables/de.slisson.mps.tables.mpl index 7cc176833..d0d58de8f 100644 --- a/code/tables/languages/de.slisson.mps.tables/de.slisson.mps.tables.mpl +++ b/code/tables/languages/de.slisson.mps.tables/de.slisson.mps.tables.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -64,8 +64,6 @@ - - @@ -77,7 +75,6 @@ - @@ -85,7 +82,6 @@ - @@ -97,7 +93,6 @@ - diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/de.slisson.mps.tables.runtime.msd b/code/tables/languages/de.slisson.mps.tables/runtime/de.slisson.mps.tables.runtime.msd index 07499e1ad..e3b09f625 100644 --- a/code/tables/languages/de.slisson.mps.tables/runtime/de.slisson.mps.tables.runtime.msd +++ b/code/tables/languages/de.slisson.mps.tables/runtime/de.slisson.mps.tables.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables/sandbox/de.slisson.mps.tables.sandbox.msd b/code/tables/languages/de.slisson.mps.tables/sandbox/de.slisson.mps.tables.sandbox.msd index 58121b2ec..b8897f758 100644 --- a/code/tables/languages/de.slisson.mps.tables/sandbox/de.slisson.mps.tables.sandbox.msd +++ b/code/tables/languages/de.slisson.mps.tables/sandbox/de.slisson.mps.tables.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/tables/solutions/de.slisson.mps.testutils/de.slisson.mps.testutils.msd b/code/tables/solutions/de.slisson.mps.testutils/de.slisson.mps.testutils.msd index 6035953f1..747595d28 100644 --- a/code/tables/solutions/de.slisson.mps.testutils/de.slisson.mps.testutils.msd +++ b/code/tables/solutions/de.slisson.mps.testutils/de.slisson.mps.testutils.msd @@ -6,7 +6,7 @@ - + diff --git a/code/tables/solutions/test.de.slisson.mps.tables/test.de.slisson.mps.tables.msd b/code/tables/solutions/test.de.slisson.mps.tables/test.de.slisson.mps.tables.msd index b18c28cad..10e24d153 100644 --- a/code/tables/solutions/test.de.slisson.mps.tables/test.de.slisson.mps.tables.msd +++ b/code/tables/solutions/test.de.slisson.mps.tables/test.de.slisson.mps.tables.msd @@ -6,7 +6,7 @@ - + diff --git a/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/de.itemis.mps.tooltips.runtime.msd b/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/de.itemis.mps.tooltips.runtime.msd index ea344f426..749954105 100644 --- a/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/de.itemis.mps.tooltips.runtime.msd +++ b/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/de.itemis.mps.tooltips.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/com.mbeddr.mpsutil.treenotation.runtime.msd b/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/com.mbeddr.mpsutil.treenotation.runtime.msd index 32157fe62..97b8384d9 100644 --- a/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/com.mbeddr.mpsutil.treenotation.runtime.msd +++ b/code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/com.mbeddr.mpsutil.treenotation.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation.sandbox/com.mbeddr.mpsutil.treenotation.sandbox.msd b/code/treenotation/com.mbeddr.mpsutil.treenotation.sandbox/com.mbeddr.mpsutil.treenotation.sandbox.msd index 4b226be23..fb549c34c 100644 --- a/code/treenotation/com.mbeddr.mpsutil.treenotation.sandbox/com.mbeddr.mpsutil.treenotation.sandbox.msd +++ b/code/treenotation/com.mbeddr.mpsutil.treenotation.sandbox/com.mbeddr.mpsutil.treenotation.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation.sandboxlang/com.mbeddr.mpsutil.treenotation.sandboxlang.mpl b/code/treenotation/com.mbeddr.mpsutil.treenotation.sandboxlang/com.mbeddr.mpsutil.treenotation.sandboxlang.mpl index f623f6d44..7640f57ff 100644 --- a/code/treenotation/com.mbeddr.mpsutil.treenotation.sandboxlang/com.mbeddr.mpsutil.treenotation.sandboxlang.mpl +++ b/code/treenotation/com.mbeddr.mpsutil.treenotation.sandboxlang/com.mbeddr.mpsutil.treenotation.sandboxlang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation.styles/com.mbeddr.mpsutil.treenotation.styles.mpl b/code/treenotation/com.mbeddr.mpsutil.treenotation.styles/com.mbeddr.mpsutil.treenotation.styles.mpl index 446c62fdd..a68a2229c 100644 --- a/code/treenotation/com.mbeddr.mpsutil.treenotation.styles/com.mbeddr.mpsutil.treenotation.styles.mpl +++ b/code/treenotation/com.mbeddr.mpsutil.treenotation.styles/com.mbeddr.mpsutil.treenotation.styles.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation/com.mbeddr.mpsutil.treenotation.mpl b/code/treenotation/com.mbeddr.mpsutil.treenotation/com.mbeddr.mpsutil.treenotation.mpl index 049267f00..34e40ba89 100644 --- a/code/treenotation/com.mbeddr.mpsutil.treenotation/com.mbeddr.mpsutil.treenotation.mpl +++ b/code/treenotation/com.mbeddr.mpsutil.treenotation/com.mbeddr.mpsutil.treenotation.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -68,8 +68,6 @@ - - @@ -78,13 +76,11 @@ - - diff --git a/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/com.mbeddr.mpsutil.serializer.xml.msd b/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/com.mbeddr.mpsutil.serializer.xml.msd index ec6f15c1a..456ab84ac 100644 --- a/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/com.mbeddr.mpsutil.serializer.xml.msd +++ b/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/com.mbeddr.mpsutil.serializer.xml.msd @@ -12,7 +12,7 @@ - + diff --git a/code/utils/solutions/de.itemis.mps.noderversioning.sandbox/de.itemis.mps.noderversioning.sandbox.msd b/code/utils/solutions/de.itemis.mps.noderversioning.sandbox/de.itemis.mps.noderversioning.sandbox.msd index 08c8977cc..adfe5c00d 100644 --- a/code/utils/solutions/de.itemis.mps.noderversioning.sandbox/de.itemis.mps.noderversioning.sandbox.msd +++ b/code/utils/solutions/de.itemis.mps.noderversioning.sandbox/de.itemis.mps.noderversioning.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/languages/de.itemis.mps.editor.bool.demolang/de.itemis.mps.editor.bool.demolang.mpl b/code/widgets/languages/de.itemis.mps.editor.bool.demolang/de.itemis.mps.editor.bool.demolang.mpl index 228749ce2..5d1ce837b 100644 --- a/code/widgets/languages/de.itemis.mps.editor.bool.demolang/de.itemis.mps.editor.bool.demolang.mpl +++ b/code/widgets/languages/de.itemis.mps.editor.bool.demolang/de.itemis.mps.editor.bool.demolang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/languages/de.itemis.mps.editor.bool/de.itemis.mps.editor.bool.mpl b/code/widgets/languages/de.itemis.mps.editor.bool/de.itemis.mps.editor.bool.mpl index 3afed5d71..ec59596d0 100644 --- a/code/widgets/languages/de.itemis.mps.editor.bool/de.itemis.mps.editor.bool.mpl +++ b/code/widgets/languages/de.itemis.mps.editor.bool/de.itemis.mps.editor.bool.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -58,8 +58,6 @@ - - @@ -67,12 +65,10 @@ - - @@ -82,7 +78,6 @@ - diff --git a/code/widgets/languages/de.itemis.mps.editor.collapsible.testlang/de.itemis.mps.editor.collapsible.testlang.mpl b/code/widgets/languages/de.itemis.mps.editor.collapsible.testlang/de.itemis.mps.editor.collapsible.testlang.mpl index 1921cad4c..d2565bbb8 100644 --- a/code/widgets/languages/de.itemis.mps.editor.collapsible.testlang/de.itemis.mps.editor.collapsible.testlang.mpl +++ b/code/widgets/languages/de.itemis.mps.editor.collapsible.testlang/de.itemis.mps.editor.collapsible.testlang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/languages/de.itemis.mps.editor.collapsible/de.itemis.mps.editor.collapsible.mpl b/code/widgets/languages/de.itemis.mps.editor.collapsible/de.itemis.mps.editor.collapsible.mpl index 6b70b9942..537654d80 100644 --- a/code/widgets/languages/de.itemis.mps.editor.collapsible/de.itemis.mps.editor.collapsible.mpl +++ b/code/widgets/languages/de.itemis.mps.editor.collapsible/de.itemis.mps.editor.collapsible.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -56,8 +56,6 @@ - - @@ -67,11 +65,9 @@ - - @@ -81,7 +77,6 @@ - diff --git a/code/widgets/languages/de.itemis.mps.editor.dropdown.demolang/de.itemis.mps.editor.dropdown.demolang.mpl b/code/widgets/languages/de.itemis.mps.editor.dropdown.demolang/de.itemis.mps.editor.dropdown.demolang.mpl index 692e833c3..c14855bef 100644 --- a/code/widgets/languages/de.itemis.mps.editor.dropdown.demolang/de.itemis.mps.editor.dropdown.demolang.mpl +++ b/code/widgets/languages/de.itemis.mps.editor.dropdown.demolang/de.itemis.mps.editor.dropdown.demolang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/languages/de.itemis.mps.editor.dropdown/de.itemis.mps.editor.dropdown.mpl b/code/widgets/languages/de.itemis.mps.editor.dropdown/de.itemis.mps.editor.dropdown.mpl index 9b730d82a..56183f37a 100644 --- a/code/widgets/languages/de.itemis.mps.editor.dropdown/de.itemis.mps.editor.dropdown.mpl +++ b/code/widgets/languages/de.itemis.mps.editor.dropdown/de.itemis.mps.editor.dropdown.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -55,8 +55,6 @@ - - @@ -65,11 +63,9 @@ - - @@ -79,7 +75,6 @@ - diff --git a/code/widgets/languages/de.itemis.mps.editor.enumeration.demolang/de.itemis.mps.editor.enumeration.demolang.mpl b/code/widgets/languages/de.itemis.mps.editor.enumeration.demolang/de.itemis.mps.editor.enumeration.demolang.mpl index f4cb994d5..f0fbc1cf5 100644 --- a/code/widgets/languages/de.itemis.mps.editor.enumeration.demolang/de.itemis.mps.editor.enumeration.demolang.mpl +++ b/code/widgets/languages/de.itemis.mps.editor.enumeration.demolang/de.itemis.mps.editor.enumeration.demolang.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/languages/de.itemis.mps.editor.enumeration/de.itemis.mps.editor.enumeration.mpl b/code/widgets/languages/de.itemis.mps.editor.enumeration/de.itemis.mps.editor.enumeration.mpl index c5c9ab583..16f0449cf 100644 --- a/code/widgets/languages/de.itemis.mps.editor.enumeration/de.itemis.mps.editor.enumeration.mpl +++ b/code/widgets/languages/de.itemis.mps.editor.enumeration/de.itemis.mps.editor.enumeration.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -59,8 +59,6 @@ - - @@ -68,12 +66,10 @@ - - @@ -83,7 +79,6 @@ - diff --git a/code/widgets/languages/de.itemis.mps.editor.enumeration/runtime/de.itemis.mps.editor.enumeration.runtime.msd b/code/widgets/languages/de.itemis.mps.editor.enumeration/runtime/de.itemis.mps.editor.enumeration.runtime.msd index 9da2dd5d0..3f18c2a51 100644 --- a/code/widgets/languages/de.itemis.mps.editor.enumeration/runtime/de.itemis.mps.editor.enumeration.runtime.msd +++ b/code/widgets/languages/de.itemis.mps.editor.enumeration/runtime/de.itemis.mps.editor.enumeration.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/languages/de.itemis.mps.editor.enumeration/sandbox/de.itemis.mps.editor.enumeration.sandbox.msd b/code/widgets/languages/de.itemis.mps.editor.enumeration/sandbox/de.itemis.mps.editor.enumeration.sandbox.msd index 01c59fb0a..aef2d6a50 100644 --- a/code/widgets/languages/de.itemis.mps.editor.enumeration/sandbox/de.itemis.mps.editor.enumeration.sandbox.msd +++ b/code/widgets/languages/de.itemis.mps.editor.enumeration/sandbox/de.itemis.mps.editor.enumeration.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/de.itemis.mps.editor.bool.runtime.msd b/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/de.itemis.mps.editor.bool.runtime.msd index 2c5482953..e9fd13326 100644 --- a/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/de.itemis.mps.editor.bool.runtime.msd +++ b/code/widgets/solutions/de.itemis.mps.editor.bool.runtime/de.itemis.mps.editor.bool.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/solutions/de.itemis.mps.editor.bool.sandbox/de.itemis.mps.editor.bool.sandbox.msd b/code/widgets/solutions/de.itemis.mps.editor.bool.sandbox/de.itemis.mps.editor.bool.sandbox.msd index ed6b94945..c53e5c1d0 100644 --- a/code/widgets/solutions/de.itemis.mps.editor.bool.sandbox/de.itemis.mps.editor.bool.sandbox.msd +++ b/code/widgets/solutions/de.itemis.mps.editor.bool.sandbox/de.itemis.mps.editor.bool.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/solutions/de.itemis.mps.editor.collapsible.runtime/de.itemis.mps.editor.collapsible.runtime.msd b/code/widgets/solutions/de.itemis.mps.editor.collapsible.runtime/de.itemis.mps.editor.collapsible.runtime.msd index dac037202..6ea996a52 100644 --- a/code/widgets/solutions/de.itemis.mps.editor.collapsible.runtime/de.itemis.mps.editor.collapsible.runtime.msd +++ b/code/widgets/solutions/de.itemis.mps.editor.collapsible.runtime/de.itemis.mps.editor.collapsible.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/de.itemis.mps.editor.dropdown.runtime.msd b/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/de.itemis.mps.editor.dropdown.runtime.msd index 6d799979d..15c391119 100644 --- a/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/de.itemis.mps.editor.dropdown.runtime.msd +++ b/code/widgets/solutions/de.itemis.mps.editor.dropdown.runtime/de.itemis.mps.editor.dropdown.runtime.msd @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/solutions/de.itemis.mps.editor.dropdown.sandbox/de.itemis.mps.editor.dropdown.sandbox.msd b/code/widgets/solutions/de.itemis.mps.editor.dropdown.sandbox/de.itemis.mps.editor.dropdown.sandbox.msd index 3ccea9ac6..5e1944e9c 100644 --- a/code/widgets/solutions/de.itemis.mps.editor.dropdown.sandbox/de.itemis.mps.editor.dropdown.sandbox.msd +++ b/code/widgets/solutions/de.itemis.mps.editor.dropdown.sandbox/de.itemis.mps.editor.dropdown.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/de.itemis.mps.mouselistener.runtime.msd b/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/de.itemis.mps.mouselistener.runtime.msd index 0b44da3e0..dc5f7aaa4 100644 --- a/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/de.itemis.mps.mouselistener.runtime.msd +++ b/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/de.itemis.mps.mouselistener.runtime.msd @@ -6,7 +6,7 @@ - + From 32d591ea46575e030023885c4d38e91e952deee5 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 12 May 2023 23:25:34 +0200 Subject: [PATCH 13/30] Update build script --- .../models/de.itemis.mps.extensions.build.mps | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 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 6be9c6f1e..146d0bc09 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 @@ -931,12 +931,12 @@ - - - + + + - - + + @@ -13006,6 +13006,11 @@ + + + + + From 40643f572fd21777f19f1fb9b7d4805686277688 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sat, 13 May 2023 00:06:34 +0200 Subject: [PATCH 14/30] mpsutil.intentions: re-enable IntentionsSupport --- .../com/mbeddr/mpsutil/intentions/runtime.mps | 296 +++++++++--------- 1 file changed, 142 insertions(+), 154 deletions(-) diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps index bd5958bee..1553b097a 100644 --- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps +++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps @@ -335,69 +335,65 @@ - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -405,85 +401,81 @@ - - + + - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -491,45 +483,41 @@ - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - + + - - - + + + + + + + + + + From 39abb8442225258e4a68b18832b405d755a361c6 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sat, 13 May 2023 12:41:02 +0200 Subject: [PATCH 15/30] Don't use ProjectManager.getInstance --- ...de.itemis.model.merge.baselang.sandbox.mps | 170 +----------------- .../org.modelix.model.mpsadapters.mps.mps | 77 ++++++-- .../models/smodel.mps | 22 ++- ...mis.model.merge.simple.demo.test@tests.mps | 61 +------ ...del.merge.test.integration.tests@tests.mps | 41 +---- 5 files changed, 88 insertions(+), 283 deletions(-) diff --git a/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.sandbox.mps b/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.sandbox.mps index bab4cc24e..5e3334eed 100644 --- a/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.sandbox.mps +++ b/code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.sandbox.mps @@ -20,6 +20,7 @@ + @@ -35,7 +36,6 @@ - @@ -43,10 +43,6 @@ - - - - @@ -60,10 +56,6 @@ - - - - @@ -79,16 +71,9 @@ - - - - - - - @@ -151,135 +136,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -293,27 +149,9 @@ - - - - - - - - - - - - - - - - - - - - - + + + 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 525ad33b8..91f8603f8 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 @@ -45,6 +45,8 @@ + + @@ -13894,14 +13896,27 @@ - - - - - - + + + + + + + + + + + + + + + + + + + @@ -14586,14 +14601,27 @@ - - - - - - + + + + + + + + + + + + + + + + + + + @@ -30196,14 +30224,27 @@ - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/smodel.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/smodel.mps index 00d1d5f98..8973f3ddd 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/smodel.mps +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/smodel.mps @@ -62,6 +62,7 @@ + @@ -18143,13 +18144,26 @@ - - - - + + + + + + + + + + + + + + + + + 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 98b6490b7..b364031b6 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 @@ -43,6 +43,7 @@ + @@ -382,25 +383,7 @@ - - - - - - - - - - - - - - - - - - - + @@ -2115,25 +2098,7 @@ - - - - - - - - - - - - - - - - - - - + @@ -2308,25 +2273,7 @@ - - - - - - - - - - - - - - - - - - - + diff --git a/code/solutions/de.itemis.model.merge.test.integration/models/de.itemis.model.merge.test.integration.tests@tests.mps b/code/solutions/de.itemis.model.merge.test.integration/models/de.itemis.model.merge.test.integration.tests@tests.mps index 9febd23d8..15b6ecea5 100644 --- a/code/solutions/de.itemis.model.merge.test.integration/models/de.itemis.model.merge.test.integration.tests@tests.mps +++ b/code/solutions/de.itemis.model.merge.test.integration/models/de.itemis.model.merge.test.integration.tests@tests.mps @@ -32,6 +32,7 @@ + @@ -261,25 +262,7 @@ - - - - - - - - - - - - - - - - - - - + @@ -572,25 +555,7 @@ - - - - - - - - - - - - - - - - - - - + From 2c5c529cb59472ad20e34854a167ffb877d404ad Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sat, 13 May 2023 13:32:42 +0200 Subject: [PATCH 16/30] mpsutil.intentions: update the action from the existing action --- .../com/mbeddr/mpsutil/intentions/runtime.mps | 40 ++++++++----------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps index 1553b097a..1e937a32e 100644 --- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps +++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps @@ -1739,33 +1739,25 @@ - - - + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + From 9308f16437e69b6494f1c2033efc553b1f5efb9c Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sat, 13 May 2023 17:14:04 +0200 Subject: [PATCH 17/30] Update build script again --- .../models/de.itemis.mps.extensions.build.mps | 5 +++++ 1 file changed, 5 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 801a76ed4..b12c8064f 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 @@ -13006,6 +13006,11 @@ + + + + + From 2715684ed71b084bec258955023d0bef4dba28f2 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 15 May 2023 16:39:25 +0200 Subject: [PATCH 18/30] Restore default icons for custom aspects --- .../com/mbeddr/mpsutil/modellisteners/runtime/plugin.mps | 9 +++++++++ .../models/plugin.mps | 9 +++++++++ .../de.q60.mps.virtualinterfaces/models/plugin.mps | 9 +++++++++ .../models/plugin.mps | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime/plugin.mps b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime/plugin.mps index 39fcb0891..62c349ca8 100644 --- a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime/plugin.mps +++ b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime/plugin.mps @@ -17,6 +17,11 @@ + + + + + @@ -30,6 +35,7 @@ + @@ -211,6 +217,9 @@ + + + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/plugin.mps b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/plugin.mps index b78cc3b13..5d4c7341c 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/plugin.mps +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/plugin.mps @@ -11,6 +11,11 @@ + + + + + @@ -18,6 +23,7 @@ + @@ -46,6 +52,9 @@ + + + diff --git a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/plugin.mps b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/plugin.mps index 7edfe3d1e..9db5985d6 100644 --- a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/plugin.mps +++ b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/plugin.mps @@ -10,9 +10,15 @@ + + + + + + @@ -33,6 +39,9 @@ + + + diff --git a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/plugin.mps b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/plugin.mps index f860e0695..bfa244545 100644 --- a/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/plugin.mps +++ b/code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/models/plugin.mps @@ -10,6 +10,11 @@ + + + + + @@ -20,6 +25,7 @@ + @@ -69,6 +75,9 @@ + + + From ff0eab6653abc2706bfbdf9ddb82f5f90b79d12d Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 5 Jun 2023 16:04:24 +0200 Subject: [PATCH 19/30] Apply changes to TreeNodeUpdater --- ...com.mbeddr.mpsutil.projectview.runtime.msd | 1 + .../projectview/runtime/tree/highlighter.mps | 1541 +++++++++++------ 2 files changed, 1053 insertions(+), 489 deletions(-) diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd index 69cf9e1de..125538881 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd @@ -35,6 +35,7 @@ + diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps index 6519eafac..110bd3a24 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps @@ -5,6 +5,9 @@ + + + @@ -40,7 +43,9 @@ - + + + @@ -151,6 +156,9 @@ + + + @@ -162,7 +170,6 @@ - @@ -174,6 +181,7 @@ + @@ -195,6 +203,7 @@ + @@ -305,6 +314,13 @@ + + + + + + + @@ -312,13 +328,6 @@ - - - - - - - @@ -8205,20 +8214,6 @@ - - - - - - - - - - - - - - @@ -8247,6 +8242,20 @@ + + + + + + + + + + + + + + @@ -8280,6 +8289,7 @@ + @@ -8302,72 +8312,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8376,6 +8320,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8391,129 +8366,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - + + + + @@ -8529,35 +8527,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + @@ -8623,259 +8612,266 @@ - + - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + @@ -8934,6 +8930,7 @@ + @@ -8961,67 +8958,633 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + From 2e3eec2c6787d04482da1fa3cf6c74b2817210f7 Mon Sep 17 00:00:00 2001 From: Alexander Shatalin Date: Wed, 1 Nov 2023 14:37:33 +0100 Subject: [PATCH 20/30] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 921863ce3..51f681764 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![official JetBrains project](http://jb.gg/badges/official-flat-square.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) # MPS Extensions From 6ae0559af0045b1596c5ad3a52f11756fba9a152 Mon Sep 17 00:00:00 2001 From: Alexander Shatalin Date: Wed, 1 Nov 2023 14:39:29 +0100 Subject: [PATCH 21/30] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 51f681764..4daf57f3a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[![official JetBrains project](http://jb.gg/badges/official-flat-square.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) # MPS Extensions ![JetBrains MPS 2022.2](https://img.shields.io/badge/JetBrains%20MPS-2022.2-orange) +[![official JetBrains project](http://jb.gg/badges/official-flat-square.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) 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. From 0293710c899b064243fe27c85170d7c36b0e7a37 Mon Sep 17 00:00:00 2001 From: Alexander Pann <88385944+alexanderpann@users.noreply.github.com> Date: Tue, 5 Dec 2023 20:11:44 +0100 Subject: [PATCH 22/30] Add the correct badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4daf57f3a..fbf43acad 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # MPS Extensions -![JetBrains MPS 2022.2](https://img.shields.io/badge/JetBrains%20MPS-2022.2-orange) +![JetBrains MPS 2022.2](https://img.shields.io/badge/JetBrains%20MPS-2022.3-orange) [![official JetBrains project](http://jb.gg/badges/official-flat-square.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) 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. From 7210d51b9d756fbc198a57f0d7718b80b1760618 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 11 Dec 2023 23:13:33 +0100 Subject: [PATCH 23/30] Update the build script --- .../models/de.itemis.mps.extensions.build.mps | 17 ----------------- 1 file changed, 17 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 472dcc633..7d9243dc1 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 @@ -106,9 +106,6 @@ - - - @@ -203,7 +200,6 @@ - @@ -939,19 +935,6 @@ - - - - - - - - - - - - - From c1ef3b73523b38a426e0c6fd9498192281a19ce4 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 11 Dec 2023 23:15:39 +0100 Subject: [PATCH 24/30] Run migrations --- .../com.mbeddr.mpsutil.blutil/blutil.mpl | 1 - .../de.slisson.mps.reflection.mpl | 1 - .../com.mbeddr.mpsutil.intentions.runtime.msd | 1 + .../de.itemis.mps.editor.math.java.mpl | 1 - .../test.org.modelix.model.mpsadapters.msd | 1 - .../de.itemis.mps.editor.pagination.mpl | 8 -- .../projectview/runtime/tree/highlighter.mps | 2 +- .../com.mbeddr.mpsutil.projectview.mpl | 1 - .../de.q60.mps.incremental.mpl | 1 - .../de.q60.mps.polymorphicfunctions.mpl | 1 - ...de.q60.mps.shadowmodels.transformation.mpl | 1 - .../de.slisson.mps.structurecheck.mpl | 1 - .../generator/template/main@generator.mps | 4 +- .../de/slisson/mps/tables/runtime/cells.mps | 80 +++++++++---------- .../de/slisson/mps/tables/runtime/plugin.mps | 30 +++---- 15 files changed, 59 insertions(+), 75 deletions(-) diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl index 5449abe11..6acd5c2dc 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl @@ -51,7 +51,6 @@ - diff --git a/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl b/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl index 9181f20a4..08f69a486 100644 --- a/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl +++ b/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl @@ -42,7 +42,6 @@ - diff --git a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd index d12fecd28..79ff9e059 100644 --- a/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd +++ b/code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd @@ -52,6 +52,7 @@ + diff --git a/code/math/languages/de.itemis.mps.editor.math.java/de.itemis.mps.editor.math.java.mpl b/code/math/languages/de.itemis.mps.editor.math.java/de.itemis.mps.editor.math.java.mpl index 2d2e3bc91..219b0046f 100644 --- a/code/math/languages/de.itemis.mps.editor.math.java/de.itemis.mps.editor.math.java.mpl +++ b/code/math/languages/de.itemis.mps.editor.math.java/de.itemis.mps.editor.math.java.mpl @@ -41,7 +41,6 @@ - diff --git a/code/model-api/test.org.modelix.model.mpsadapters/test.org.modelix.model.mpsadapters.msd b/code/model-api/test.org.modelix.model.mpsadapters/test.org.modelix.model.mpsadapters.msd index 2d767dfd6..0d3c7e9e2 100644 --- a/code/model-api/test.org.modelix.model.mpsadapters/test.org.modelix.model.mpsadapters.msd +++ b/code/model-api/test.org.modelix.model.mpsadapters/test.org.modelix.model.mpsadapters.msd @@ -39,7 +39,6 @@ - diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl b/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl index be12067f4..46366a3a0 100644 --- a/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl +++ b/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl @@ -52,12 +52,7 @@ - - - - - @@ -65,11 +60,9 @@ - - @@ -77,7 +70,6 @@ - diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps index 110bd3a24..cc485a682 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree/highlighter.mps @@ -8688,7 +8688,7 @@ - + diff --git a/code/projectview/com.mbeddr.mpsutil.projectview/com.mbeddr.mpsutil.projectview.mpl b/code/projectview/com.mbeddr.mpsutil.projectview/com.mbeddr.mpsutil.projectview.mpl index e780fd76d..6351f7b04 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview/com.mbeddr.mpsutil.projectview.mpl +++ b/code/projectview/com.mbeddr.mpsutil.projectview/com.mbeddr.mpsutil.projectview.mpl @@ -45,7 +45,6 @@ - diff --git a/code/shadowmodels/languages/de.q60.mps.incremental/de.q60.mps.incremental.mpl b/code/shadowmodels/languages/de.q60.mps.incremental/de.q60.mps.incremental.mpl index e021800a5..ac84356b2 100644 --- a/code/shadowmodels/languages/de.q60.mps.incremental/de.q60.mps.incremental.mpl +++ b/code/shadowmodels/languages/de.q60.mps.incremental/de.q60.mps.incremental.mpl @@ -46,7 +46,6 @@ - diff --git a/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/de.q60.mps.polymorphicfunctions.mpl b/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/de.q60.mps.polymorphicfunctions.mpl index a1fcd4c4b..16126c92c 100644 --- a/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/de.q60.mps.polymorphicfunctions.mpl +++ b/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/de.q60.mps.polymorphicfunctions.mpl @@ -47,7 +47,6 @@ - diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/de.q60.mps.shadowmodels.transformation.mpl b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/de.q60.mps.shadowmodels.transformation.mpl index 3212423a7..4d5e0e312 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/de.q60.mps.shadowmodels.transformation.mpl +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/de.q60.mps.shadowmodels.transformation.mpl @@ -55,7 +55,6 @@ - diff --git a/code/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl b/code/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl index 40198191c..92355efd5 100644 --- a/code/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl +++ b/code/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl @@ -41,7 +41,6 @@ - diff --git a/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps b/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps index 271d6c69c..c69f91250 100644 --- a/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps +++ b/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps @@ -2283,7 +2283,7 @@ - + @@ -2296,7 +2296,7 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps index f9bedbbfe..c33c7ca1b 100644 --- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps +++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps @@ -1883,7 +1883,7 @@ - + @@ -1923,7 +1923,7 @@ - + @@ -28133,7 +28133,7 @@ - + @@ -28167,7 +28167,7 @@ - + @@ -28182,7 +28182,7 @@ - + @@ -28197,7 +28197,7 @@ - + @@ -28212,7 +28212,7 @@ - + @@ -34381,11 +34381,11 @@ - + - + @@ -34433,7 +34433,7 @@ - + @@ -34613,7 +34613,7 @@ - + @@ -34629,7 +34629,7 @@ - + @@ -34645,7 +34645,7 @@ - + @@ -34662,7 +34662,7 @@ - + @@ -34687,13 +34687,13 @@ - + - + @@ -34994,7 +34994,7 @@ - + @@ -35013,7 +35013,7 @@ - + @@ -35021,12 +35021,12 @@ - + - + @@ -35049,13 +35049,13 @@ - + - + @@ -35112,7 +35112,7 @@ - + @@ -35141,7 +35141,7 @@ - + @@ -35158,7 +35158,7 @@ - + @@ -35170,13 +35170,13 @@ - + - + @@ -35246,7 +35246,7 @@ - + @@ -35263,7 +35263,7 @@ - + @@ -35299,13 +35299,13 @@ - + - + @@ -35632,7 +35632,7 @@ - + @@ -35643,7 +35643,7 @@ - + @@ -35662,13 +35662,13 @@ - + - + @@ -35702,7 +35702,7 @@ - + @@ -35713,7 +35713,7 @@ - + @@ -35732,12 +35732,12 @@ - + - + @@ -35939,7 +35939,7 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/plugin.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/plugin.mps index 445681bd0..e673076b8 100644 --- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/plugin.mps +++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/plugin.mps @@ -648,7 +648,7 @@ - + @@ -669,7 +669,7 @@ - + @@ -711,7 +711,7 @@ - + @@ -752,7 +752,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -831,7 +831,7 @@ - + @@ -873,7 +873,7 @@ - + @@ -914,7 +914,7 @@ - + @@ -954,7 +954,7 @@ - + @@ -993,7 +993,7 @@ - + @@ -1032,7 +1032,7 @@ - + @@ -1057,7 +1057,7 @@ - + @@ -1073,7 +1073,7 @@ - + @@ -1112,7 +1112,7 @@ - + @@ -1137,7 +1137,7 @@ - + From 1d64ea65e94c0d16517db399751c23a0bab706bd Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 11 Dec 2023 23:17:36 +0100 Subject: [PATCH 25/30] Update the readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fbf43acad..6e43d48d8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # MPS Extensions -![JetBrains MPS 2022.2](https://img.shields.io/badge/JetBrains%20MPS-2022.3-orange) +![JetBrains MPS 2022.3.1](https://img.shields.io/badge/JetBrains%20MPS-2022.3.1-orange) [![official JetBrains project](http://jb.gg/badges/official-flat-square.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) 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. From cd46d167aa2c8da74eb429cf45f24e6b20ebfd16 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 11 Dec 2023 23:44:59 +0100 Subject: [PATCH 26/30] Fix test --- ...est.org.modelix.model.mpsadapters.wrappingmodelapi@tests.mps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/model-api/test.org.modelix.model.mpsadapters/models/test.org.modelix.model.mpsadapters.wrappingmodelapi@tests.mps b/code/model-api/test.org.modelix.model.mpsadapters/models/test.org.modelix.model.mpsadapters.wrappingmodelapi@tests.mps index 417116f56..d6fe2085d 100644 --- a/code/model-api/test.org.modelix.model.mpsadapters/models/test.org.modelix.model.mpsadapters.wrappingmodelapi@tests.mps +++ b/code/model-api/test.org.modelix.model.mpsadapters/models/test.org.modelix.model.mpsadapters.wrappingmodelapi@tests.mps @@ -1343,7 +1343,7 @@ - + From 378e4b7c765577721407c195cb271b817b00bd21 Mon Sep 17 00:00:00 2001 From: Alexander Pann <88385944+alexanderpann@users.noreply.github.com> Date: Fri, 22 Dec 2023 07:41:27 +0100 Subject: [PATCH 27/30] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e43d48d8..71e0f5c9f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MPS Extensions - + ![JetBrains MPS 2022.3.1](https://img.shields.io/badge/JetBrains%20MPS-2022.3.1-orange) [![official JetBrains project](http://jb.gg/badges/official-flat-square.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) From 2c2b8e6942bb94cf1bf2aabf6e5cdc7fad1363cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Wed, 10 Jan 2024 13:44:06 +0100 Subject: [PATCH 28/30] Fix MPS version --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9e3cfc8ed..d4b64f299 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ ext.dependencyRepositories = [ // major version, e.g. '2021.1', '2021.2' ext.mpsMajor = '2022.3' // optional minor/bugfix number (not added to the final build version) -ext.mpsMinor = '2' +ext.mpsMinor = '1' // e.g. Beta, EAP, RC ext.mpsReleaseType = '' @@ -401,4 +401,4 @@ githubRelease { tasks.named('githubRelease').configure { dependsOn packageExtensions -} \ No newline at end of file +} From bb24a4f5ee1b9a2c2c361e71a67c70a8e0a5e28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Sun, 28 Jan 2024 09:52:43 +0100 Subject: [PATCH 29/30] Patch JNA path in build scripts Necessary to run tests on macOS until https://github.com/JetBrains/MPS/pull/71 is fixed --- build.gradle | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 3035e8f0b..9d3545b08 100644 --- a/build.gradle +++ b/build.gradle @@ -229,7 +229,7 @@ ext.skipUnmodifiedModels = "-Dmps.generator.skipUnmodifiedModels=true" //increme // ___________________ utilities ___________________ File scriptFile(String relativePath) { - new File("$rootDir/build/generated/$relativePath") + new File("$rootDir/build/patched/$relativePath") } def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.pluginVersion, ext.skipUnmodifiedModels] @@ -272,15 +272,30 @@ task resolved_diagram_dependencies(type: Copy) { } } -task build_allScripts(type: BuildLanguages, dependsOn: [ - 'downloadJbr', - resolveMps, - resolved_diagram_dependencies, - copyModelApi, -]) { +def build_allScripts_unpatched = tasks.register('build_allScripts_unpatched', BuildLanguages) { + dependsOn 'downloadJbr', resolveMps, copyModelApi, resolved_diagram_dependencies script "$rootDir/scripts/build.xml" } +// Patch JNA path in generated build scripts until https://github.com/JetBrains/MPS/pull/71 is fixed +def patch_allScripts = tasks.register('patch_allScripts', Copy) { + dependsOn build_allScripts_unpatched + from 'build/generated' + into 'build/patched' + + def isAarch64 = System.getProperty('os.arch') == 'aarch64' + def jnaArch = isAarch64 ? 'aarch64' : 'amd64' + + filter { + it.replace('"-Djna.boot.library.path=${artifacts.mps}/lib/jna"', + '"-Djna.boot.library.path=${artifacts.mps}/lib/jna/' + jnaArch + '"') + } +} + +task build_allScripts { + dependsOn patch_allScripts +} + task build_languages(type: BuildLanguages, dependsOn: [build_allScripts]) { script scriptFile('languages/build.xml') } From c64f7b6adb946bc02be78ddd9e1a1053cbc8835a Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 5 Mar 2024 11:49:00 +0100 Subject: [PATCH 30/30] Run migrations --- .../blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl | 1 + .../languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl | 8 -------- .../de.itemis.mps.editor.pagination.mpl | 3 +++ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl index 52bc5a64e..9cc4bc07c 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl @@ -82,6 +82,7 @@ + diff --git a/code/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl b/code/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl index 92793b3b5..b3af2f8c8 100644 --- a/code/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl +++ b/code/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl @@ -57,8 +57,6 @@ - - @@ -66,16 +64,10 @@ - - - - - - diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl b/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl index 2c38ccb4c..6c6204c86 100644 --- a/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl +++ b/code/pagination/languages/de.itemis.mps.editor.pagination/de.itemis.mps.editor.pagination.mpl @@ -53,7 +53,10 @@ + + +