Skip to content

Merge maintenance/mps20232 into maintenance/mps20241 #3004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 28, 2025
Merged

Merge maintenance/mps20232 into maintenance/mps20241 #3004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
202f612
mbeddr.doc.gen: use real stable ids during generation
arimer May 19, 2025
9e6b925
changelog: updated
arimer May 27, 2025
9e6e78e
Merge pull request #2959 from mbeddr/bugfix/StableIDs
arimer May 27, 2025
e81ea86
Merge branch 'maintenance/mps20241' into merge/mps20241
sergej-koscejev May 27, 2025
4deffab
gradle migrate remigrate
arimer May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
- PlantUML version changed from erroneously used old 8059 back to 1.2025.2. The erroneous update happened in commit
[d3e54084](https://github.com/mbeddr/mbeddr.core/commit/d3e540849808d1649a4728ac9a32a5c06d37ade2), and was merged
in [ee09cc31](https://github.com/mbeddr/mbeddr.core/commit/ee09cc3167c9943e3a193d2d2dc89d3e82fd1e35) in April 2025.
- Use original nodeID for stable ID (SID) generation instead of transient nodeID

## com.mbeddr.mpsutil.process

Expand Down
118 changes: 75 additions & 43 deletions ...n_latex/generator/template/com/mbeddr/doc/gen_latex/generator/template/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
<import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" />
<import index="znf5" ref="r:07597124-beb3-41b7-beb1-a882af3ded40(com.mbeddr.doc.plugin)" />
</imports>
<registry>
<language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
Expand Down Expand Up @@ -220,6 +221,9 @@
</concept>
</language>
<language id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext">
<concept id="1229477454423" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalCopiedInputByOutput" flags="nn" index="12$id9">
<child id="1229477520175" name="outputNode" index="12$y8L" />
</concept>
<concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
<concept id="1217026863835" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalInputModel" flags="nn" index="1st3f0" />
</language>
Expand Down Expand Up @@ -1813,11 +1817,15 @@
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
<node concept="3zFVjK" id="3RseghIc$Gx" role="3zH0cK">
<node concept="3clFbS" id="3RseghIc$Gy" role="2VODD2">
<node concept="3clFbF" id="3RseghIc$Gz" role="3cqZAp">
<node concept="2OqwBi" id="3RseghIc$G$" role="3clFbG">
<node concept="30H73N" id="3RseghIc$GA" role="2Oq$k0" />
<node concept="2qgKlT" id="6jiGbW_JG4W" role="2OqNvi">
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
<node concept="3clFbF" id="4XyruUDCSu7" role="3cqZAp">
<node concept="2YIFZM" id="4XyruUDCSw4" role="3clFbG">
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
<node concept="2OqwBi" id="3x8tM34lh5m" role="37wK5m">
<node concept="1iwH7S" id="3x8tM34lgEW" role="2Oq$k0" />
<node concept="12$id9" id="3x8tM34lhw7" role="2OqNvi">
<node concept="30H73N" id="3x8tM34lhx3" role="12$y8L" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -2214,12 +2222,16 @@
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
<node concept="3zFVjK" id="3DAECxG6qZ2" role="3zH0cK">
<node concept="3clFbS" id="3DAECxG6qZ3" role="2VODD2">
<node concept="3clFbF" id="3DAECxG6qZ4" role="3cqZAp">
<node concept="2OqwBi" id="3DAECxG6qZ5" role="3clFbG">
<node concept="2qgKlT" id="6jiGbW_GeII" role="2OqNvi">
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
<node concept="3clFbF" id="4XyruUDD3vA" role="3cqZAp">
<node concept="2YIFZM" id="4XyruUDD3vB" role="3clFbG">
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
<node concept="2OqwBi" id="3x8tM34ljkT" role="37wK5m">
<node concept="1iwH7S" id="3x8tM34ljkU" role="2Oq$k0" />
<node concept="12$id9" id="3x8tM34ljkV" role="2OqNvi">
<node concept="30H73N" id="3x8tM34ljkW" role="12$y8L" />
</node>
</node>
<node concept="30H73N" id="3DAECxG6qZ7" role="2Oq$k0" />
</node>
</node>
</node>
Expand Down Expand Up @@ -2463,12 +2475,16 @@
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
<node concept="3zFVjK" id="4vQSg$Ar7kk" role="3zH0cK">
<node concept="3clFbS" id="4vQSg$Ar7kl" role="2VODD2">
<node concept="3clFbF" id="4vQSg$Ar7km" role="3cqZAp">
<node concept="2OqwBi" id="6jiGbW_JP4$" role="3clFbG">
<node concept="2qgKlT" id="6jiGbW_JP4_" role="2OqNvi">
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
<node concept="3clFbF" id="4XyruUDD58s" role="3cqZAp">
<node concept="2YIFZM" id="4XyruUDD58t" role="3clFbG">
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
<node concept="2OqwBi" id="3x8tM34ljmY" role="37wK5m">
<node concept="1iwH7S" id="3x8tM34ljmZ" role="2Oq$k0" />
<node concept="12$id9" id="3x8tM34ljn0" role="2OqNvi">
<node concept="30H73N" id="3x8tM34ljn1" role="12$y8L" />
</node>
</node>
<node concept="30H73N" id="6jiGbW_JP4A" role="2Oq$k0" />
</node>
</node>
</node>
Expand Down Expand Up @@ -2630,11 +2646,15 @@
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
<node concept="3zFVjK" id="6jiGbW$Iwda" role="3zH0cK">
<node concept="3clFbS" id="6jiGbW$Iwdb" role="2VODD2">
<node concept="3clFbF" id="6jiGbW$Iwdc" role="3cqZAp">
<node concept="2OqwBi" id="6jiGbW$Iwdd" role="3clFbG">
<node concept="30H73N" id="6jiGbW$Iwdf" role="2Oq$k0" />
<node concept="2qgKlT" id="6jiGbW_GfZL" role="2OqNvi">
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
<node concept="3clFbF" id="4XyruUDD63o" role="3cqZAp">
<node concept="2YIFZM" id="4XyruUDD63p" role="3clFbG">
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
<node concept="2OqwBi" id="3x8tM34ljp0" role="37wK5m">
<node concept="1iwH7S" id="3x8tM34ljp1" role="2Oq$k0" />
<node concept="12$id9" id="3x8tM34ljp2" role="2OqNvi">
<node concept="30H73N" id="3x8tM34ljp3" role="12$y8L" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -2889,11 +2909,15 @@
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
<node concept="3zFVjK" id="519ky_SjBN$" role="3zH0cK">
<node concept="3clFbS" id="519ky_SjBN_" role="2VODD2">
<node concept="3clFbF" id="519ky_SjBNA" role="3cqZAp">
<node concept="2OqwBi" id="519ky_SjBNB" role="3clFbG">
<node concept="30H73N" id="519ky_SjBND" role="2Oq$k0" />
<node concept="2qgKlT" id="6jiGbW_JPNW" role="2OqNvi">
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
<node concept="3clFbF" id="4XyruUDD8JM" role="3cqZAp">
<node concept="2YIFZM" id="4XyruUDD8JN" role="3clFbG">
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
<node concept="2OqwBi" id="3x8tM34ll0u" role="37wK5m">
<node concept="1iwH7S" id="3x8tM34ll0v" role="2Oq$k0" />
<node concept="12$id9" id="3x8tM34ll0w" role="2OqNvi">
<node concept="30H73N" id="3x8tM34ll0x" role="12$y8L" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -3334,17 +3358,21 @@
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
<node concept="3zFVjK" id="3RseghIc$J6" role="3zH0cK">
<node concept="3clFbS" id="3RseghIc$J7" role="2VODD2">
<node concept="3clFbF" id="3RseghIc$J8" role="3cqZAp">
<node concept="2OqwBi" id="3RseghIc$J9" role="3clFbG">
<node concept="2OqwBi" id="3RseghIc$Ja" role="2Oq$k0">
<node concept="30H73N" id="3RseghIc$Jb" role="2Oq$k0" />
<node concept="3TrEf2" id="3RseghIc$Jc" role="2OqNvi">
<ref role="3Tt5mk" to="2c95:5yxqZJwzrde" resolve="image" />
<node concept="3clFbF" id="4XyruUDDddd" role="3cqZAp">
<node concept="2YIFZM" id="4XyruUDDdde" role="3clFbG">
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
<node concept="2OqwBi" id="3x8tM34lnfP" role="37wK5m">
<node concept="1iwH7S" id="3x8tM34lnfQ" role="2Oq$k0" />
<node concept="12$id9" id="3x8tM34lnfR" role="2OqNvi">
<node concept="2OqwBi" id="3x8tM34lnHj" role="12$y8L">
<node concept="30H73N" id="3x8tM34lnfS" role="2Oq$k0" />
<node concept="3TrEf2" id="3x8tM34lomB" role="2OqNvi">
<ref role="3Tt5mk" to="2c95:5yxqZJwzrde" resolve="image" />
</node>
</node>
</node>
</node>
<node concept="2qgKlT" id="6jiGbW_JQzP" role="2OqNvi">
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -3397,17 +3425,21 @@
<property role="P4ACc" value="f8f68d92-c6d2-44b3-8d63-c00ade75ec86/4457500422381364540/4457500422381364541" />
<node concept="3zFVjK" id="3RseghIc$I4" role="3zH0cK">
<node concept="3clFbS" id="3RseghIc$I5" role="2VODD2">
<node concept="3clFbF" id="3RseghIc$I6" role="3cqZAp">
<node concept="2OqwBi" id="6jiGbW_JQOA" role="3clFbG">
<node concept="2OqwBi" id="6jiGbW_JQOB" role="2Oq$k0">
<node concept="30H73N" id="6jiGbW_JQOC" role="2Oq$k0" />
<node concept="3TrEf2" id="6jiGbW_JQOD" role="2OqNvi">
<ref role="3Tt5mk" to="2c95:2TZO3DbvhAJ" resolve="target" />
<node concept="3clFbF" id="4XyruUDDhPN" role="3cqZAp">
<node concept="2YIFZM" id="4XyruUDDhPO" role="3clFbG">
<ref role="37wK5l" to="znf5:52iEUv_OK3m" resolve="getOriginalStableId" />
<ref role="1Pybhc" to="znf5:4XyruUDBFl$" resolve="DocGeneratorHelper" />
<node concept="2OqwBi" id="3x8tM34lqlV" role="37wK5m">
<node concept="1iwH7S" id="3x8tM34lqlW" role="2Oq$k0" />
<node concept="12$id9" id="3x8tM34lqlX" role="2OqNvi">
<node concept="2OqwBi" id="3x8tM34lqMs" role="12$y8L">
<node concept="30H73N" id="3x8tM34lqlY" role="2Oq$k0" />
<node concept="3TrEf2" id="3x8tM34lrcV" role="2OqNvi">
<ref role="3Tt5mk" to="2c95:2TZO3DbvhAJ" resolve="target" />
</node>
</node>
</node>
</node>
<node concept="2qgKlT" id="6jiGbW_JQOE" role="2OqNvi">
<ref role="37wK5l" to="4gky:6jiGbW_aIil" resolve="stableId" />
</node>
</node>
</node>
</node>
Expand Down
Loading