Merge pull request #1085 from JetBrains/feature/edge_IDs

JetBrains · Dec 9, 2024 · c303704 · c303704
2 parents 7a0c5b6 + 5be6ec6
commit c303704
Show file tree

Hide file tree

Showing 8 changed files with 202 additions and 16 deletions.
diff --git 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.
 
+## December 2024
+
+### Added
+
+- *de.itemis.mps.editor.diagram*: Edges now support custom IDs.
+
 ## October 2024
 
 ### Added

diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/[email protected] b/code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/[email protected]
@@ -8947,7 +8947,7 @@
                     <node concept="YeOm9" id="5RIhRmzydXe" role="2ShVmc">
                       <node concept="1Y3b0j" id="5RIhRmzydXf" role="YeSDq">
                         <property role="2bfB8j" value="true" />
-                        <ref role="37wK5l" to="nkm5:7jhYr4hIVhs" resolve="SNodeEdgeAccessor" />
+                        <ref role="37wK5l" to="nkm5:7f8dMG55GxJ" resolve="SNodeEdgeAccessor" />
                         <ref role="1Y3XeK" to="nkm5:7jhYr4hIToa" resolve="SNodeEdgeAccessor" />
                         <node concept="312cEg" id="5RIhRmzydXH" role="jymVt">
                           <property role="TrG5h" value="startRoleCell" />
@@ -10225,6 +10225,43 @@
                         <node concept="37vLTw" id="5RIhRmzye3i" role="37wK5m">
                           <ref role="3cqZAo" node="5qgNcfDowQN" resolve="node" />
                         </node>
+                        <node concept="10Nm6u" id="7f8dMG5axAF" role="37wK5m">
+                          <node concept="1W57fq" id="7f8dMG5axAG" role="lGtFl">
+                            <node concept="3IZrLx" id="7f8dMG5axAH" role="3IZSJc">
+                              <node concept="3clFbS" id="7f8dMG5axAI" role="2VODD2">
+                                <node concept="3clFbF" id="7f8dMG5axAJ" role="3cqZAp">
+                                  <node concept="2OqwBi" id="7f8dMG5axAK" role="3clFbG">
+                                    <node concept="2OqwBi" id="7f8dMG5axAL" role="2Oq$k0">
+                                      <node concept="30H73N" id="7f8dMG5axAM" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="7f8dMG5axAN" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="2qld:7f8dMG51zry" resolve="edgeID" />
+                                      </node>
+                                    </node>
+                                    <node concept="3x8VRR" id="7f8dMG5axAO" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="gft3U" id="7f8dMG5axAP" role="UU_$l">
+                              <node concept="10Nm6u" id="7f8dMG5aJqF" role="gfFT$" />
+                            </node>
+                          </node>
+                          <node concept="1sPUBX" id="7f8dMG5axB1" role="lGtFl">
+                            <ref role="v9R2y" node="5FQFTBpMLdO" resolve="switch_ExpressionToAccessorKey" />
+                            <node concept="3NFfHV" id="7f8dMG5axB2" role="1sPUBK">
+                              <node concept="3clFbS" id="7f8dMG5axB3" role="2VODD2">
+                                <node concept="3clFbF" id="7f8dMG5axB4" role="3cqZAp">
+                                  <node concept="2OqwBi" id="7f8dMG5axB5" role="3clFbG">
+                                    <node concept="30H73N" id="7f8dMG5axB6" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="7f8dMG5axB7" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="2qld:7f8dMG51zry" resolve="edgeID" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>

diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps
@@ -4662,6 +4662,25 @@
     <property role="3GE5qa" value="edgeEditor" />
     <ref role="1XX52x" to="2qld:7RbR7LCxiqz" resolve="IEdgeEditor" />
     <node concept="3EZMnI" id="6clvLV1rFOL" role="2wV5jI">
