Skip to content

Commit c303704

Browse files
author
Alexander Pann
authored
Merge pull request #1085 from JetBrains/feature/edge_IDs
2 parents 7a0c5b6 + 5be6ec6 commit c303704

File tree

8 files changed

+202
-16
lines changed

8 files changed

+202
-16
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project are documented in this file.
44

55
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.
66

7+
## December 2024
8+
9+
### Added
10+
11+
- *de.itemis.mps.editor.diagram*: Edges now support custom IDs.
12+
713
## October 2024
814

915
### Added

‎code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/[email protected]‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8947,7 +8947,7 @@
89478947
<node concept="YeOm9" id="5RIhRmzydXe" role="2ShVmc">
89488948
<node concept="1Y3b0j" id="5RIhRmzydXf" role="YeSDq">
89498949
<property role="2bfB8j" value="true" />
8950-
<ref role="37wK5l" to="nkm5:7jhYr4hIVhs" resolve="SNodeEdgeAccessor" />
8950+
<ref role="37wK5l" to="nkm5:7f8dMG55GxJ" resolve="SNodeEdgeAccessor" />
89518951
<ref role="1Y3XeK" to="nkm5:7jhYr4hIToa" resolve="SNodeEdgeAccessor" />
89528952
<node concept="312cEg" id="5RIhRmzydXH" role="jymVt">
89538953
<property role="TrG5h" value="startRoleCell" />
@@ -10225,6 +10225,43 @@
1022510225
<node concept="37vLTw" id="5RIhRmzye3i" role="37wK5m">
1022610226
<ref role="3cqZAo" node="5qgNcfDowQN" resolve="node" />
1022710227
</node>
10228+
<node concept="10Nm6u" id="7f8dMG5axAF" role="37wK5m">
10229+
<node concept="1W57fq" id="7f8dMG5axAG" role="lGtFl">
10230+
<node concept="3IZrLx" id="7f8dMG5axAH" role="3IZSJc">
10231+
<node concept="3clFbS" id="7f8dMG5axAI" role="2VODD2">
10232+
<node concept="3clFbF" id="7f8dMG5axAJ" role="3cqZAp">
10233+
<node concept="2OqwBi" id="7f8dMG5axAK" role="3clFbG">
10234+
<node concept="2OqwBi" id="7f8dMG5axAL" role="2Oq$k0">
10235+
<node concept="30H73N" id="7f8dMG5axAM" role="2Oq$k0" />
10236+
<node concept="3TrEf2" id="7f8dMG5axAN" role="2OqNvi">
10237+
<ref role="3Tt5mk" to="2qld:7f8dMG51zry" resolve="edgeID" />
10238+
</node>
10239+
</node>
10240+
<node concept="3x8VRR" id="7f8dMG5axAO" role="2OqNvi" />
10241+
</node>
10242+
</node>
10243+
</node>
10244+
</node>
10245+
<node concept="gft3U" id="7f8dMG5axAP" role="UU_$l">
10246+
<node concept="10Nm6u" id="7f8dMG5aJqF" role="gfFT$" />
10247+
</node>
10248+
</node>
10249+
<node concept="1sPUBX" id="7f8dMG5axB1" role="lGtFl">
10250+
<ref role="v9R2y" node="5FQFTBpMLdO" resolve="switch_ExpressionToAccessorKey" />
10251+
<node concept="3NFfHV" id="7f8dMG5axB2" role="1sPUBK">
10252+
<node concept="3clFbS" id="7f8dMG5axB3" role="2VODD2">
10253+
<node concept="3clFbF" id="7f8dMG5axB4" role="3cqZAp">
10254+
<node concept="2OqwBi" id="7f8dMG5axB5" role="3clFbG">
10255+
<node concept="30H73N" id="7f8dMG5axB6" role="2Oq$k0" />
10256+
<node concept="3TrEf2" id="7f8dMG5axB7" role="2OqNvi">
10257+
<ref role="3Tt5mk" to="2qld:7f8dMG51zry" resolve="edgeID" />
10258+
</node>
10259+
</node>
10260+
</node>
10261+
</node>
10262+
</node>
10263+
</node>
10264+
</node>
1022810265
</node>
1022910266
</node>
1023010267
</node>

