From 2ecdd0ff84951b6d525606f6f0d1825dce463557 Mon Sep 17 00:00:00 2001 From: Niko Stotz Date: Wed, 7 Aug 2024 13:46:19 +0200 Subject: [PATCH 01/14] made querylist model checking result propagation more responsive to cancellation and added optional timeout (cherry picked from commit 3204fe83d84c30030744a2f86b6351730526159a) --- ...psutil.editor.querylist.runtime.plugin.mps | 1112 ++++++++++++----- 1 file changed, 789 insertions(+), 323 deletions(-) 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 ebbd0ede1..c3b5132f9 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 @@ -1,15 +1,16 @@ + - + - + @@ -53,6 +54,8 @@ + + @@ -77,12 +80,19 @@ + + + + + + + @@ -90,6 +100,7 @@ + @@ -97,6 +108,13 @@ + + + + + + + @@ -108,6 +126,7 @@ + @@ -145,6 +164,7 @@ + @@ -186,7 +206,9 @@ + + @@ -203,12 +225,24 @@ + + + + + + + + + + + + @@ -217,6 +251,7 @@ + @@ -235,6 +270,7 @@ + @@ -322,7 +358,6 @@ - @@ -465,6 +500,7 @@ + @@ -538,425 +574,754 @@ - - - - - + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - - + + - - - - + + + + - - - - - - - - - + + + + + + + + + - + - + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + - - - - + + + + + + + + + + - - + + - - - - - - - - - - - - - - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + @@ -967,8 +1332,9 @@ - - + + + @@ -1114,15 +1480,15 @@ - + - + - + @@ -1145,8 +1511,12 @@ - - + + + + + + @@ -1201,6 +1571,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1370,6 +1817,25 @@ + + + + + + + + + + + + + + + + + + + From bf07e309c2a30b4b53be1d1a5c160d3accb198a0 Mon Sep 17 00:00:00 2001 From: Niko Stotz Date: Wed, 7 Aug 2024 18:00:43 +0200 Subject: [PATCH 02/14] keep typesystem checker computation mode alive inside querylist (cherry picked from commit cddb8681d8e41ec89206327e7ef4f34e004bbfe3) --- .../languageModels/typesystem.mps | 61 +- ...beddr.mpsutil.editor.querylist.runtime.msd | 2 + ...psutil.editor.querylist.runtime.plugin.mps | 717 +++++++++++++++++- 3 files changed, 748 insertions(+), 32 deletions(-) diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps index ca4554869..d5154992c 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps @@ -4,7 +4,64 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd index f430843f2..def4b4d6a 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd @@ -25,6 +25,7 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime) 7037b32c-9607-4f8e-81bd-1f028a4c117b(de.slisson.mps.reflection.runtime) + 20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine) @@ -74,6 +75,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 c3b5132f9..3eed7964a 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 @@ -1,7 +1,6 @@ - @@ -56,6 +55,9 @@ + + + @@ -90,6 +92,9 @@ + + + @@ -100,6 +105,9 @@ + + + @@ -133,6 +141,10 @@ + + + + @@ -164,12 +176,15 @@ + - + + + @@ -216,6 +231,10 @@ + + + + @@ -237,12 +256,21 @@ + + + + + + + + + @@ -277,6 +305,10 @@ + + + + @@ -284,6 +316,12 @@ + + + + + + @@ -326,6 +364,21 @@ + + + + + + + + + + + + + + + @@ -365,10 +418,16 @@ + + + + + + @@ -587,25 +646,6 @@ - - - - - - - - - - - - - - - - - - - @@ -637,6 +677,25 @@ + + + + + + + + + + + + + + + + + + + @@ -1371,10 +1430,9 @@ - - - - + + + @@ -1563,6 +1621,12 @@ + + + + + + @@ -1571,10 +1635,142 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1816,7 +2012,6 @@ - @@ -1836,6 +2031,7 @@ + @@ -1947,5 +2143,466 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6ccb113b87153cccbd081793953b098af16f3f5d Mon Sep 17 00:00:00 2001 From: Niko Stotz Date: Thu, 8 Aug 2024 13:37:15 +0200 Subject: [PATCH 03/14] updated changelog (cherry picked from commit 87e67fce4ef9038f55ebd1fe73e8e8eedc5e9103) --- CHANGELOG.md | 3 +- .../de.itemis.mps.extensions.changelog.mps | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 702bf3e96..b5bb11537 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e ### Added -- *de.slisson.mps.tables*: Sticky table cells were added. Add the style sheet item *horizontal-sticky-cell* or *vertical-sticky-cell* *to* *a* *table* *cell* *to* *activate* *the* *feature.* - *de.itemis.mps.editor.diagram*: A new option for diagrams was added to allow boxes to set a new required minimum size. +- *de.slisson.mps.tables*: Sticky table cells were added. Add the style sheet item *horizontal-sticky-cell* or *vertical-sticky-cell* *to* *a* *table* *cell* *to* *activate* *the* *feature.* - *de.slisson.mps.editor.multiline*: A new cell *constant multi-line* can be used to create dynamic read-only text that spans multiple lines. ### Fixed @@ -20,6 +20,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e ### Changed - *de.slisson.mps.reflection*: The language uses the class ReflectionUtil directly and doesn't copy ReflectionUtil_copy in the model anymore. +- *com.mbeddr.mpsutil.editor.querylist.runtime*: Querylist calls model checks of target nodes less agressively. ## July 2024 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 ee4c85563..014ea39be 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 @@ -622,6 +622,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ae8b7d19487118078528a2f106f052269faec7ff Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 29 Aug 2024 08:38:11 +0200 Subject: [PATCH 04/14] update the build script --- .../models/de.itemis.mps.extensions.build.mps | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index d53174f3c..9fb7e40b7 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 @@ -13536,6 +13536,11 @@ + + + + + From 9d8282a891da89fbfbb0c1f52d060f57c57809ac Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 29 Aug 2024 08:39:24 +0200 Subject: [PATCH 05/14] update MPS version to 2022.3.2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7f7d47aec..97c06a221 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ logger.info 'Repository username: {}', project.nexusUsername // major version, e.g. '2021.1', '2021.2' ext.mpsMajor = '2022.3' // optional minor/bugfix number (not added to the final build version) -ext.mpsMinor = '1' +ext.mpsMinor = '2' // e.g. Beta, EAP, RC ext.mpsReleaseType = '' From 531b642a8fd5f5c5f217cb47d324d7e229af224e Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 29 Aug 2024 13:47:31 +0200 Subject: [PATCH 06/14] fix the compilation error --- ...psutil.editor.querylist.runtime.plugin.mps | 72 +++++++++++++------ 1 file changed, 51 insertions(+), 21 deletions(-) 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 3eed7964a..32ab3fe92 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 @@ -364,6 +364,10 @@ + + + + @@ -1668,34 +1672,34 @@ - - - - - + - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - @@ -1721,6 +1725,15 @@ + + + + + + + + + @@ -1768,8 +1781,25 @@ - - + + + + + + + + + + + + + + + + + + + From 5876427aa30d8984b63768ad5307707c2b51b482 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 2 Sep 2024 08:53:43 +0200 Subject: [PATCH 07/14] shadowmodels: check that application is not already disposed when accessing the project --- .../models/smodel.mps | 77 ++++++++++++------- 1 file changed, 48 insertions(+), 29 deletions(-) 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 01b923597..6ed2a366f 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 @@ -60,6 +60,7 @@ + @@ -18135,44 +18136,63 @@ - - - - - - + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + - @@ -18181,7 +18201,6 @@ - From 53c262df997fc23e6192defb9cfa507d9a7ab3d6 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 6 Sep 2024 08:19:18 +0200 Subject: [PATCH 08/14] force save all --- .../mps/editor/diagram/runtime/jgraph.mps | 2 +- .../mps/editor/diagram/solution@tests.mps | 24 +++++----- .../demolang/languageModels/structure.mps | 2 +- .../multiline/languageModels/editor.mps | 2 +- .../multiline/languageModels/structure.mps | 2 +- .../languageModels/typesystem.mps | 2 +- ...psutil.editor.querylist.runtime.plugin.mps | 18 +++---- .../languageModels/editor.mps | 16 +++---- .../de/slisson/mps/tables/runtime/cells.mps | 48 +++++++++---------- 9 files changed, 58 insertions(+), 58 deletions(-) diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps index 17715ce45..fa7c88b07 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 @@ -51772,7 +51772,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 965166951..ce462c217 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 @@ -3327,8 +3327,8 @@ - - + + @@ -3362,7 +3362,7 @@ - + @@ -13370,7 +13370,7 @@ - + @@ -14619,7 +14619,7 @@ - + @@ -24921,7 +24921,7 @@ - + @@ -24978,11 +24978,11 @@ - + - + @@ -25035,11 +25035,11 @@ - + - + @@ -25092,11 +25092,11 @@ - + - + diff --git a/code/multiline/languages/demolang/languageModels/structure.mps b/code/multiline/languages/demolang/languageModels/structure.mps index 417eca54e..b0373cabf 100644 --- a/code/multiline/languages/demolang/languageModels/structure.mps +++ b/code/multiline/languages/demolang/languageModels/structure.mps @@ -121,7 +121,7 @@ - + diff --git a/code/multiline/languages/multiline/languageModels/editor.mps b/code/multiline/languages/multiline/languageModels/editor.mps index 2106d287c..3f3b418ea 100644 --- a/code/multiline/languages/multiline/languageModels/editor.mps +++ b/code/multiline/languages/multiline/languageModels/editor.mps @@ -296,7 +296,7 @@ - + diff --git a/code/multiline/languages/multiline/languageModels/structure.mps b/code/multiline/languages/multiline/languageModels/structure.mps index b8c6f1324..f25d2ffcc 100644 --- a/code/multiline/languages/multiline/languageModels/structure.mps +++ b/code/multiline/languages/multiline/languageModels/structure.mps @@ -78,7 +78,7 @@ - + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps index d5154992c..52ba2b545 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps @@ -40,7 +40,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 32ab3fe92..e0599c54b 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 @@ -685,7 +685,7 @@ - + @@ -830,7 +830,7 @@ - + @@ -902,7 +902,7 @@ - + @@ -1384,7 +1384,7 @@ - + @@ -1575,7 +1575,7 @@ - + @@ -1829,7 +1829,7 @@ - + @@ -2192,7 +2192,7 @@ - + @@ -2437,7 +2437,7 @@ - + @@ -2484,7 +2484,7 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/editor.mps b/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/editor.mps index 076c6bddb..bf0dbb4f1 100644 --- a/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/editor.mps +++ b/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/editor.mps @@ -1422,7 +1422,7 @@ - + @@ -1586,7 +1586,7 @@ - + @@ -1701,7 +1701,7 @@ - + @@ -1870,7 +1870,7 @@ - + @@ -1917,7 +1917,7 @@ - + @@ -2870,7 +2870,7 @@ - + @@ -3643,7 +3643,7 @@ - + @@ -4428,7 +4428,7 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps index 52ea70b17..6a6c4c418 100644 --- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps +++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps @@ -4093,7 +4093,7 @@ - + @@ -4103,7 +4103,7 @@ - + @@ -4115,7 +4115,7 @@ - + @@ -4139,7 +4139,7 @@ - + @@ -8709,7 +8709,7 @@ - + @@ -8777,7 +8777,7 @@ - + @@ -9256,7 +9256,7 @@ - + @@ -9308,7 +9308,7 @@ - + @@ -9535,7 +9535,7 @@ - + @@ -9549,7 +9549,7 @@ - + @@ -9571,7 +9571,7 @@ - + @@ -9587,12 +9587,12 @@ - + - + @@ -11115,7 +11115,7 @@ - + @@ -12439,7 +12439,7 @@ - + @@ -12475,16 +12475,16 @@ - + - + - + @@ -12499,7 +12499,7 @@ - + @@ -12756,7 +12756,7 @@ - + @@ -30017,11 +30017,11 @@ - + - + @@ -30051,7 +30051,7 @@ - + @@ -36551,7 +36551,7 @@ - + From 7e6cbcb0dbf22341837616174762a4f2a574b246 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 5 Sep 2024 15:05:41 +0200 Subject: [PATCH 09/14] create new stubs MPS.Kotlin --- CHANGELOG.md | 8 +- code/.mps/modules.xml | 4 +- .../models/de.itemis.mps.extensions.build.mps | 348 ++++++++++++++++++ .../de.itemis.mps.editor.diagram.runtime.msd | 1 - .../solutions/MPS.Kotlin/MPS.Kotlin.msd | 40 ++ .../kotlin.usage.test/kotlin.usage.test.msd | 32 ++ .../models/kotlin.usage.test.mdl.mps | 163 ++++++++ .../de.itemis.mps.extensions.changelog.mps | 71 +++- .../MPS.ThirdParty/MPS.ThirdParty.msd | 8 +- .../third.party.usage.test.msd | 2 + 10 files changed, 671 insertions(+), 6 deletions(-) create mode 100644 code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd create mode 100644 code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd create mode 100644 code/kotlin/solutions/kotlin.usage.test/models/kotlin.usage.test.mdl.mps diff --git a/CHANGELOG.md b/CHANGELOG.md index b5bb11537..519128c65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project are documented in this file. The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month. +## September 2024 + +### Added + +- A module stub solution *MPS.Kotlin* was added to support referencing Kotlin classes and libraries from MPS.ThirdParty. + ## August 2024 ### Added @@ -20,7 +26,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e ### Changed - *de.slisson.mps.reflection*: The language uses the class ReflectionUtil directly and doesn't copy ReflectionUtil_copy in the model anymore. -- *com.mbeddr.mpsutil.editor.querylist.runtime*: Querylist calls model checks of target nodes less agressively. +- *com.mbeddr.mpsutil.editor.querylist.runtime*: Querylist calls model checks of target nodes less aggressively. ## July 2024 diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml index 939b868e8..d82df8a52 100644 --- a/code/.mps/modules.xml +++ b/code/.mps/modules.xml @@ -69,6 +69,8 @@ + + @@ -202,7 +204,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 9fb7e40b7..a6e37e1ba 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 @@ -177,6 +177,7 @@ + @@ -201,6 +202,9 @@ + + + @@ -889,6 +893,9 @@ + + + @@ -977,6 +984,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15661,6 +15861,10 @@ + + + + @@ -15716,6 +15920,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16220,6 +16487,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22081,6 +22416,16 @@ + + + + + + + + + + @@ -22337,6 +22682,9 @@ + + + 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 40f06ba2c..c3bd5a4ed 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 @@ -129,7 +129,6 @@ - diff --git a/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd new file mode 100644 index 000000000..41a0c6544 --- /dev/null +++ b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) + + + + + + + + + + + + + + + + diff --git a/code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd b/code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd new file mode 100644 index 000000000..aae316846 --- /dev/null +++ b/code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 47198eff-d292-4dcd-85af-227f983426b5(MPS.Kotlin) + + + + + + + + + + + + + + + + diff --git a/code/kotlin/solutions/kotlin.usage.test/models/kotlin.usage.test.mdl.mps b/code/kotlin/solutions/kotlin.usage.test/models/kotlin.usage.test.mdl.mps new file mode 100644 index 000000000..68d11ee6f --- /dev/null +++ b/code/kotlin/solutions/kotlin.usage.test/models/kotlin.usage.test.mdl.mps @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 014ea39be..6cbbc3f9e 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 @@ -227,6 +227,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -662,8 +726,11 @@ - - + + + + + diff --git a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd index d916fc109..02cb95b27 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 @@ - + @@ -16,6 +16,9 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) + 47198eff-d292-4dcd-85af-227f983426b5(MPS.Kotlin) @@ -24,7 +27,10 @@ + + + diff --git a/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd index ce23a897c..cd390f88d 100644 --- a/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd +++ b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd @@ -20,7 +20,9 @@ + + From 53455ab41a0f420319a62e3034f5e006aa3ed57e Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 10 Sep 2024 08:37:58 +0200 Subject: [PATCH 10/14] execute rerunable migrations --- .../languageModels/editor.mps | 16 ++++----- ...mis.mps.editor.diagram.demo.elk.editor.mps | 14 ++++---- .../languageModels/editor.mps | 12 +++---- .../languageModels/structure.mps | 2 +- .../generator/template/main@generator.mps | 16 ++++----- .../languageModels/behavior.mps | 10 +++--- ...de.itemis.mps.editor.diagram.migration.mps | 6 ++-- .../languageModels/editor.mps | 22 ++++++------ .../languageModels/structure.mps | 2 +- .../languageModels/typesystem.mps | 6 ++-- .../languageModels/behavior.mps | 6 ++-- .../languageModels/constraints.mps | 2 +- .../languageModels/editor.mps | 14 ++++---- .../languageModels/structure.mps | 2 +- ...is.mps.editor.diagram.demo.elk.sandbox.mps | 6 ++-- .../editor/diagram/demoentities/sandbox.mps | 2 +- .../mps/editor/diagram/runtime/model.mps | 10 +++--- .../mps/editor/diagram/runtime/plugin.mps | 16 ++++----- .../mps/editor/diagram/solution@tests.mps | 34 +++++++++---------- .../generator/template/main@generator.mps | 6 ++-- .../solutions/MPS.Kotlin/MPS.Kotlin.msd | 3 +- .../kotlin.usage.test/kotlin.usage.test.msd | 3 +- .../models/kotlin.usage.test.mdl.mps | 10 +++--- .../demolang/languageModels/editor.mps | 4 +-- .../demolang/languageModels/structure.mps | 2 +- .../generator/template/main@generator.mps | 12 +++---- .../multiline/languageModels/behavior.mps | 6 ++-- .../mps/editor/multiline/sandbox/sandbox.mps | 4 +-- ...psutil.editor.querylist.runtime.plugin.mps | 18 +++++----- .../mpsutil/editor/querylist/runtime.mps | 8 ++--- .../languageModels/intentions.mps | 4 +-- .../languageModels/structure.mps | 2 +- .../languageModels/editor.mps | 18 +++++----- .../slisson/mps/tables/runtime/gridmodel.mps | 8 ++--- .../models/de/slisson/mps/tables/sandbox.mps | 2 +- .../test/de/slisson/mps/tables@tests.mps | 10 +++--- 36 files changed, 158 insertions(+), 160 deletions(-) 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 7b9cc015d..6704217e1 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 @@ -83,7 +83,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -248,7 +248,7 @@ - + @@ -304,7 +304,7 @@ - + @@ -329,7 +329,7 @@ - + @@ -423,7 +423,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 361b0dc3d..333a8d5a4 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.demoentities/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps index 5e03034c2..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 @@ -81,7 +81,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -240,7 +240,7 @@ - + @@ -312,7 +312,7 @@ - + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/structure.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/structure.mps index caf86f524..c10c5f480 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/structure.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/structure.mps @@ -50,7 +50,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 289a29c05..8f46f18fd 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 @@ - + @@ -175,7 +175,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -266,7 +266,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -380,7 +380,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -594,7 +594,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 609e6738b..9f945f553 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/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 6a2e33f36..700f6280d 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 @@ -85,7 +85,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -180,7 +180,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 d495c4061..19bcab5c4 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 bb442e11e..06e28d908 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 97913b408..8cae358d9 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/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/behavior.mps b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/behavior.mps index e4a511259..8b51026ad 100644 --- a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/behavior.mps +++ b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/behavior.mps @@ -100,7 +100,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -151,7 +151,7 @@ - + diff --git a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/constraints.mps b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/constraints.mps index 5516d3048..8f6a6ed85 100644 --- a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/constraints.mps +++ b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/constraints.mps @@ -27,7 +27,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 656d1f292..21e8f2b6d 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 @@ -93,7 +93,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -323,7 +323,7 @@ - + @@ -366,7 +366,7 @@ - + @@ -526,7 +526,7 @@ - + diff --git a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/structure.mps b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/structure.mps index 3e195a188..d7a449440 100644 --- a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/structure.mps +++ b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/structure.mps @@ -47,7 +47,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 1ef514391..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 @@ - + @@ -201,7 +201,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps index 2c37b2791..66340092a 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps @@ -37,7 +37,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 dc17396ef..f23163904 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/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps index ce987f9ae..da5fe5d56 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps @@ -111,7 +111,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -350,7 +350,7 @@ - + @@ -427,7 +427,7 @@ - + @@ -457,7 +457,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 325f58e6d..51dd897d8 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 @@ -11549,7 +11549,7 @@ - + @@ -11773,7 +11773,7 @@ - + @@ -12073,7 +12073,7 @@ - + @@ -12515,7 +12515,7 @@ - + @@ -12699,7 +12699,7 @@ - + @@ -12862,7 +12862,7 @@ - + @@ -13024,7 +13024,7 @@ - + @@ -13403,7 +13403,7 @@ - + @@ -13657,7 +13657,7 @@ - + @@ -13844,7 +13844,7 @@ - + @@ -14143,7 +14143,7 @@ - + @@ -14478,7 +14478,7 @@ - + @@ -14692,7 +14692,7 @@ - + @@ -15301,7 +15301,7 @@ - + @@ -17211,7 +17211,7 @@ - + @@ -19131,7 +19131,7 @@ - + @@ -26201,7 +26201,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/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd index 41a0c6544..183a924ba 100644 --- a/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd +++ b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd @@ -1,5 +1,5 @@ - + @@ -19,7 +19,6 @@ - 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) 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 aae316846..c18184dad 100644 --- a/code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd +++ b/code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd @@ -1,5 +1,5 @@ - + @@ -10,7 +10,6 @@ - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 47198eff-d292-4dcd-85af-227f983426b5(MPS.Kotlin) diff --git a/code/kotlin/solutions/kotlin.usage.test/models/kotlin.usage.test.mdl.mps b/code/kotlin/solutions/kotlin.usage.test/models/kotlin.usage.test.mdl.mps index 68d11ee6f..597a29b5f 100644 --- a/code/kotlin/solutions/kotlin.usage.test/models/kotlin.usage.test.mdl.mps +++ b/code/kotlin/solutions/kotlin.usage.test/models/kotlin.usage.test.mdl.mps @@ -15,7 +15,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/code/multiline/languages/demolang/languageModels/editor.mps b/code/multiline/languages/demolang/languageModels/editor.mps index 3f207fd7f..02a88c236 100644 --- a/code/multiline/languages/demolang/languageModels/editor.mps +++ b/code/multiline/languages/demolang/languageModels/editor.mps @@ -81,7 +81,7 @@ - + @@ -119,7 +119,7 @@ - + diff --git a/code/multiline/languages/demolang/languageModels/structure.mps b/code/multiline/languages/demolang/languageModels/structure.mps index b0373cabf..535c5fd52 100644 --- a/code/multiline/languages/demolang/languageModels/structure.mps +++ b/code/multiline/languages/demolang/languageModels/structure.mps @@ -34,7 +34,7 @@ - + diff --git a/code/multiline/languages/multiline/generator/template/main@generator.mps b/code/multiline/languages/multiline/generator/template/main@generator.mps index 2726ea9ce..47bfb0936 100644 --- a/code/multiline/languages/multiline/generator/template/main@generator.mps +++ b/code/multiline/languages/multiline/generator/template/main@generator.mps @@ -47,7 +47,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -290,7 +290,7 @@ - + diff --git a/code/multiline/languages/multiline/languageModels/behavior.mps b/code/multiline/languages/multiline/languageModels/behavior.mps index 29f5356fa..cbea856e5 100644 --- a/code/multiline/languages/multiline/languageModels/behavior.mps +++ b/code/multiline/languages/multiline/languageModels/behavior.mps @@ -71,14 +71,14 @@ - + - + @@ -116,7 +116,7 @@ - + diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.sandbox/models/de/slisson/mps/editor/multiline/sandbox/sandbox.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.sandbox/models/de/slisson/mps/editor/multiline/sandbox/sandbox.mps index 32a939023..ce5e228ff 100644 --- a/code/multiline/solutions/de.slisson.mps.editor.multiline.sandbox/models/de/slisson/mps/editor/multiline/sandbox/sandbox.mps +++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.sandbox/models/de/slisson/mps/editor/multiline/sandbox/sandbox.mps @@ -12,7 +12,7 @@ - + @@ -37,7 +37,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 859f6aa96..e65f29aaf 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 @@ -652,7 +652,7 @@ - + @@ -828,7 +828,7 @@ - + @@ -900,7 +900,7 @@ - + @@ -1382,7 +1382,7 @@ - + @@ -1573,7 +1573,7 @@ - + @@ -1801,7 +1801,7 @@ - + @@ -2166,7 +2166,7 @@ - + @@ -2411,7 +2411,7 @@ - + @@ -2458,7 +2458,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 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/intentions.mps b/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/intentions.mps index 92facb4f7..5a5dc6cb3 100644 --- a/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/intentions.mps +++ b/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/intentions.mps @@ -82,7 +82,7 @@ - + @@ -165,7 +165,7 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/structure.mps b/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/structure.mps index 01ec84460..4b31e4791 100644 --- a/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/structure.mps +++ b/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/structure.mps @@ -51,7 +51,7 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables/languageModels/editor.mps b/code/tables/languages/de.slisson.mps.tables/languageModels/editor.mps index 579ae5487..bc3eaa036 100644 --- a/code/tables/languages/de.slisson.mps.tables/languageModels/editor.mps +++ b/code/tables/languages/de.slisson.mps.tables/languageModels/editor.mps @@ -26,7 +26,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -95,10 +95,10 @@ - + - + @@ -122,7 +122,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -367,7 +367,7 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps index 381dcf5fb..9abb60a69 100644 --- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps +++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps @@ -82,7 +82,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -269,7 +269,7 @@ - + @@ -366,7 +366,7 @@ - + diff --git a/code/tables/languages/de.slisson.mps.tables/sandbox/models/de/slisson/mps/tables/sandbox.mps b/code/tables/languages/de.slisson.mps.tables/sandbox/models/de/slisson/mps/tables/sandbox.mps index 996068d7d..f2cc3143b 100644 --- a/code/tables/languages/de.slisson.mps.tables/sandbox/models/de/slisson/mps/tables/sandbox.mps +++ b/code/tables/languages/de.slisson.mps.tables/sandbox/models/de/slisson/mps/tables/sandbox.mps @@ -111,7 +111,7 @@ - + diff --git a/code/tables/solutions/test.de.slisson.mps.tables/models/test/de/slisson/mps/tables@tests.mps b/code/tables/solutions/test.de.slisson.mps.tables/models/test/de/slisson/mps/tables@tests.mps index 219a1d422..19208e238 100644 --- a/code/tables/solutions/test.de.slisson.mps.tables/models/test/de/slisson/mps/tables@tests.mps +++ b/code/tables/solutions/test.de.slisson.mps.tables/models/test/de/slisson/mps/tables@tests.mps @@ -68,7 +68,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -242,7 +242,7 @@ - + From 53a84fe7eb5bdde5d970aa9d3345e379ff545195 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 10 Sep 2024 08:53:44 +0200 Subject: [PATCH 11/14] restore the old build script --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 98381d3b9..e40fe95c9 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ logger.info 'Repository username: {}', project.nexusUsername // major version, e.g. '2021.1', '2021.2' ext.mpsMajor = '2023.2' // optional minor/bugfix number (not added to the final build version) -ext.mpsMinor = '2' +ext.mpsMinor = '1' // e.g. Beta, EAP, RC ext.mpsReleaseType = '' From f6a7aa27ba0d27ae5b0cff87f5f7aa5b0de8b75d Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 10 Sep 2024 10:32:49 +0200 Subject: [PATCH 12/14] update the kotlin libs from 1.7.0 to 1.9.0 --- .../models/de.itemis.mps.extensions.build.mps | 5 ++--- code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd | 9 ++++----- 2 files changed, 6 insertions(+), 8 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 712059d7e..9c70781bc 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 @@ -1160,7 +1160,7 @@ - + @@ -1182,7 +1182,7 @@ - + @@ -23238,4 +23238,3 @@ - diff --git a/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd index 183a924ba..d97072cc3 100644 --- a/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd +++ b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd @@ -4,8 +4,8 @@ - - + + @@ -16,8 +16,8 @@ - - + + 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) @@ -36,4 +36,3 @@ - From c869ef7b186a07c3cc740c932e3b91c90d7bad35 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 11 Sep 2024 11:19:30 +0200 Subject: [PATCH 13/14] only re-export Annotations in MPS.Kotlin --- .../models/de.itemis.mps.extensions.build.mps | 21 +++++++++++-------- .../solutions/MPS.Kotlin/MPS.Kotlin.msd | 5 ++--- .../kotlin.usage.test/kotlin.usage.test.msd | 3 +-- 3 files changed, 15 insertions(+), 14 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 9c70781bc..7e5a0a89c 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 @@ -1027,9 +1027,6 @@ - - - @@ -1099,12 +1096,6 @@ - - - - - - @@ -1193,6 +1184,12 @@ + + + + + + @@ -16942,6 +16939,11 @@ + + + + + @@ -23238,3 +23240,4 @@ + diff --git a/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd index d97072cc3..668e1f019 100644 --- a/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd +++ b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd @@ -20,7 +20,7 @@ - 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) + 3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations) @@ -31,8 +31,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 c18184dad..864db2607 100644 --- a/code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd +++ b/code/kotlin/solutions/kotlin.usage.test/kotlin.usage.test.msd @@ -13,6 +13,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 47198eff-d292-4dcd-85af-227f983426b5(MPS.Kotlin) + 3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations) @@ -22,9 +23,7 @@ - - From 7624835ee45e7a528ac72518df00b17aaa884259 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 11 Sep 2024 11:51:57 +0200 Subject: [PATCH 14/14] force save all --- .../mps/editor/diagram/solution@tests.mps | 36 +++++++++---------- .../solutions/MPS.Kotlin/MPS.Kotlin.msd | 10 +++--- .../models/de/slisson/mps/tables/sandbox.mps | 2 +- 3 files changed, 23 insertions(+), 25 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 51dd897d8..f7541503d 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 @@ -372,7 +372,7 @@ - + @@ -11549,7 +11549,7 @@ - + @@ -11773,7 +11773,7 @@ - + @@ -12073,7 +12073,7 @@ - + @@ -12515,7 +12515,7 @@ - + @@ -12699,7 +12699,7 @@ - + @@ -12862,7 +12862,7 @@ - + @@ -13024,7 +13024,7 @@ - + @@ -13403,7 +13403,7 @@ - + @@ -13657,7 +13657,7 @@ - + @@ -13844,7 +13844,7 @@ - + @@ -14143,7 +14143,7 @@ - + @@ -14478,7 +14478,7 @@ - + @@ -14692,7 +14692,7 @@ - + @@ -15301,7 +15301,7 @@ - + @@ -17211,7 +17211,7 @@ - + @@ -19131,7 +19131,7 @@ - + @@ -26201,7 +26201,7 @@ - + diff --git a/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd index 668e1f019..7d8fe0bca 100644 --- a/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd +++ b/code/kotlin/solutions/MPS.Kotlin/MPS.Kotlin.msd @@ -11,14 +11,12 @@ + + + + - - - - - - 3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations) diff --git a/code/tables/languages/de.slisson.mps.tables/sandbox/models/de/slisson/mps/tables/sandbox.mps b/code/tables/languages/de.slisson.mps.tables/sandbox/models/de/slisson/mps/tables/sandbox.mps index f2cc3143b..06cd60d3f 100644 --- a/code/tables/languages/de.slisson.mps.tables/sandbox/models/de/slisson/mps/tables/sandbox.mps +++ b/code/tables/languages/de.slisson.mps.tables/sandbox/models/de/slisson/mps/tables/sandbox.mps @@ -87,7 +87,7 @@ - +