+      <node concept="3EZMnI" id="7f8dMG51$vw" role="3EZMnx">
+        <node concept="VPM3Z" id="7f8dMG51$vx" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="VPXOz" id="7f8dMG51$vy" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3F0ifn" id="7f8dMG51$vz" role="3EZMnx">
+          <property role="3F0ifm" value="id" />
+        </node>
+        <node concept="3F1sOY" id="7f8dMG51$v$" role="3EZMnx">
+          <property role="1$x2rV" value="derived from node" />
+          <ref role="1NtTu8" to="2qld:7f8dMG51zry" resolve="edgeID" />
+          <node concept="VPXOz" id="7f8dMG51$v_" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+        <node concept="2iRfu4" id="7f8dMG51$vA" role="2iSdaV" />
+      </node>
       <node concept="VPM3Z" id="6clvLV1rFOM" role="3F10Kt">
         <property role="VOm3f" value="false" />
       </node>

diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps
@@ -464,6 +464,12 @@
       <ref role="20lvS9" to="tpc2:fBEYTCT" resolve="EditorCellModel" />
       <node concept="asaX9" id="7sHDEc2Si7c" role="lGtFl" />
     </node>
+    <node concept="1TJgyj" id="7f8dMG51zry" role="1TKVEi">
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="edgeID" />
+      <property role="IQ2ns" value="8342978967611258594" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
     <node concept="PrWs8" id="5qgNcfDnW48" role="PzmwI">
       <ref role="PrY4T" node="5qgNcfDnW3k" resolve="IDiagramCell" />
     </node>

diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps
@@ -539,6 +539,29 @@
           </node>
         </node>
       </node>
+      <node concept="3clFbH" id="7f8dMG5brK0" role="3cqZAp" />
+      <node concept="1ZobV4" id="7f8dMG5bsUF" role="3cqZAp">
+        <node concept="mw_s8" id="7f8dMG5bsUR" role="1ZfhKB">
+          <node concept="2c44tf" id="7f8dMG5bsUN" role="mwGJk">
+            <node concept="2usRSg" id="7f8dMG5bsVc" role="2c44tc">
+              <node concept="3Tqbb2" id="7f8dMG5bsVT" role="2usUpS" />
+              <node concept="17QB3L" id="7f8dMG5bsW_" role="2usUpS" />
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="7f8dMG5bsUI" role="1ZfhK$">
+          <node concept="1Z2H0r" id="7f8dMG5brKI" role="mwGJk">
+            <node concept="2OqwBi" id="7f8dMG5brZh" role="1Z2MuG">
+              <node concept="1YBJjd" id="7f8dMG5brKX" role="2Oq$k0">
+                <ref role="1YBMHb" node="2eQzkDKPuOj" resolve="node" />
+              </node>
+              <node concept="3TrEf2" id="7f8dMG5bsqi" role="2OqNvi">
+                <ref role="3Tt5mk" to="2qld:7f8dMG51zry" resolve="edgeID" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="1YaCAy" id="2eQzkDKPuOj" role="1YuTPh">
       <property role="TrG5h" value="node" />

diff --git a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/editor.mps b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/editor.mps
@@ -137,6 +137,9 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
@@ -406,7 +409,9 @@
         <child id="1566844231766602492" name="ports2" index="3DrZTU" />
         <child id="6160055369549989399" name="allowScaling" index="3RJMYJ" />
       </concept>
-      <concept id="6237710625713831199" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramConnector" flags="ng" index="2ZMJ7s" />
+      <concept id="6237710625713831199" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramConnector" flags="ng" index="2ZMJ7s">
+        <child id="8342978967611258594" name="edgeID" index="1QNw79" />
+      </concept>
       <concept id="6237710625713942002" name="de.itemis.mps.editor.diagram.structure.Content_BLQuery" flags="ig" index="2ZMM4L" />
       <concept id="6237710625713964946" name="de.itemis.mps.editor.diagram.structure.Parameter_Node" flags="ng" index="2ZN8Hh" />
       <concept id="5468226901223973329" name="de.itemis.mps.editor.diagram.structure.PortObject" flags="ng" index="15kUEO" />
@@ -859,6 +864,16 @@
           </node>
         </node>
       </node>
