From 6c5a6e1e1c188d5606e40c0aee325eb1c7e353c1 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 29 Jul 2024 12:47:48 +0200 Subject: [PATCH 01/17] editor.diagram: fix the style generation for edges --- .../de.itemis.mps.editor.diagram.mpl | 7 +- .../generator/template/main@generator.mps | 443 +++++++++++++++++- 2 files changed, 445 insertions(+), 5 deletions(-) diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl index 0415c266f..0c914d58e 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl @@ -14,7 +14,7 @@ - + @@ -30,13 +30,15 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime) - 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) 18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor) 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) a150150e-46ee-4c9e-b080-08d136e4eefb(jetbrains.mps.baseLanguage.tuples#1238919486295) 2e24a298-44d1-4697-baec-5c424fed3a3b(jetbrains.mps.editorlang.runtime) b1ab8c10-c118-4755-bf2a-cebab35cf533(jetbrains.mps.lang.editor.tooltips) 0647eca7-da98-422a-8a8b-6ebc0bd014ea(jetbrains.mps.lang.editor#1129914002149) + 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) + c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) + ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) @@ -100,6 +102,7 @@ + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps index ea5ba1a8b..15c3d36e5 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 @@ -66,10 +66,9 @@ - + - @@ -135,6 +134,7 @@ + @@ -493,6 +493,12 @@ + + + + + + @@ -9588,7 +9594,7 @@ - + @@ -9688,6 +9694,16 @@ + + + + + + + + + + @@ -25058,5 +25074,426 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4544a006108b2f84d9e9681f2371fbe6d71d6957 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 30 Jul 2024 07:35:04 +0200 Subject: [PATCH 02/17] editor.diagram: add a missing null check --- .../generator/template/main@generator.mps | 61 ++++++++++++------- 1 file changed, 38 insertions(+), 23 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 15c3d36e5..ac651a23e 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 @@ -2645,36 +2645,51 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + + + + + + From 183a38529ecb0e7eb78aacd68a45980ae36bd238 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 30 Jul 2024 09:25:25 +0200 Subject: [PATCH 03/17] update the build script --- .../models/de.itemis.mps.extensions.build.mps | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 3d39d9162..5690e30be 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 @@ -5749,11 +5749,6 @@ - - - - - @@ -5812,6 +5807,21 @@ + + + + + + + + + + + + + + + From 25fe85983e2a2856737647387c8045fcd3bdf9ce Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 2 Aug 2024 15:07:10 +0200 Subject: [PATCH 04/17] editor.querylist: remove own copy of ReflectionUtil --- ...beddr.mpsutil.editor.querylist.runtime.msd | 2 + .../mpsutil/editor/querylist/runtime.mps | 652 +----------------- 2 files changed, 5 insertions(+), 649 deletions(-) diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd index 1e7f5a5ab..f430843f2 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd @@ -24,6 +24,7 @@ 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime) + 7037b32c-9607-4f8e-81bd-1f028a4c117b(de.slisson.mps.reflection.runtime) @@ -58,6 +59,7 @@ + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps index 459b594eb..2a2c40748 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps @@ -56,12 +56,10 @@ + - - - @@ -73,10 +71,6 @@ - - - - @@ -110,7 +104,6 @@ - @@ -125,15 +118,9 @@ - - - - - - @@ -234,10 +221,6 @@ - - - - @@ -252,12 +235,8 @@ - - - - @@ -2526,8 +2505,8 @@ - - + + @@ -3433,631 +3412,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 0d5f3bfcd7b161d1b1c546e0a21665d0cd749a09 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 2 Aug 2024 15:10:33 +0200 Subject: [PATCH 05/17] mps.reflection: use the ReflectionUtil class directly --- .../models/de.itemis.mps.extensions.build.mps | 11 ++ .../mps/editor/diagram/solution@tests.mps | 119 ++++++++----- .../de.slisson.mps.reflection.mpl | 7 +- .../generator/template/main@generator.mps | 163 ------------------ 4 files changed, 89 insertions(+), 211 deletions(-) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 5690e30be..58faadeaf 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 @@ -5010,6 +5010,12 @@ + + + + + + @@ -13515,6 +13521,11 @@ + + + + + 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 f6ebd30f8..0ff6b3efd 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 @@ -5234,13 +5234,6 @@ - - - - - - - @@ -5252,40 +5245,26 @@ - - - - - - - - - - - - - - - - - - + + + + - - - - + + + + @@ -5296,8 +5275,8 @@ - - + + @@ -5331,6 +5310,14 @@ + + + + + + + + @@ -5340,8 +5327,8 @@ - - + + @@ -5375,6 +5362,14 @@ + + + + + + + + @@ -5387,6 +5382,16 @@ + + + + + + + + + + @@ -5394,20 +5399,20 @@ - - - - + + + + - - - - + + + + @@ -6578,8 +6583,8 @@ - - + + @@ -6622,8 +6627,8 @@ - - + + @@ -6666,8 +6671,8 @@ - - + + @@ -6703,6 +6708,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl b/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl index 3e5538cd8..178e14dfc 100644 --- a/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl +++ b/code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl @@ -1,7 +1,7 @@ - + @@ -155,6 +155,7 @@ e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime) + 7037b32c-9607-4f8e-81bd-1f028a4c117b(de.slisson.mps.reflection.runtime) @@ -196,6 +197,7 @@ + @@ -204,6 +206,9 @@ + + 7037b32c-9607-4f8e-81bd-1f028a4c117b(de.slisson.mps.reflection.runtime) + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) diff --git a/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps b/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps index 831926943..ec204af9c 100644 --- a/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps +++ b/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps @@ -30,7 +30,6 @@ - @@ -66,7 +65,6 @@ - @@ -117,9 +115,6 @@ - - - @@ -128,12 +123,8 @@ - - - - @@ -148,7 +139,6 @@ - @@ -158,14 +148,10 @@ - - - - @@ -246,9 +232,6 @@ - - - @@ -463,19 +446,6 @@ - - - - - - - - - - - - - @@ -599,19 +569,6 @@ - - - - - - - - - - - - - @@ -2125,19 +2082,6 @@ - - - - - - - - - - - - - @@ -2399,19 +2343,6 @@ - - - - - - - - - - - - - @@ -2723,19 +2654,6 @@ - - - - - - - - - - - - - @@ -2877,19 +2795,6 @@ - - - - - - - - - - - - - @@ -2968,19 +2873,6 @@ - - - - - - - - - - - - - @@ -3130,19 +3022,6 @@ - - - - - - - - - - - - - @@ -3286,19 +3165,6 @@ - - - - - - - - - - - - - @@ -3325,34 +3191,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 3d67a619b9d7a36f2e079644b7d81e7253b56022 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 2 Aug 2024 15:16:11 +0200 Subject: [PATCH 06/17] update the changelog --- CHANGELOG.md | 6 ++ .../de.itemis.mps.extensions.changelog.mps | 71 +++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da5fb8fc4..fc95a446b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project are documented in this file. The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month. +## August 2024 + +### 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 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 6a652f2e1..30d77747e 100644 --- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps +++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps @@ -227,6 +227,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c82b8b79f1102fe817093846244bba1bb6412054 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 5 Aug 2024 18:30:42 +0200 Subject: [PATCH 07/17] projectview.runtime: filter out treenodes without tree during before update --- .../mpsutil/projectview/runtime/tree.mps | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps index 0803d5e09..e3cfc850a 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps @@ -468,6 +468,7 @@ + @@ -9504,6 +9505,7 @@ + @@ -9529,7 +9531,6 @@ - @@ -15041,9 +15042,6 @@ - - - @@ -15062,6 +15060,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From 892f7c4381d901b3767788126f4c09cba5dc1b8e Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 6 Aug 2024 10:44:46 +0200 Subject: [PATCH 08/17] projectview.runtime:CustomTreeNodesUpdater: perform update only on nodes in tree --- .../mpsutil/projectview/runtime/tree.mps | 49 +++++++------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps index e3cfc850a..44a0c0afb 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps @@ -468,7 +468,6 @@ - @@ -15060,30 +15059,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -15118,13 +15095,25 @@ - - - + + + + + + + + + + + + + + + - - + + From e3ffa09f81229c4696822b0645fd57767b581774 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 6 Aug 2024 10:53:26 +0200 Subject: [PATCH 09/17] projectview.runtime:CustomTreeNodesUpdater: perform update presention only on nodes in tree --- .../mpsutil/projectview/runtime/tree.mps | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps index 44a0c0afb..8d0157e27 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps @@ -15218,13 +15218,25 @@ - - - + + + + + + + + + + + + + + + - - + + From 01054d1c6c5da819cb19e0fa1bf0b6a79e402774 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 6 Aug 2024 11:08:13 +0200 Subject: [PATCH 10/17] projectview.runtime: fixed NPEs #904, #903 --- .../mpsutil/projectview/runtime/tree.mps | 61 +++++++++++++++---- 1 file changed, 50 insertions(+), 11 deletions(-) diff --git a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps index 8d0157e27..cf7ffd57b 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps @@ -219,6 +219,7 @@ + @@ -2021,13 +2022,33 @@ + + + + + + + + + + + + + + - - - + + + - - + + + + + + + + @@ -5042,12 +5063,6 @@ - - - - - - @@ -5131,6 +5146,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + From 49da6b0c71a1a6dd288b6c9d6d0f9920b8a89f32 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 6 Aug 2024 13:06:15 +0200 Subject: [PATCH 11/17] changelog: udated --- CHANGELOG.md | 6 ++ .../de.itemis.mps.extensions.changelog.mps | 58 +++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c5db06b0..c8d99166b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project are documented in this file. The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month. +## August 2024 + +### 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) + ## July 2024 ### Fixed 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 40f128bfc..3b7b0c10a 100644 --- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps +++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps @@ -227,6 +227,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3204fe83d84c30030744a2f86b6351730526159a Mon Sep 17 00:00:00 2001 From: Niko Stotz Date: Wed, 7 Aug 2024 13:46:19 +0200 Subject: [PATCH 12/17] made querylist model checking result propagation more responsive to cancellation and added optional timeout --- ...psutil.editor.querylist.runtime.plugin.mps | 1099 ++++++++++++----- 1 file changed, 782 insertions(+), 317 deletions(-) diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps index 87117c4bd..162e37bb3 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps @@ -53,6 +53,8 @@ + + @@ -78,12 +80,19 @@ + + + + + + + @@ -91,6 +100,7 @@ + @@ -98,6 +108,13 @@ + + + + + + + @@ -109,6 +126,7 @@ + @@ -146,6 +164,7 @@ + @@ -187,7 +206,9 @@ + + @@ -204,12 +225,24 @@ + + + + + + + + + + + + @@ -218,6 +251,7 @@ + @@ -466,6 +500,7 @@ + @@ -539,425 +574,754 @@ - - - - - + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - - + + - - - - + + + + - - - - - - - - - + + + + + + + + + - + - + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + - - - - + + + + + + + + + + - - + + - - - - - - - - - - - - - - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + @@ -968,8 +1332,9 @@ - - + + + @@ -1146,8 +1511,12 @@ - - + + + + + + @@ -1194,6 +1563,12 @@ + + + + + + @@ -1203,6 +1578,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1370,6 +1816,25 @@ + + + + + + + + + + + + + + + + + + + From cddb8681d8e41ec89206327e7ef4f34e004bbfe3 Mon Sep 17 00:00:00 2001 From: Niko Stotz Date: Wed, 7 Aug 2024 18:00:43 +0200 Subject: [PATCH 13/17] keep typesystem checker computation mode alive inside querylist --- .../languageModels/typesystem.mps | 61 +- ...beddr.mpsutil.editor.querylist.runtime.msd | 2 + ...psutil.editor.querylist.runtime.plugin.mps | 668 +++++++++++++++++- 3 files changed, 724 insertions(+), 7 deletions(-) diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps index ca4554869..d5154992c 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.demolang/languageModels/typesystem.mps @@ -4,7 +4,64 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd index e238912be..2285fef69 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/com.mbeddr.mpsutil.editor.querylist.runtime.msd @@ -24,6 +24,7 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime) 7037b32c-9607-4f8e-81bd-1f028a4c117b(de.slisson.mps.reflection.runtime) + 20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine) @@ -73,6 +74,7 @@ + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps index 162e37bb3..62303d046 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps @@ -55,6 +55,9 @@ + + + @@ -90,6 +93,9 @@ + + + @@ -100,6 +106,9 @@ + + + @@ -133,6 +142,10 @@ + + + + @@ -164,12 +177,15 @@ + - + + + @@ -216,6 +232,10 @@ + + + + @@ -237,12 +257,21 @@ + + + + + + + + + @@ -277,6 +306,10 @@ + + + + @@ -284,6 +317,12 @@ + + + + + + @@ -326,6 +365,21 @@ + + + + + + + + + + + + + + + @@ -365,10 +419,16 @@ + + + + + + @@ -1371,10 +1431,9 @@ - - - - + + + @@ -1578,6 +1637,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1949,5 +2146,466 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c8da0bb53ce2dfc3bd05204b9f5759a787fb0f3f Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Thu, 8 Aug 2024 13:12:23 +0200 Subject: [PATCH 14/17] changelog: updated --- CHANGELOG.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f08ad9b42..c8d99166b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,6 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e - *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 @@ -33,7 +29,6 @@ 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 87e67fce4ef9038f55ebd1fe73e8e8eedc5e9103 Mon Sep 17 00:00:00 2001 From: Niko Stotz Date: Thu, 8 Aug 2024 13:37:15 +0200 Subject: [PATCH 15/17] updated changelog --- .../de.itemis.mps.extensions.changelog.mps | 48 ++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) 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 30d77747e..d8f32824c 100644 --- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps +++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps @@ -73,13 +73,13 @@ - + - + @@ -296,6 +296,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e9f8ab615fd3ddef448de314cdc89b238d52e9fa Mon Sep 17 00:00:00 2001 From: Niko Stotz Date: Thu, 8 Aug 2024 13:37:24 +0200 Subject: [PATCH 16/17] updated build model --- .../models/de.itemis.mps.extensions.build.mps | 85 ++----------------- 1 file changed, 7 insertions(+), 78 deletions(-) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 285e169af..b0c1095e4 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -112,7 +112,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -12903,82 +12903,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13940,6 +13864,11 @@ + + + + + From e3018a18d50edf3baf6db4fb351dba8b2fc3a4a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Mon, 12 Aug 2024 09:23:42 +0200 Subject: [PATCH 17/17] Run migrations/MPS file updates --- code/batik/solutions/de.itemis.stubs.batik.msd | 10 +++++++--- .../mps/editor/diagram/solution@tests.mps | 8 ++++---- .../generator/template/main@generator.mps | 6 +++--- ...mpsutil.editor.querylist.runtime.plugin.mps | 18 +++++++++--------- .../mpsutil/editor/querylist/runtime.mps | 8 ++++---- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/code/batik/solutions/de.itemis.stubs.batik.msd b/code/batik/solutions/de.itemis.stubs.batik.msd index d259e8cec..c24ebc237 100644 --- a/code/batik/solutions/de.itemis.stubs.batik.msd +++ b/code/batik/solutions/de.itemis.stubs.batik.msd @@ -1,5 +1,5 @@ - + @@ -31,11 +31,15 @@ - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + + + + + + diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps index 279924637..cdf49a354 100644 --- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps +++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps @@ -104,7 +104,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -378,7 +378,7 @@ - + diff --git a/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps b/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps index d4c723718..ac8ff0e50 100644 --- a/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps +++ b/code/hacks/languages/de.slisson.mps.reflection/generator/template/main@generator.mps @@ -111,7 +111,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps index 62303d046..8c2876c5f 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com.mbeddr.mpsutil.editor.querylist.runtime.plugin.mps @@ -682,7 +682,7 @@ - + @@ -827,7 +827,7 @@ - + @@ -899,7 +899,7 @@ - + @@ -1381,7 +1381,7 @@ - + @@ -1572,7 +1572,7 @@ - + @@ -1800,7 +1800,7 @@ - + @@ -2165,7 +2165,7 @@ - + @@ -2410,7 +2410,7 @@ - + @@ -2457,7 +2457,7 @@ - + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps index 3e84f8773..fab00a495 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist.runtime/models/com/mbeddr/mpsutil/editor/querylist/runtime.mps @@ -81,7 +81,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -225,7 +225,7 @@ - + @@ -316,7 +316,7 @@ - +