‎code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4662,6 +4662,25 @@
46624662
<property role="3GE5qa" value="edgeEditor" />
46634663
<ref role="1XX52x" to="2qld:7RbR7LCxiqz" resolve="IEdgeEditor" />
46644664
<node concept="3EZMnI" id="6clvLV1rFOL" role="2wV5jI">
4665+
<node concept="3EZMnI" id="7f8dMG51$vw" role="3EZMnx">
4666+
<node concept="VPM3Z" id="7f8dMG51$vx" role="3F10Kt">
4667+
<property role="VOm3f" value="false" />
4668+
</node>
4669+
<node concept="VPXOz" id="7f8dMG51$vy" role="3F10Kt">
4670+
<property role="VOm3f" value="true" />
4671+
</node>
4672+
<node concept="3F0ifn" id="7f8dMG51$vz" role="3EZMnx">
4673+
<property role="3F0ifm" value="id" />
4674+
</node>
4675+
<node concept="3F1sOY" id="7f8dMG51$v$" role="3EZMnx">
4676+
<property role="1$x2rV" value="derived from node" />
4677+
<ref role="1NtTu8" to="2qld:7f8dMG51zry" resolve="edgeID" />
4678+
<node concept="VPXOz" id="7f8dMG51$v_" role="3F10Kt">
4679+
<property role="VOm3f" value="true" />
4680+
</node>
4681+
</node>
4682+
<node concept="2iRfu4" id="7f8dMG51$vA" role="2iSdaV" />
4683+
</node>
46654684
<node concept="VPM3Z" id="6clvLV1rFOM" role="3F10Kt">
46664685
<property role="VOm3f" value="false" />
46674686
</node>

‎code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,12 @@
464464
<ref role="20lvS9" to="tpc2:fBEYTCT" resolve="EditorCellModel" />
465465
<node concept="asaX9" id="7sHDEc2Si7c" role="lGtFl" />
466466
</node>
467+
<node concept="1TJgyj" id="7f8dMG51zry" role="1TKVEi">
468+
<property role="20lmBu" value="fLJjDmT/aggregation" />
469+
<property role="20kJfa" value="edgeID" />
470+
<property role="IQ2ns" value="8342978967611258594" />
471+
<ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
472+
</node>
467473
<node concept="PrWs8" id="5qgNcfDnW48" role="PzmwI">
468474
<ref role="PrY4T" node="5qgNcfDnW3k" resolve="IDiagramCell" />
469475
</node>

‎code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,29 @@
539539
</node>
540540
</node>
541541
</node>
542+
<node concept="3clFbH" id="7f8dMG5brK0" role="3cqZAp" />
543+
<node concept="1ZobV4" id="7f8dMG5bsUF" role="3cqZAp">
544+
<node concept="mw_s8" id="7f8dMG5bsUR" role="1ZfhKB">
545+
<node concept="2c44tf" id="7f8dMG5bsUN" role="mwGJk">
546+
<node concept="2usRSg" id="7f8dMG5bsVc" role="2c44tc">
547+
<node concept="3Tqbb2" id="7f8dMG5bsVT" role="2usUpS" />
548+
<node concept="17QB3L" id="7f8dMG5bsW_" role="2usUpS" />
549+
</node>
550+
</node>
551+
</node>
552+
<node concept="mw_s8" id="7f8dMG5bsUI" role="1ZfhK$">
553+
<node concept="1Z2H0r" id="7f8dMG5brKI" role="mwGJk">
554+
<node concept="2OqwBi" id="7f8dMG5brZh" role="1Z2MuG">
555+
<node concept="1YBJjd" id="7f8dMG5brKX" role="2Oq$k0">
556+
<ref role="1YBMHb" node="2eQzkDKPuOj" resolve="node" />
557+
</node>
558+
<node concept="3TrEf2" id="7f8dMG5bsqi" role="2OqNvi">
559+
<ref role="3Tt5mk" to="2qld:7f8dMG51zry" resolve="edgeID" />
560+
</node>
561+
</node>
562+
</node>
563+
</node>
564+
</node>
542565
</node>
543566
<node concept="1YaCAy" id="2eQzkDKPuOj" role="1YuTPh">
544567
<property role="TrG5h" value="node" />

‎code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/editor.mps‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@
137137
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
138138
<property id="1070475926801" name="value" index="Xl_RC" />
139139
</concept>
140+
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
141+
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
142+
</concept>
140143
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
141144
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
142145
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
@@ -406,7 +409,9 @@
406409
<child id="1566844231766602492" name="ports2" index="3DrZTU" />
407410
<child id="6160055369549989399" name="allowScaling" index="3RJMYJ" />
408411
</concept>
409-
<concept id="6237710625713831199" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramConnector" flags="ng" index="2ZMJ7s" />
412+
<concept id="6237710625713831199" name="de.itemis.mps.editor.diagram.structure.CellModel_DiagramConnector" flags="ng" index="2ZMJ7s">
413+
<child id="8342978967611258594" name="edgeID" index="1QNw79" />
414+
</concept>
410415
<concept id="6237710625713942002" name="de.itemis.mps.editor.diagram.structure.Content_BLQuery" flags="ig" index="2ZMM4L" />
411416
<concept id="6237710625713964946" name="de.itemis.mps.editor.diagram.structure.Parameter_Node" flags="ng" index="2ZN8Hh" />
412417
<concept id="5468226901223973329" name="de.itemis.mps.editor.diagram.structure.PortObject" flags="ng" index="15kUEO" />
@@ -859,6 +864,16 @@
859864
</node>
860865
</node>
861866
</node>
867+
<node concept="2OqwBi" id="7f8dMG5h3NJ" role="1QNw79">
868+
<node concept="2YIFZM" id="5FQFTBpMRtG" role="2Oq$k0">
869+
<ref role="37wK5l" to="nkm5:5BPceOK74em" resolve="createAccessorKeyForSNode" />
870+
<ref role="1Pybhc" to="nkm5:2JYLxR6CE8o" resolve="EndpointUtil" />
871+
<node concept="1Pxb5l" id="7f8dMG5h3tD" role="37wK5m" />
872+
</node>
873+
<node concept="liA8E" id="7f8dMG5h4aS" role="2OqNvi">
874+
<ref role="37wK5l" to="nkm5:7L$rKAVbO88" resolve="serialize" />
875+
</node>
876+
</node>
862877
</node>
863878
</node>
864879
<node concept="24kQdi" id="24zrZPP$0Jw">

‎code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps‎

Lines changed: 53 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23883,30 +23883,68 @@
2388323883
<node concept="3cqZAl" id="7jhYr4hIVht" role="3clF45" />
2388423884
<node concept="3Tm1VV" id="7jhYr4hIVhu" role="1B3o_S" />
2388523885
<node concept="3clFbS" id="7jhYr4hIVhw" role="3clF47">
23886-
<node concept="XkiVB" id="4rVJEOknRSf" role="3cqZAp">
23886+
<node concept="1VxSAg" id="7f8dMG563uq" role="3cqZAp">
23887+
<ref role="37wK5l" node="7f8dMG55GxJ" resolve="SNodeEdgeAccessor" />
23888+
<node concept="37vLTw" id="7f8dMG564Da" role="37wK5m">
23889+
<ref role="3cqZAo" node="7jhYr4hIVhz" resolve="snode" />
23890+
</node>
23891+
<node concept="10Nm6u" id="7f8dMG58_kb" role="37wK5m" />
23892+
</node>
23893+
</node>
23894+
<node concept="37vLTG" id="7jhYr4hIVhz" role="3clF46">
23895+
<property role="TrG5h" value="snode" />
23896+
<node concept="3Tqbb2" id="7jhYr4hIVhy" role="1tU5fm" />
23897+
</node>
23898+
</node>
23899+
<node concept="2tJIrI" id="7f8dMG55CKn" role="jymVt" />
23900+
<node concept="3clFbW" id="7f8dMG55GxJ" role="jymVt">
23901+
<node concept="3cqZAl" id="7f8dMG55GxK" role="3clF45" />
23902+
<node concept="3clFbS" id="7f8dMG55GxM" role="3clF47">
23903+
<node concept="XkiVB" id="7f8dMG55IWS" role="3cqZAp">
2388723904
<ref role="37wK5l" node="4rVJEOko35H" resolve="AbstractEdgeAccessor" />
23888-
<node concept="2YIFZM" id="5BPceOK77mS" role="37wK5m">
23889-
<ref role="37wK5l" node="5BPceOK74em" resolve="createAccessorKeyForSNode" />
23890-
<ref role="1Pybhc" node="2JYLxR6CE8o" resolve="EndpointUtil" />
23891-
<node concept="37vLTw" id="5BPceOK77ny" role="37wK5m">
23892-
<ref role="3cqZAo" node="7jhYr4hIVhz" resolve="snode" />
23905+
<node concept="3K4zz7" id="7f8dMG58CpR" role="37wK5m">
23906+
<node concept="37vLTw" id="7f8dMG58D3Z" role="3K4E3e">
23907+
<ref role="3cqZAo" node="7f8dMG55Jhk" resolve="id" />
23908+
</node>
23909+
<node concept="3y3z36" id="7f8dMG58Ap4" role="3K4Cdx">
23910+
<node concept="10Nm6u" id="7f8dMG58BW1" role="3uHU7w" />
23911+
<node concept="37vLTw" id="7f8dMG55ZjA" role="3uHU7B">
23912+
<ref role="3cqZAo" node="7f8dMG55Jhk" resolve="id" />
23913+
</node>
23914+
</node>
23915+
<node concept="2YIFZM" id="5BPceOK77mS" role="3K4GZi">
23916+
<ref role="37wK5l" node="5BPceOK74em" resolve="createAccessorKeyForSNode" />
23917+
<ref role="1Pybhc" node="2JYLxR6CE8o" resolve="EndpointUtil" />
23918+
<node concept="37vLTw" id="5BPceOK77ny" role="37wK5m">
23919+
<ref role="3cqZAo" node="7f8dMG55Hq1" resolve="snode" />
23920+
</node>
2389323921
</node>
2389423922
</node>
2389523923
</node>
23896-
<node concept="3clFbF" id="7jhYr4hIVh$" role="3cqZAp">
23897-
<node concept="37vLTI" id="7jhYr4hIVhA" role="3clFbG">
23898-
<node concept="37vLTw" id="7jhYr4hIVhE" role="37vLTJ">
23899-
<ref role="3cqZAo" node="7jhYr4hIU7Q" resolve="mySNode" />
23924+
<node concept="3clFbF" id="7f8dMG5602a" role="3cqZAp">
23925+
<node concept="37vLTI" id="7f8dMG560OX" role="3clFbG">
23926+
<node concept="37vLTw" id="7f8dMG561ZS" role="37vLTx">
23927+
<ref role="3cqZAo" node="7f8dMG55Hq1" resolve="snode" />
2390023928
</node>
23901-
<node concept="37vLTw" id="7jhYr4hIVhF" role="37vLTx">
23902-
<ref role="3cqZAo" node="7jhYr4hIVhz" resolve="snode" />
23929+
<node concept="37vLTw" id="7f8dMG56028" role="37vLTJ">
23930+
<ref role="3cqZAo" node="7jhYr4hIU7Q" resolve="mySNode" />
2390323931
</node>
2390423932
</node>
2390523933
</node>
2390623934
</node>
23907-
<node concept="37vLTG" id="7jhYr4hIVhz" role="3clF46">
23935+
<node concept="3Tm1VV" id="7f8dMG55GxN" role="1B3o_S" />
23936+
<node concept="37vLTG" id="7f8dMG55Hq1" role="3clF46">
2390823937
<property role="TrG5h" value="snode" />
23909-
<node concept="3Tqbb2" id="7jhYr4hIVhy" role="1tU5fm" />
23938+
<node concept="3Tqbb2" id="7f8dMG55Hq0" role="1tU5fm" />
23939+
</node>
23940+
<node concept="37vLTG" id="7f8dMG55Jhk" role="3clF46">
23941+
<property role="TrG5h" value="id" />
23942+
<node concept="3uibUv" id="7f8dMG55JCV" role="1tU5fm">
23943+
<ref role="3uigEE" node="18fiNKZvCpQ" resolve="IAccessorKey" />
23944+
</node>
23945+
<node concept="2AHcQZ" id="7f8dMG58zaV" role="2AJF6D">
23946+
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
23947+
</node>
2391023948
</node>
2391123949
</node>
2391223950
<node concept="2tJIrI" id="7jhYr4hITG_" role="jymVt" />
@@ -23933,6 +23971,7 @@
2393323971
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
2393423972
</node>
2393523973
</node>
23974+
<node concept="2tJIrI" id="7f8dMG58DE$" role="jymVt" />
2393623975
<node concept="3clFb_" id="7jhYr4hITpp" role="jymVt">
2393723976
<property role="1EzhhJ" value="false" />
2393823977
<property role="TrG5h" value="getSNode" />

‎code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,47 @@
230230
</node>
231231
</node>
232232
</node>
233+
<node concept="15bmVD" id="7f8dMG5jNin" role="15bmVC">
234+
<node concept="15ShDW" id="7f8dMG5jNik" role="15bq2Y">
235+
<property role="15ShDY" value="Po4Z58IgBx/December" />
236+
<property role="15ShDw" value="2024" />
237+
</node>
238+
<node concept="15bAme" id="7f8dMG5jNil" role="15bAlL">
239+
<property role="15bAli" value="Po4Z58tnOE/added" />
240+
<node concept="2DRihI" id="7f8dMG5jNim" role="15bAlk">
241+
<node concept="2hgSXJ" id="7f8dMG5jNi$" role="1PaTwD">
242+
<node concept="1PaTwC" id="7f8dMG5jNi_" role="2hiFM$">
243+
<node concept="15Ami3" id="7f8dMG5jNiA" role="1PaTwD">
244+
<node concept="37shsh" id="7f8dMG5jNiB" role="15Aodc">
245+
<node concept="1dCxOk" id="7f8dMG5jNiC" role="37shsm">
246+
<property role="1XweGW" value="fa13cc63-c476-4d46-9c96-d53670abe7bc" />
247+
<property role="1XxBO9" value="de.itemis.mps.editor.diagram" />
248+
</node>
249+
</node>
250+
</node>
251+
<node concept="3oM_SD" id="7f8dMG5jNiD" role="1PaTwD">
252+
<property role="3oM_SC" value=":" />
253+
</node>
254+
</node>
255+
</node>
256+
<node concept="3oM_SD" id="7f8dMG5jNiX" role="1PaTwD">
257+
<property role="3oM_SC" value="Edges" />
258+
</node>
259+
<node concept="3oM_SD" id="7f8dMG5jNiY" role="1PaTwD">
260+
<property role="3oM_SC" value="now" />
261+
</node>
262+
<node concept="3oM_SD" id="7f8dMG5jNiZ" role="1PaTwD">
263+
<property role="3oM_SC" value="support" />
264+
</node>
265+
<node concept="3oM_SD" id="7f8dMG5jNj0" role="1PaTwD">
266+
<property role="3oM_SC" value="custom" />
267+
</node>
268+
<node concept="3oM_SD" id="7f8dMG5jNj1" role="1PaTwD">
269+
<property role="3oM_SC" value="IDs." />
270+
</node>
271+
</node>
272+
</node>
273+
</node>
233274
<node concept="15bmVD" id="3YRpSuyWDXu" role="15bmVC">
234275
<node concept="15ShDW" id="3YRpSuyWDXr" role="15bq2Y">
235276
<property role="15ShDY" value="Po4Z58IgBa/October" />

0 commit comments

Comments
 (0)