From b7b5b2746187e81d3b3d400e6ebfcad0212880ab Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Fri, 15 Dec 2023 11:06:46 +0200 Subject: [PATCH 01/46] Don't reference deprecated IProject --- .../models/com/mbeddr/mpsutil/projectview/views/plugin.mps | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.views/models/com/mbeddr/mpsutil/projectview/views/plugin.mps b/code/projectview/com.mbeddr.mpsutil.projectview.views/models/com/mbeddr/mpsutil/projectview/views/plugin.mps index b98e1ddb2..841b6c421 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.views/models/com/mbeddr/mpsutil/projectview/views/plugin.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview.views/models/com/mbeddr/mpsutil/projectview/views/plugin.mps @@ -1383,7 +1383,7 @@ - + @@ -1661,14 +1661,14 @@ - + - + From ea3ad4d37a353047ef0291e7e81d0409340b5103 Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Wed, 20 Dec 2023 10:59:06 +0200 Subject: [PATCH 02/46] Reflect changes in SModelInternal API and update names in model references (reflect renames that happened long time ago and were not reflected as long as we match model references by id only) --- .../models/de.q60.mps.incremental.runtime.mps | 6 ++-- .../models/model.persistent.mps | 4 +-- .../models/smodel.mps | 36 ++----------------- 3 files changed, 7 insertions(+), 39 deletions(-) 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 7c18f0f0b..3904a4776 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 @@ -17,9 +17,9 @@ - - - + + + diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/model.persistent.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/model.persistent.mps index b40a01a9a..729faed46 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/model.persistent.mps +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/model.persistent.mps @@ -13,8 +13,8 @@ - - + + 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 f0258afb1..1cb1f1ec3 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 @@ -46,10 +46,10 @@ - + - + @@ -5777,38 +5777,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From db2f43079749d0bfd93098f9a516cedde37bccc4 Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Fri, 16 Feb 2024 15:27:08 +0200 Subject: [PATCH 03/46] Remove duplicating test annotation in node's history During tests, we remove test annotations, so they have to be irrelevant for versioning. However, with recent change in MPS (access to annotated node by name), using same name in annotation of 2 different nodes confuse MPS (second node down in hierarchy replaces the one at the top) and tests fail. --- .../models/version@tests.mps | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/code/nodeversioning/tests/de.itemis.mps.nodeversioning.test/models/version@tests.mps b/code/nodeversioning/tests/de.itemis.mps.nodeversioning.test/models/version@tests.mps index ea7ced714..e4c17f151 100644 --- a/code/nodeversioning/tests/de.itemis.mps.nodeversioning.test/models/version@tests.mps +++ b/code/nodeversioning/tests/de.itemis.mps.nodeversioning.test/models/version@tests.mps @@ -1349,9 +1349,6 @@ - - - @@ -1387,9 +1384,6 @@ - - - @@ -1425,9 +1419,6 @@ - - - @@ -1487,9 +1478,6 @@ - - - @@ -1530,9 +1518,6 @@ - - - From d854aab9d7542fc67ad5a742b095214ab8aff092 Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Tue, 5 Mar 2024 17:10:08 +0200 Subject: [PATCH 04/46] Make sure MPS.ThirdParty solution is recognized as CL dependency With compileInMPS default to false, and CLM being picky about which module dependency is vital for CL, have to use contemporary JMF settings. --- code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd index c276069f0..80f3232a6 100644 --- a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd +++ b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd @@ -7,8 +7,7 @@ - - + From b4369f4618fba674cebf159a2a519880845dd58c Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Wed, 20 Mar 2024 17:11:52 +0200 Subject: [PATCH 05/46] Address deprecated SLanguage methods in MappingConfigurationList hack getLanguageRuntimes() dropped in 2024.1; had default impl before isValid() dropped as well, had no default impl. --- .../models/behavior.mps | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/behavior.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/behavior.mps index df721605d..77e2b2c0f 100644 --- a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/behavior.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/behavior.mps @@ -1694,39 +1694,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From aa9018c23a25f8bd1b7c5079779aa68056e6e3a2 Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Thu, 21 Mar 2024 14:56:34 +0200 Subject: [PATCH 06/46] Annoying warning about StatementList instead of Statement apply template: child 'jetbrains.mps.baseLanguage.structure.Statement' is expected for role 'statement' but was 'jetbrains.mps.baseLanguage.structure.StatementList' -- was input: [childCellModel] OptionalCell null[4330386229156360880] in com.mbeddr.mpsutil.grammarcells.sandboxlang.editor@3_2 -- was template node: r:0e2d0780-27a1-4dda-a429-65b192261fcc(com.mbeddr.mpsutil.grammarcells.generator.template.main@generator)/7048944721633471250 ELSE produced StatementList, while IF annotated a ReturnStatement inside method body's StatementList, IF moved up, to substitute whole StatementList, as in-line template in ELSE is limited to producing a single node (can't get list of Statements there) --- .../generator/template/main@generator.mps | 155 +++++++++--------- 1 file changed, 80 insertions(+), 75 deletions(-) diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps index a2fa43ea9..bbcfa6094 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps @@ -5183,97 +5183,102 @@ - + - - - - - - - - - + + + + + + + + + + + + + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d3d763947eb6d2431a5025617300c7cb4b3962dc Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Thu, 21 Mar 2024 17:48:27 +0200 Subject: [PATCH 07/46] Drop unused language from editor.celllayout generator j.m.console.base is not in use but creates a runtime dependency which can't be satisfied as celllayout plugin doesn't manifest dependency to j.m.console plugin, and new (strict) classloading no longer ignores broken/missing runtimes of used languages. --- .../de.itemis.mps.editor.celllayout.mpl | 2 -- .../generator/template/main@generator.mps | 1 - 2 files changed, 3 deletions(-) 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 b355bca0f..e5dfd9fd4 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 @@ -41,7 +41,6 @@ - @@ -49,7 +48,6 @@ - diff --git a/code/celllayout/languages/de.itemis.mps.editor.celllayout/generator/template/main@generator.mps b/code/celllayout/languages/de.itemis.mps.editor.celllayout/generator/template/main@generator.mps index 3f548f552..2d5d58b4a 100644 --- a/code/celllayout/languages/de.itemis.mps.editor.celllayout/generator/template/main@generator.mps +++ b/code/celllayout/languages/de.itemis.mps.editor.celllayout/generator/template/main@generator.mps @@ -5,7 +5,6 @@ - From fea5da55fc3d81cee425b24e7f334553080e0a5d Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Thu, 21 Mar 2024 18:18:12 +0200 Subject: [PATCH 08/46] DefaultActionGroup.canBePerformed has been removed in 24.1 Has been deprecated for a long time, replaced with presentation template manipulation. --- .../com/mbeddr/mpsutil/intentions/runtime.mps | 96 ++++++++----------- 1 file changed, 39 insertions(+), 57 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 cd4f925da..5815dc983 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 @@ -1010,15 +1010,20 @@ - - - - + + + + + + + + + - - - - + + + + @@ -1041,6 +1046,19 @@ + + + + + + + + + + + + + @@ -1154,30 +1172,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -4326,6 +4320,19 @@ + + + + + + + + + + + + + @@ -4379,31 +4386,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - From 90673e3926d7bc5e5a08f9b4975f8665d4acdd4a Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Wed, 3 Apr 2024 13:22:31 +0300 Subject: [PATCH 09/46] Replace uses of deprecated MatchingUtil with contemporary SNodeMatcher --- .../models/typesystem.mps | 190 ++++++++++++++++-- 1 file changed, 175 insertions(+), 15 deletions(-) diff --git a/code/shadowmodels/languages/de.q60.mps.incremental/models/typesystem.mps b/code/shadowmodels/languages/de.q60.mps.incremental/models/typesystem.mps index f59552b3d..a34c02054 100644 --- a/code/shadowmodels/languages/de.q60.mps.incremental/models/typesystem.mps +++ b/code/shadowmodels/languages/de.q60.mps.incremental/models/typesystem.mps @@ -10,7 +10,7 @@ - + @@ -28,6 +28,7 @@ + @@ -55,9 +56,13 @@ + + + + @@ -106,6 +111,7 @@ + @@ -2390,6 +2396,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2498,14 +2650,18 @@ - - - - - + + + - - + + + + + + + + @@ -2612,14 +2768,18 @@ - - - - - + + + - - + + + + + + + + From 0dfa9cfe64322d3ca1cd29e411f93bcf197677cb Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Sat, 20 Apr 2024 14:15:13 +0200 Subject: [PATCH 10/46] Resolve info in model imports auto-updated --- .../solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps | 2 +- .../models/test.de.q60.mps.shadowmodels.runtime@tests.mps | 2 +- .../models/de.itemis.model.merge.simple.demo.test@tests.mps | 2 +- .../de.itemis.model.merge.test.integration.tests@tests.mps | 2 +- .../models/de.itemis.model.merge.test.gen@tests.mps | 2 +- .../models/de.itemis.model.merge.test.test1@tests.mps | 2 +- .../models/de.itemis.model.merge.test.util.mps | 2 +- .../generator/template/main@generator.mps | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps index 84edc4c6e..108909277 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps @@ -24,7 +24,7 @@ - + diff --git a/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.runtime/models/test.de.q60.mps.shadowmodels.runtime@tests.mps b/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.runtime/models/test.de.q60.mps.shadowmodels.runtime@tests.mps index 6677c6598..665b673d7 100644 --- a/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.runtime/models/test.de.q60.mps.shadowmodels.runtime@tests.mps +++ b/code/shadowmodels/solutions/test.de.q60.mps.shadowmodels.runtime/models/test.de.q60.mps.shadowmodels.runtime@tests.mps @@ -21,7 +21,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.test@tests.mps b/code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.test@tests.mps index 5199058e8..8d390a4fe 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 @@ -19,7 +19,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 566991901..816a5d5f4 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 @@ -21,7 +21,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps index 765c8f706..f5eacb29a 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps @@ -13,7 +13,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.test1@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.test1@tests.mps index 98cda8059..10fa89a3a 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.test1@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.test1@tests.mps @@ -13,7 +13,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps index 8057a4d9f..980dcb5b8 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps @@ -18,7 +18,7 @@ - + diff --git a/code/structurecheck/languages/de.itemis.mps.structurecheck/generator/template/main@generator.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/generator/template/main@generator.mps index 1dbc41507..6361b2a00 100644 --- a/code/structurecheck/languages/de.itemis.mps.structurecheck/generator/template/main@generator.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/generator/template/main@generator.mps @@ -7,7 +7,7 @@ - + From 7eff7a7ed9b41e4ced1f9bb04281ed5252a96a17 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Sat, 20 Apr 2024 14:15:59 +0200 Subject: [PATCH 11/46] Fix reference to a java method --- .../models/virtualinterfaces.mps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/models/virtualinterfaces.mps b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/models/virtualinterfaces.mps index 61f240186..d2262fb11 100644 --- a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/models/virtualinterfaces.mps +++ b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces.sandboxlang/models/virtualinterfaces.mps @@ -100,7 +100,7 @@ - + From 3f0e09129169cc735416cedd981aacc2c1628005 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Sat, 20 Apr 2024 14:16:08 +0200 Subject: [PATCH 12/46] Rebuild project --- scripts/build.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/build.xml b/scripts/build.xml index 313078465..fb39d4332 100644 --- a/scripts/build.xml +++ b/scripts/build.xml @@ -16,6 +16,7 @@ + @@ -78,7 +79,7 @@ - mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version} + mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mps.runtimeBuild=${mps.runtimeBuild}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version} @@ -106,8 +107,8 @@ - - + + @@ -127,7 +128,6 @@ - @@ -140,6 +140,7 @@ + @@ -184,6 +185,7 @@ + From 15b1a7b6ef8978e2e73884248339ee567f9d8984 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Sat, 20 Apr 2024 16:57:47 +0200 Subject: [PATCH 13/46] Reimplement ProjectViewExtension with new ProjectViewNode API --- .../models/plugin.mps | 3011 ++++------------- 1 file changed, 719 insertions(+), 2292 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 58fc1e5fd..a3588d842 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 @@ -52,7 +52,13 @@ - + + + + + + + @@ -110,28 +116,17 @@ - - - - - - + - - - - - - @@ -145,6 +140,7 @@ + @@ -163,7 +159,6 @@ - @@ -195,6 +190,9 @@ + + + @@ -220,10 +218,8 @@ - - @@ -242,18 +238,11 @@ - - - - - - - @@ -261,12 +250,12 @@ - + @@ -276,11 +265,6 @@ - - - - - @@ -288,15 +272,7 @@ - - - - - - - - @@ -318,28 +294,13 @@ - - - - - - - - - - - - - - - @@ -363,13 +324,6 @@ - - - - - - - @@ -394,10 +348,6 @@ - - - - @@ -416,7 +366,7 @@ - + @@ -427,7 +377,6 @@ - @@ -443,6 +392,7 @@ + @@ -960,194 +910,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1155,255 +917,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1434,9 +947,21 @@ - - - + + + + + + + + + + + + + + + @@ -1512,510 +1037,89 @@ - - - - - - - - - + + + + + - - + + - - - - + + + + + + + + - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2031,55 +1135,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2105,1373 +1160,742 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + - - + + + + + - - - - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + + - - + + - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - + @@ -4135,20 +2559,23 @@ - - - - - - - - + + + + + + + + - - + + + + + From c53b9877ad054a2604688360521b283edead71bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Wed, 10 Jul 2024 14:51:30 +0200 Subject: [PATCH 14/46] Switch MPS to prerelease version --- build.gradle | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 52e5d0029..590abb8de 100644 --- a/build.gradle +++ b/build.gradle @@ -41,9 +41,9 @@ logger.info 'Repository username: {}', project.nexusUsername // Dependency versions // major version, e.g. '2021.1', '2021.2' -ext.mpsMajor = '2023.2' +ext.mpsMajor = '9999.9' // optional minor/bugfix number (not added to the final build version) -ext.mpsMinor = '1' +ext.mpsMinor = '' // e.g. Beta, EAP, RC ext.mpsReleaseType = '' @@ -59,8 +59,7 @@ if (ciBuild) { if (branch.matches(/(maintenance|mps)[\/-](mps)?\d+(\.\d+)*/)) { version = "$buildMajor.$buildMinor.$buildNumber.${GitBasedVersioning.gitShortCommitHash}" } else { - def isSnapshot = !(branch.equals("master")) - version = GitBasedVersioning.getVersionWithCount(buildMajor, buildMinor, buildNumber) + (isSnapshot ? "-SNAPSHOT" : "") + version = GitBasedVersioning.getVersionWithCount(buildMajor, buildMinor, buildNumber) + "-SNAPSHOT" } println "##teamcity[buildNumber '${version}']" @@ -93,7 +92,9 @@ configurations { } dependencies { - mps "com.jetbrains:mps:$mpsVersion" + // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency: + // mps "com.jetbrains:mps:$mpsVersion" + mps "com.jetbrains.mps:mps-prerelease:241.18034.993" } repositories { From f3a5bce8fc265b3eb30c8f5bd719cb1dd14eaa88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Wed, 3 Jul 2024 15:06:54 +0200 Subject: [PATCH 15/46] Use Remigrate task from mps-gradle-plugin --- build.gradle | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index 590abb8de..4cef4fbee 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,7 @@ plugins { import de.itemis.mps.gradle.* import de.itemis.mps.gradle.tasks.MpsMigrate +import de.itemis.mps.gradle.tasks.Remigrate import de.itemis.mps.gradle.downloadJBR.DownloadJbrForPlatform import groovy.xml.XmlSlurper @@ -500,12 +501,12 @@ def usedPluginRoots = [ new File(mpsHomeDir, 'plugins/mps-tooltips'), new File(mpsHomeDir, 'plugins/mps-vcs'), new File(mpsHomeDir, 'plugins/mps-git4idea'), + new File(mpsHomeDir, 'plugins/mps-httpsupport'), ] tasks.register('migrate', MpsMigrate) { dependsOn(resolveMps, 'downloadJbr', 'build_languages', 'build_tests') - javaExecutable = layout.file( - tasks.named('downloadJbr', DownloadJbrForPlatform).map { it.javaExecutable }) + javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher } haltOnPrecheckFailure = true haltOnDependencyError = true @@ -519,37 +520,16 @@ tasks.register('migrate', MpsMigrate) { maxHeapSize = '4G' } - -tasks.register('rerunMigrations', JavaExec) { +tasks.register('remigrate', Remigrate) { mustRunAfter('migrate') mustRunAfter('build_languages', 'build_tests') dependsOn(resolveMps, 'downloadJbr') - mpsBackendLauncher.builder() - .withMpsHome(mpsHomeDir) - .withJavaExecutable(tasks.named('downloadJbr', DownloadJbrForPlatform).map { it.javaExecutable.path }) - .configure(it) - - classpath(fileTree(mpsHomeDir) { - include("lib/**/*.jar") - }) - classpath(configurations.rerunMigrationsBackend) - mainClass = 'de.itemis.mps.gradle.migrate.MainKt' - - args("--project=${file('code')}") - - // rerun-migrations needs its own jar added as a plugin - argumentProviders.add(new CommandLineArgumentProvider() { - @Override - Iterable asArguments() { - def config = configurations.rerunMigrationsBackend - - ["--plugin=de.itemis.mps.buildbackends.rerun-migrations::" + - configurations.rerunMigrationsBackend.files(config.dependencies.first()).first()] - } - }) - args(usedPluginRoots.collect { "--plugin-root=$it".toString() }) + javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher } - maxHeapSize = "4G" + mpsHome = mpsHomeDir + projectDirectories.from('code') + pluginRoots.from(usedPluginRoots) + maxHeapSize = '4G' } From 9ee8c2475febd76e0eef3ee55c0b9318980b8db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Tue, 9 Jul 2024 19:08:33 +0200 Subject: [PATCH 16/46] Exclude diagram migration version 0 It is currently not rerunnable. --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4cef4fbee..6c442d3bf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'de.itemis.mps.gradle.common' version '1.27.0.+' + id 'de.itemis.mps.gradle.common' version '1.28.0.+' id "com.github.breadmoirai.github-release" version "2.5.2" id 'maven-publish' id 'base' @@ -532,4 +532,7 @@ tasks.register('remigrate', Remigrate) { projectDirectories.from('code') pluginRoots.from(usedPluginRoots) maxHeapSize = '4G' + + // diagram migration from version 0 is currently not rerunnable, although it claims to be + excludeModuleMigration("de.itemis.mps.editor.diagram", 0) } From 6f1f7cb628953eb2c404182b0905c0ca36eb2337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Wed, 10 Jul 2024 16:47:27 +0200 Subject: [PATCH 17/46] Run migrations --- code/.mps/migration.xml | 3 +- .../build/solutions/allScripts/allScripts.msd | 2 +- .../solutions/allScripts/models/build.mps | 2 +- .../de.itemis.mps.extensions.build.msd | 2 +- .../models/de.itemis.mps.extensions.build.mps | 8 +- .../itemis/mps/editor/celllayout/layout.mps | 196 +++++++++--------- .../mps/editor/celllayout/editor@tests.mps | 14 +- .../de.itemis.mps.changelog.sandbox.msd | 2 +- .../de.itemis.mps.changelog.mpl | 4 +- ...emis.mps.changelog.generator@generator.mps | 36 ++-- .../de.itemis.mps.changelog.behavior.mps | 2 +- .../de.itemis.mps.changelog.intentions.mps | 16 +- .../de.itemis.mps.changelog.typesystem.mps | 14 +- .../languageModels/editor.mps | 20 +- .../languageModels/editor.mps | 10 +- .../de.itemis.mps.editor.diagram.demo.elk.mpl | 9 +- ...demo.elk.generator.templates@generator.mps | 2 +- ...s.mps.editor.diagram.demo.elk.behavior.mps | 4 +- ...ps.editor.diagram.demo.elk.constraints.mps | 2 +- ...mis.mps.editor.diagram.demo.elk.editor.mps | 12 +- ....mps.editor.diagram.demo.elk.structure.mps | 2 +- .../languageModels/editor.mps | 12 +- .../mps/editor/diagram/demolang/shapes.mps | 4 +- .../languageModels/editor.mps | 16 +- .../de.itemis.mps.editor.diagram.mpl | 2 +- .../generator/template/main@generator.mps | 16 +- .../languageModels/behavior.mps | 85 ++++---- .../languageModels/constraints.mps | 6 +- ...de.itemis.mps.editor.diagram.migration.mps | 44 ++-- .../languageModels/editor.mps | 14 +- .../languageModels/structure.mps | 3 +- .../languageModels/typesystem.mps | 6 +- .../languageModels/editor.mps | 10 +- ...is.mps.editor.diagram.demo.elk.sandbox.msd | 7 +- ...is.mps.editor.diagram.demo.elk.sandbox.mps | 6 +- .../de.itemis.mps.editor.diagram.runtime.msd | 77 +------ .../mps/editor/diagram/runtime/jgraph.mps | 12 +- .../mps/editor/diagram/runtime/model.mps | 10 +- .../de/itemis/mps/editor/diagram/shapes.mps | 4 +- .../generator/template/main@generator.mps | 34 +-- ...de.itemis.mps.editor.htmlcell.demolang.mpl | 4 +- .../de.itemis.mps.modelmerger.mpl | 1 + .../de/slisson/mps/editor/multiline/cells.mps | 8 +- ....itemis.mps.editor.pagination.demolang.mpl | 2 +- ...beddr.mpsutil.editor.querylist.sandbox.msd | 5 + .../models/plugin.mps | 32 +-- .../models/smodel.mps | 12 +- .../de.itemis.model.merge.test.gen@tests.mps | 14 +- .../de.itemis.mps.extensions.changelog.msd | 2 +- .../de.itemis.mps.extensions.changelog.mps | 4 +- .../MPS.ThirdParty/MPS.ThirdParty.msd | 6 +- 51 files changed, 383 insertions(+), 437 deletions(-) diff --git a/code/.mps/migration.xml b/code/.mps/migration.xml index a2e96ad57..475d1f0b4 100644 --- a/code/.mps/migration.xml +++ b/code/.mps/migration.xml @@ -12,6 +12,7 @@ - + + \ No newline at end of file diff --git a/code/build/solutions/allScripts/allScripts.msd b/code/build/solutions/allScripts/allScripts.msd index 37c2e55f5..bfa78d045 100644 --- a/code/build/solutions/allScripts/allScripts.msd +++ b/code/build/solutions/allScripts/allScripts.msd @@ -15,7 +15,7 @@ - + diff --git a/code/build/solutions/allScripts/models/build.mps b/code/build/solutions/allScripts/models/build.mps index 1763a2364..c7ecf7e25 100644 --- a/code/build/solutions/allScripts/models/build.mps +++ b/code/build/solutions/allScripts/models/build.mps @@ -2,7 +2,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 ca3031bc1..ff89e1126 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 @@ -15,7 +15,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 5000d7eb5..81d960fdf 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 @@ -4,7 +4,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -925,8 +925,8 @@ - + @@ -13976,8 +13976,8 @@ - + diff --git a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps index d6c955f12..d09ed80b2 100644 --- a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps +++ b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps @@ -5,7 +5,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -205,7 +205,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -274,6 +274,7 @@ + @@ -307,7 +308,7 @@ - + @@ -373,7 +374,6 @@ - @@ -3417,7 +3417,7 @@ - + @@ -3429,9 +3429,9 @@ - + - + @@ -3492,7 +3492,7 @@ - + @@ -3502,9 +3502,9 @@ - + - + @@ -4490,7 +4490,7 @@ - + @@ -4501,7 +4501,7 @@ - + @@ -4511,9 +4511,9 @@ - + - + @@ -4524,7 +4524,7 @@ - + @@ -4532,9 +4532,9 @@ - + - + @@ -5054,7 +5054,7 @@ - + @@ -5062,9 +5062,9 @@ - + - + @@ -5197,7 +5197,7 @@ - + @@ -5205,9 +5205,9 @@ - + - + @@ -5435,7 +5435,7 @@ - + @@ -5446,7 +5446,7 @@ - + @@ -5456,9 +5456,9 @@ - + - + @@ -5469,7 +5469,7 @@ - + @@ -5477,9 +5477,9 @@ - + - + @@ -6799,12 +6799,12 @@ - + - + @@ -6813,9 +6813,9 @@ - + - + @@ -6837,7 +6837,7 @@ - + @@ -6848,7 +6848,7 @@ - + @@ -6866,7 +6866,7 @@ - + @@ -6879,7 +6879,7 @@ - + @@ -6920,7 +6920,7 @@ - + @@ -6956,9 +6956,9 @@ - + - + @@ -7016,7 +7016,7 @@ - + @@ -7024,9 +7024,9 @@ - + - + @@ -7673,7 +7673,7 @@ - + @@ -7690,7 +7690,7 @@ - + @@ -7704,9 +7704,9 @@ - + - + @@ -7722,7 +7722,7 @@ - + @@ -7731,9 +7731,9 @@ - + - + @@ -8071,7 +8071,7 @@ - + @@ -8081,9 +8081,9 @@ - + - + @@ -8363,7 +8363,7 @@ - + @@ -8385,9 +8385,9 @@ - + - + @@ -8545,14 +8545,14 @@ - + - + - + @@ -10148,7 +10148,7 @@ - + @@ -10156,9 +10156,9 @@ - + - + @@ -10360,7 +10360,7 @@ - + @@ -10376,9 +10376,9 @@ - + - + @@ -10415,7 +10415,7 @@ - + @@ -10428,9 +10428,9 @@ - + - + @@ -11044,7 +11044,7 @@ - + @@ -11052,9 +11052,9 @@ - + - + @@ -11680,7 +11680,7 @@ - + @@ -11688,9 +11688,9 @@ - + - + @@ -11706,7 +11706,7 @@ - + @@ -11715,9 +11715,9 @@ - + - + @@ -11746,7 +11746,7 @@ - + @@ -11754,9 +11754,9 @@ - + - + @@ -11772,7 +11772,7 @@ - + @@ -11781,9 +11781,9 @@ - + - + @@ -11899,7 +11899,7 @@ - + @@ -11908,9 +11908,9 @@ - + - + @@ -14685,7 +14685,7 @@ - + @@ -14694,9 +14694,9 @@ - + - + @@ -19989,14 +19989,14 @@ - + - + - + @@ -20093,7 +20093,7 @@ - + @@ -20101,9 +20101,9 @@ - + - + diff --git a/code/celllayout/solutions/test.de.itemis.mps.editor.celllayout.runtime/models/test/de/itemis/mps/editor/celllayout/editor@tests.mps b/code/celllayout/solutions/test.de.itemis.mps.editor.celllayout.runtime/models/test/de/itemis/mps/editor/celllayout/editor@tests.mps index 72720b635..30f94438a 100644 --- a/code/celllayout/solutions/test.de.itemis.mps.editor.celllayout.runtime/models/test/de/itemis/mps/editor/celllayout/editor@tests.mps +++ b/code/celllayout/solutions/test.de.itemis.mps.editor.celllayout.runtime/models/test/de/itemis/mps/editor/celllayout/editor@tests.mps @@ -179,6 +179,7 @@ + @@ -258,7 +259,6 @@ - @@ -3219,7 +3219,7 @@ - + @@ -3227,7 +3227,7 @@ - + @@ -3235,7 +3235,7 @@ - + @@ -3243,7 +3243,7 @@ - + @@ -3253,9 +3253,9 @@ - + - + diff --git a/code/changelog/de.itemis.mps.changelog.sandbox/de.itemis.mps.changelog.sandbox.msd b/code/changelog/de.itemis.mps.changelog.sandbox/de.itemis.mps.changelog.sandbox.msd index 6b14a109e..5f67b0516 100644 --- a/code/changelog/de.itemis.mps.changelog.sandbox/de.itemis.mps.changelog.sandbox.msd +++ b/code/changelog/de.itemis.mps.changelog.sandbox/de.itemis.mps.changelog.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/changelog/de.itemis.mps.changelog/de.itemis.mps.changelog.mpl b/code/changelog/de.itemis.mps.changelog/de.itemis.mps.changelog.mpl index d6cb7a490..cbfc75ed7 100644 --- a/code/changelog/de.itemis.mps.changelog/de.itemis.mps.changelog.mpl +++ b/code/changelog/de.itemis.mps.changelog/de.itemis.mps.changelog.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/code/changelog/de.itemis.mps.changelog/generator/templates/de.itemis.mps.changelog.generator@generator.mps b/code/changelog/de.itemis.mps.changelog/generator/templates/de.itemis.mps.changelog.generator@generator.mps index 9ab5c88b3..c06d7d2e3 100644 --- a/code/changelog/de.itemis.mps.changelog/generator/templates/de.itemis.mps.changelog.generator@generator.mps +++ b/code/changelog/de.itemis.mps.changelog/generator/templates/de.itemis.mps.changelog.generator@generator.mps @@ -289,7 +289,7 @@ - + @@ -524,7 +524,7 @@ - + @@ -535,7 +535,7 @@ - + @@ -622,7 +622,7 @@ - + @@ -636,7 +636,7 @@ - + @@ -644,7 +644,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -702,7 +702,7 @@ - + @@ -723,7 +723,7 @@ - + @@ -733,7 +733,7 @@ - + @@ -744,7 +744,7 @@ - + @@ -765,7 +765,7 @@ - + @@ -775,7 +775,7 @@ - + @@ -786,7 +786,7 @@ - + @@ -799,7 +799,7 @@ - + @@ -817,7 +817,7 @@ - + diff --git a/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.behavior.mps b/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.behavior.mps index a4a209175..2979bf300 100644 --- a/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.behavior.mps +++ b/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.behavior.mps @@ -1093,7 +1093,7 @@ - + diff --git a/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.intentions.mps b/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.intentions.mps index 4f6ab08bf..786378d81 100644 --- a/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.intentions.mps +++ b/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.intentions.mps @@ -257,7 +257,7 @@ - + @@ -288,7 +288,7 @@ - + @@ -365,7 +365,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -636,7 +636,7 @@ - + @@ -678,7 +678,7 @@ - + @@ -732,7 +732,7 @@ - + @@ -808,7 +808,7 @@ - + diff --git a/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.typesystem.mps b/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.typesystem.mps index 5066a788e..34ea674dc 100644 --- a/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.typesystem.mps +++ b/code/changelog/de.itemis.mps.changelog/models/de.itemis.mps.changelog.typesystem.mps @@ -479,7 +479,7 @@ - + @@ -529,7 +529,7 @@ - + @@ -537,7 +537,7 @@ - + @@ -567,7 +567,7 @@ - + @@ -579,7 +579,7 @@ - + @@ -674,7 +674,7 @@ - + @@ -773,7 +773,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/languageModels/editor.mps index 5896d7829..4b239a221 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/languageModels/editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/languageModels/editor.mps @@ -78,7 +78,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -234,7 +234,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -317,7 +317,7 @@ - + @@ -346,7 +346,7 @@ - + @@ -482,7 +482,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/languageModels/editor.mps index 5c69d5702..b9a6b7ce9 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/languageModels/editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/languageModels/editor.mps @@ -46,7 +46,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -237,7 +237,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl index c368f53c2..7cf44099e 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -79,7 +79,6 @@ - f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) @@ -91,7 +90,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/generator/templates/de.itemis.mps.editor.diagram.demo.elk.generator.templates@generator.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/generator/templates/de.itemis.mps.editor.diagram.demo.elk.generator.templates@generator.mps index 7111e9a56..79efd9e63 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/generator/templates/de.itemis.mps.editor.diagram.demo.elk.generator.templates@generator.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/generator/templates/de.itemis.mps.editor.diagram.demo.elk.generator.templates@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.behavior.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.behavior.mps index 629c62248..cfa1bec94 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.behavior.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.behavior.mps @@ -62,7 +62,7 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.constraints.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.constraints.mps index 51144fcdf..cf2544954 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.constraints.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.constraints.mps @@ -35,7 +35,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.editor.mps index 69159a0f1..fcc3a927b 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.editor.mps @@ -72,7 +72,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -243,7 +243,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.structure.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.structure.mps index fd002e7c3..ad2253337 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.structure.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.structure.mps @@ -39,7 +39,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps index 53008e009..041da4acb 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps @@ -63,7 +63,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -292,7 +292,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageAccessories/de/itemis/mps/editor/diagram/demolang/shapes.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageAccessories/de/itemis/mps/editor/diagram/demolang/shapes.mps index c412d57e6..a75881c8c 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageAccessories/de/itemis/mps/editor/diagram/demolang/shapes.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageAccessories/de/itemis/mps/editor/diagram/demolang/shapes.mps @@ -27,7 +27,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/editor.mps index e90f6201a..4e7ac371d 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/editor.mps @@ -84,7 +84,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -225,7 +225,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -479,7 +479,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 4e0df756b..6a434f31e 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 @@ -201,7 +201,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps index d717e42fc..717d793e6 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps @@ -103,7 +103,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -332,7 +332,7 @@ - + @@ -374,7 +374,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -582,7 +582,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps index 82e50aa74..62926dd83 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps @@ -119,7 +119,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -193,7 +193,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -246,6 +246,9 @@ + + + @@ -344,7 +347,7 @@ - + @@ -6172,17 +6175,19 @@ - - - - - - - - - - - + + + + + + + + + + + + + @@ -6678,17 +6683,19 @@ - - - - - - - - - - - + + + + + + + + + + + + + @@ -9210,17 +9217,19 @@ - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/constraints.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/constraints.mps index 370935be2..22db97715 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/constraints.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/constraints.mps @@ -66,7 +66,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -144,7 +144,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/de.itemis.mps.editor.diagram.migration.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/de.itemis.mps.editor.diagram.migration.mps index 69777c620..bdd3b0d2f 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/de.itemis.mps.editor.diagram.migration.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/de.itemis.mps.editor.diagram.migration.mps @@ -5,7 +5,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -106,6 +106,7 @@ + @@ -165,7 +166,7 @@ - + @@ -194,7 +195,6 @@ - @@ -285,7 +285,7 @@ - + @@ -305,7 +305,7 @@ - + @@ -324,7 +324,7 @@ - + @@ -334,9 +334,9 @@ - + - + @@ -373,7 +373,7 @@ - + @@ -405,7 +405,7 @@ - + @@ -414,9 +414,9 @@ - + - + @@ -444,7 +444,7 @@ - + @@ -453,9 +453,9 @@ - + - + @@ -477,7 +477,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -594,9 +594,9 @@ - + - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps index 3ed8a6298..523c13136 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps @@ -45,7 +45,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -257,7 +257,7 @@ - + @@ -331,7 +331,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps index a3c10122e..965c724be 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps @@ -3,6 +3,7 @@ + @@ -90,7 +91,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps index ebd8841d0..c708f1cbd 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps @@ -41,7 +41,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -151,7 +151,7 @@ - + diff --git a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/editor.mps b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/editor.mps index 31250ce60..9959db0a8 100644 --- a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/editor.mps +++ b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/editor.mps @@ -66,7 +66,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -147,11 +147,11 @@ - + - + @@ -182,7 +182,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/de.itemis.mps.editor.diagram.demo.elk.sandbox.msd b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/de.itemis.mps.editor.diagram.demo.elk.sandbox.msd index 3abf02020..887d44d51 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/de.itemis.mps.editor.diagram.demo.elk.sandbox.msd +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/de.itemis.mps.editor.diagram.demo.elk.sandbox.msd @@ -1,16 +1,15 @@ - + - + - @@ -18,7 +17,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps index 4950d178e..2c3fcb06e 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps @@ -101,7 +101,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -190,7 +190,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 e7b2bf351..d9488ff4f 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 @@ -26,60 +26,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -88,25 +34,14 @@ + + + + + + - - - - - - - - - - - - - - - - - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps index d411a9e7b..cd4e3a8fc 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps @@ -225,7 +225,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -402,7 +402,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -562,7 +562,7 @@ - + @@ -626,7 +626,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps index 559ac6b26..483b94173 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps @@ -126,7 +126,7 @@ - + @@ -205,7 +205,7 @@ - + @@ -295,7 +295,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -531,7 +531,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.shapes/models/de/itemis/mps/editor/diagram/shapes.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.shapes/models/de/itemis/mps/editor/diagram/shapes.mps index ebc2f74f6..70c5857ca 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.shapes/models/de/itemis/mps/editor/diagram/shapes.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.shapes/models/de/itemis/mps/editor/diagram/shapes.mps @@ -67,7 +67,7 @@ - + @@ -100,7 +100,7 @@ - + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps index 5c98e396e..f8f6cda98 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps @@ -92,7 +92,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -172,11 +172,11 @@ - + - + @@ -222,7 +222,7 @@ - + @@ -345,7 +345,7 @@ - + @@ -375,7 +375,7 @@ - + @@ -455,7 +455,7 @@ - + @@ -473,7 +473,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -593,7 +593,7 @@ - + @@ -805,7 +805,7 @@ - + @@ -5213,15 +5213,15 @@ - + - + - + @@ -5237,7 +5237,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 5371c6c72..1bf40332c 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 @@ -8,12 +8,10 @@ + - - - 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 0e4a0df95..893a22325 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 @@ -67,6 +67,7 @@ + diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps index 193b87cdf..16dd6f408 100644 --- a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps +++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps @@ -89,7 +89,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -269,7 +269,7 @@ - + @@ -384,7 +384,7 @@ - + diff --git a/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/de.itemis.mps.editor.pagination.demolang.mpl b/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/de.itemis.mps.editor.pagination.demolang.mpl index 4606e6b36..fe6643d43 100644 --- a/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/de.itemis.mps.editor.pagination.demolang.mpl +++ b/code/pagination/languages/de.itemis.mps.editor.pagination.demolang/de.itemis.mps.editor.pagination.demolang.mpl @@ -19,7 +19,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 89d083b0f..43c627562 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 @@ -5,6 +5,11 @@ + + + + + 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 f61c1f13a..cfdac0a6e 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 @@ -95,7 +95,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -269,7 +269,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -328,7 +328,7 @@ - + @@ -1081,7 +1081,7 @@ - + @@ -1266,7 +1266,7 @@ - + @@ -1325,7 +1325,7 @@ - + @@ -1384,7 +1384,7 @@ - + @@ -1487,7 +1487,7 @@ - + @@ -1610,7 +1610,7 @@ - + @@ -1636,7 +1636,7 @@ - + @@ -1679,7 +1679,7 @@ - + @@ -1887,7 +1887,7 @@ - + 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 03b193408..ffed5e596 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 @@ -46,10 +46,10 @@ - + - + @@ -93,7 +93,7 @@ - + @@ -252,7 +252,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -449,7 +449,7 @@ - + diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps index fdecf352b..c0ee66f2d 100644 --- a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps +++ b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.gen@tests.mps @@ -13,7 +13,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -284,7 +284,7 @@ - + diff --git a/code/solutions/de.itemis.mps.extensions.changelog/de.itemis.mps.extensions.changelog.msd b/code/solutions/de.itemis.mps.extensions.changelog/de.itemis.mps.extensions.changelog.msd index b26d3bc2a..63c17999e 100644 --- a/code/solutions/de.itemis.mps.extensions.changelog/de.itemis.mps.extensions.changelog.msd +++ b/code/solutions/de.itemis.mps.extensions.changelog/de.itemis.mps.extensions.changelog.msd @@ -6,7 +6,7 @@ - + diff --git a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps index b3f55be1e..c1d4bc198 100644 --- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps +++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps @@ -73,13 +73,13 @@ - + - + diff --git a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd index 5589342cb..4f786a266 100644 --- a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd +++ b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd @@ -9,12 +9,10 @@ + + - - - - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) From b95b750c9653ecc3614a703af8b06dcd5979880f Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Tue, 16 Jul 2024 11:38:28 +0300 Subject: [PATCH 18/46] Use Project API to access module's virtual folder ModulePath is internal data structure; with ProjectBase.getVirtualFolder available since 2022, no need to use one. --- .../org.modelix.model.mpsadapters.mps.mps | 78 ++++++++++--------- 1 file changed, 43 insertions(+), 35 deletions(-) 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 e5e8c4722..9f3ae92fa 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 @@ -192,6 +192,7 @@ + @@ -14640,7 +14641,7 @@ - + @@ -14656,20 +14657,15 @@ - - - - - - - - - - - + + + - - + + + + + @@ -14681,7 +14677,24 @@ - + + + + + + + + + + + + + + + + + + @@ -30827,30 +30840,25 @@ - - - - - + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - From 620d8614ba890e17d0916cbb864036fee823e044 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 19:54:58 +0000 Subject: [PATCH 19/46] build(deps): bump com.jetbrains.mps:mps-prerelease Bumps com.jetbrains.mps:mps-prerelease from 241.18034.993 to 241.18034.10049. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6c442d3bf..8a66271a4 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configurations { dependencies { // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency: // mps "com.jetbrains:mps:$mpsVersion" - mps "com.jetbrains.mps:mps-prerelease:241.18034.993" + mps "com.jetbrains.mps:mps-prerelease:241.18034.10049" } repositories { From 1905d52654c52e8854e10f643297f39fa99f53f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 22:02:08 +0000 Subject: [PATCH 20/46] build(deps): bump com.jetbrains.mps:mps-prerelease Bumps com.jetbrains.mps:mps-prerelease from 241.18034.10049 to 241.18034.10078. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8a66271a4..61bfcc9c7 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configurations { dependencies { // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency: // mps "com.jetbrains:mps:$mpsVersion" - mps "com.jetbrains.mps:mps-prerelease:241.18034.10049" + mps "com.jetbrains.mps:mps-prerelease:241.18034.10078" } repositories { From 4b7782965cc2be04b73827f69870876f2c101ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Fri, 26 Jul 2024 13:09:35 +0200 Subject: [PATCH 21/46] Reload build scripts from disk --- .../models/de.itemis.mps.extensions.build.mps | 1388 +---------------- 1 file changed, 1 insertion(+), 1387 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 81d960fdf..3fa2e3753 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 @@ -5434,1392 +5434,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13977,7 +12591,7 @@ - + From 1cd46da4718c993c35000c2906198dc53cebbb37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Fri, 26 Jul 2024 13:36:02 +0200 Subject: [PATCH 22/46] Run migrations --- .../batik/solutions/de.itemis.stubs.batik.msd | 2 +- .../models/de.itemis.mps.extensions.build.mps | 4 ++-- .../languageModels/editor.mps | 18 +++++++-------- .../languageModels/editor.mps | 10 ++++----- ...mis.mps.editor.diagram.demo.elk.editor.mps | 14 ++++++------ ....mps.editor.diagram.demo.elk.structure.mps | 2 +- .../languageModels/editor.mps | 12 +++++----- .../generator/template/main@generator.mps | 16 +++++++------- .../languageModels/behavior.mps | 10 ++++----- .../languageModels/constraints.mps | 6 ++--- .../languageModels/editor.mps | 22 +++++++++---------- .../languageModels/structure.mps | 2 +- .../languageModels/typesystem.mps | 6 ++--- ...is.mps.editor.diagram.demo.elk.sandbox.mps | 8 +++---- .../mps/editor/diagram/runtime/jgraph.mps | 14 ++++++------ .../mps/editor/diagram/runtime/model.mps | 10 ++++----- .../de.itemis.mps.extensions.changelog.mps | 4 ++-- 17 files changed, 80 insertions(+), 80 deletions(-) diff --git a/code/batik/solutions/de.itemis.stubs.batik.msd b/code/batik/solutions/de.itemis.stubs.batik.msd index 61ae94e31..c24ebc237 100644 --- a/code/batik/solutions/de.itemis.stubs.batik.msd +++ b/code/batik/solutions/de.itemis.stubs.batik.msd @@ -16,7 +16,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 838ae34b2..c73a4d776 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 @@ -112,7 +112,7 @@ - + @@ -131,7 +131,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/languageModels/editor.mps index 6f5337a06..d76929887 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/languageModels/editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.activity/languageModels/editor.mps @@ -78,7 +78,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -234,7 +234,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -314,7 +314,7 @@ - + @@ -331,7 +331,7 @@ - + @@ -408,7 +408,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/languageModels/editor.mps index 7c7d703bc..350c16fb3 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/languageModels/editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.callgraph/languageModels/editor.mps @@ -46,7 +46,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -245,7 +245,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.editor.mps index 6b4c87e12..cf89547f5 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.editor.mps @@ -82,7 +82,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -259,7 +259,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -338,7 +338,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.structure.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.structure.mps index 9b1b5db3d..eb4826e00 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.structure.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/models/de.itemis.mps.editor.diagram.demo.elk.structure.mps @@ -45,7 +45,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps index 3e539251c..21c464283 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps @@ -73,7 +73,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -302,7 +302,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps index 25553c48b..1c86a3114 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps @@ -108,7 +108,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -265,7 +265,7 @@ - + @@ -337,7 +337,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -440,7 +440,7 @@ - + @@ -587,7 +587,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps index bd400fd9c..aead197c4 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps @@ -132,7 +132,7 @@ - + @@ -193,7 +193,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -257,7 +257,7 @@ - + @@ -384,7 +384,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/constraints.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/constraints.mps index cb8a5bb00..52e9de29b 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/constraints.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/constraints.mps @@ -67,7 +67,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -150,7 +150,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps index fcc0a8f5f..0979b8611 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps @@ -50,7 +50,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -120,12 +120,12 @@ - + - + @@ -142,7 +142,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -306,7 +306,7 @@ - + @@ -324,7 +324,7 @@ - + @@ -424,7 +424,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps index 9a13d402d..24ea3f0be 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps @@ -92,7 +92,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps index 6d27bf91e..972999185 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps @@ -42,7 +42,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -152,7 +152,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps index 9035d7355..ea1b44c0d 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps @@ -103,7 +103,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -209,7 +209,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps index 0cdc23047..7fed82b9f 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps @@ -195,7 +195,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -409,7 +409,7 @@ - + @@ -455,7 +455,7 @@ - + @@ -574,7 +574,7 @@ - + @@ -647,7 +647,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps index 7daae47d9..ef3024f32 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps @@ -128,7 +128,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -297,7 +297,7 @@ - + @@ -343,7 +343,7 @@ - + @@ -533,7 +533,7 @@ - + diff --git a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps index 158793cd1..ebae33c53 100644 --- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps +++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps @@ -73,13 +73,13 @@ - + - + From 2067cb0cd5f3e5e3784f64d9eacf3a69c3a90052 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 21:26:28 +0000 Subject: [PATCH 23/46] build(deps): bump com.jetbrains.mps:mps-prerelease Bumps com.jetbrains.mps:mps-prerelease from 241.18034.10078 to 241.18034.10119. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ff61197db..67808166e 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configurations { dependencies { // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency: // mps "com.jetbrains:mps:$mpsVersion" - mps "com.jetbrains.mps:mps-prerelease:241.18034.10078" + mps "com.jetbrains.mps:mps-prerelease:241.18034.10119" } repositories { From 915233f0e19cf92090070a8ed9e99c9e9afd1b12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 21:26:21 +0000 Subject: [PATCH 24/46] build(deps): bump com.jetbrains.mps:mps-prerelease Bumps com.jetbrains.mps:mps-prerelease from 241.18034.10119 to 241.18034.10142. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 67808166e..9ce22c6d0 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configurations { dependencies { // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency: // mps "com.jetbrains:mps:$mpsVersion" - mps "com.jetbrains.mps:mps-prerelease:241.18034.10119" + mps "com.jetbrains.mps:mps-prerelease:241.18034.10142" } repositories { From 2da361a98c18f27a88ed4f92e9d89696cfdfa34e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 21:26:26 +0000 Subject: [PATCH 25/46] build(deps): bump de.itemis.mps.gradle.launcher Bumps [de.itemis.mps.gradle.launcher](https://github.com/mbeddr/mps-build-backends) from 2.4.2.+ to 2.5.2.107.def8e1d. - [Changelog](https://github.com/mbeddr/mps-build-backends/blob/main/CHANGELOG.md) - [Commits](https://github.com/mbeddr/mps-build-backends/commits) --- updated-dependencies: - dependency-name: de.itemis.mps.gradle.launcher dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 67808166e..518b46a14 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id "com.github.breadmoirai.github-release" version "2.5.2" id 'maven-publish' id 'base' - id 'de.itemis.mps.gradle.launcher' version '2.4.2.+' + id 'de.itemis.mps.gradle.launcher' version '2.5.2.+' } import de.itemis.mps.gradle.* From e3018a18d50edf3baf6db4fb351dba8b2fc3a4a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Mon, 12 Aug 2024 09:23:42 +0200 Subject: [PATCH 26/46] Run migrations/MPS file updates --- code/batik/solutions/de.itemis.stubs.batik.msd | 10 +++++++--- .../mps/editor/diagram/solution@tests.mps | 8 ++++---- .../generator/template/main@generator.mps | 6 +++--- ...mpsutil.editor.querylist.runtime.plugin.mps | 18 +++++++++--------- .../mpsutil/editor/querylist/runtime.mps | 8 ++++---- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/code/batik/solutions/de.itemis.stubs.batik.msd b/code/batik/solutions/de.itemis.stubs.batik.msd index d259e8cec..c24ebc237 100644 --- a/code/batik/solutions/de.itemis.stubs.batik.msd +++ b/code/batik/solutions/de.itemis.stubs.batik.msd @@ -1,5 +1,5 @@ - + @@ -31,11 +31,15 @@ - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + + + + + + diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps index 279924637..cdf49a354 100644 --- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps +++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps @@ -104,7 +104,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -378,7 +378,7 @@ - + diff --git a/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps b/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps index d4c723718..ac8ff0e50 100644 --- a/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps +++ b/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps @@ -111,7 +111,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps index 62303d046..8c2876c5f 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps @@ -682,7 +682,7 @@ - + @@ -827,7 +827,7 @@ - + @@ -899,7 +899,7 @@ - + @@ -1381,7 +1381,7 @@ - + @@ -1572,7 +1572,7 @@ - + @@ -1800,7 +1800,7 @@ - + @@ -2165,7 +2165,7 @@ - + @@ -2410,7 +2410,7 @@ - + @@ -2457,7 +2457,7 @@ - + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps index 3e84f8773..fab00a495 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps @@ -81,7 +81,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -225,7 +225,7 @@ - + @@ -316,7 +316,7 @@ - + From 00efdb1c6b09c561bb7b416c881e33ec2dc35fa6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 21:31:03 +0000 Subject: [PATCH 27/46] build(deps): bump com.jetbrains.mps:mps-prerelease Bumps com.jetbrains.mps:mps-prerelease from 241.18034.10142 to 241.19072.10175. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6644e59a3..3c21c849d 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configurations { dependencies { // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency: // mps "com.jetbrains:mps:$mpsVersion" - mps "com.jetbrains.mps:mps-prerelease:241.18034.10142" + mps "com.jetbrains.mps:mps-prerelease:241.19072.10175" } repositories { From e5ff7b61aa6f66ade3ea4b20cca116cd8958399e Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Tue, 13 Aug 2024 15:22:56 +0300 Subject: [PATCH 28/46] blutil: PerformanceProfiler - Statement vs StatementList --- .../generator/template/main@generator.mps | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps index acffe3152..3b46441ce 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps @@ -7586,14 +7586,19 @@ - - - + + + - - - - + + + + + + + + + From c8549597a9c8b3077b2399a885eae869e9961ce9 Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Wed, 14 Aug 2024 15:52:52 +0300 Subject: [PATCH 29/46] hacks.editor: EditorExtensionRegistry is now CC to access IDEA's Component and MPS CoreComponent in uniform way, use MPSProject.getComponent() --- .../models/de/slisson/mps/hacks/editor.mps | 95 +++++++++++++++---- .../de/itemis/mps/tooltips/runtime/plugin.mps | 27 ------ 2 files changed, 78 insertions(+), 44 deletions(-) diff --git a/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps b/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps index 330fe1084..cbbf60074 100644 --- a/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps +++ b/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps @@ -847,10 +847,10 @@ - + - + @@ -858,14 +858,14 @@ - - - - - - + + + + + + @@ -882,12 +882,12 @@ - - - - - - + + + + + + @@ -999,12 +999,73 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1012,7 +1073,7 @@ - + @@ -1039,7 +1100,7 @@ - + diff --git a/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps b/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps index b382be0af..2e580da51 100644 --- a/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps +++ b/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps @@ -51,9 +51,6 @@ - - - @@ -80,10 +77,6 @@ - - - - @@ -133,13 +126,6 @@ - - - - - - - @@ -149,19 +135,6 @@ - - - - - - - - - - - - - From 84e8c430b9b21bba9d7c69e3e1587232d5011cd4 Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Wed, 14 Aug 2024 16:12:23 +0300 Subject: [PATCH 30/46] Replace deprecated hacks.editor.EditorComponentCreationListener Use MPS EditorExtension API for replacement. --- .../models/de.itemis.mps.extensions.build.mps | 11 - ...e.itemis.mps.editor.celllayout.runtime.msd | 2 - .../mps/editor/celllayout/runtime/plugin.mps | 219 +++++++++++++----- .../de/itemis/mps/tooltips/runtime/plugin.mps | 201 +++++++++++----- .../de.itemis.mps.mouselistener.runtime.msd | 2 - .../mps/mouselistener/runtime/plugin.mps | 174 ++++++++++---- 6 files changed, 436 insertions(+), 173 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 0ad3cd8a7..cbe73d646 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 @@ -2313,11 +2313,6 @@ - - - - - @@ -6354,12 +6349,6 @@ - - - - - - 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 e31332429..5b3e985de 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 @@ -13,7 +13,6 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor) 24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles) @@ -48,7 +47,6 @@ - diff --git a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps index 82457d47d..d224a2ee0 100644 --- a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps +++ b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps @@ -9,13 +9,15 @@ - + + + @@ -53,6 +55,7 @@ + @@ -79,11 +82,21 @@ + + + + + + + + + + @@ -138,6 +151,9 @@ + + + @@ -202,10 +218,10 @@ - + - + @@ -330,26 +346,75 @@ - - + + + - - - - - - - + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -382,14 +447,14 @@ - + - + @@ -412,7 +477,7 @@ - + @@ -425,7 +490,7 @@ - + @@ -439,7 +504,7 @@ - + @@ -449,23 +514,45 @@ + + + - - - - - - - + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + - + @@ -483,7 +570,7 @@ - + @@ -502,7 +589,7 @@ - + @@ -526,13 +613,15 @@ - + + + + - @@ -544,18 +633,24 @@ - - - - - - + + + + + + + + + - - - - + + + + + + + @@ -564,17 +659,37 @@ + + + + + + + + + + + + + + + + + + + + + + - - + + + - + - - - diff --git a/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps b/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps index 2e580da51..5c56844ea 100644 --- a/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps +++ b/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps @@ -9,11 +9,12 @@ - - - - + + + + + @@ -35,6 +36,12 @@ + + + + + + @@ -51,6 +58,16 @@ + + + + + + + + + + @@ -64,9 +81,7 @@ - - - + @@ -74,9 +89,6 @@ - - - @@ -97,6 +109,9 @@ + + + @@ -130,7 +145,7 @@ - + @@ -148,21 +163,52 @@ - - + + - - - - - - - + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -198,54 +244,77 @@ - - + + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - + - - + + + + + + + + + + - - - - - - - + + + + + + + + + - - - - + + + + + + + @@ -254,16 +323,36 @@ - - - - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + 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 d5defa974..8faf7aec0 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 @@ -14,7 +14,6 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor) @@ -43,7 +42,6 @@ - diff --git a/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/models/de/itemis/mps/mouselistener/runtime/plugin.mps b/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/models/de/itemis/mps/mouselistener/runtime/plugin.mps index 541600d7f..92b9789ef 100644 --- a/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/models/de/itemis/mps/mouselistener/runtime/plugin.mps +++ b/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/models/de/itemis/mps/mouselistener/runtime/plugin.mps @@ -17,8 +17,10 @@ - + + + @@ -85,6 +87,7 @@ + @@ -138,9 +141,6 @@ - - - @@ -1476,7 +1476,7 @@ - + @@ -1487,28 +1487,64 @@ - - + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -1517,26 +1553,36 @@ + + + - - - - - - - + + + + + + + + + + + - - - + - - + + + + + + + @@ -1545,8 +1591,10 @@ + + + - @@ -1558,18 +1606,24 @@ - - - - - - + + + + + + + + + - - - - + + + + + + + @@ -1578,16 +1632,36 @@ - - - - - - + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + From 6f568724518f78144317e07f982888b0a885032c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 21:58:46 +0000 Subject: [PATCH 31/46] build(deps): bump com.jetbrains.mps:mps-prerelease Bumps com.jetbrains.mps:mps-prerelease from 241.19072.10175 to 241.19072.10217. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3c21c849d..0b0d13396 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configurations { dependencies { // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency: // mps "com.jetbrains:mps:$mpsVersion" - mps "com.jetbrains.mps:mps-prerelease:241.19072.10175" + mps "com.jetbrains.mps:mps-prerelease:241.19072.10217" } repositories { From 0ff52e918b196623217aa677542fb6ac70c6949c Mon Sep 17 00:00:00 2001 From: Artem Tikhomirov Date: Tue, 20 Aug 2024 14:04:16 +0300 Subject: [PATCH 32/46] Access ReloadManager impl through interface and getInstance() In 24.2, MPS replaced IDEA AppComponent with a service. --- .../mpsutil/projectview/runtime/tree.mps | 34 ++++++------------- 1 file changed, 10 insertions(+), 24 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 0bec5056f..212af13af 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 @@ -3477,23 +3477,16 @@ - - - - - - - - - - - - + + + + + @@ -3755,18 +3748,11 @@ - + - - - - - - - - - - + + + @@ -3825,7 +3811,7 @@ - + From 82be768b8ae9000458027eaff6482bb67de6a5c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 21:26:01 +0000 Subject: [PATCH 33/46] build(deps): bump org.eclipse.emf:org.eclipse.emf.ecore.xmi Bumps [org.eclipse.emf:org.eclipse.emf.ecore.xmi](https://github.com/eclipse-emf/org.eclipse.emf) from 2.37.0 to 2.38.0. - [Commits](https://github.com/eclipse-emf/org.eclipse.emf/commits) --- updated-dependencies: - dependency-name: org.eclipse.emf:org.eclipse.emf.ecore.xmi dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0b0d13396..389159fb9 100644 --- a/build.gradle +++ b/build.gradle @@ -195,7 +195,7 @@ dependencies { diagram_lib ("org.eclipse.elk:org.eclipse.elk.graph:$elkVersion") diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.30.0") diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.36.0") - diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.37.0") + diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.38.0") batik ("org.apache.xmlgraphics:batik-svggen:1.17") batik ("org.apache.xmlgraphics:batik-dom:1.17") From f733d7f0bf0fb6b600e0bb7fde1ea874ab1fca85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 21:26:07 +0000 Subject: [PATCH 34/46] build(deps): bump com.jetbrains.mps:mps-prerelease Bumps com.jetbrains.mps:mps-prerelease from 241.19072.10217 to 241.19072.10271. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0b0d13396..703b316bb 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configurations { dependencies { // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency: // mps "com.jetbrains:mps:$mpsVersion" - mps "com.jetbrains.mps:mps-prerelease:241.19072.10217" + mps "com.jetbrains.mps:mps-prerelease:241.19072.10271" } repositories { From 6e89b7504886a18ec10945e6757b0cd21fbe688f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 21:26:10 +0000 Subject: [PATCH 35/46] build(deps): bump org.eclipse.emf:org.eclipse.emf.common Bumps [org.eclipse.emf:org.eclipse.emf.common](https://github.com/eclipse-emf/org.eclipse.emf) from 2.30.0 to 2.31.0. - [Commits](https://github.com/eclipse-emf/org.eclipse.emf/commits) --- updated-dependencies: - dependency-name: org.eclipse.emf:org.eclipse.emf.common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0b0d13396..d1bc778d7 100644 --- a/build.gradle +++ b/build.gradle @@ -193,7 +193,7 @@ dependencies { diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.topdownpacking:$elkVersion") diagram_lib ("org.eclipse.elk:org.eclipse.elk.core:$elkVersion") diagram_lib ("org.eclipse.elk:org.eclipse.elk.graph:$elkVersion") - diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.30.0") + diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.31.0") diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.36.0") diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.37.0") From 56ae100a80a5af9fd9d149d9916d3b3354389129 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 05:32:23 +0000 Subject: [PATCH 36/46] build(deps): bump org.eclipse.emf:org.eclipse.emf.ecore Bumps [org.eclipse.emf:org.eclipse.emf.ecore](https://github.com/eclipse-emf/org.eclipse.emf) from 2.36.0 to 2.37.0. - [Commits](https://github.com/eclipse-emf/org.eclipse.emf/commits) --- updated-dependencies: - dependency-name: org.eclipse.emf:org.eclipse.emf.ecore dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 70ea21e65..bdc85a239 100644 --- a/build.gradle +++ b/build.gradle @@ -194,7 +194,7 @@ dependencies { diagram_lib ("org.eclipse.elk:org.eclipse.elk.core:$elkVersion") diagram_lib ("org.eclipse.elk:org.eclipse.elk.graph:$elkVersion") diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.31.0") - diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.36.0") + diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.37.0") diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.38.0") batik ("org.apache.xmlgraphics:batik-svggen:1.17") From 1e8696762c7f05a3957c964e7e9066e993200122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Mon, 2 Sep 2024 13:09:53 +0200 Subject: [PATCH 37/46] Add mps-testing plugin --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 703b316bb..854de7bf1 100644 --- a/build.gradle +++ b/build.gradle @@ -527,6 +527,7 @@ def usedPluginRoots = [ new File(mpsHomeDir, 'plugins/mps-vcs'), new File(mpsHomeDir, 'plugins/mps-git4idea'), new File(mpsHomeDir, 'plugins/mps-httpsupport'), + new File(mpsHomeDir, 'plugins/mps-testing'), ] tasks.register('migrate', MpsMigrate) { From e6f2deeac6abc364e529fa315a44b16fc7dff948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Mon, 2 Sep 2024 15:30:33 +0200 Subject: [PATCH 38/46] Run migrations --- .../languages/com.mbeddr.mpsutil.blutil/blutil.mpl | 1 - .../generator/template/main@generator.mps | 4 ++-- .../de.itemis.mps.editor.celllayout.mpl | 2 -- .../test.de.itemis.mps.editor.celllayout.lang.mpl | 1 - .../de/itemis/mps/editor/celllayout/runtime/plugin.mps | 10 +++++----- .../test.de.itemis.mps.editor.celllayout.msd | 1 - .../de.itemis.mps.debug/de.itemis.mps.debug.mpl | 2 -- .../de.itemis.mps.debug.runtime.msd | 1 - .../de.itemis.mps.editor.diagram.demo.activity.mpl | 1 - .../de.itemis.mps.editor.diagram.demo.callgraph.mpl | 1 - .../de.itemis.mps.editor.diagram.demo.elk.mpl | 2 -- .../de.itemis.mps.editor.diagram.demoentities.mpl | 1 - .../de.itemis.mps.editor.diagram.demolang.mpl | 1 - .../de.itemis.mps.editor.diagram.styles.mpl | 1 - .../de.itemis.mps.editor.diagram.mpl | 2 -- .../de.itemis.mps.editor.diagram.demo.elk.sandbox.msd | 1 - .../test.de.itemis.mps.editor.diagram.solution.msd | 1 - .../models/de/slisson/mps/hacks/editor.mps | 4 ++-- .../de.itemis.mps.editor.htmlcell.mpl | 1 - .../de.itemis.mps.editor.htmlcell.runtime.msd | 1 - .../de.slisson.mps.editor.multiline.test.mpl | 2 -- code/multiline/languages/multiline/multiline.mpl | 1 - .../runtime.msd | 1 - .../test.de.slisson.mps.editor.multiline.msd | 1 - .../de.slisson.mps.richtext.test.mpl | 1 - code/richtext/languages/javadoc/javadoc.mpl | 1 - .../test.de.slisson.mps.richtext.msd | 1 - .../de.slisson.mps.tables.demolang.mpl | 1 - .../de.slisson.mps.tables/de.slisson.mps.tables.mpl | 1 - .../test.de.slisson.mps.tables.msd | 1 - .../models/de/itemis/mps/tooltips/runtime/plugin.mps | 8 ++++---- .../de/itemis/mps/mouselistener/runtime/plugin.mps | 8 ++++---- 32 files changed, 17 insertions(+), 49 deletions(-) diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl index 4e59fc530..6c88c3cc0 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl @@ -192,7 +192,6 @@ - diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps index 3b46441ce..a19064414 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/generator/template/main@generator.mps @@ -7594,11 +7594,11 @@ - + - + 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 01204a762..1a2543786 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 @@ -64,7 +64,6 @@ - @@ -157,7 +156,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 80267d8cc..4f45c716a 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 @@ -66,7 +66,6 @@ - diff --git a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps index d224a2ee0..146c956b1 100644 --- a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps +++ b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps @@ -347,7 +347,7 @@ - + @@ -376,7 +376,7 @@ - + @@ -515,7 +515,7 @@ - + @@ -619,7 +619,7 @@ - + @@ -628,7 +628,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 825303137..e6741349b 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 @@ -38,7 +38,6 @@ - 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 a56f6c2c6..bcd76b528 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 @@ -62,7 +62,6 @@ - @@ -127,7 +126,6 @@ - diff --git a/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd b/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd index fda258c57..9439cea86 100644 --- a/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd +++ b/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd @@ -46,7 +46,6 @@ - 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 b18e5f841..134f6868c 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 @@ -68,7 +68,6 @@ - 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 190c4a7e6..48609ad67 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 @@ -68,7 +68,6 @@ - diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl index 66786d69c..96f1b873c 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl @@ -60,7 +60,6 @@ - @@ -140,7 +139,6 @@ - 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 da4515edd..123bedd6e 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 @@ -78,7 +78,6 @@ - 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 26c1846c1..61bd371a2 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 @@ -106,7 +106,6 @@ - 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 4d5efe1cb..2923a80e6 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 @@ -62,7 +62,6 @@ - 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 0cac29a4e..6213a9358 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 @@ -84,7 +84,6 @@ - @@ -237,7 +236,6 @@ - diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/de.itemis.mps.editor.diagram.demo.elk.sandbox.msd b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/de.itemis.mps.editor.diagram.demo.elk.sandbox.msd index e7ac71f26..4e44547cd 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/de.itemis.mps.editor.diagram.demo.elk.sandbox.msd +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/de.itemis.mps.editor.diagram.demo.elk.sandbox.msd @@ -46,7 +46,6 @@ - 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 d9bb24777..e61d9ed4a 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 @@ -57,7 +57,6 @@ - diff --git a/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps b/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps index cbbf60074..ffc6d1eb8 100644 --- a/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps +++ b/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps @@ -1070,7 +1070,7 @@ - + @@ -1097,7 +1097,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 7093ab531..e44075677 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 @@ -63,7 +63,6 @@ - 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 dcd9611d9..e2f6da4b5 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 @@ -41,7 +41,6 @@ - diff --git a/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl b/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl index 635e47c13..2b6174aaf 100644 --- a/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl +++ b/code/multiline/languages/de.slisson.mps.editor.multiline.test/de.slisson.mps.editor.multiline.test.mpl @@ -59,7 +59,6 @@ - @@ -139,7 +138,6 @@ - diff --git a/code/multiline/languages/multiline/multiline.mpl b/code/multiline/languages/multiline/multiline.mpl index 2b7011263..0b804b4b0 100644 --- a/code/multiline/languages/multiline/multiline.mpl +++ b/code/multiline/languages/multiline/multiline.mpl @@ -62,7 +62,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 4bed35d2e..a48f44664 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 @@ -55,7 +55,6 @@ - diff --git a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd index f75ad72b0..6e3500026 100644 --- a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd +++ b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/test.de.slisson.mps.editor.multiline.msd @@ -48,7 +48,6 @@ - diff --git a/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl b/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl index 170fbd77c..f4f1faf93 100644 --- a/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl +++ b/code/richtext/languages/de.slisson.mps.richtext.test/de.slisson.mps.richtext.test.mpl @@ -136,7 +136,6 @@ - diff --git a/code/richtext/languages/javadoc/javadoc.mpl b/code/richtext/languages/javadoc/javadoc.mpl index ded8ac92c..5b71e15c2 100644 --- a/code/richtext/languages/javadoc/javadoc.mpl +++ b/code/richtext/languages/javadoc/javadoc.mpl @@ -65,7 +65,6 @@ - diff --git a/code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd b/code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd index 0c29990c6..b51ab5004 100644 --- a/code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd +++ b/code/richtext/solutions/test.de.slisson.mps.richtext/test.de.slisson.mps.richtext.msd @@ -40,7 +40,6 @@ - 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 cb25a5edb..eea5a0bfb 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 @@ -64,7 +64,6 @@ - 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 27b5c57a1..be17650b7 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 @@ -197,7 +197,6 @@ - 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 c670d7093..6a4d3e534 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 @@ -42,7 +42,6 @@ - diff --git a/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps b/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps index 5c56844ea..b1c156c93 100644 --- a/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps +++ b/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps @@ -164,7 +164,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -289,7 +289,7 @@ - + diff --git a/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/models/de/itemis/mps/mouselistener/runtime/plugin.mps b/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/models/de/itemis/mps/mouselistener/runtime/plugin.mps index 92b9789ef..51c9e9727 100644 --- a/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/models/de/itemis/mps/mouselistener/runtime/plugin.mps +++ b/code/widgets/solutions/de.itemis.mps.mouselistener.runtime/models/de/itemis/mps/mouselistener/runtime/plugin.mps @@ -1488,7 +1488,7 @@ - + @@ -1516,7 +1516,7 @@ - + @@ -1554,7 +1554,7 @@ - + @@ -1592,7 +1592,7 @@ - + From 70b5e9eff6d09f59869a9f92ac0706cd66994ad5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 22:04:46 +0000 Subject: [PATCH 39/46] build(deps): bump org.apache.ant:ant-junit4 from 1.10.14 to 1.10.15 Bumps org.apache.ant:ant-junit4 from 1.10.14 to 1.10.15. --- updated-dependencies: - dependency-name: org.apache.ant:ant-junit4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2842946c6..384e477f5 100644 --- a/build.gradle +++ b/build.gradle @@ -369,7 +369,7 @@ dependencies { junitAnt('org.apache.ant:ant-junit:1.10.14') { transitive = false } - junitAnt('org.apache.ant:ant-junit4:1.10.14') { + junitAnt('org.apache.ant:ant-junit4:1.10.15') { transitive = false } } From c5855a4070b83947dcbc78a1386d825402e6f359 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 22:04:48 +0000 Subject: [PATCH 40/46] build(deps): bump org.apache.ant:ant-junit from 1.10.14 to 1.10.15 Bumps org.apache.ant:ant-junit from 1.10.14 to 1.10.15. --- updated-dependencies: - dependency-name: org.apache.ant:ant-junit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2842946c6..b28077231 100644 --- a/build.gradle +++ b/build.gradle @@ -179,7 +179,7 @@ configurations { } dependencies { - ant_lib "org.apache.ant:ant-junit:1.10.14" + ant_lib "org.apache.ant:ant-junit:1.10.15" def elkVersion = "0.9.1" diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.common:$elkVersion") @@ -366,10 +366,10 @@ configurations { } dependencies { junitAnt 'junit:junit:4.13.2' - junitAnt('org.apache.ant:ant-junit:1.10.14') { + junitAnt('org.apache.ant:ant-junit:1.10.15') { transitive = false } - junitAnt('org.apache.ant:ant-junit4:1.10.14') { + junitAnt('org.apache.ant:ant-junit4:1.10.15') { transitive = false } } From 3cfd4df178c48e7edbfc2b6365415ff839c83be5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 22:04:50 +0000 Subject: [PATCH 41/46] build(deps): bump com.jetbrains.mps:mps-prerelease Bumps com.jetbrains.mps:mps-prerelease from 241.19072.10271 to 241.19072.10282. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2842946c6..c45770146 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configurations { dependencies { // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency: // mps "com.jetbrains:mps:$mpsVersion" - mps "com.jetbrains.mps:mps-prerelease:241.19072.10271" + mps "com.jetbrains.mps:mps-prerelease:241.19072.10282" } repositories { From 8fabf55215127a476110f013c8bf7dcbc401fd11 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 3 Sep 2024 11:29:06 +0200 Subject: [PATCH 42/46] editor.diagram: remove the flaky activity collapse test --- .../mps/editor/diagram/solution@tests.mps | 1597 +---------------- 1 file changed, 1 insertion(+), 1596 deletions(-) diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps index cdf49a354..e3531412b 100644 --- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps +++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps @@ -333,11 +333,6 @@ - - - - - @@ -395,7 +390,7 @@ - + @@ -6739,1596 +6734,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 4f9a6adda287fa5da237ffc4f3d2660ee01fb3ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 21:18:44 +0000 Subject: [PATCH 43/46] build(deps): bump com.jetbrains.mps:mps-prerelease Bumps com.jetbrains.mps:mps-prerelease from 241.19072.10282 to 241.19072.10319. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 916cd8c5c..c13a65066 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configurations { dependencies { // For published releases adjust ext.mpsMajor and ext.mpsMinor above and use this dependency: // mps "com.jetbrains:mps:$mpsVersion" - mps "com.jetbrains.mps:mps-prerelease:241.19072.10282" + mps "com.jetbrains.mps:mps-prerelease:241.19072.10319" } repositories { From 6ceab3d2b48f5ae19f73ae8087eae7f50fc84e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Wed, 11 Sep 2024 09:10:18 +0200 Subject: [PATCH 44/46] MPS file updates --- code/batik/solutions/de.itemis.stubs.batik.msd | 2 +- .../de.itemis.mps.debug.runtime.msd | 2 +- .../de.itemis.mps.editor.diagram.mpl | 2 +- .../test/de/itemis/mps/editor/diagram/solution@tests.mps | 2 +- .../de.slisson.mps.reflection/de.slisson.mps.reflection.mpl | 2 +- .../de.itemis.mps.editor.pagination.mpl | 4 ++-- .../de.itemis.mps.editor.pagination.runtime.msd | 2 +- .../de.itemis.mps.editor.pagination.test.msd | 2 +- .../com.mbeddr.mpsutil.editor.querylist.sandbox.msd | 2 +- .../de.itemis.mps.structurecheck.mpl | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/batik/solutions/de.itemis.stubs.batik.msd b/code/batik/solutions/de.itemis.stubs.batik.msd index c24ebc237..da080beef 100644 --- a/code/batik/solutions/de.itemis.stubs.batik.msd +++ b/code/batik/solutions/de.itemis.stubs.batik.msd @@ -1,7 +1,7 @@ - + diff --git a/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd b/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd index 9439cea86..bd43705fa 100644 --- a/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd +++ b/code/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd @@ -1,7 +1,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 6213a9358..b82886257 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 @@ -14,7 +14,7 @@ - + diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps index e3531412b..73de429d4 100644 --- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps +++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps @@ -390,7 +390,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 51a0dfcc0..f5a0a4c3d 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 @@ -1,7 +1,7 @@ - + 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 fc7c54f83..72995a4cf 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 @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd b/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd index e427f023d..2e87679ca 100644 --- a/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd +++ b/code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/de.itemis.mps.editor.pagination.runtime.msd @@ -1,7 +1,7 @@ - + diff --git a/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd b/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd index 298eb1e15..b140b3711 100644 --- a/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd +++ b/code/pagination/solutions/de.itemis.mps.editor.pagination.test/de.itemis.mps.editor.pagination.test.msd @@ -1,7 +1,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 43c627562..8fec60b39 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 @@ -1,7 +1,7 @@ - + diff --git a/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl b/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl index 72b0ae05c..99affd847 100644 --- a/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl @@ -1,7 +1,7 @@ - + From f47fd32b28c00dec7439a166aac8a107120f724d Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 11 Sep 2024 14:06:19 +0200 Subject: [PATCH 45/46] update the Kotlin stubs --- .../models/de.itemis.mps.extensions.build.mps | 164 ++++++++++-------- .../solutions/MPS.Kotlin/MPS.Kotlin.msd | 14 +- 2 files changed, 93 insertions(+), 85 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 8199933be..7e1745891 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 @@ -4,7 +4,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -932,8 +932,8 @@ + - @@ -1151,7 +1151,7 @@ - + @@ -1173,7 +1173,7 @@ - + @@ -2520,6 +2520,11 @@ + + + + + @@ -5651,19 +5656,39 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + @@ -5673,19 +5698,19 @@ - - - + + + - + - + - + - + - + @@ -5695,19 +5720,19 @@ - - - + + + - + - + - + - + - + @@ -5717,19 +5742,19 @@ - - - + + + - + - + - + - + - + @@ -5739,19 +5764,19 @@ - - - + + + - + - + - + - + - + @@ -5761,19 +5786,19 @@ - - - + + + - + - + - + - + - + @@ -5783,31 +5808,11 @@ - - + + - - - - - - - - - - - - - - - - - - - - @@ -6556,6 +6561,12 @@ + + + + + + @@ -13126,8 +13137,8 @@ + - @@ -23229,4 +23240,3 @@ - diff --git a/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd index 7d8fe0bca..7db6d5ebe 100644 --- a/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd +++ b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd @@ -1,20 +1,18 @@ - + - - - + + - + - - - + + From 2a777a6bea463362941e8cf29c4d09d91925ba4c Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 11 Sep 2024 14:43:08 +0200 Subject: [PATCH 46/46] force save all --- .../models/de.itemis.mps.extensions.build.mps | 9 +- .../de.itemis.mps.editor.diagram.demo.elk.mpl | 2 +- ...itemis.mps.editor.diagram.demoentities.mpl | 1 - .../languageModels/editor.mps | 18 ++-- ...test.de.itemis.mps.editor.diagram.lang.mpl | 1 - ...is.mps.editor.diagram.demo.elk.sandbox.mps | 4 +- .../mps/editor/diagram/solution@tests.mps | 4 +- .../kotlin.usage.test/kotlin.usage.test.msd | 4 +- .../MPS.ThirdParty/MPS.ThirdParty.msd | 2 +- scripts/build.xml | 93 +------------------ 10 files changed, 23 insertions(+), 115 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 7e1745891..25ad714c7 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 @@ -183,7 +183,7 @@ - + @@ -932,8 +932,8 @@ - + @@ -1060,8 +1060,8 @@ - + @@ -13137,8 +13137,8 @@ - + @@ -23240,3 +23240,4 @@ + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl index 1076c642d..96f1b873c 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl @@ -1,7 +1,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 ca0bf249d..369ffef57 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 @@ -82,7 +82,6 @@ - diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps index 813ca9dba..3af1590c7 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps @@ -208,7 +208,7 @@ - + @@ -227,8 +227,8 @@ - - + + @@ -238,9 +238,9 @@ - + - + @@ -252,11 +252,11 @@ - + - + - + @@ -264,7 +264,7 @@ - + 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 b25b47858..71f12d724 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 @@ -72,7 +72,6 @@ - diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps index 81b320ff8..75f028ad8 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.demo.elk.sandbox/models/de.itemis.mps.editor.diagram.demo.elk.sandbox.mps @@ -105,7 +105,7 @@ - + @@ -180,7 +180,7 @@ - + diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps index 2a9dc1181..b49bbe488 100644 --- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps +++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps @@ -550,7 +550,7 @@ - + @@ -648,7 +648,7 @@ - + diff --git a/code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd b/code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd index 864db2607..a30191ad5 100644 --- a/code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd +++ b/code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd @@ -1,12 +1,12 @@ - + - + diff --git a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd index 1e9505907..3eccffd84 100644 --- a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd +++ b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd @@ -1,7 +1,7 @@ - + diff --git a/scripts/build.xml b/scripts/build.xml index 37cb1c665..006aba31d 100644 --- a/scripts/build.xml +++ b/scripts/build.xml @@ -45,9 +45,7 @@ - - - + @@ -110,95 +108,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -