Merge pull request #976 from JetBrains/merge/mps20232

JetBrains · Oct 14, 2024 · 78943f2 · 78943f2
2 parents b898377 + 45150a5
commit 78943f2
Show file tree

Hide file tree

Showing 13 changed files with 5,407 additions and 742 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,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
 

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
@@ -12,6 +12,8 @@
   </facets>
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="true">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
+    <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -28,8 +30,12 @@
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="360a4e25-e902-4667-a0a6-0e971c4f3177(com.mbeddr.mpsutil.blutil.rt)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/...uages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps b/...uages/com.mbeddr.mpsutil.blutil/solutions/models/com.mbeddr.mpsutil.blutil.rt.scoping.mps
diff --git a/...ts/test.com.mbeddr.mpsutil.blutil/models/[email protected] b/...ts/test.com.mbeddr.mpsutil.blutil/models/[email protected]
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
@@ -13,6 +13,7 @@
   </facets>
   <dependencies>
     <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+    <dependency reexport="false">360a4e25-e902-4667-a0a6-0e971c4f3177(com.mbeddr.mpsutil.blutil.rt)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -32,6 +33,7 @@
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="360a4e25-e902-4667-a0a6-0e971c4f3177(com.mbeddr.mpsutil.blutil.rt)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />

diff --git a/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -7683,6 +7683,17 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4WzSqRID1aE" role="3bR37C">
+          <node concept="3bR9La" id="4WzSqRID1aF" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="4WzSqRID1aG" role="3bR37C">
+          <node concept="3bR9La" id="4WzSqRID1aH" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="2NyZxKpUQhZ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -9745,9 +9756,6 @@
           <property role="3MwjfP" value="Enhancements for the MPS spell checker" />
         </node>
       </node>
-      <node concept="m$_yC" id="5Jv8_iJO2NL" role="m$_yJ">
-        <ref role="m$_y1" to="ffeo:4O0hKJpjIV3" resolve="jetbrains.mps.ide.devkit" />
-      </node>
       <node concept="m$_yC" id="5Jv8_iJO3bn" role="m$_yJ">
         <ref role="m$_y1" to="ffeo:3SKb_4Jujh$" resolve="jetbrains.mps.editor.spellcheck" />
       </node>

diff --git a/...olutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps b/...olutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <model ref="r:c2a03117-d7bb-4287-be70-b5591cc02c98(de.itemis.mps.extensions.changelog)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="638c9345-2613-49dc-b2ae-8ceadef24141" name="de.itemis.mps.changelog" version="0" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
-    <use id="82194f31-b6f9-4f39-bf3d-bad4ce201c4e" name="de.itemis.mps.spellcheck" version="0" />
+    <use id="82194f31-b6f9-4f39-bf3d-bad4ce201c4e" name="de.itemis.mps.spellcheck" version="-1" />
   </languages>
   <imports>
     <import index="hba4" ref="63e0e566-5131-447e-90e3-12ea330e1a00/r:f5bd2ad9-cd54-4408-b815-07f9f306f074(com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.structure)" />
@@ -502,6 +503,134 @@
             <property role="1X82VY" value="true" />
           </node>
         </node>
