From e200ed6f3d77a0ad28770914977e7d2c31cb9807 Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Tue, 8 Oct 2024 17:16:15 +0200 Subject: [PATCH 01/13] Implement UniqueElementScope (issue #969). --- .../com.mbeddr.mpsutil.blutil.rt.msd | 4 +- .../com.mbeddr.mpsutil.blutil.rt.scoping.mps | 306 ++++++++++++++++++ 2 files changed, 309 insertions(+), 1 deletion(-) create mode 100644 code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd index df793d9ae..81c6e8836 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd @@ -1,7 +1,7 @@ - + @@ -13,6 +13,8 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) + 3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations) diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps new file mode 100644 index 000000000..4e40086ba --- /dev/null +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b749b53acec2101a1bfdba8952cff71612e68bed Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Tue, 8 Oct 2024 17:16:52 +0200 Subject: [PATCH 02/13] Add some tests for UniqueElementScope (issue #969). --- ...om.mbeddr.mpsutil.blutil.scoping@tests.mps | 530 ++++++++++++++++++ .../test.com.mbeddr.mpsutil.blutil.msd | 1 + 2 files changed, 531 insertions(+) create mode 100644 code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps new file mode 100644 index 000000000..590223122 --- /dev/null +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps @@ -0,0 +1,530 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd index cb6beae50..409db8d96 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd @@ -14,6 +14,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + 360a4e25-e902-4667-a0a6-0e971c4f3177(com.mbeddr.mpsutil.blutil.rt) From b55e393dd298f3892f2c1c196ce145078e0a1bc5 Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Tue, 8 Oct 2024 17:17:09 +0200 Subject: [PATCH 03/13] Update build script (issue #969). --- .../models/de.itemis.mps.extensions.build.mps | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 366ff4df0..2adb445a2 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 @@ -7659,6 +7659,17 @@ + + + + + + + + + + + From 6b8ef9aba84604472080132980192be75359708b Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Tue, 8 Oct 2024 17:27:08 +0200 Subject: [PATCH 04/13] Update CHANGELOG (issue #969). --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb69fc782..fd6604bab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e - *com.mbeddr.mpsutil.editor.querylist*: The expression *queryListNode* was renamed to node and a new expression *index* can now be used to refer to the index of the current queried node. - *de.itemis.mps.spellcheck*: This new language enhances the MPS spell checker to support custom dictionaries declared in a language and also adds some dictionary-related intentions to a new intention group *Dictionary.* +- *com.mbeddr.mpsutil.blutil.rt*: Provide useful scope class *UniqueElementScope* which ensures that there are no duplicates in the scope. ## September 2024 From 42029f0e1c08c74ba64b9267453b6489f390c459 Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Tue, 8 Oct 2024 18:12:57 +0200 Subject: [PATCH 05/13] Extend test suite to capture prefixes (issue #969). --- ...om.mbeddr.mpsutil.blutil.scoping@tests.mps | 294 +++++++++++++++++- 1 file changed, 288 insertions(+), 6 deletions(-) diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps index 590223122..6ebdb2f97 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps @@ -280,7 +280,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -419,7 +419,7 @@ - + @@ -463,12 +463,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -476,7 +758,7 @@ - + @@ -484,7 +766,7 @@ - + From a3837b9dbc0d9ec18fcd95926ceffda0d4051107 Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Tue, 8 Oct 2024 18:53:14 +0200 Subject: [PATCH 06/13] Update resolve info (issue #969). --- .../test.com.mbeddr.mpsutil.blutil.scoping@tests.mps | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps index 6ebdb2f97..be442e21c 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps @@ -185,7 +185,7 @@ - + @@ -270,7 +270,7 @@ - + @@ -780,14 +780,14 @@ - + - + - + From c5254b6911f49c652dba89baa843e9b52ca52785 Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Tue, 8 Oct 2024 19:52:07 +0200 Subject: [PATCH 07/13] Run migrations (issue #969). --- .../solutions/com.mbeddr.mpsutil.blutil.rt.msd | 4 ++++ .../test.com.mbeddr.mpsutil.blutil.msd | 1 + 2 files changed, 5 insertions(+) diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd index 81c6e8836..dac39f73c 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd @@ -31,8 +31,12 @@ + + + + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd index 409db8d96..a8d254974 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd @@ -34,6 +34,7 @@ + From 46757c55c4ee4e72718b56a22b805c35d221ec37 Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 9 Oct 2024 10:39:19 +0200 Subject: [PATCH 08/13] Revert "Update CHANGELOG (issue #969)." This reverts commit 6b8ef9aba84604472080132980192be75359708b. --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd6604bab..eb69fc782 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,6 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e - *com.mbeddr.mpsutil.editor.querylist*: The expression *queryListNode* was renamed to node and a new expression *index* can now be used to refer to the index of the current queried node. - *de.itemis.mps.spellcheck*: This new language enhances the MPS spell checker to support custom dictionaries declared in a language and also adds some dictionary-related intentions to a new intention group *Dictionary.* -- *com.mbeddr.mpsutil.blutil.rt*: Provide useful scope class *UniqueElementScope* which ensures that there are no duplicates in the scope. ## September 2024 From 7b86157d587b2b97193b3313015d99ce616d769d Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 9 Oct 2024 10:44:33 +0200 Subject: [PATCH 09/13] Add item to changelog model (issue #969). --- .../de.itemis.mps.extensions.changelog.mps | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) 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 79e4cfa34..40b530db3 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 @@ -437,6 +437,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d1a1a3e038b3f4edf25afcd2c43b7c629a66464a Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 9 Oct 2024 11:07:40 +0200 Subject: [PATCH 10/13] Run "./gradlew copyChangelog" to copy the changelog (issue #969). --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb69fc782..fd6604bab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e - *com.mbeddr.mpsutil.editor.querylist*: The expression *queryListNode* was renamed to node and a new expression *index* can now be used to refer to the index of the current queried node. - *de.itemis.mps.spellcheck*: This new language enhances the MPS spell checker to support custom dictionaries declared in a language and also adds some dictionary-related intentions to a new intention group *Dictionary.* +- *com.mbeddr.mpsutil.blutil.rt*: Provide useful scope class *UniqueElementScope* which ensures that there are no duplicates in the scope. ## September 2024 From f6492694b1e36da66a111763e2c260efc108d632 Mon Sep 17 00:00:00 2001 From: Klaus Birken Date: Wed, 9 Oct 2024 17:30:13 +0200 Subject: [PATCH 11/13] Force save all. --- .../models/com.mbeddr.mpsutil.blutil.rt.scoping.mps | 10 +++++----- .../test.com.mbeddr.mpsutil.blutil.scoping@tests.mps | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps index 4e40086ba..c724de53e 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps @@ -21,7 +21,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -122,7 +122,7 @@ - + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps index be442e21c..ddb44c735 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps @@ -80,7 +80,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -133,7 +133,7 @@ - + From eb8efd28133c8b3a130279df1aa99236107e7d72 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 10 Oct 2024 10:13:00 +0200 Subject: [PATCH 12/13] editor.spellcheck: remove dependency to devkit plugin --- .../models/de.itemis.mps.extensions.build.mps | 3 --- 1 file changed, 3 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 2adb445a2..05a40350c 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 @@ -9712,9 +9712,6 @@ - - - From 6941aad0bb7ae5179209b55f95fc117bebc8609e Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 10 Oct 2024 11:08:50 +0200 Subject: [PATCH 13/13] run migrations --- .../com.mbeddr.mpsutil.blutil.rt.scoping.mps | 2 +- ...om.mbeddr.mpsutil.blutil.scoping@tests.mps | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps index c724de53e..91c771fdd 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps @@ -4,7 +4,7 @@ - + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps index ddb44c735..b18896e16 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.scoping@tests.mps @@ -101,6 +101,7 @@ + @@ -144,7 +145,6 @@ - @@ -300,7 +300,7 @@ - + @@ -308,9 +308,9 @@ - + - + @@ -439,7 +439,7 @@ - + @@ -447,9 +447,9 @@ - + - + @@ -580,7 +580,7 @@ - + @@ -588,9 +588,9 @@ - + - + @@ -721,7 +721,7 @@ - + @@ -729,9 +729,9 @@ - + - +