+      <node concept="2OqwBi" id="7f8dMG5h3NJ" role="1QNw79">
+        <node concept="2YIFZM" id="5FQFTBpMRtG" role="2Oq$k0">
+          <ref role="37wK5l" to="nkm5:5BPceOK74em" resolve="createAccessorKeyForSNode" />
+          <ref role="1Pybhc" to="nkm5:2JYLxR6CE8o" resolve="EndpointUtil" />
+          <node concept="1Pxb5l" id="7f8dMG5h3tD" role="37wK5m" />
+        </node>
+        <node concept="liA8E" id="7f8dMG5h4aS" role="2OqNvi">
+          <ref role="37wK5l" to="nkm5:7L$rKAVbO88" resolve="serialize" />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="24kQdi" id="24zrZPP$0Jw">

diff --git a/...e.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps b/...e.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
@@ -23883,30 +23883,68 @@
       <node concept="3cqZAl" id="7jhYr4hIVht" role="3clF45" />
       <node concept="3Tm1VV" id="7jhYr4hIVhu" role="1B3o_S" />
       <node concept="3clFbS" id="7jhYr4hIVhw" role="3clF47">
-        <node concept="XkiVB" id="4rVJEOknRSf" role="3cqZAp">
+        <node concept="1VxSAg" id="7f8dMG563uq" role="3cqZAp">
+          <ref role="37wK5l" node="7f8dMG55GxJ" resolve="SNodeEdgeAccessor" />
+          <node concept="37vLTw" id="7f8dMG564Da" role="37wK5m">
+            <ref role="3cqZAo" node="7jhYr4hIVhz" resolve="snode" />
+          </node>
+          <node concept="10Nm6u" id="7f8dMG58_kb" role="37wK5m" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7jhYr4hIVhz" role="3clF46">
+        <property role="TrG5h" value="snode" />
+        <node concept="3Tqbb2" id="7jhYr4hIVhy" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7f8dMG55CKn" role="jymVt" />
+    <node concept="3clFbW" id="7f8dMG55GxJ" role="jymVt">
+      <node concept="3cqZAl" id="7f8dMG55GxK" role="3clF45" />
+      <node concept="3clFbS" id="7f8dMG55GxM" role="3clF47">
+        <node concept="XkiVB" id="7f8dMG55IWS" role="3cqZAp">
           <ref role="37wK5l" node="4rVJEOko35H" resolve="AbstractEdgeAccessor" />
-          <node concept="2YIFZM" id="5BPceOK77mS" role="37wK5m">
-            <ref role="37wK5l" node="5BPceOK74em" resolve="createAccessorKeyForSNode" />
-            <ref role="1Pybhc" node="2JYLxR6CE8o" resolve="EndpointUtil" />
-            <node concept="37vLTw" id="5BPceOK77ny" role="37wK5m">
-              <ref role="3cqZAo" node="7jhYr4hIVhz" resolve="snode" />
+          <node concept="3K4zz7" id="7f8dMG58CpR" role="37wK5m">
+            <node concept="37vLTw" id="7f8dMG58D3Z" role="3K4E3e">
+              <ref role="3cqZAo" node="7f8dMG55Jhk" resolve="id" />
+            </node>
+            <node concept="3y3z36" id="7f8dMG58Ap4" role="3K4Cdx">
+              <node concept="10Nm6u" id="7f8dMG58BW1" role="3uHU7w" />
+              <node concept="37vLTw" id="7f8dMG55ZjA" role="3uHU7B">
+                <ref role="3cqZAo" node="7f8dMG55Jhk" resolve="id" />
+              </node>
+            </node>
+            <node concept="2YIFZM" id="5BPceOK77mS" role="3K4GZi">
+              <ref role="37wK5l" node="5BPceOK74em" resolve="createAccessorKeyForSNode" />
+              <ref role="1Pybhc" node="2JYLxR6CE8o" resolve="EndpointUtil" />
+              <node concept="37vLTw" id="5BPceOK77ny" role="37wK5m">
+                <ref role="3cqZAo" node="7f8dMG55Hq1" resolve="snode" />
+              </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7jhYr4hIVh$" role="3cqZAp">
-          <node concept="37vLTI" id="7jhYr4hIVhA" role="3clFbG">
-            <node concept="37vLTw" id="7jhYr4hIVhE" role="37vLTJ">
-              <ref role="3cqZAo" node="7jhYr4hIU7Q" resolve="mySNode" />
+        <node concept="3clFbF" id="7f8dMG5602a" role="3cqZAp">
+          <node concept="37vLTI" id="7f8dMG560OX" role="3clFbG">
+            <node concept="37vLTw" id="7f8dMG561ZS" role="37vLTx">
+              <ref role="3cqZAo" node="7f8dMG55Hq1" resolve="snode" />
             </node>
