From a2cbc63d108a06efb9d9bdeca065be6c4350e0f5 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 26 Mar 2024 10:02:20 +0100 Subject: [PATCH 1/6] diagram: reduce the log level when the diagram palette can't be found --- .../mps/editor/diagram/runtime/jgraph.mps | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 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 5f61fa91c..dcb6c3b1a 100755 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps @@ -3221,6 +3221,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3235,22 +3263,8 @@ - - - - - - - - - - - - - - - - + + @@ -4821,22 +4835,8 @@ - - - - - - - - - - - - - - - - + + @@ -4879,7 +4879,7 @@ - + From 6ca407bd6f519ccfba4ab2daba232cfb8d8f8588 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 26 Mar 2024 10:03:37 +0100 Subject: [PATCH 2/6] Run migrations --- ...st.com.mbeddr.mpsutil.blutil.doc@tests.mps | 41 +++++++++++++------ .../test.com.mbeddr.mpsutil.blutil.doc.msd | 4 +- .../models/test.ts.conceptswitch@tests.mps | 2 +- .../test.ts.conceptswitch.msd | 2 +- code/blutil/tests/test.ts.match/match.msd | 2 +- .../tests/test.ts.match/models/main@tests.mps | 2 +- .../languageModels/editor.mps | 2 +- .../languageModels/structure.mps | 4 +- .../generator/template/main@generator.mps | 4 +- .../languageModels/editor.mps | 2 +- .../languageModels/structure.mps | 2 +- .../languageModels/typesystem.mps | 6 +-- .../generator/template/main@generator.mps | 8 ++-- .../slisson/mps/editor/multiline/runtime.mps | 4 +- .../de.q60.mps.shadowmodels.runtime.msd | 2 +- .../models/engine.mps | 2 +- 16 files changed, 52 insertions(+), 37 deletions(-) diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps index 963ccf8b0..b755daf3e 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps @@ -3,7 +3,7 @@ - + @@ -199,10 +199,15 @@ - - - - + + + + + + + + + @@ -238,10 +243,15 @@ - - - - + + + + + + + + + @@ -358,10 +368,15 @@ - - - - + + + + + + + + + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd index 979edd1e3..cb8f08d6f 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd @@ -16,8 +16,8 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - - + + diff --git a/code/blutil/tests/test.ts.conceptswitch/models/test.ts.conceptswitch@tests.mps b/code/blutil/tests/test.ts.conceptswitch/models/test.ts.conceptswitch@tests.mps index a71a01262..35728956d 100644 --- a/code/blutil/tests/test.ts.conceptswitch/models/test.ts.conceptswitch@tests.mps +++ b/code/blutil/tests/test.ts.conceptswitch/models/test.ts.conceptswitch@tests.mps @@ -4,7 +4,7 @@ - + diff --git a/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd b/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd index 2751c55ea..8d645b098 100644 --- a/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd +++ b/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd @@ -17,7 +17,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - + diff --git a/code/blutil/tests/test.ts.match/match.msd b/code/blutil/tests/test.ts.match/match.msd index 68a6e8f78..32fe07db2 100644 --- a/code/blutil/tests/test.ts.match/match.msd +++ b/code/blutil/tests/test.ts.match/match.msd @@ -17,7 +17,7 @@ 63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil) - + diff --git a/code/blutil/tests/test.ts.match/models/main@tests.mps b/code/blutil/tests/test.ts.match/models/main@tests.mps index 5650301e0..3dbf0201d 100644 --- a/code/blutil/tests/test.ts.match/models/main@tests.mps +++ b/code/blutil/tests/test.ts.match/models/main@tests.mps @@ -4,7 +4,7 @@ - + diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/editor.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/editor.mps index 3ca5d420b..9adbd8b88 100644 --- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/editor.mps +++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/editor.mps @@ -617,7 +617,7 @@ - + diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/structure.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/structure.mps index 69b6aaadd..695bf4b2c 100644 --- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/structure.mps +++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/languageModels/structure.mps @@ -44,7 +44,7 @@ - + @@ -53,7 +53,7 @@ - + diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps index 00d56a480..214eb1e71 100644 --- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps +++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/generator/template/main@generator.mps @@ -449,7 +449,7 @@ - + @@ -1759,7 +1759,7 @@ - + diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps index f7da0edc7..7813c18ef 100644 --- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps +++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/editor.mps @@ -786,7 +786,7 @@ - + diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/structure.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/structure.mps index 3dc952926..8cae435e9 100644 --- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/structure.mps +++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/structure.mps @@ -179,7 +179,7 @@ - + diff --git a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/typesystem.mps b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/typesystem.mps index f1b46ef06..7680b92c1 100644 --- a/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/typesystem.mps +++ b/code/conditional-editor/languages/de.slisson.mps.conditionalEditor/languageModels/typesystem.mps @@ -509,7 +509,7 @@ - + @@ -529,7 +529,7 @@ - + @@ -820,7 +820,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 d7e5f13ae..8c61b1a0b 100755 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps @@ -592,14 +592,14 @@ - - - + + + - + diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps index 8905609cd..b03aa1f6b 100644 --- a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps +++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/runtime.mps @@ -507,7 +507,7 @@ - + @@ -538,7 +538,7 @@ - + diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd index 2be56d9b3..c27c9201e 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd @@ -32,7 +32,7 @@ ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs) - + 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 ac3f87f4c..8fb8ee754 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 @@ -9,7 +9,7 @@ - + From 584a5af03df7cf4060f9cc2f25530232f5bb70d3 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 27 Mar 2024 07:17:27 +0100 Subject: [PATCH 3/6] Delete empty solution de.slisson.mps.editor.celllayout --- code/.mps/modules.xml | 5 ++--- .../de.slisson.mps.editor.celllayout.msd | 19 ------------------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml index d54ba85c0..0712da7b1 100644 --- a/code/.mps/modules.xml +++ b/code/.mps/modules.xml @@ -20,7 +20,6 @@ - @@ -50,8 +49,8 @@ - + @@ -195,8 +194,8 @@ - + diff --git a/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd b/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd deleted file mode 100644 index c1c4cbc24..000000000 --- a/code/celllayout/solutions/de.slisson.mps.editor.celllayout/de.slisson.mps.editor.celllayout.msd +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - From 73833ff177f5e2a6f4f8289a3ec8f08f48aea8b9 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 27 Mar 2024 07:55:28 +0100 Subject: [PATCH 4/6] Fix the build script --- .../models/de.itemis.mps.extensions.build.mps | 13 +++++++++++++ 1 file changed, 13 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 5b29bb38f..721b788f1 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 @@ -13900,6 +13900,19 @@ + + + + + + + + + + + + + From 0fea75af798e74e4238740812d0fbf1b48fff972 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 28 Mar 2024 06:59:09 +0100 Subject: [PATCH 5/6] querylist.runtime: check for empty nodes in the query condition --- CHANGELOG.md | 4 +++ .../mpsutil/editor/querylist/runtime.mps | 28 +++++++++++++------ 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7835f701a..6d0d89f15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented - de.slisson.mps.conditionalEditor: Support for editor components with parameters was added. - com.mbeddr.mpsutil.grammarcells: Read-only model accessory cells can now also be used in places where constant cells are supported. +### Fixed + +- com.mbeddr.mpsutil.editor.querylist: return null in the query shows the empty cell again (regression). + ## February 2024 ### Changed 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 33c68ae79..131b4a11d 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 @@ -1721,18 +1721,28 @@ - - - + + + + + + - - - - + + + + + + + + + + + + + - - From d5e7c1210264ca20530161df75e775f86afac127 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 28 Mar 2024 07:28:46 +0100 Subject: [PATCH 6/6] Run migrations --- .../languageModels/editor.mps | 8 ++++---- .../de.itemis.mps.extensions.build.msd | 1 + .../de/slisson/mps/editor/multiline/cells.mps | 4 ++-- ...est.de.slisson.mps.editor.multiline@tests.mps | 16 ++++++++-------- .../test.de.slisson.mps.editor.multiline.msd | 1 + .../languages/richtext/languageModels/editor.mps | 6 +++--- .../languages/richtext/languageModels/plugin.mps | 2 +- .../slisson/mps/richtext/runtime/selection.mps | 2 +- .../third.party.usage.test.msd | 1 + 9 files changed, 22 insertions(+), 19 deletions(-) diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps index 2e7db55f2..65cfd9ad1 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps @@ -415,14 +415,14 @@ - - - + + + - + diff --git a/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd b/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd index 097ecd1c1..215edae8c 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 @@ -20,6 +20,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 da3bcdd28..951c202b0 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 @@ -13473,7 +13473,7 @@ - + @@ -14378,7 +14378,7 @@ - + diff --git a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps index 9a976d39c..dedb4a2d8 100644 --- a/code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps +++ b/code/multiline/solutions/test.de.slisson.mps.editor.multiline/models/test.de.slisson.mps.editor.multiline@tests.mps @@ -921,7 +921,7 @@ - + @@ -939,7 +939,7 @@ - + @@ -1716,7 +1716,7 @@ - + @@ -1731,7 +1731,7 @@ - + @@ -1749,7 +1749,7 @@ - + @@ -1788,7 +1788,7 @@ - + @@ -1803,7 +1803,7 @@ - + @@ -1821,7 +1821,7 @@ - + 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 15ffc23c7..4b322a7d7 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 @@ -21,6 +21,7 @@ + diff --git a/code/richtext/languages/richtext/languageModels/editor.mps b/code/richtext/languages/richtext/languageModels/editor.mps index 8fdec964a..41bf8ac14 100644 --- a/code/richtext/languages/richtext/languageModels/editor.mps +++ b/code/richtext/languages/richtext/languageModels/editor.mps @@ -5298,7 +5298,7 @@ - + @@ -5332,7 +5332,7 @@ - + @@ -7791,7 +7791,7 @@ - + diff --git a/code/richtext/languages/richtext/languageModels/plugin.mps b/code/richtext/languages/richtext/languageModels/plugin.mps index 08c4c7491..f76d2bf1d 100644 --- a/code/richtext/languages/richtext/languageModels/plugin.mps +++ b/code/richtext/languages/richtext/languageModels/plugin.mps @@ -1807,7 +1807,7 @@ - + diff --git a/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps b/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps index 8aa0df01a..75fef331b 100644 --- a/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps +++ b/code/richtext/languages/richtext/models/de/slisson/mps/richtext/runtime/selection.mps @@ -2540,7 +2540,7 @@ - + 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 c7d6975ab..3c04071bd 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,6 +20,7 @@ +