From b51277623fd126ec193f929d9907dd49e7c99091 Mon Sep 17 00:00:00 2001 From: Alexei Quapp Date: Mon, 5 Dec 2022 18:08:49 +0100 Subject: [PATCH 01/32] Fixed table styles in dark and high contrast themes. --- .../languages/org.iets3.core.base/org.iets3.core.base.mpl | 4 ++-- .../models/org.iets3.core.expr.data.editor.mps | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl index 9a8b858899..ec5136382a 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl @@ -16,7 +16,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) - 5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml) + 5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml) f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor) @@ -72,10 +72,10 @@ + - diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps index 52160a33a2..a96092cf4c 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps @@ -1,6 +1,7 @@ + From 7c955f98c3e426febbeb7425e88a7e8263460b33 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 07:51:03 +0100 Subject: [PATCH 02/32] Extend ErrorSolverTask to support dark themes Color is untested. --- .../org.iets3.analysis.base/models/editor.mps | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps index fd0970b94a..f970932338 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps @@ -12,6 +12,7 @@ + @@ -276,17 +277,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + From 1e789047d9e0cc255b8e959b5e79a90f9c9c8083 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 08:12:07 +0100 Subject: [PATCH 03/32] Extend org.iets3.components.core to support dark themes Colors are untested. --- .../models/behavior.mps | 38 +++++++--- .../models/editor.mps | 75 ++++++++++++++----- 2 files changed, 86 insertions(+), 27 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps index 8d962d5b55..262af67669 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps @@ -44,6 +44,7 @@ + @@ -2753,21 +2754,40 @@ - + - - - - - - + + + + + + + + + + + + + + - - + + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps index 0741c24f23..5fac83e9fa 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps @@ -51,6 +51,7 @@ + @@ -1410,16 +1411,35 @@ - - - - - - - + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -1439,16 +1459,35 @@ - - - - - - - + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + From 612d6688ab1afdef85e227811f58516e134b0e32 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 08:30:34 +0100 Subject: [PATCH 04/32] Adapt IETS3Colors to support dark themes in org.iets3.core.base Color tested via inspection of library L in playground with Darcula theme --- .../org.iets3.core.base/models/editor.mps | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps index 2f730f7ef0..d524213993 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/editor.mps @@ -1,7 +1,6 @@ - @@ -611,9 +610,18 @@ - - - + + + + + + + + + + + + From cf27767774ccb0dbe7602b4441b5db247bbdccd3 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 09:37:21 +0100 Subject: [PATCH 05/32] Adapt org.iets2.components.core to support dark themes Some colors tested via inspection of example component "MyChunk" in components sandbox with Darcula theme --- .../models/editor.mps | 359 ++++++++++++++---- 1 file changed, 283 insertions(+), 76 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps index 5fac83e9fa..03f99517f1 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps @@ -50,8 +50,8 @@ - + @@ -1333,9 +1333,18 @@ - - - + + + + + + + + + + + + @@ -1925,9 +1934,18 @@ - - - + + + + + + + + + + + + @@ -1949,9 +1967,18 @@ - - - + + + + + + + + + + + + @@ -2060,9 +2087,18 @@ - - - + + + + + + + + + + + + @@ -8280,10 +8316,6 @@ - - - - @@ -8298,6 +8330,19 @@ + + + + + + + + + + + + + @@ -8607,13 +8652,22 @@ - - - - + + + + + + + + + + + + + @@ -8922,10 +8976,6 @@ - - - - @@ -8940,6 +8990,19 @@ + + + + + + + + + + + + + @@ -9237,10 +9300,6 @@ - - - - @@ -9255,6 +9314,19 @@ + + + + + + + + + + + + + @@ -12037,10 +12109,19 @@ - - - - + + + + + + + + + + + + + @@ -12062,9 +12143,18 @@ - - - + + + + + + + + + + + + @@ -12105,9 +12195,18 @@ - - - + + + + + + + + + + + + @@ -12129,9 +12228,18 @@ - - - + + + + + + + + + + + + @@ -12181,9 +12289,18 @@ - - - + + + + + + + + + + + + @@ -12205,9 +12322,18 @@ - - - + + + + + + + + + + + + @@ -12253,9 +12379,18 @@ - - - + + + + + + + + + + + + @@ -12277,9 +12412,18 @@ - - - + + + + + + + + + + + + @@ -12375,9 +12519,18 @@ - - - + + + + + + + + + + + + @@ -12499,10 +12652,6 @@ - - - - @@ -12517,6 +12666,19 @@ + + + + + + + + + + + + + @@ -12824,9 +12986,18 @@ - - - + + + + + + + + + + + + @@ -12848,9 +13019,18 @@ - - - + + + + + + + + + + + + @@ -12920,9 +13100,18 @@ - - - + + + + + + + + + + + + @@ -12944,9 +13133,18 @@ - - - + + + + + + + + + + + + @@ -13025,9 +13223,18 @@ - - - + + + + + + + + + + + + From 3f1a568756e8592dbec006648416699d739f5920 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 09:47:40 +0100 Subject: [PATCH 06/32] Adapt org.iets2.components.req to support dark themes Color untested --- .../org.iets3.components.req/models/editor.mps | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps index a57f0f21a7..ec98dfe49f 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps @@ -8,6 +8,7 @@ + @@ -119,9 +120,18 @@ - - - + + + + + + + + + + + + From ee2dda104fc3a8e93ec45d89d3dcbd637b1bcdc3 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 09:50:38 +0100 Subject: [PATCH 07/32] Adapt org.iets3.cre.attributes to support dark themes Colors tested via inspection of example component "MyChunk" in components sandbox with Darcula theme --- .../models/editor.mps | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps index 98425da448..b70e62dd5a 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps @@ -21,6 +21,7 @@ + @@ -300,9 +301,18 @@ - - - + + + + + + + + + + + + @@ -335,9 +345,18 @@ - - - + + + + + + + + + + + + From 1e1ca7941782a45e97bd1ac41d8fcd4310837fae Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 10:38:42 +0100 Subject: [PATCH 08/32] Adapt org.iets3.core.expr.base to support dark themes Some Colors tested via inspection of tests with Darcula theme Some Colors, especially in DefaultCoverageAnalyzer and StructuralCoverageAnalyzer reuse light theme colors. --- .../models/behavior.mps | 608 +++++++++++------- .../models/editor.mps | 246 +++++-- 2 files changed, 574 insertions(+), 280 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps index b549599688..92d6abade2 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps @@ -44,6 +44,7 @@ + @@ -14920,17 +14921,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -14942,9 +14962,18 @@ - - - + + + + + + + + + + + + @@ -14954,17 +14983,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -14976,17 +15024,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -14999,11 +15066,23 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -15014,11 +15093,23 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -15029,11 +15120,23 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -15044,11 +15147,23 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -20000,17 +20115,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -20022,9 +20156,18 @@ - - - + + + + + + + + + + + + @@ -20034,17 +20177,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -26386,6 +26548,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27373,152 +27682,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps index 1a93d087ab..4553f69677 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps @@ -1,6 +1,7 @@ + @@ -3332,9 +3333,18 @@ - - - + + + + + + + + + + + + @@ -3397,9 +3407,18 @@ - - - + + + + + + + + + + + + @@ -4145,9 +4164,18 @@ - - - + + + + + + + + + + + + @@ -4167,9 +4195,18 @@ - - - + + + + + + + + + + + + @@ -4191,9 +4228,18 @@ - - - + + + + + + + + + + + + @@ -4215,9 +4261,18 @@ - - - + + + + + + + + + + + + @@ -4271,9 +4326,18 @@ - - - + + + + + + + + + + + + @@ -4662,11 +4726,23 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -5944,9 +6020,18 @@ - - - + + + + + + + + + + + + @@ -5975,9 +6060,18 @@ - - - + + + + + + + + + + + + @@ -6249,17 +6343,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -6273,17 +6386,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -7216,11 +7348,6 @@ - - - - - @@ -7368,6 +7495,11 @@ + + + + + From 63eda970c528f105098af2c6971527a1e9e07011 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 10:40:49 +0100 Subject: [PATCH 09/32] Add changes missing in previous commit --- .../models/plugin.mps | 55 +++++++++++++------ 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps index 5ee45194be..42715f37b9 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps @@ -48,6 +48,7 @@ + @@ -9886,13 +9887,31 @@ - - - + + + + + + + + + + + + - - - + + + + + + + + + + + + @@ -14084,16 +14103,12 @@ - + + - - - - - - + + - @@ -14147,12 +14162,16 @@ - - + - - + + + + + + + From be4d9e6a2b69f7ab5c72922758253d6dd3486985 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 11:12:19 +0100 Subject: [PATCH 10/32] Adapt org.iets3.core.expr.dataflow to support dark themes Colors tested via inspection of example "Examples" in dataflow@tests with Darcula theme --- .../models/editor.mps | 131 ++++++++++++++---- 1 file changed, 107 insertions(+), 24 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps index 61bb1a2e62..ab83f1675c 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps @@ -17,6 +17,7 @@ + @@ -1855,9 +1856,18 @@ - - - + + + + + + + + + + + + @@ -1994,9 +2004,18 @@ - - - + + + + + + + + + + + + @@ -2159,9 +2178,18 @@ - - - + + + + + + + + + + + + @@ -2283,9 +2311,18 @@ - - - + + + + + + + + + + + + @@ -2484,9 +2521,18 @@ - - - + + + + + + + + + + + + @@ -2540,9 +2586,23 @@ - - - + + + + + + + + + + + + + + + + + @@ -2865,9 +2925,23 @@ - - - + + + + + + + + + + + + + + + + + @@ -3407,9 +3481,18 @@ - - - + + + + + + + + + + + + From 4fee3ac44dbcd9f91732e7045abd24b979ab587a Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 11:26:10 +0100 Subject: [PATCH 11/32] Adapt org.iets3.core.expr.datetime to support dark themes The color that was used everywhere was encapsulated into a stylesheet returning a JBColor Colors tested via inspection of example "date" in datatime@tests with Darcula theme --- .../models/editor.mps | 267 ++++-------------- 1 file changed, 57 insertions(+), 210 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/editor.mps index 6d4ca12847..a0acce83b7 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.datetime/models/editor.mps @@ -9,6 +9,7 @@ + @@ -31,6 +32,9 @@ + + + @@ -41,6 +45,7 @@ + @@ -70,6 +75,9 @@ + + + @@ -92,6 +100,7 @@ + @@ -143,99 +152,29 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - @@ -370,27 +309,13 @@ + - - - - - - - - - - - - - - - @@ -403,24 +328,10 @@ + - - - - - - - - - - - - - - - @@ -711,42 +622,14 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -759,21 +642,7 @@ - - - - - - - - - - - - - - - + @@ -786,42 +655,14 @@ - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - @@ -836,27 +677,13 @@ + - - - - - - - - - - - - - - - @@ -887,24 +714,10 @@ + - - - - - - - - - - - - - - - @@ -993,5 +806,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a52201e2c5766e47fecf0ab5310945d4b1e11e56 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 11:28:12 +0100 Subject: [PATCH 12/32] Adapt org.iets3.core.expr.doc to support dark themes Color untested as concept is unused --- .../org.iets3.core.expr.doc/models/editor.mps | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps index 87fb019eb2..08f4acdd61 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps @@ -14,6 +14,7 @@ + @@ -633,9 +634,18 @@ - - - + + + + + + + + + + + + From 88ab6ff192f6a912154084526ce984f612313b1d Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 11:30:39 +0100 Subject: [PATCH 13/32] Adapt org.iets3.core.expr.lambda to support dark themes Color tested with "AlgebraicCommand" test --- .../models/editor.mps | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/editor.mps index 0797e06970..19820e0893 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/editor.mps @@ -17,6 +17,7 @@ + @@ -269,6 +270,7 @@ + @@ -1192,11 +1194,23 @@ - - - - - + + + + + + + + + + + + + + + + + From 19fef02488ad773f4a26a68eb351856c02c376ef Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 11:33:30 +0100 Subject: [PATCH 14/32] Adapt org.iets3.core.expr.messages to support dark themes Color tested with "Messages" test --- .../models/editor.mps | 46 +++++++++++++++---- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps index b0a17fba0d..c67225b37d 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps @@ -15,6 +15,7 @@ + @@ -382,9 +383,18 @@ - - - + + + + + + + + + + + + @@ -411,9 +421,18 @@ - - - + + + + + + + + + + + + @@ -463,9 +482,18 @@ - - - + + + + + + + + + + + + From 3358bc15bd53842b5fd6a7e209c28336a267ebfd Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 11:37:58 +0100 Subject: [PATCH 15/32] Adapt org.iets3.core.expr.natlang to support dark themes Color tested with "natlang" test --- .../models/editor.mps | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps index 361ffae472..50fb8b9272 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/models/editor.mps @@ -25,6 +25,7 @@ + @@ -1492,16 +1493,35 @@ - - - - - - - + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + From ee73e45dbe117308335c4758499b8b9c2c5e511d Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 11:46:43 +0100 Subject: [PATCH 16/32] Adapt org.iets3.core.expr.process to support dark themes Color tested with "A_DecisionsSimple" test --- .../org.iets3.core.expr.process.editor.mps | 69 +++++++++++++++---- 1 file changed, 57 insertions(+), 12 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps index 2ea3935ffb..cfc99c833b 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps @@ -10,6 +10,7 @@ + @@ -92,6 +93,9 @@ + + + @@ -110,6 +114,11 @@ + + + + + @@ -170,9 +179,18 @@ - - - + + + + + + + + + + + + @@ -239,9 +257,18 @@ - - - + + + + + + + + + + + + @@ -391,9 +418,18 @@ - - - + + + + + + + + + + + + @@ -522,9 +558,18 @@ - - - + + + + + + + + + + + + From 67dd462d7fe1e5782d6d30c1dd49d7e00f468a42 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 11:48:59 +0100 Subject: [PATCH 17/32] Adapt org.iets3.core.expr.query to support dark themes Color tested with "helloQuery" test --- .../org.iets3.core.expr.query.editor.mps | 31 +++++++++++++++---- .../org.iets3.core.expr.query.mpl | 1 + 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps index 3a79a261b9..467aca6def 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps @@ -9,6 +9,7 @@ + @@ -111,9 +112,18 @@ - - - + + + + + + + + + + + + @@ -221,9 +231,18 @@ - - - + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl index c24998da18..938f1d2025 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl @@ -16,6 +16,7 @@ 10e056b2-49fd-40ca-8b64-de69c81163ac(org.iets3.core.expr.query) dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime) 2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) From b4f6e37b973f4c5c7a923a011ed42ccfe5fc6f16 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 12:08:07 +0100 Subject: [PATCH 18/32] Adapt org.iets3.core.req.core to support dark themes Colors untested --- .../org.iets3.req.core/models/editor.mps | 106 ++++++++++++++---- 1 file changed, 85 insertions(+), 21 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps index e32942e8fc..199a9091ce 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps @@ -32,6 +32,7 @@ + @@ -943,9 +944,18 @@ - - - + + + + + + + + + + + + @@ -1004,9 +1014,18 @@ - - - + + + + + + + + + + + + @@ -1245,9 +1264,18 @@ - - - + + + + + + + + + + + + @@ -1445,9 +1473,18 @@ - - - + + + + + + + + + + + + @@ -1538,9 +1575,18 @@ - - - + + + + + + + + + + + + @@ -1563,9 +1609,18 @@ - - - + + + + + + + + + + + + @@ -1983,9 +2038,18 @@ - - - + + + + + + + + + + + + From 06f892d56695855a813aaeb1b20f066885ce83a2 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 12:10:29 +0100 Subject: [PATCH 19/32] Adapt org.iets3.glossary to support dark themes Colors untested --- .../org.iets3.glossary/models/editor.mps | 61 +++++++++++++++---- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps index cb1ff8982a..167912cb1b 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps @@ -15,6 +15,7 @@ + @@ -376,9 +377,18 @@ - - - + + + + + + + + + + + + @@ -461,9 +471,18 @@ - - - + + + + + + + + + + + + @@ -507,9 +526,18 @@ - - - + + + + + + + + + + + + @@ -798,9 +826,18 @@ - - - + + + + + + + + + + + + From ef2ffe246c1d193ae9fcb0cdd70cc1d5610c1837 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 12:11:44 +0100 Subject: [PATCH 20/32] Adapt org.iets3.core.users to support dark themes Colors untested --- .../org.iets3.core.users/models/editor.mps | 16 +++++++++++++--- .../org.iets3.core.users.mpl | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/editor.mps index 45df3ab735..ae09734715 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/editor.mps @@ -11,6 +11,7 @@ + @@ -219,9 +220,18 @@ - - - + + + + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/org.iets3.core.users.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/org.iets3.core.users.mpl index ed3039ed0d..0f808ef507 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/org.iets3.core.users.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/org.iets3.core.users.mpl @@ -14,6 +14,7 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) From ffc178bd51f75243aea11032674fadcd6f755a3c Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 12:22:01 +0100 Subject: [PATCH 21/32] Adapt org.iets3.core.trace to support dark themes Color tested with "testChunc" test --- .../org.iets3.core.trace/models/behavior.mps | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps index 692c7af9ac..66778af41f 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps @@ -11,6 +11,7 @@ + @@ -88,7 +89,9 @@ + + @@ -197,9 +200,28 @@ - - - + + + + + + + + + + + + + + + + + + + + + + From d0961a88722da60c4178ed58b7e52008976a24ec Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 12:46:43 +0100 Subject: [PATCH 22/32] Adapt org.iets3.core.expr.util to support dark themes Colors tested with "multidectab" and "dectre" tests --- .../models/editor.mps | 154 ++++++++++++++---- 1 file changed, 119 insertions(+), 35 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps index 02653147d1..a4a1fa3154 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps @@ -1,12 +1,13 @@ + - - + + @@ -40,6 +41,7 @@ + @@ -1670,9 +1672,18 @@ - - - + + + + + + + + + + + + @@ -1942,9 +1953,18 @@ - - - + + + + + + + + + + + + @@ -1956,9 +1976,18 @@ - - - + + + + + + + + + + + + @@ -2069,9 +2098,18 @@ - - - + + + + + + + + + + + + @@ -2329,17 +2367,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -2690,9 +2747,18 @@ - - - + + + + + + + + + + + + @@ -2852,10 +2918,19 @@ - - - - + + + + + + + + + + + + + @@ -3803,10 +3878,19 @@ - - - - + + + + + + + + + + + + + From eedae16f9516de8aded83fdd98e0dc1d5861f9d9 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 13:03:46 +0100 Subject: [PATCH 23/32] Adapt org.iets3.core.expr.toplevel to support dark themes Colors tested with library "L" in playground --- .../org/iets3/core/expr/toplevel/editor.mps | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps index afaf8889f4..631a9c023a 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps @@ -26,21 +26,21 @@ + + + + + - - + - - - - @@ -2705,9 +2705,18 @@ - - - + + + + + + + + + + + + @@ -4923,6 +4932,13 @@ + + + + + + + @@ -4957,12 +4973,5 @@ - - - - - - - From 84b7fcba87087a242d036d003f2f1f93b37a6d31 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 14:00:11 +0100 Subject: [PATCH 24/32] Adapt org.iets3.core.expr.tests to support dark themes Colors untested --- .../models/editor.mps | 145 ++++++++++++++---- 1 file changed, 112 insertions(+), 33 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps index 835d76f488..bab8692f21 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps @@ -1661,17 +1661,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -2569,10 +2588,6 @@ - - - - @@ -2588,6 +2603,19 @@ + + + + + + + + + + + + + @@ -4698,11 +4726,23 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -4714,9 +4754,18 @@ - - - + + + + + + + + + + + + @@ -4756,11 +4805,23 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -4772,9 +4833,18 @@ - - - + + + + + + + + + + + + @@ -6624,9 +6694,18 @@ - - - + + + + + + + + + + + + From 7530dd1255dd0df6df476c5f6fe159179d662d12 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Wed, 18 Jan 2023 14:03:51 +0100 Subject: [PATCH 25/32] Adapt org.iets3.core.expr.stringvalidation to support dark themes Colors tested with "acceptance_tests" test --- ...ets3.core.expr.stringvalidation.editor.mps | 61 +++++++++++++++---- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps index ed1f759f1b..33acea4435 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps @@ -11,6 +11,7 @@ + @@ -134,9 +135,18 @@ - - - + + + + + + + + + + + + @@ -159,9 +169,18 @@ - - - + + + + + + + + + + + + @@ -269,9 +288,18 @@ - - - + + + + + + + + + + + + @@ -294,9 +322,18 @@ - - - + + + + + + + + + + + + From c4f8d79ffd981dd54dd0ae900db51e1a2fe81b0b Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Thu, 19 Jan 2023 09:07:14 +0100 Subject: [PATCH 26/32] Adapt org.iets3.core.expr.repl to support dark themes Colors for concepts with test instances tested with "Test" sheet --- .../org/iets3/core/expr/repl/editor.mps | 1054 +++++++++++++---- 1 file changed, 807 insertions(+), 247 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps index b1d07646e7..e9d33aff30 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps @@ -33,6 +33,7 @@ + @@ -512,6 +513,9 @@ + + + @@ -553,11 +557,23 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -568,12 +584,24 @@ - - - - - - + + + + + + + + + + + + + + + + + + @@ -646,9 +674,18 @@ - - - + + + + + + + + + + + + @@ -722,20 +759,38 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -783,22 +838,40 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -823,12 +896,24 @@ - - - - - - + + + + + + + + + + + + + + + + + + @@ -853,11 +938,23 @@ - - - - - + + + + + + + + + + + + + + + + + @@ -870,9 +967,18 @@ - - - + + + + + + + + + + + + @@ -914,9 +1020,18 @@ - - - + + + + + + + + + + + + @@ -978,12 +1093,24 @@ - - - - + + + + + + + + + + + + + + + + @@ -1336,13 +1463,22 @@ - - - - + + + + + + + + + + + + + @@ -1369,13 +1505,22 @@ - - - - + + + + + + + + + + + + + @@ -1415,13 +1560,22 @@ - - - - + + + + + + + + + + + + + @@ -2429,9 +2583,18 @@ - - - + + + + + + + + + + + + @@ -2805,9 +2968,18 @@ - - - + + + + + + + + + + + + @@ -2840,9 +3012,18 @@ - - - + + + + + + + + + + + + @@ -2862,9 +3043,18 @@ - - - + + + + + + + + + + + + @@ -2938,9 +3128,18 @@ - - - + + + + + + + + + + + + @@ -2973,9 +3172,18 @@ - - - + + + + + + + + + + + + @@ -2995,9 +3203,18 @@ - - - + + + + + + + + + + + + @@ -3069,9 +3286,18 @@ - - - + + + + + + + + + + + + @@ -3087,10 +3313,19 @@ - - - - + + + + + + + + + + + + + @@ -3112,9 +3347,18 @@ - - - + + + + + + + + + + + + @@ -3126,10 +3370,19 @@ - - - - + + + + + + + + + + + + + @@ -3145,10 +3398,19 @@ - - - - + + + + + + + + + + + + + @@ -3169,10 +3431,19 @@ - - - - + + + + + + + + + + + + + @@ -3184,10 +3455,19 @@ - - - - + + + + + + + + + + + + + @@ -3203,10 +3483,19 @@ - - - - + + + + + + + + + + + + + @@ -3227,10 +3516,19 @@ - - - - + + + + + + + + + + + + + @@ -3242,10 +3540,19 @@ - - - - + + + + + + + + + + + + + @@ -3261,10 +3568,19 @@ - - - - + + + + + + + + + + + + + @@ -3285,10 +3601,19 @@ - - - - + + + + + + + + + + + + + @@ -3301,17 +3626,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -3327,17 +3671,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -3379,9 +3742,18 @@ - - - + + + + + + + + + + + + @@ -3399,17 +3771,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -3426,17 +3817,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -3482,17 +3892,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -3508,17 +3937,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -3559,18 +4007,37 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -3605,18 +4072,37 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -3984,7 +4470,25 @@ - + + + + + + + + + + + + + + + + + + + @@ -4614,13 +5118,31 @@ - - - + + + + + + + + + + + + - - - + + + + + + + + + + + + @@ -5117,17 +5639,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -5188,17 +5729,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + From 5aef077ca1eee4d52bba241969a72c03d6f80b08 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Thu, 19 Jan 2023 09:21:30 +0100 Subject: [PATCH 27/32] Adapt org.iets3.core.expr.tracing to support dark themes Colors are untested --- .../models/editor.mps | 191 ++++++++++++++---- 1 file changed, 153 insertions(+), 38 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps index 8e6bee647b..011d370937 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tracing/models/editor.mps @@ -24,6 +24,7 @@ + @@ -152,6 +153,9 @@ + + + @@ -235,6 +239,7 @@ + @@ -535,9 +540,18 @@ - - - + + + + + + + + + + + + @@ -623,9 +637,18 @@ - - - + + + + + + + + + + + + @@ -676,9 +699,18 @@ - - - + + + + + + + + + + + + @@ -1479,13 +1511,26 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -1579,13 +1624,26 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -1690,11 +1748,30 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1734,11 +1811,30 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1753,11 +1849,30 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + From 5d5530ae7e6d4f3cc553a38281abd79af4a6b5d5 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Thu, 19 Jan 2023 09:25:50 +0100 Subject: [PATCH 28/32] Adapt org.iets3.core.expr.plugin to support dark themes Colors are untested --- .../models/plugin.mps | 2869 +++++++++-------- 1 file changed, 1458 insertions(+), 1411 deletions(-) diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps index d52eb8289c..8f80ef5c2f 100644 --- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps +++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps @@ -1442,17 +1442,36 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + @@ -1567,11 +1586,30 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -4729,9 +4767,18 @@ - - - + + + + + + + + + + + + @@ -8102,46 +8149,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8461,1595 +8468,1635 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + - - - - - - - - - - + + + + + + - - + + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - - + + + + + + + - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - + + - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + - - + + + + + - - - + + + + + + + + + + + - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + - - - - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + + - - + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - - + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - + + + - - - - - - - - - - - - - - - - + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - + + - - + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - - - - - + + + + + + + - - - - + + + + + + - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - + + - - - - - + + - - - - - - - - - - - - - - - - - + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + From 0d5ac12689be8f34c55ac2132b3f320f57059aad Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Thu, 19 Jan 2023 11:50:42 +0100 Subject: [PATCH 29/32] Add new dependencies to build script --- .../models/org/iets3/opensource/build/build.mps | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps index 6f7e2f7ec5..bb93564e2c 100755 --- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps +++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps @@ -1457,6 +1457,11 @@ + + + + + @@ -7142,6 +7147,11 @@ + + + + + From 23d516bc01cb55091fe4e31195bda4da23f2c81f Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Thu, 19 Jan 2023 13:00:16 +0100 Subject: [PATCH 30/32] Use more lighter way of declaring colors via JBColors static fields --- .../models/editor.mps | 357 +++--------- .../models/editor.mps | 15 +- .../models/editor.mps | 30 +- .../models/behavior.mps | 15 +- .../models/editor.mps | 122 +---- .../models/editor.mps | 115 +--- .../org.iets3.core.expr.doc/models/editor.mps | 15 +- .../models/editor.mps | 45 +- .../org.iets3.core.expr.process.editor.mps | 68 +-- .../org.iets3.core.expr.query.editor.mps | 30 +- .../org/iets3/core/expr/repl/editor.mps | 510 ++++-------------- ...ets3.core.expr.stringvalidation.editor.mps | 32 +- .../models/editor.mps | 60 +-- .../org/iets3/core/expr/toplevel/editor.mps | 17 +- .../models/editor.mps | 163 +++--- .../org.iets3.core.trace/models/behavior.mps | 29 +- .../org.iets3.core.users/models/editor.mps | 15 +- .../org.iets3.glossary/models/editor.mps | 60 +-- .../org.iets3.req.core/models/editor.mps | 107 +--- .../models/plugin.mps | 15 +- 20 files changed, 403 insertions(+), 1417 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps index 03f99517f1..4fd8200956 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps @@ -1333,18 +1333,9 @@ - - - - - - - - - - - - + + + @@ -1934,18 +1925,9 @@ - - - - - - - - - - - - + + + @@ -1967,18 +1949,9 @@ - - - - - - - - - - - - + + + @@ -2087,18 +2060,9 @@ - - - - - - - - - - - - + + + @@ -8330,18 +8294,9 @@ - - - - - - - - - - - - + + + @@ -8551,13 +8506,13 @@ - - - + + + - - - + + + @@ -8655,18 +8610,9 @@ - - - - - - - - - - - - + + + @@ -8990,18 +8936,9 @@ - - - - - - - - - - - - + + + @@ -9314,18 +9251,9 @@ - - - - - - - - - - - - + + + @@ -12110,18 +12038,9 @@ - - - - - - - - - - - - + + + @@ -12143,18 +12062,9 @@ - - - - - - - - - - - - + + + @@ -12195,18 +12105,9 @@ - - - - - - - - - - - - + + + @@ -12228,18 +12129,9 @@ - - - - - - - - - - - - + + + @@ -12289,18 +12181,9 @@ - - - - - - - - - - - - + + + @@ -12322,18 +12205,9 @@ - - - - - - - - - - - - + + + @@ -12379,18 +12253,9 @@ - - - - - - - - - - - - + + + @@ -12412,18 +12277,9 @@ - - - - - - - - - - - - + + + @@ -12519,18 +12375,9 @@ - - - - - - - - - - - - + + + @@ -12666,18 +12513,9 @@ - - - - - - - - - - - - + + + @@ -12986,18 +12824,9 @@ - - - - - - - - - - - - + + + @@ -13019,18 +12848,9 @@ - - - - - - - - - - - - + + + @@ -13100,18 +12920,9 @@ - - - - - - - - - - - - + + + @@ -13133,18 +12944,9 @@ - - - - - - - - - - - - + + + @@ -13223,18 +13025,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps index ec98dfe49f..7606e5d012 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps @@ -120,18 +120,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps index b70e62dd5a..f3e33d7313 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps @@ -301,18 +301,9 @@ - - - - - - - - - - - - + + + @@ -345,18 +336,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps index 92d6abade2..f2171925cb 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps @@ -20156,18 +20156,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps index 4553f69677..bf069050ce 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps @@ -36,10 +36,10 @@ + - @@ -3333,18 +3333,9 @@ - - - - - - - - - - - - + + + @@ -3407,18 +3398,9 @@ - - - - - - - - - - - - + + + @@ -4164,18 +4146,9 @@ - - - - - - - - - - - - + + + @@ -4195,18 +4168,9 @@ - - - - - - - - - - - - + + + @@ -4228,18 +4192,9 @@ - - - - - - - - - - - - + + + @@ -4261,18 +4216,9 @@ - - - - - - - - - - - - + + + @@ -4326,18 +4272,9 @@ - - - - - - - - - - - - + + + @@ -6020,18 +5957,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps index ab83f1675c..785be05660 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.dataflow/models/editor.mps @@ -1856,18 +1856,9 @@ - - - - - - - - - - - - + + + @@ -2004,18 +1995,9 @@ - - - - - - - - - - - - + + + @@ -2178,18 +2160,9 @@ - - - - - - - - - - - - + + + @@ -2521,18 +2494,9 @@ - - - - - - - - - - - - + + + @@ -2586,23 +2550,9 @@ - - - - - - - - - - - - - - - - - + + + @@ -2925,23 +2875,9 @@ - - - - - - - - - - - - - - - - - + + + @@ -3481,18 +3417,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps index 08f4acdd61..1019010f85 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.doc/models/editor.mps @@ -634,18 +634,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps index c67225b37d..5e9ae2378e 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/editor.mps @@ -383,18 +383,9 @@ - - - - - - - - - - - - + + + @@ -421,18 +412,9 @@ - - - - - - - - - - - - + + + @@ -482,18 +464,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps index cfc99c833b..4b40b4b6ae 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.process/models/org.iets3.core.expr.process.editor.mps @@ -93,9 +93,6 @@ - - - @@ -114,11 +111,6 @@ - - - - - @@ -179,18 +171,9 @@ - - - - - - - - - - - - + + + @@ -257,18 +240,9 @@ - - - - - - - - - - - - + + + @@ -418,18 +392,9 @@ - - - - - - - - - - - - + + + @@ -558,18 +523,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps index 467aca6def..da819d3491 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/models/org.iets3.core.expr.query.editor.mps @@ -112,18 +112,9 @@ - - - - - - - - - - - - + + + @@ -231,18 +222,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps index e9d33aff30..ee67a4af96 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps @@ -674,18 +674,9 @@ - - - - - - - - - - - - + + + @@ -765,31 +756,13 @@ - - - - - - - - - - - - + + + - - - - - - - - - - - - + + + @@ -846,31 +819,13 @@ - - - - - - - - - - - - + + + - - - - - - - - - - - - + + + @@ -967,18 +922,9 @@ - - - - - - - - - - - - + + + @@ -1020,18 +966,9 @@ - - - - - - - - - - - - + + + @@ -1099,18 +1036,9 @@ - - - - - - - - - - - - + + + @@ -1466,18 +1394,9 @@ - - - - - - - - - - - - + + + @@ -1508,18 +1427,9 @@ - - - - - - - - - - - - + + + @@ -1563,18 +1473,9 @@ - - - - - - - - - - - - + + + @@ -2583,18 +2484,9 @@ - - - - - - - - - - - - + + + @@ -2968,18 +2860,9 @@ - - - - - - - - - - - - + + + @@ -3012,18 +2895,9 @@ - - - - - - - - - - - - + + + @@ -3043,18 +2917,9 @@ - - - - - - - - - - - - + + + @@ -3128,18 +2993,9 @@ - - - - - - - - - - - - + + + @@ -3172,18 +3028,9 @@ - - - - - - - - - - - - + + + @@ -3203,18 +3050,9 @@ - - - - - - - - - - - - + + + @@ -3286,18 +3124,9 @@ - - - - - - - - - - - - + + + @@ -3314,18 +3143,9 @@ - - - - - - - - - - - - + + + @@ -3347,18 +3167,9 @@ - - - - - - - - - - - - + + + @@ -3371,18 +3182,9 @@ - - - - - - - - - - - - + + + @@ -3399,18 +3201,9 @@ - - - - - - - - - - - - + + + @@ -3432,18 +3225,9 @@ - - - - - - - - - - - - + + + @@ -3456,18 +3240,9 @@ - - - - - - - - - - - - + + + @@ -3484,18 +3259,9 @@ - - - - - - - - - - - - + + + @@ -3517,18 +3283,9 @@ - - - - - - - - - - - - + + + @@ -3541,18 +3298,9 @@ - - - - - - - - - - - - + + + @@ -3569,18 +3317,9 @@ - - - - - - - - - - - - + + + @@ -3602,18 +3341,9 @@ - - - - - - - - - - - - + + + @@ -3742,18 +3472,9 @@ - - - - - - - - - - - - + + + @@ -4473,18 +4194,9 @@ - - - - - - - - - - - - + + + @@ -5118,31 +4830,13 @@ - - - - - - - - - - - - + + + - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps index 33acea4435..841ad65573 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.stringvalidation/models/org.iets3.core.expr.stringvalidation.editor.mps @@ -10,8 +10,8 @@ - + @@ -288,18 +288,9 @@ - - - - - - - - - - - - + + + @@ -322,18 +313,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps index bab8692f21..e4bd0e4301 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/editor.mps @@ -2603,18 +2603,9 @@ - - - - - - - - - - - - + + + @@ -4754,18 +4745,9 @@ - - - - - - - - - - - - + + + @@ -4833,18 +4815,9 @@ - - - - - - - - - - - - + + + @@ -6694,18 +6667,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps index 631a9c023a..41dbdce04b 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/editor.mps @@ -29,6 +29,7 @@ + @@ -39,7 +40,6 @@ - @@ -2705,18 +2705,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps index a4a1fa3154..a3dd1e0dda 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps @@ -1,7 +1,6 @@ - @@ -173,6 +172,7 @@ + @@ -1445,9 +1445,30 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1495,9 +1516,30 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1672,18 +1714,9 @@ - - - - - - - - - - - - + + + @@ -1953,18 +1986,9 @@ - - - - - - - - - - - - + + + @@ -1976,18 +2000,9 @@ - - - - - - - - - - - - + + + @@ -2098,18 +2113,9 @@ - - - - - - - - - - - - + + + @@ -2747,18 +2753,9 @@ - - - - - - - - - - - - + + + @@ -2918,19 +2915,10 @@ - - - - - - - - - - - - - + + + + @@ -3879,18 +3867,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps index 66778af41f..4e4b1804af 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.trace/models/behavior.mps @@ -89,9 +89,7 @@ - - @@ -199,29 +197,10 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/editor.mps index ae09734715..cd85440184 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.users/models/editor.mps @@ -220,18 +220,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps index 167912cb1b..5972471fce 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.glossary/models/editor.mps @@ -377,18 +377,9 @@ - - - - - - - - - - - - + + + @@ -471,18 +462,9 @@ - - - - - - - - - - - - + + + @@ -526,18 +508,9 @@ - - - - - - - - - - - - + + + @@ -826,18 +799,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps index 199a9091ce..0a955c81a6 100755 --- a/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.req.core/models/editor.mps @@ -31,8 +31,8 @@ - + @@ -944,18 +944,9 @@ - - - - - - - - - - - - + + + @@ -1014,18 +1005,9 @@ - - - - - - - - - - - - + + + @@ -1264,18 +1246,9 @@ - - - - - - - - - - - - + + + @@ -1473,18 +1446,9 @@ - - - - - - - - - - - - + + + @@ -1575,18 +1539,9 @@ - - - - - - - - - - - - + + + @@ -1609,18 +1564,9 @@ - - - - - - - - - - - - + + + @@ -2038,18 +1984,9 @@ - - - - - - - - - - - - + + + diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps index 8f80ef5c2f..6c1d287f14 100644 --- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps +++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps @@ -4767,18 +4767,9 @@ - - - - - - - - - - - - + + + From f25589b60bc2f4c5add79ffda884d25c4f51c365 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Mon, 18 Mar 2024 10:03:24 +0100 Subject: [PATCH 31/32] Update sheet colors to have more contrast --- .../org/iets3/core/expr/repl/editor.mps | 92 ++++++++++++++----- 1 file changed, 71 insertions(+), 21 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps index ee67a4af96..932e64f83c 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/models/org/iets3/core/expr/repl/editor.mps @@ -2895,9 +2895,19 @@ - - - + + + + + + + + + + + + + @@ -2917,9 +2927,19 @@ - - - + + + + + + + + + + + + + @@ -3028,9 +3048,19 @@ - - - + + + + + + + + + + + + + @@ -3050,9 +3080,19 @@ - - - + + + + + + + + + + + + + @@ -3424,11 +3464,11 @@ - - + + - + @@ -4193,10 +4233,20 @@ - - - - + + + + + + + + + + + + + + @@ -5357,10 +5407,10 @@ - + - + From c999e796ce2efe29750e73758a68efbc4be3c50b Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 19 Mar 2024 10:42:09 +0100 Subject: [PATCH 32/32] manuel changes after conflict resolution --- .../org.iets3.core.base.mpl | 7 +- ....iets3.core.expr.tracing.plugin.plugin.mps | 72 +++++++++++++++---- .../org.iets3.core.expr.tracing.plugin.msd | 2 +- .../org/iets3/opensource/build/build.mps | 5 ++ 4 files changed, 68 insertions(+), 18 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl index 830f89e400..9a8b858899 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl @@ -16,13 +16,16 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) - 5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml) + 5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml) f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor) + + + @@ -69,10 +72,10 @@ - + diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/models/org.iets3.core.expr.tracing.plugin.plugin.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/models/org.iets3.core.expr.tracing.plugin.plugin.mps index b90a8e446c..6ba84760da 100644 --- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/models/org.iets3.core.expr.tracing.plugin.plugin.mps +++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/models/org.iets3.core.expr.tracing.plugin.plugin.mps @@ -758,15 +758,36 @@ - - - - - - + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + @@ -881,11 +902,32 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6002,8 +6044,8 @@ - - + + diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/org.iets3.core.expr.tracing.plugin.msd b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/org.iets3.core.expr.tracing.plugin.msd index 8de751c0f1..34075a913c 100644 --- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/org.iets3.core.expr.tracing.plugin.msd +++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.tracing.plugin/org.iets3.core.expr.tracing.plugin.msd @@ -21,6 +21,7 @@ 71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel) c0080a47-7e37-4558-bee9-9ae18e690549(jetbrains.mps.lang.extension) 726886d1-ef90-4249-a08f-1e3ec23a7113(com.mbeddr.mpsutil.traceExplorer) + c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) @@ -82,7 +83,6 @@ - diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps index 51974f574a..bee11b694e 100644 --- a/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps +++ b/code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps @@ -8470,6 +8470,11 @@ + + + + +