+        <node concept="2DRihI" id="18DnuGEwDCE" role="15bAlk">
+          <property role="2RT3bR" value="0" />
+          <node concept="2hgSXJ" id="18DnuGEwDCF" role="1PaTwD">
+            <node concept="1PaTwC" id="18DnuGEwDCG" role="2hiFM$">
+              <node concept="15Ami3" id="18DnuGEwDCH" role="1PaTwD">
+                <node concept="37shsh" id="18DnuGEwDCI" role="15Aodc">
+                  <node concept="1dCxOk" id="18DnuGEwDDk" role="37shsm">
+                    <property role="1XweGW" value="360a4e25-e902-4667-a0a6-0e971c4f3177" />
+                    <property role="1XxBO9" value="com.mbeddr.mpsutil.blutil.rt" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3oM_SD" id="18DnuGEwDCK" role="1PaTwD">
+                <property role="3oM_SC" value=":" />
+              </node>
+            </node>
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDD" role="1PaTwD">
+            <property role="3oM_SC" value="Provide" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDr" role="1PaTwD">
+            <property role="3oM_SC" value="useful" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDs" role="1PaTwD">
+            <property role="3oM_SC" value="scope" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDt" role="1PaTwD">
+            <property role="3oM_SC" value="class" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDu" role="1PaTwD">
+            <property role="3oM_SC" value="UniqueElementScope" />
+            <property role="1X82VY" value="true" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDv" role="1PaTwD">
+            <property role="3oM_SC" value="which" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDw" role="1PaTwD">
+            <property role="3oM_SC" value="ensures" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDx" role="1PaTwD">
+            <property role="3oM_SC" value="that" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDy" role="1PaTwD">
+            <property role="3oM_SC" value="there" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDz" role="1PaTwD">
+            <property role="3oM_SC" value="are" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDD$" role="1PaTwD">
+            <property role="3oM_SC" value="no" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDD_" role="1PaTwD">
+            <property role="3oM_SC" value="duplicates" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDA" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDB" role="1PaTwD">
+            <property role="3oM_SC" value="the" />
+          </node>
+          <node concept="3oM_SD" id="18DnuGEwDDC" role="1PaTwD">
+            <property role="3oM_SC" value="scope." />
+          </node>
+        </node>
+      </node>
+      <node concept="15bAme" id="3EttCnc6$0u" role="15bAlL">
+        <node concept="2DRihI" id="1ieETfbmCxp" role="15bAlk">
+          <node concept="2hgSXJ" id="1ieETfbmCXZ" role="1PaTwD">
+            <node concept="1PaTwC" id="1ieETfbmCY0" role="2hiFM$">
+              <node concept="15Ami3" id="1ieETfbmCY1" role="1PaTwD">
+                <node concept="37shsh" id="1ieETfbmCY2" role="15Aodc">
+                  <node concept="1dCxOk" id="1ieETfbmCY3" role="37shsm">
+                    <property role="1XweGW" value="7e450f4e-1ac3-41ef-a851-4598161bdb94" />
+                    <property role="1XxBO9" value="de.slisson.mps.tables" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3oM_SD" id="1ieETfbmCY4" role="1PaTwD">
+                <property role="3oM_SC" value=":" />
+              </node>
+            </node>
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmCZs" role="1PaTwD">
+            <property role="3oM_SC" value="Various" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmD20" role="1PaTwD">
+            <property role="3oM_SC" value="fixes" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmD3n" role="1PaTwD">
+            <property role="3oM_SC" value="to" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmD4J" role="1PaTwD">
+            <property role="3oM_SC" value="table" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmD9n" role="1PaTwD">
+            <property role="3oM_SC" value="end" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmDan" role="1PaTwD">
+            <property role="3oM_SC" value="cells" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmDd3" role="1PaTwD">
+            <property role="3oM_SC" value="in" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmDe5" role="1PaTwD">
+            <property role="3oM_SC" value="combination" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmDf8" role="1PaTwD">
+            <property role="3oM_SC" value="with" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmDgc" role="1PaTwD">
+            <property role="3oM_SC" value="insert" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmDhh" role="1PaTwD">
+            <property role="3oM_SC" value="and" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmDin" role="1PaTwD">
+            <property role="3oM_SC" value="deletion" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmDki" role="1PaTwD">
+            <property role="3oM_SC" value="handlers" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmDlq" role="1PaTwD">
+            <property role="3oM_SC" value="were" />
+          </node>
+          <node concept="3oM_SD" id="1ieETfbmDmz" role="1PaTwD">
+            <property role="3oM_SC" value="made." />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="15bmVD" id="2IcGFIaJNN3" role="15bmVC">

diff --git a/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/editor.mps b/code/tables/languages/de.slisson.mps.tables.demolang/languageModels/editor.mps
@@ -2144,7 +2144,7 @@
                 <node concept="liA8E" id="5ivXze3esyy" role="2OqNvi">
                   <ref role="37wK5l" to="6dpw:DXnsYPPSef" resolve="setCell" />
                   <node concept="3cmrfG" id="5ivXze3eszF" role="37wK5m">
-                    <property role="3cmrfH" value="0" />
+                    <property role="3cmrfH" value="1" />
                   </node>
                   <node concept="3cmrfG" id="5ivXze3esEi" role="37wK5m">
                     <property role="3cmrfH" value="0" />