Merge pull request #714 from JetBrains/feature/cascade_20212_20213_1211

JetBrains · Dec 11, 2023 · 69abea0 · 69abea0
2 parents 6c7e84f + 718d261
commit 69abea0
Show file tree

Hide file tree

Showing 24 changed files with 5,318 additions and 609 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # MPS Extensions
 
 <a href="https://build.mbeddr.com/project.html?projectId=Mbeddr2_Mbeddr_Gradle_MpsExtensions&tab=projectOverview"><img src="https://build.mbeddr.com/app/rest/builds/buildType:(id:Mbeddr2_Mbeddr_Gradle_MpsExtenstions)/statusIcon"/></a>
-![≤ JetBrains MPS 2021.3.3](https://img.shields.io/badge/JetBrains%20MPS-%E2%89%A42021.3.3-orange)
+![≤ JetBrains MPS 2021.3.5](https://img.shields.io/badge/JetBrains%20MPS-%E2%89%A42021.3.5-orange)
 
 The MPS extensions aim to ease language development within MPS. They are maintained by itemis, JetBrains, and the open source community, and its development is closely aligned with the development of MPS.
 

diff --git a/build.gradle b/build.gradle
@@ -70,7 +70,7 @@ ext.dependencyRepositories = [
 // major version, e.g. '2021.1', '2021.2'
 ext.mpsMajor = '2021.3'
 // optional minor/bugfix number (not added to the final build version)
-ext.mpsMinor = '3'
+ext.mpsMinor = '5'
 // e.g. Beta, EAP, RC
 ext.mpsReleaseType = ''
 

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
@@ -12126,9 +12126,6 @@
       <node concept="m$_yC" id="3ofF9dt4eDr" role="m$_yJ">
         <ref role="m$_y1" node="2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
       </node>
-      <node concept="m$_yC" id="5lBBNpx5PcJ" role="m$_yJ">
-        <ref role="m$_y1" node="4p3FRivDLPy" resolve="org.apache.commons" />
-      </node>
       <node concept="2iUeEo" id="3vhhDKcvNeO" role="2iVFfd">
         <property role="2iUeEt" value="Modelix" />
         <property role="2iUeEu" value="http://modelix.org" />
@@ -12138,6 +12135,9 @@
           <property role="3MwjfP" value="Alternative model API with better support for persistent data structures." />
         </node>
       </node>
+      <node concept="m$_yC" id="5lBBNpx5PcJ" role="m$_yJ">
+        <ref role="m$_y1" node="4p3FRivDLPy" resolve="org.apache.commons" />
+      </node>
     </node>
     <node concept="2G$12M" id="5U8hsWC6WQb" role="3989C9">
       <property role="TrG5h" value="group.model-api" />
@@ -14735,6 +14735,11 @@
             <ref role="3bR37D" node="F1NWDqweoc" resolve="com.mbeddr.mpsutil.grammarcells.sandboxlang" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2ii6N8k6GSa" role="3bR37C">
+          <node concept="3bR9La" id="2ii6N8k6GSb" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6$6tsX_CURF" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -16068,6 +16073,26 @@
             <ref role="3bR37D" node="2UnEDPCh8Ac" resolve="de.itemis.model.simple.demo.property" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2ii6N8k6GXx" role="3bR37C">
+          <node concept="3bR9La" id="2ii6N8k6GXy" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2ii6N8k6GXz" role="3bR37C">
+          <node concept="3bR9La" id="2ii6N8k6GX$" role="1SiIV1">
+            <ref role="3bR37D" node="GuygFg7AfB" resolve="test.de.itemis.mps.modelmerger.testlanguage" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2ii6N8k6GX_" role="3bR37C">
+          <node concept="3bR9La" id="2ii6N8k6GXA" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2ii6N8k6GXB" role="3bR37C">
+          <node concept="3bR9La" id="2ii6N8k6GXC" role="1SiIV1">
+            <ref role="3bR37D" node="5Jy3PcPRnpY" resolve="de.itemis.model.merge.baselang.sandbox" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="2UnEDPCpnjG" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -16437,6 +16462,11 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2ii6N8k6GYE" role="3bR37C">
+          <node concept="3bR9La" id="2ii6N8k6GYF" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="3oyo9Wzq1vN" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -17022,31 +17052,11 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7g5FWGK3ZSY" role="3bR37C">
-          <node concept="3bR9La" id="7g5FWGK3ZSZ" role="1SiIV1">
-            <ref role="3bR37D" node="5U8hsWC73Be" resolve="org.modelix.model.repositoryconcepts" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7g5FWGK3ZT0" role="3bR37C">
-          <node concept="3bR9La" id="7g5FWGK3ZT1" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7g5FWGK3ZT2" role="3bR37C">
           <node concept="3bR9La" id="7g5FWGK3ZT3" role="1SiIV1">
             <ref role="3bR37D" node="5U8hsWC70jw" resolve="org.modelix.model.api" />
           </node>
         </node>
-        <node concept="1SiIV0" id="7g5FWGK3ZT4" role="3bR37C">
-          <node concept="3bR9La" id="7g5FWGK3ZT5" role="1SiIV1">
-            <ref role="3bR37D" node="4iIKqJTZ5Hm" resolve="de.q60.mps.shadowmodels.runtime" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="7g5FWGK3ZT6" role="3bR37C">
-          <node concept="3bR9La" id="7g5FWGK3ZT7" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="7g5FWGK3ZT8" role="3bR37C">
           <node concept="3bR9La" id="7g5FWGK3ZT9" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />

diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
@@ -1388,10 +1388,7 @@
                             <node concept="Xl_RD" id="6rPpQ1NH_wj" role="3uHU7B">
                               <property role="Xl_RC" value="returning Extends.to: " />
                             </node>
-                            <node concept="2OqwBi" id="7LJ_vJOlkvY" role="3uHU7w">
-                              <node concept="1Pxb5l" id="6rPpQ1NH_wu" role="2Oq$k0" />
-                              <node concept="2Iv5rx" id="7LJ_vJOlkvZ" role="2OqNvi" />
-                            </node>
+                            <node concept="1Pxb5l" id="6rPpQ1NH_wu" role="3uHU7w" />
                           </node>
                         </node>
                       </node>

diff --git a/...diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps b/...diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps
@@ -139,8 +139,8 @@
           <node concept="gqqVs" id="56Tfdun38iY" role="37mO4d">
             <property role="gqqTZ" value="237.0" />
             <property role="gqqTW" value="334.0004967285156" />
-            <property role="gqqTX" value="116.0" />
-            <property role="gqqTy" value="46.0" />
+            <property role="gqqTX" value="155.0" />
+            <property role="gqqTy" value="64.0" />
             <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           </node>
         </node>
@@ -149,8 +149,8 @@
           <node concept="gqqVs" id="56Tfdun38iA" role="37mO4d">
             <property role="gqqTZ" value="245.0" />
             <property role="gqqTW" value="455.0007103515625" />
-            <property role="gqqTX" value="100.0" />
-            <property role="gqqTy" value="46.0" />
+            <property role="gqqTX" value="133.0" />
+            <property role="gqqTy" value="64.0" />
             <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           </node>
         </node>
@@ -159,8 +159,8 @@
           <node concept="gqqVs" id="56Tfdun38hW" role="37mO4d">
             <property role="gqqTZ" value="130.0" />
             <property role="gqqTW" value="193.00029836425782" />
-            <property role="gqqTX" value="92.0" />
-            <property role="gqqTy" value="46.0" />
+            <property role="gqqTX" value="122.0" />
+            <property role="gqqTy" value="64.0" />
             <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           </node>
         </node>
@@ -169,8 +169,8 @@
           <node concept="gqqVs" id="56Tfdun38iw" role="37mO4d">
             <property role="gqqTZ" value="146.0" />
             <property role="gqqTW" value="52.0001" />
-            <property role="gqqTX" value="60.0" />
-            <property role="gqqTy" value="46.0" />
+            <property role="gqqTX" value="78.0" />
+            <property role="gqqTy" value="64.0" />
             <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           </node>
         </node>

diff --git a/....itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/....itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -59147,6 +59147,24 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="itssr789xH" role="jymVt" />
+    <node concept="3clFb_" id="itssr78hM5" role="jymVt">
+      <property role="TrG5h" value="getMPSCell" />
+      <node concept="3clFbS" id="itssr78hM8" role="3clF47">
+        <node concept="3cpWs6" id="itssr78jZ_" role="3cqZAp">
+          <node concept="2OqwBi" id="itssr78l_4" role="3cqZAk">
+            <node concept="Xjq3P" id="itssr78kdS" role="2Oq$k0" />
+            <node concept="2OwXpG" id="itssr78nJe" role="2OqNvi">
+              <ref role="2Oxat6" node="1uCOQFMkh1i" resolve="myEditingCell" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="itssr78dG3" role="1B3o_S" />
+      <node concept="3uibUv" id="itssr78haf" role="3clF45">
+        <ref role="3uigEE" node="3YJYJT3M3W" resolve="MPSCell" />
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="1uCOQFNaAxI">
     <property role="TrG5h" value="MPSCellEditor" />
@@ -107043,6 +107061,9 @@
                   <ref role="3cqZAo" node="2BjZSlQD2RX" resolve="ports" />
                 </node>
                 <node concept="2DpFxk" id="6KIoYkeusZH" role="2OqNvi">
+                  <node concept="1nlBCl" id="6KIoYkeusZP" role="2Dq5b$">
+                    <property role="3clFbU" value="true" />
+                  </node>
                   <node concept="1bVj0M" id="6L_GEhdDfhS" role="23t8la">
                     <node concept="3clFbS" id="6L_GEhdDfhT" role="1bW5cS">
                       <node concept="3clFbF" id="6L_GEhdDi6L" role="3cqZAp">
@@ -107070,9 +107091,6 @@
                       <node concept="2jxLKc" id="6L_GEhdDfhX" role="1tU5fm" />
                     </node>
                   </node>
-                  <node concept="1nlBCl" id="6KIoYkeusZP" role="2Dq5b$">
-                    <property role="3clFbU" value="true" />
-                  </node>
                 </node>
               </node>
               <node concept="ANE8D" id="6Fu8whC8Cv6" role="2OqNvi" />