-            <node concept="37vLTw" id="7jhYr4hIVhF" role="37vLTx">
-              <ref role="3cqZAo" node="7jhYr4hIVhz" resolve="snode" />
+            <node concept="37vLTw" id="7f8dMG56028" role="37vLTJ">
+              <ref role="3cqZAo" node="7jhYr4hIU7Q" resolve="mySNode" />
             </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="7jhYr4hIVhz" role="3clF46">
+      <node concept="3Tm1VV" id="7f8dMG55GxN" role="1B3o_S" />
+      <node concept="37vLTG" id="7f8dMG55Hq1" role="3clF46">
         <property role="TrG5h" value="snode" />
-        <node concept="3Tqbb2" id="7jhYr4hIVhy" role="1tU5fm" />
+        <node concept="3Tqbb2" id="7f8dMG55Hq0" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7f8dMG55Jhk" role="3clF46">
+        <property role="TrG5h" value="id" />
+        <node concept="3uibUv" id="7f8dMG55JCV" role="1tU5fm">
+          <ref role="3uigEE" node="18fiNKZvCpQ" resolve="IAccessorKey" />
+        </node>
+        <node concept="2AHcQZ" id="7f8dMG58zaV" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="7jhYr4hITG_" role="jymVt" />
@@ -23933,6 +23971,7 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="7f8dMG58DE$" role="jymVt" />
     <node concept="3clFb_" id="7jhYr4hITpp" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="getSNode" />

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
@@ -230,6 +230,47 @@
         </node>
       </node>
     </node>
+    <node concept="15bmVD" id="7f8dMG5jNin" role="15bmVC">
+      <node concept="15ShDW" id="7f8dMG5jNik" role="15bq2Y">
+        <property role="15ShDY" value="Po4Z58IgBx/December" />
+        <property role="15ShDw" value="2024" />
+      </node>
+      <node concept="15bAme" id="7f8dMG5jNil" role="15bAlL">
+        <property role="15bAli" value="Po4Z58tnOE/added" />
+        <node concept="2DRihI" id="7f8dMG5jNim" role="15bAlk">
+          <node concept="2hgSXJ" id="7f8dMG5jNi$" role="1PaTwD">
+            <node concept="1PaTwC" id="7f8dMG5jNi_" role="2hiFM$">
+              <node concept="15Ami3" id="7f8dMG5jNiA" role="1PaTwD">
+                <node concept="37shsh" id="7f8dMG5jNiB" role="15Aodc">
+                  <node concept="1dCxOk" id="7f8dMG5jNiC" role="37shsm">
+                    <property role="1XweGW" value="fa13cc63-c476-4d46-9c96-d53670abe7bc" />
+                    <property role="1XxBO9" value="de.itemis.mps.editor.diagram" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3oM_SD" id="7f8dMG5jNiD" role="1PaTwD">
+                <property role="3oM_SC" value=":" />
+              </node>
+            </node>
+          </node>
+          <node concept="3oM_SD" id="7f8dMG5jNiX" role="1PaTwD">
+            <property role="3oM_SC" value="Edges" />
+          </node>
+          <node concept="3oM_SD" id="7f8dMG5jNiY" role="1PaTwD">
+            <property role="3oM_SC" value="now" />
+          </node>
+          <node concept="3oM_SD" id="7f8dMG5jNiZ" role="1PaTwD">
+            <property role="3oM_SC" value="support" />
+          </node>
+          <node concept="3oM_SD" id="7f8dMG5jNj0" role="1PaTwD">
+            <property role="3oM_SC" value="custom" />
+          </node>
+          <node concept="3oM_SD" id="7f8dMG5jNj1" role="1PaTwD">
+            <property role="3oM_SC" value="IDs." />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="15bmVD" id="3YRpSuyWDXu" role="15bmVC">
       <node concept="15ShDW" id="3YRpSuyWDXr" role="15bq2Y">
         <property role="15ShDY" value="Po4Z58IgBa/October" />