From d1c3788da3d96d7d12188daf3cbc62f6bcf46474 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 12 Aug 2024 11:28:33 +0200 Subject: [PATCH 01/15] editor.diagram: add a new option to allow boxes to set a new required minimum size --- CHANGELOG.md | 1 + ...itemis.mps.editor.diagram.demoentities.mpl | 4 + .../languageModels/editor.mps | 49 + .../languageModels/structure.mps | 7 + .../generator/template/main@generator.mps | 96 + .../languageModels/editor.mps | 13 + .../languageModels/structure.mps | 6 + .../languageModels/behavior.mps | 27 +- .../languageModels/editor.mps | 121 +- .../languageModels/structure.mps | 47 +- ...test.de.itemis.mps.editor.diagram.lang.mpl | 4 + .../editor/diagram/demoentities/sandbox.mps | 153 +- .../mps/editor/diagram/runtime/jgraph.mps | 398 +++- .../mps/editor/diagram/runtime/model.mps | 18 + .../mps/editor/diagram/solution@tests.mps | 1744 ++++++++++++++++- .../de.itemis.mps.extensions.changelog.mps | 68 + 16 files changed, 2603 insertions(+), 153 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7b97d783..32368fdfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e ### Added +- *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.editor.multiline*: A new cell *constant multi-line* can be used to create dynamic read-only text that spans multiple lines. ### Fixed 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 89562460c..9cf1a9359 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 @@ -18,6 +18,7 @@ f7ad14aa-a3e2-4301-8822-d919845c8bcf(de.itemis.mps.editor.diagram.shapes) fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram) aff569ad-098d-414a-aa23-96963959392c(test.de.itemis.mps.editor.diagram.lang) + 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) @@ -79,8 +80,11 @@ + + + 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 ae6b7c1cd..a6eb9b7f5 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 @@ -13,6 +13,7 @@ + @@ -32,6 +33,7 @@ + @@ -51,6 +53,9 @@ + + + @@ -65,6 +70,9 @@ + + + @@ -210,6 +218,7 @@ + @@ -282,6 +291,7 @@ + @@ -412,6 +422,15 @@ + + + + + + + + + @@ -478,6 +497,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -831,6 +871,15 @@ + + + + + + + + + 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 1e0a352f0..3bc6fe259 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 @@ -6,6 +6,7 @@ + @@ -77,6 +78,12 @@ + + + + + + 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 9f47aacbc..452355aee 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 @@ -6137,6 +6137,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6531,6 +6556,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0e85e418f..df83fc5b1 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 @@ -1166,6 +1166,19 @@ + + + + + + + + + + + + + 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 1975cbe49..5d3b6171b 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 @@ -210,6 +210,12 @@ + + + + + + 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 971c9f59d..e4a511259 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 @@ -31,6 +31,10 @@ + + + + @@ -68,6 +72,7 @@ + @@ -154,7 +159,27 @@ - + + + + + + + + + + + + + + + + + + + + + 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 7cc166192..a5bbbd3ab 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 @@ -36,6 +36,9 @@ + + + @@ -76,7 +79,9 @@ + + @@ -279,6 +284,7 @@ + @@ -937,8 +943,16 @@ - - + + + + + + + + + + @@ -2516,6 +2530,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5312,5 +5354,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8c4fb6d26..57beb0be5 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 @@ -8,6 +8,7 @@ + @@ -172,10 +173,15 @@ - + + + + + + @@ -333,5 +339,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1d2675a53..16b941c59 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 @@ -19,6 +19,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram) 1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime) + 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) @@ -69,8 +70,11 @@ + + + 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 df56330cf..2c37b2791 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 @@ -7,6 +7,14 @@ + + + + + + + + @@ -22,6 +30,7 @@ + @@ -416,50 +425,50 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -470,8 +479,8 @@ - - + + @@ -479,6 +488,14 @@ + + + + + + + + @@ -488,8 +505,8 @@ - - + + @@ -498,28 +515,28 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -530,8 +547,8 @@ - - + + @@ -539,14 +556,6 @@ - - - - - - - - @@ -556,8 +565,8 @@ - - + + @@ -566,12 +575,12 @@ - - + + - - + + @@ -582,8 +591,8 @@ - - + + @@ -596,10 +605,10 @@ - + - - + + @@ -620,6 +629,11 @@ + + + + + @@ -634,12 +648,22 @@ + + + + + + + + + + @@ -650,6 +674,11 @@ + + + + + @@ -664,6 +693,11 @@ + + + + + @@ -678,6 +712,11 @@ + + + + + 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 dec01d63a..17715ce45 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 @@ -48769,6 +48769,25 @@ + + + + + + + + + + + + + + + + + + + @@ -51595,6 +51614,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78156,6 +78369,12 @@ + + + + + + @@ -78243,6 +78462,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -78433,6 +78674,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78845,57 +79140,90 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + 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 a1226507b..f0f278a5a 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 @@ -17585,6 +17585,13 @@ + + + + + + + @@ -29384,6 +29391,17 @@ + + + + + + + + + + + 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 9a929ff5f..8d9d5d3f7 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 @@ -316,6 +316,14 @@ + + + + + + + + @@ -342,6 +350,13 @@ + + + + + + + @@ -355,7 +370,8 @@ - + + @@ -414,6 +430,7 @@ + @@ -23638,40 +23655,40 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -23679,9 +23696,9 @@ - - - + + + @@ -23692,8 +23709,8 @@ - - + + @@ -23701,6 +23718,14 @@ + + + + + + + + @@ -23710,8 +23735,8 @@ - - + + @@ -23720,28 +23745,28 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -23752,8 +23777,8 @@ - - + + @@ -23761,14 +23786,6 @@ - - - - - - - - @@ -23778,8 +23795,8 @@ - - + + @@ -23788,12 +23805,12 @@ - - + + - - + + @@ -23804,8 +23821,8 @@ - - + + @@ -23818,10 +23835,10 @@ - + - - + + @@ -23842,6 +23859,11 @@ + + + + + @@ -23856,12 +23878,22 @@ + + + + + + + + + + @@ -23872,6 +23904,11 @@ + + + + + @@ -23886,6 +23923,11 @@ + + + + + @@ -23900,6 +23942,11 @@ + + + + + @@ -24630,5 +24677,1588 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 3b32c4aa7..7cf4db119 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 @@ -234,6 +234,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d1f9d7b574214f23807c50ecedc31f28f3fd8080 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 13 Aug 2024 07:57:56 +0200 Subject: [PATCH 02/15] editor.diagram: remove move to viewer config --- .../generator/template/main@generator.mps | 33 -------------- .../languageModels/behavior.mps | 45 ------------------- .../languageModels/editor.mps | 19 -------- .../languageModels/structure.mps | 5 --- 4 files changed, 102 deletions(-) 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 452355aee..8a29e185d 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 @@ -16526,39 +16526,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 0273dd060..609e6738b 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 @@ -10249,51 +10249,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 df83fc5b1..41c35cf49 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 @@ -5670,25 +5670,6 @@ - - - - - - - - - - - - - - - - - - - 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 5d3b6171b..bb442e11e 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 @@ -2154,11 +2154,6 @@ - - - - - From 915d3fa3b4e7acec95f3a5ffd898f100327327d9 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 13 Aug 2024 08:10:08 +0200 Subject: [PATCH 03/15] editor.diagram: fix tests --- .../mps/editor/diagram/solution@tests.mps | 295 ++++++++---------- 1 file changed, 123 insertions(+), 172 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 8d9d5d3f7..965166951 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 @@ -11880,8 +11880,8 @@ - - + + @@ -12248,8 +12248,8 @@ - - + + @@ -12271,7 +12271,7 @@ - + @@ -12418,149 +12418,90 @@ - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - + + - - + + + + + + + + + + + - - + + + + + + - - + + - - - - - - - - + + + + + + - - - - - - - - - - - - - - + + - - - - - - - - - - - + + + + - - - - - - - - - - - + + - - - - - - - - - - - + + + + + + - - - - - - - - - - - + + - - - - - - - - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + @@ -13364,20 +13305,6 @@ - - - - - - - - - - - - - - @@ -13409,6 +13336,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -14303,8 +14254,8 @@ - - + + @@ -18803,7 +18754,7 @@ - + @@ -18847,7 +18798,7 @@ - + @@ -18997,8 +18948,8 @@ - - + + @@ -19019,8 +18970,8 @@ - - + + @@ -19123,7 +19074,7 @@ - + @@ -19167,7 +19118,7 @@ - + @@ -23012,7 +22963,7 @@ - + @@ -23028,9 +22979,9 @@ - + - + @@ -23046,9 +22997,9 @@ - + - + @@ -23073,23 +23024,23 @@ - + - + - + - + - + @@ -23189,9 +23140,9 @@ - + - + @@ -23207,9 +23158,9 @@ - + - + @@ -23227,7 +23178,7 @@ - + @@ -23248,23 +23199,23 @@ - + - + - + - + - + From 46f7a743ea15fb62d1d625590df4b4e5bf18d980 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 13 Aug 2024 08:28:30 +0200 Subject: [PATCH 04/15] update the build script --- .../models/de.itemis.mps.extensions.build.mps | 10 ++++++++++ 1 file changed, 10 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 1d81e0b28..d53174f3c 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 @@ -20850,6 +20850,11 @@ + + + + + @@ -21160,6 +21165,11 @@ + + + + + From 84552e7b8bdbe0b6a5290a78d7a02ab62d79944a Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 21 Aug 2024 11:12:05 +0200 Subject: [PATCH 05/15] mps.tables: implement sticky cells --- CHANGELOG.md | 9 + .../de.itemis.mps.extensions.changelog.mps | 93 + .../languageModels/editor.mps | 578 ++++- .../languageModels/intentions.mps | 35 + .../languageModels/structure.mps | 27 + .../languageModels/editor.mps | 12 + .../de/slisson/mps/tables/runtime/cells.mps | 1964 ++++++++++++++++- .../slisson/mps/tables/runtime/gridmodel.mps | 1 + .../models/de/slisson/mps/tables/sandbox.mps | 11 +- 9 files changed, 2648 insertions(+), 82 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8d99166b..d26e11bb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,18 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e ## August 2024 +### 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.* + ### Fixed - *com.mbeddr.mpsutil.projectview.runtime*: Fixed several NPEs. See: [#903,](https://github.com/JetBrains/MPS-extensions/issues/903) [#904]((https://github.com/JetBrains/MPS-extensions/issues/904) , [#901](https://github.com/JetBrains/MPS-extensions/issues/901) +### Changed + +- *de.slisson.mps.reflection*: The language uses the class ReflectionUtil directly and doesn't copy ReflectionUtil_copy in the model anymore. + ## July 2024 ### Fixed @@ -29,6 +37,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e ### Fixed - *de.itemis.mps.editor.diagram.runtime*: Diagrams can now be used in an headless environment (e.g. for rendering documentation). +- *de.slisson.mps.editor.multiline.runtime*: A bug was fixed where the multiline cell got a wrong background color set. - *de.itemis.mps.editor.diagram.runtime*: The dependency to *de.q60.mps.collections.libs* was removed. - *de.itemis.mps.editor.diagram*: Various improvements to diagrams were made. (see: [PR #866](https://github.com/JetBrains/MPS-extensions/pull/866) ) 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 987f0187f..6dc4be188 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 @@ -228,6 +228,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 159cbd27c..8b0c79089 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 @@ -81,7 +81,12 @@ + + + + + @@ -202,6 +207,9 @@ + + + @@ -480,6 +488,12 @@ + + + + + + @@ -842,17 +856,266 @@ + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + @@ -893,6 +1156,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -935,11 +1222,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -952,6 +1265,20 @@ + + + + + + + + + + + + + + @@ -985,6 +1312,20 @@ + + + + + + + + + + + + + + @@ -1068,6 +1409,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1088,6 +1453,18 @@ + + + + + + + + + + + + @@ -1197,6 +1574,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -1291,6 +1689,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -1451,6 +1869,18 @@ + + + + + + + + + + + + @@ -1486,6 +1916,18 @@ + + + + + + + + + + + + @@ -1713,6 +2155,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2330,6 +2802,21 @@ + + + + + + + + + + + + + + + @@ -2382,6 +2869,21 @@ + + + + + + + + + + + + + + + @@ -2998,6 +3500,23 @@ + + + + + + + + + + + + + + + + + @@ -3122,6 +3641,23 @@ + + + + + + + + + + + + + + + + + @@ -3771,6 +4307,23 @@ + + + + + + + + + + + + + + + + + @@ -3873,6 +4426,23 @@ + + + + + + + + + + + + + + + + + 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 be0ffecb2..92facb4f7 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 @@ -66,6 +66,9 @@ + + + @@ -91,6 +94,7 @@ + @@ -972,5 +976,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 b4808ab60..01ec84460 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 @@ -102,6 +102,9 @@ + + + @@ -115,6 +118,9 @@ + + + @@ -181,6 +187,9 @@ + + + @@ -266,6 +275,9 @@ + + + @@ -411,6 +423,9 @@ + + + @@ -483,6 +498,9 @@ + + + @@ -509,5 +527,14 @@ + + + + + + + + + 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 21b41c76d..579ae5487 100644 --- a/code/tables/languages/de.slisson.mps.tables/languageModels/editor.mps +++ b/code/tables/languages/de.slisson.mps.tables/languageModels/editor.mps @@ -3315,6 +3315,18 @@ + + + + + + + + + + + + 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 c33c7ca1b..294f9a276 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 @@ -14,6 +14,7 @@ + @@ -64,10 +65,12 @@ - - - - + + + + + + @@ -149,7 +152,9 @@ - + + + @@ -196,6 +201,9 @@ + + + @@ -1724,6 +1732,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3986,6 +4027,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7946,20 +8362,6 @@ - - - - - - - - - - - - - - @@ -8282,6 +8684,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8317,67 +8747,1092 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9594,6 +11049,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10844,6 +12391,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10865,11 +12509,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 a45f58ac5..505adc722 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 @@ -9,6 +9,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 26c55adf1..996068d7d 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,6 +87,9 @@ + + + @@ -115,7 +118,9 @@ + + @@ -720,6 +725,7 @@ + @@ -983,12 +989,13 @@ + - + @@ -996,7 +1003,7 @@ - + From 5a0d28c33a53553346052179a87323dcaf148e6c Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 22 Aug 2024 08:38:37 +0200 Subject: [PATCH 06/15] mps.tables: make tests execution work in the same process --- .../test/de/slisson/mps/tables@tests.mps | 171 ++++++++++++------ 1 file changed, 111 insertions(+), 60 deletions(-) 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 64a65cdc9..219a1d422 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 @@ -21,6 +21,7 @@ + @@ -434,18 +435,28 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -747,18 +758,28 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1024,18 +1045,28 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1504,18 +1535,28 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1788,18 +1829,28 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + From fee98c58d3e5ff5c20174ce082201d0f55c7034d Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 22 Aug 2024 11:28:22 +0200 Subject: [PATCH 07/15] mps.tables: fix the error "IllegalModelAccessException: anchor is not a child of this node" --- .../slisson/mps/tables/runtime/gridmodel.mps | 47 +++++++++++++++---- 1 file changed, 38 insertions(+), 9 deletions(-) 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 505adc722..f999d186f 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 @@ -34,6 +34,7 @@ + @@ -32332,17 +32333,45 @@ - - - - + + + + + + + + + - - - + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + From 26cf3c7fc85ced6f056759cc987bea175648e5c8 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 12 Aug 2024 11:28:33 +0200 Subject: [PATCH 08/15] editor.diagram: add a new option to allow boxes to set a new required minimum size --- CHANGELOG.md | 1 + ...itemis.mps.editor.diagram.demoentities.mpl | 4 + .../languageModels/editor.mps | 49 + .../languageModels/structure.mps | 7 + .../generator/template/main@generator.mps | 96 + .../languageModels/editor.mps | 13 + .../languageModels/structure.mps | 6 + .../languageModels/behavior.mps | 27 +- .../languageModels/editor.mps | 121 +- .../languageModels/structure.mps | 47 +- ...test.de.itemis.mps.editor.diagram.lang.mpl | 4 + .../editor/diagram/demoentities/sandbox.mps | 153 +- .../mps/editor/diagram/runtime/jgraph.mps | 398 +++- .../mps/editor/diagram/runtime/model.mps | 18 + .../mps/editor/diagram/solution@tests.mps | 1744 ++++++++++++++++- .../de.itemis.mps.extensions.changelog.mps | 68 + 16 files changed, 2603 insertions(+), 153 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78031b4f3..a038a7450 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e ### Added +- *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.editor.multiline*: A new cell *constant multi-line* can be used to create dynamic read-only text that spans multiple lines. - *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.* 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 89562460c..9cf1a9359 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 @@ -18,6 +18,7 @@ f7ad14aa-a3e2-4301-8822-d919845c8bcf(de.itemis.mps.editor.diagram.shapes) fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram) aff569ad-098d-414a-aa23-96963959392c(test.de.itemis.mps.editor.diagram.lang) + 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) @@ -79,8 +80,11 @@ + + + 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 ae6b7c1cd..a6eb9b7f5 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 @@ -13,6 +13,7 @@ + @@ -32,6 +33,7 @@ + @@ -51,6 +53,9 @@ + + + @@ -65,6 +70,9 @@ + + + @@ -210,6 +218,7 @@ + @@ -282,6 +291,7 @@ + @@ -412,6 +422,15 @@ + + + + + + + + + @@ -478,6 +497,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -831,6 +871,15 @@ + + + + + + + + + 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 1e0a352f0..3bc6fe259 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 @@ -6,6 +6,7 @@ + @@ -77,6 +78,12 @@ + + + + + + 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 9f47aacbc..452355aee 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 @@ -6137,6 +6137,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6531,6 +6556,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0e85e418f..df83fc5b1 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 @@ -1166,6 +1166,19 @@ + + + + + + + + + + + + + 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 1975cbe49..5d3b6171b 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 @@ -210,6 +210,12 @@ + + + + + + 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 971c9f59d..e4a511259 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 @@ -31,6 +31,10 @@ + + + + @@ -68,6 +72,7 @@ + @@ -154,7 +159,27 @@ - + + + + + + + + + + + + + + + + + + + + + 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 7cc166192..a5bbbd3ab 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 @@ -36,6 +36,9 @@ + + + @@ -76,7 +79,9 @@ + + @@ -279,6 +284,7 @@ + @@ -937,8 +943,16 @@ - - + + + + + + + + + + @@ -2516,6 +2530,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5312,5 +5354,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8c4fb6d26..57beb0be5 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 @@ -8,6 +8,7 @@ + @@ -172,10 +173,15 @@ - + + + + + + @@ -333,5 +339,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1d2675a53..16b941c59 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 @@ -19,6 +19,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram) 1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime) + 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) @@ -69,8 +70,11 @@ + + + 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 df56330cf..2c37b2791 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 @@ -7,6 +7,14 @@ + + + + + + + + @@ -22,6 +30,7 @@ + @@ -416,50 +425,50 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -470,8 +479,8 @@ - - + + @@ -479,6 +488,14 @@ + + + + + + + + @@ -488,8 +505,8 @@ - - + + @@ -498,28 +515,28 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -530,8 +547,8 @@ - - + + @@ -539,14 +556,6 @@ - - - - - - - - @@ -556,8 +565,8 @@ - - + + @@ -566,12 +575,12 @@ - - + + - - + + @@ -582,8 +591,8 @@ - - + + @@ -596,10 +605,10 @@ - + - - + + @@ -620,6 +629,11 @@ + + + + + @@ -634,12 +648,22 @@ + + + + + + + + + + @@ -650,6 +674,11 @@ + + + + + @@ -664,6 +693,11 @@ + + + + + @@ -678,6 +712,11 @@ + + + + + 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 dec01d63a..17715ce45 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 @@ -48769,6 +48769,25 @@ + + + + + + + + + + + + + + + + + + + @@ -51595,6 +51614,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78156,6 +78369,12 @@ + + + + + + @@ -78243,6 +78462,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -78433,6 +78674,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78845,57 +79140,90 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + 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 a1226507b..f0f278a5a 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 @@ -17585,6 +17585,13 @@ + + + + + + + @@ -29384,6 +29391,17 @@ + + + + + + + + + + + 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 9a929ff5f..8d9d5d3f7 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 @@ -316,6 +316,14 @@ + + + + + + + + @@ -342,6 +350,13 @@ + + + + + + + @@ -355,7 +370,8 @@ - + + @@ -414,6 +430,7 @@ + @@ -23638,40 +23655,40 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -23679,9 +23696,9 @@ - - - + + + @@ -23692,8 +23709,8 @@ - - + + @@ -23701,6 +23718,14 @@ + + + + + + + + @@ -23710,8 +23735,8 @@ - - + + @@ -23720,28 +23745,28 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -23752,8 +23777,8 @@ - - + + @@ -23761,14 +23786,6 @@ - - - - - - - - @@ -23778,8 +23795,8 @@ - - + + @@ -23788,12 +23805,12 @@ - - + + - - + + @@ -23804,8 +23821,8 @@ - - + + @@ -23818,10 +23835,10 @@ - + - - + + @@ -23842,6 +23859,11 @@ + + + + + @@ -23856,12 +23878,22 @@ + + + + + + + + + + @@ -23872,6 +23904,11 @@ + + + + + @@ -23886,6 +23923,11 @@ + + + + + @@ -23900,6 +23942,11 @@ + + + + + @@ -24630,5 +24677,1588 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 c4a6b2b5d..ee4c85563 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 @@ -234,6 +234,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From da9bea4f60fe1cfdf988a847929ece2e65000b7b Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 13 Aug 2024 07:57:56 +0200 Subject: [PATCH 09/15] editor.diagram: remove move to viewer config --- .../generator/template/main@generator.mps | 33 -------------- .../languageModels/behavior.mps | 45 ------------------- .../languageModels/editor.mps | 19 -------- .../languageModels/structure.mps | 5 --- 4 files changed, 102 deletions(-) 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 452355aee..8a29e185d 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 @@ -16526,39 +16526,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 0273dd060..609e6738b 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 @@ -10249,51 +10249,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 df83fc5b1..41c35cf49 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 @@ -5670,25 +5670,6 @@ - - - - - - - - - - - - - - - - - - - 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 5d3b6171b..bb442e11e 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 @@ -2154,11 +2154,6 @@ - - - - - From a3e3af30e416c31ea220aa13fc90e8765a43dd10 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 13 Aug 2024 08:10:08 +0200 Subject: [PATCH 10/15] editor.diagram: fix tests --- .../mps/editor/diagram/solution@tests.mps | 295 ++++++++---------- 1 file changed, 123 insertions(+), 172 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 8d9d5d3f7..965166951 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 @@ -11880,8 +11880,8 @@ - - + + @@ -12248,8 +12248,8 @@ - - + + @@ -12271,7 +12271,7 @@ - + @@ -12418,149 +12418,90 @@ - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - + + - - + + + + + + + + + + + - - + + + + + + - - + + - - - - - - - - + + + + + + - - - - - - - - - - - - - - + + - - - - - - - - - - - + + + + - - - - - - - - - - - + + - - - - - - - - - - - + + + + + + - - - - - - - - - - - + + - - - - - - - - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + @@ -13364,20 +13305,6 @@ - - - - - - - - - - - - - - @@ -13409,6 +13336,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -14303,8 +14254,8 @@ - - + + @@ -18803,7 +18754,7 @@ - + @@ -18847,7 +18798,7 @@ - + @@ -18997,8 +18948,8 @@ - - + + @@ -19019,8 +18970,8 @@ - - + + @@ -19123,7 +19074,7 @@ - + @@ -19167,7 +19118,7 @@ - + @@ -23012,7 +22963,7 @@ - + @@ -23028,9 +22979,9 @@ - + - + @@ -23046,9 +22997,9 @@ - + - + @@ -23073,23 +23024,23 @@ - + - + - + - + - + @@ -23189,9 +23140,9 @@ - + - + @@ -23207,9 +23158,9 @@ - + - + @@ -23227,7 +23178,7 @@ - + @@ -23248,23 +23199,23 @@ - + - + - + - + - + From 1a4b47fb06bb6ac5239a59fe17d28b435f0bdcde Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 13 Aug 2024 08:28:30 +0200 Subject: [PATCH 11/15] update the build script --- .../models/de.itemis.mps.extensions.build.mps | 10 ++++++++++ 1 file changed, 10 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 1d81e0b28..d53174f3c 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 @@ -20850,6 +20850,11 @@ + + + + + @@ -21160,6 +21165,11 @@ + + + + + From 8a54a49e58a69117592486e90a2ccc9f003f0058 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 22 Aug 2024 11:34:08 +0200 Subject: [PATCH 12/15] publish the changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a038a7450..702bf3e96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,9 @@ 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.editor.multiline*: A new cell *constant multi-line* can be used to create dynamic read-only text that spans multiple lines. -- *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.* ### Fixed @@ -40,6 +40,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e ### Fixed - *de.itemis.mps.editor.diagram.runtime*: Diagrams can now be used in an headless environment (e.g. for rendering documentation). +- *de.slisson.mps.editor.multiline.runtime*: A bug was fixed where the multiline cell got a wrong background color set. - *de.itemis.mps.editor.diagram.runtime*: The dependency to *de.q60.mps.collections.libs* was removed. - *de.itemis.mps.editor.diagram*: Various improvements to diagrams were made. (see: [PR #866](https://github.com/JetBrains/MPS-extensions/pull/866) ) From 81a2d7acce468dfb2af40c3e3e191cf6ecffdf38 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 22 Aug 2024 12:12:21 +0200 Subject: [PATCH 13/15] mps.tables: make the dummy link work in the cell inspector --- .../models/de/slisson/mps/tables/runtime/cells.mps | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps index 294f9a276..5dfdd8cba 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 @@ -36086,11 +36086,9 @@ - - - - - + + + From 41d677673747233cef23040675ade6423e68a556 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 22 Aug 2024 12:25:58 +0200 Subject: [PATCH 14/15] mps.tables: restore the old behavior that the insert row action is always enabled --- .../de/slisson/mps/tables/runtime/cells.mps | 157 +++++++++++++----- 1 file changed, 115 insertions(+), 42 deletions(-) diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps index 5dfdd8cba..bbaf67497 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 @@ -29936,6 +29936,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -29943,14 +29973,8 @@ - - - - - - - - + + @@ -36210,6 +36234,12 @@ + + + + + + @@ -36247,6 +36277,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -36388,55 +36443,73 @@ - - - - - + + + + + + + + + - - + + - - - - - + + + + + + - - - - - - - - - + + - - - - - + + + + + + + + - - - + + + + + + + - - - + + + + + - - + + + + + + + + + + + + + From 9da990c88b352523511d56ecaccf617f374d2514 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 22 Aug 2024 12:49:33 +0200 Subject: [PATCH 15/15] mps.tables: remove sticky header painters correctly --- .../languageModels/editor.mps | 88 +++++++-------- .../de/slisson/mps/tables/runtime/cells.mps | 103 +++++++++++++++--- 2 files changed, 134 insertions(+), 57 deletions(-) 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 8b0c79089..076c6bddb 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 @@ -856,265 +856,265 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 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 bbaf67497..52ea70b17 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 @@ -9064,12 +9064,28 @@ - + + + + + + + + + + + + + + + + + @@ -12617,23 +12633,55 @@ - - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12654,6 +12702,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +