Skip to content

Commit 9e6e78e

Browse files
arimerarimer
authored
Merge pull request #2959 from mbeddr/bugfix/StableIDs
mbeddr.doc: make IDs robust over several generations
2 parents 820f5ae + 9e6b925 commit 9e6e78e

File tree

15 files changed

+1356
-250
lines changed

15 files changed

+1356
-250
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
77

88
# May 2025
99

10+
## com.mbeddr.doc
11+
- Use original nodeID for stable ID (SID) generation instead of transient nodeID
12+
1013
## com.mbeddr.mpsutil.actionsfilter
1114

1215
- An exception (!app.isDispatchThread()) was fixed that was related to the initialization of the actionsfilter language.

‎code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/generator/template/com/mbeddr/doc/gen_latex/generator/template/[email protected]

Lines changed: 75 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
2626
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
2727
<import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" />
28+
<import index="znf5" ref="r:07597124-beb3-41b7-beb1-a882af3ded40(com.mbeddr.doc.plugin)" />
2829
</imports>
2930
<registry>
3031
<language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
@@ -220,6 +221,9 @@
220221
</concept>
221222
</language>
222223
<language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
224+
<concept id="1229477454423" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalCopiedInputByOutput" flags="nn" index="12$id9">
225+
<child id="1229477520175" name="outputNode" index="12$y8L" />
226+
</concept>
223227
<concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
224228
<concept id="1217026863835" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalInputModel" flags="nn" index="1st3f0" />
225229
</language>
@@ -1813,11 +1817,15 @@
18131817
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
18141818
<node concept="3zFVjK" id="3RseghIc$Gx" role="3zH0cK">
18151819
<node concept="3clFbS" id="3RseghIc$Gy" role="2VODD2">
1816-
<node concept="3clFbF" id="3RseghIc$Gz" role="3cqZAp">
1817-
<node concept="2OqwBi" id="3RseghIc$G$" role="3clFbG">
1818-
<node concept="30H73N" id="3RseghIc$GA" role="2Oq$k0" />
1819-
<node concept="2qgKlT" id="6jiGbW_JG4W" role="2OqNvi">
1820-
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
1820+
<node concept="3clFbF" id="4XyruUDCSu7" role="3cqZAp">
1821+
<node concept="2YIFZM" id="4XyruUDCSw4" role="3clFbG">
1822+
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
1823+
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
1824+
<node concept="2OqwBi" id="3x8tM34lh5m" role="37wK5m">
1825+
<node concept="1iwH7S" id="3x8tM34lgEW" role="2Oq$k0" />
1826+
<node concept="12$id9" id="3x8tM34lhw7" role="2OqNvi">
1827+
<node concept="30H73N" id="3x8tM34lhx3" role="12$y8L" />
1828+
</node>
18211829
</node>
18221830
</node>
18231831
</node>
@@ -2214,12 +2222,16 @@
22142222
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
22152223
<node concept="3zFVjK" id="3DAECxG6qZ2" role="3zH0cK">
22162224
<node concept="3clFbS" id="3DAECxG6qZ3" role="2VODD2">
2217-
<node concept="3clFbF" id="3DAECxG6qZ4" role="3cqZAp">
2218-
<node concept="2OqwBi" id="3DAECxG6qZ5" role="3clFbG">
2219-
<node concept="2qgKlT" id="6jiGbW_GeII" role="2OqNvi">
2220-
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
2225+
<node concept="3clFbF" id="4XyruUDD3vA" role="3cqZAp">
2226+
<node concept="2YIFZM" id="4XyruUDD3vB" role="3clFbG">
2227+
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
2228+
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
2229+
<node concept="2OqwBi" id="3x8tM34ljkT" role="37wK5m">
2230+
<node concept="1iwH7S" id="3x8tM34ljkU" role="2Oq$k0" />
2231+
<node concept="12$id9" id="3x8tM34ljkV" role="2OqNvi">
2232+
<node concept="30H73N" id="3x8tM34ljkW" role="12$y8L" />
2233+
</node>
22212234
</node>
2222-
<node concept="30H73N" id="3DAECxG6qZ7" role="2Oq$k0" />
22232235
</node>
22242236
</node>
22252237
</node>
@@ -2463,12 +2475,16 @@
24632475
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
24642476
<node concept="3zFVjK" id="4vQSg$Ar7kk" role="3zH0cK">
24652477
<node concept="3clFbS" id="4vQSg$Ar7kl" role="2VODD2">
2466-
<node concept="3clFbF" id="4vQSg$Ar7km" role="3cqZAp">
2467-
<node concept="2OqwBi" id="6jiGbW_JP4$" role="3clFbG">
2468-
<node concept="2qgKlT" id="6jiGbW_JP4_" role="2OqNvi">
2469-
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
2478+
<node concept="3clFbF" id="4XyruUDD58s" role="3cqZAp">
2479+
<node concept="2YIFZM" id="4XyruUDD58t" role="3clFbG">
2480+
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
2481+
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
2482+
<node concept="2OqwBi" id="3x8tM34ljmY" role="37wK5m">
2483+
<node concept="1iwH7S" id="3x8tM34ljmZ" role="2Oq$k0" />
2484+
<node concept="12$id9" id="3x8tM34ljn0" role="2OqNvi">
2485+
<node concept="30H73N" id="3x8tM34ljn1" role="12$y8L" />
2486+
</node>
24702487
</node>
2471-
<node concept="30H73N" id="6jiGbW_JP4A" role="2Oq$k0" />
24722488
</node>
24732489
</node>
24742490
</node>
@@ -2630,11 +2646,15 @@
26302646
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
26312647
<node concept="3zFVjK" id="6jiGbW$Iwda" role="3zH0cK">
26322648
<node concept="3clFbS" id="6jiGbW$Iwdb" role="2VODD2">
2633-
<node concept="3clFbF" id="6jiGbW$Iwdc" role="3cqZAp">
2634-
<node concept="2OqwBi" id="6jiGbW$Iwdd" role="3clFbG">
2635-
<node concept="30H73N" id="6jiGbW$Iwdf" role="2Oq$k0" />
2636-
<node concept="2qgKlT" id="6jiGbW_GfZL" role="2OqNvi">
2637-
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
2649+
<node concept="3clFbF" id="4XyruUDD63o" role="3cqZAp">
2650+
<node concept="2YIFZM" id="4XyruUDD63p" role="3clFbG">
2651+
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
2652+
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
2653+
<node concept="2OqwBi" id="3x8tM34ljp0" role="37wK5m">
2654+
<node concept="1iwH7S" id="3x8tM34ljp1" role="2Oq$k0" />
2655+
<node concept="12$id9" id="3x8tM34ljp2" role="2OqNvi">
2656+
<node concept="30H73N" id="3x8tM34ljp3" role="12$y8L" />
2657+
</node>
26382658
</node>
26392659
</node>
26402660
</node>
@@ -2889,11 +2909,15 @@
28892909
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
28902910
<node concept="3zFVjK" id="519ky_SjBN$" role="3zH0cK">
28912911
<node concept="3clFbS" id="519ky_SjBN_" role="2VODD2">
2892-
<node concept="3clFbF" id="519ky_SjBNA" role="3cqZAp">
2893-
<node concept="2OqwBi" id="519ky_SjBNB" role="3clFbG">
2894-
<node concept="30H73N" id="519ky_SjBND" role="2Oq$k0" />
2895-
<node concept="2qgKlT" id="6jiGbW_JPNW" role="2OqNvi">
2896-
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
2912+
<node concept="3clFbF" id="4XyruUDD8JM" role="3cqZAp">
2913+
<node concept="2YIFZM" id="4XyruUDD8JN" role="3clFbG">
2914+
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
2915+
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
2916+
<node concept="2OqwBi" id="3x8tM34ll0u" role="37wK5m">
2917+
<node concept="1iwH7S" id="3x8tM34ll0v" role="2Oq$k0" />
2918+
<node concept="12$id9" id="3x8tM34ll0w" role="2OqNvi">
2919+
<node concept="30H73N" id="3x8tM34ll0x" role="12$y8L" />
2920+
</node>
28972921
</node>
28982922
</node>
28992923
</node>
@@ -3334,17 +3358,21 @@
33343358
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
33353359
<node concept="3zFVjK" id="3RseghIc$J6" role="3zH0cK">
33363360
<node concept="3clFbS" id="3RseghIc$J7" role="2VODD2">
3337-
<node concept="3clFbF" id="3RseghIc$J8" role="3cqZAp">
3338-
<node concept="2OqwBi" id="3RseghIc$J9" role="3clFbG">
3339-
<node concept="2OqwBi" id="3RseghIc$Ja" role="2Oq$k0">
3340-
<node concept="30H73N" id="3RseghIc$Jb" role="2Oq$k0" />
3341-
<node concept="3TrEf2" id="3RseghIc$Jc" role="2OqNvi">
3342-
<ref role="3Tt5mk" to="2c95:5yxqZJwzrde" resolve="image" />
3361+
<node concept="3clFbF" id="4XyruUDDddd" role="3cqZAp">
3362+
<node concept="2YIFZM" id="4XyruUDDdde" role="3clFbG">
3363+
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
3364+
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
3365+
<node concept="2OqwBi" id="3x8tM34lnfP" role="37wK5m">
3366+
<node concept="1iwH7S" id="3x8tM34lnfQ" role="2Oq$k0" />
3367+
<node concept="12$id9" id="3x8tM34lnfR" role="2OqNvi">
3368+
<node concept="2OqwBi" id="3x8tM34lnHj" role="12$y8L">
3369+
<node concept="30H73N" id="3x8tM34lnfS" role="2Oq$k0" />
3370+
<node concept="3TrEf2" id="3x8tM34lomB" role="2OqNvi">
3371+
<ref role="3Tt5mk" to="2c95:5yxqZJwzrde" resolve="image" />
3372+
</node>
3373+
</node>
33433374
</node>
33443375
</node>
3345-
<node concept="2qgKlT" id="6jiGbW_JQzP" role="2OqNvi">
3346-
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
3347-
</node>
33483376
</node>
33493377
</node>
33503378
</node>
@@ -3397,17 +3425,21 @@
33973425
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
33983426
<node concept="3zFVjK" id="3RseghIc$I4" role="3zH0cK">
33993427
<node concept="3clFbS" id="3RseghIc$I5" role="2VODD2">
3400-
<node concept="3clFbF" id="3RseghIc$I6" role="3cqZAp">
3401-
<node concept="2OqwBi" id="6jiGbW_JQOA" role="3clFbG">
3402-
<node concept="2OqwBi" id="6jiGbW_JQOB" role="2Oq$k0">
3403-
<node concept="30H73N" id="6jiGbW_JQOC" role="2Oq$k0" />
3404-
<node concept="3TrEf2" id="6jiGbW_JQOD" role="2OqNvi">
3405-
<ref role="3Tt5mk" to="2c95:2TZO3DbvhAJ" resolve="target" />
3428+
<node concept="3clFbF" id="4XyruUDDhPN" role="3cqZAp">
3429+
<node concept="2YIFZM" id="4XyruUDDhPO" role="3clFbG">
3430+
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
3431+
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
3432+
<node concept="2OqwBi" id="3x8tM34lqlV" role="37wK5m">
3433+
<node concept="1iwH7S" id="3x8tM34lqlW" role="2Oq$k0" />
3434+
<node concept="12$id9" id="3x8tM34lqlX" role="2OqNvi">
3435+
<node concept="2OqwBi" id="3x8tM34lqMs" role="12$y8L">
3436+
<node concept="30H73N" id="3x8tM34lqlY" role="2Oq$k0" />
3437+
<node concept="3TrEf2" id="3x8tM34lrcV" role="2OqNvi">
3438+
<ref role="3Tt5mk" to="2c95:2TZO3DbvhAJ" resolve="target" />
3439+
</node>
3440+
</node>
34063441
</node>
34073442
</node>
3408-
<node concept="2qgKlT" id="6jiGbW_JQOE" role="2OqNvi">
3409-
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
3410-
</node>
34113443
</node>
34123444
</node>
34133445
</node>

0 commit comments

Comments
 (0)