Skip to content

Commit

Permalink
Merge pull request #1175 from JetBrains/merge/mps20241
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20232 into maintenance/mps20241
  • Loading branch information
@mps-ci-buildbot
mps-ci-buildbot authored Mar 4, 2025
2 parents c8b9f18 + 6c11fd7 commit 5f98f05
Show file tree
Hide file tree
Showing 4 changed files with 149 additions and 52 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## March 2025

### Fixed

- *de.itemis.mps.editor.diagram*: An issue was fixed where edges of sub-diagrams where not correctly displayed when the diagram was first opened

## January 2025

### Fixed
Expand Down
101 changes: 56 additions & 45 deletions ....itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7919,42 +7919,6 @@
</node>
</node>
</node>
<node concept="1Wc70l" id="4KKQOHIOebF" role="3clFbw">
<node concept="3clFbC" id="4KKQOHIOebO" role="3uHU7B">
<node concept="2OqwBi" id="4KKQOHIOebP" role="3uHU7B">
<node concept="37vLTw" id="4KKQOHIOebQ" role="2Oq$k0">
<ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
</node>
<node concept="2OwXpG" id="4KKQOHIOebR" role="2OqNvi">
<ref role="2Oxat6" node="4KKQOHIOecd" resolve="myCurrentDirection" />
</node>
</node>
<node concept="Rm8GO" id="4KKQOHIOebS" role="3uHU7w">
<ref role="1Px2BO" node="4KKQOHIOeoe" resolve="JGraphModelSynchronizer.SyncDirection" />
<ref role="Rm8GQ" node="4KKQOHIOeof" resolve="GRAPH2MODEL" />
</node>
</node>
<node concept="3clFbC" id="4KKQOHIOebG" role="3uHU7w">
<node concept="2OqwBi" id="4KKQOHIOebI" role="3uHU7B">
<node concept="1eOMI4" id="4KKQOHIOebJ" role="2Oq$k0">
<node concept="10QFUN" id="4KKQOHIOebK" role="1eOMHV">
<node concept="3uibUv" id="4KKQOHIOebL" role="10QFUM">
<ref role="3uigEE" to="99ht:~mxGraphModel" resolve="mxGraphModel" />
</node>
<node concept="37vLTw" id="4KKQOHIOebM" role="10QFUP">
<ref role="3cqZAo" node="4KKQOHIOebq" resolve="sender" />
</node>
</node>
</node>
<node concept="liA8E" id="4KKQOHIOebN" role="2OqNvi">
<ref role="37wK5l" to="99ht:~mxGraphModel.getUpdateLevel()" resolve="getUpdateLevel" />
</node>
</node>
<node concept="3cmrfG" id="4KKQOHIOebH" role="3uHU7w">
<property role="3cmrfH" value="0" />
</node>
</node>
</node>
<node concept="3eNFk2" id="1UvgBlYJrSk" role="3eNLev">
<node concept="1Wc70l" id="1UvgBlYN1jd" role="3eO9$A">
<node concept="3clFbC" id="1UvgBlYK4HB" role="3uHU7B">
Expand Down Expand Up @@ -8131,6 +8095,42 @@
</node>
</node>
</node>
<node concept="1Wc70l" id="4KKQOHIOebF" role="3clFbw">
<node concept="3clFbC" id="4KKQOHIOebO" role="3uHU7B">
<node concept="2OqwBi" id="4KKQOHIOebP" role="3uHU7B">
<node concept="37vLTw" id="4KKQOHIOebQ" role="2Oq$k0">
<ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
</node>
<node concept="2OwXpG" id="4KKQOHIOebR" role="2OqNvi">
<ref role="2Oxat6" node="4KKQOHIOecd" resolve="myCurrentDirection" />
</node>
</node>
<node concept="Rm8GO" id="4KKQOHIOebS" role="3uHU7w">
<ref role="1Px2BO" node="4KKQOHIOeoe" resolve="JGraphModelSynchronizer.SyncDirection" />
<ref role="Rm8GQ" node="4KKQOHIOeof" resolve="GRAPH2MODEL" />
</node>
</node>
<node concept="3clFbC" id="4KKQOHIOebG" role="3uHU7w">
<node concept="2OqwBi" id="4KKQOHIOebI" role="3uHU7B">
<node concept="1eOMI4" id="4KKQOHIOebJ" role="2Oq$k0">
<node concept="10QFUN" id="4KKQOHIOebK" role="1eOMHV">
<node concept="3uibUv" id="4KKQOHIOebL" role="10QFUM">
<ref role="3uigEE" to="99ht:~mxGraphModel" resolve="mxGraphModel" />
</node>
<node concept="37vLTw" id="4KKQOHIOebM" role="10QFUP">
<ref role="3cqZAo" node="4KKQOHIOebq" resolve="sender" />
</node>
</node>
</node>
<node concept="liA8E" id="4KKQOHIOebN" role="2OqNvi">
<ref role="37wK5l" to="99ht:~mxGraphModel.getUpdateLevel()" resolve="getUpdateLevel" />
</node>
</node>
<node concept="3cmrfG" id="4KKQOHIOebH" role="3uHU7w">
<property role="3cmrfH" value="0" />
</node>
</node>
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -13385,6 +13385,21 @@
</node>
</node>
<node concept="3clFbH" id="5S8_I2GS8wk" role="3cqZAp" />
<node concept="3clFbF" id="7Px_cmtYPBn" role="3cqZAp">
<node concept="1rXfSq" id="7Px_cmtYPBo" role="3clFbG">
<ref role="37wK5l" node="1FlH1cKdtR4" resolve="model2graphPorts" />
<node concept="37vLTw" id="7Px_cmtYPBp" role="37wK5m">
<ref role="3cqZAo" node="1O5GA4gqRtN" resolve="dcell" />
</node>
<node concept="37vLTw" id="7Px_cmtYPBq" role="37wK5m">
<ref role="3cqZAo" node="4KKQOHIOelW" resolve="box" />
</node>
<node concept="37vLTw" id="7Px_cmtYPBr" role="37wK5m">
<ref role="3cqZAo" node="1O5GA4gfk56" resolve="syncContext" />
</node>
</node>
</node>
<node concept="3clFbH" id="7Px_cmtYKgA" role="3cqZAp" />
<node concept="2Gpval" id="6OP6SOH_zdO" role="3cqZAp">
<node concept="2GrKxI" id="6OP6SOH_zdQ" role="2Gsz3X">
<property role="TrG5h" value="subdiagram" />
Expand Down Expand Up @@ -13630,17 +13645,13 @@
</node>
<node concept="3clFbH" id="1HjGWYx6LQF" role="3cqZAp" />
<node concept="3clFbF" id="2Q7VE3OLTDg" role="3cqZAp">
<node concept="1rXfSq" id="2Q7VE3OLTDh" role="3clFbG">
<ref role="37wK5l" node="1FlH1cKdtR4" resolve="model2graphPorts" />
<node concept="37vLTw" id="2Q7VE3OLVzX" role="37wK5m">
<node concept="2YIFZM" id="7Px_cmu3fAV" role="3clFbG">
<ref role="1Pybhc" node="3FRjz$vys4Z" resolve="PortLayouter" />
<ref role="37wK5l" node="6O6KyRn8ret" resolve="layoutPortCells" />
<node concept="37vLTw" id="7Px_cmu49ug" role="37wK5m">
<ref role="3cqZAo" node="1O5GA4gqRtN" resolve="dcell" />
</node>
<node concept="37vLTw" id="2Q7VE3OLVDN" role="37wK5m">
<ref role="3cqZAo" node="4KKQOHIOelW" resolve="box" />
</node>
<node concept="37vLTw" id="2Q7VE3OLTDk" role="37wK5m">
<ref role="3cqZAo" node="1O5GA4gfk56" resolve="syncContext" />
</node>
<node concept="3clFbT" id="7Px_cmu3fB0" role="37wK5m" />
</node>
</node>
</node>
Expand Down
15 changes: 8 additions & 7 deletions ....itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1106,6 +1106,7 @@
<node concept="sE7Ow" id="2THfnm7nq5w">
<property role="TrG5h" value="Diagram_FlipPortsSideHorizontally" />
<property role="2uzpH1" value="Diagram: Flip All Port's Side Horizontally" />
<property role="2YLI8m" value="6u2MFnph2yk/editorCommand" />
<node concept="tnohg" id="2THfnm7nq5x" role="tncku">
<node concept="3clFbS" id="2THfnm7nq5y" role="2VODD2">
<node concept="3cpWs8" id="2THfnm7nq5z" role="3cqZAp">
Expand Down Expand Up @@ -1326,7 +1327,7 @@
<node concept="sE7Ow" id="5IQEFjDErcz">
<property role="TrG5h" value="Diagram_FitSizeAll" />
<property role="2uzpH1" value="Diagram: Fit Size on Selected Boxes" />
<property role="2YLI8m" value="6u2MFnph2wS/none" />
<property role="2YLI8m" value="6u2MFnph2yk/editorCommand" />
<property role="1rBW0U" value="true" />
<node concept="tnohg" id="5IQEFjDErc$" role="tncku">
<node concept="3clFbS" id="5IQEFjDErc_" role="2VODD2">
Expand Down Expand Up @@ -1375,8 +1376,7 @@
<node concept="sE7Ow" id="5IQEFjDGFIZ">
<property role="TrG5h" value="Diagram_Autolayout" />
<property role="2uzpH1" value="Diagram: Auto Layout Diagram" />
<property role="2YLI8m" value="6u2MFnph2wS/none" />
<property role="1rBW0U" value="true" />
<property role="2YLI8m" value="6u2MFnph2yk/editorCommand" />
<node concept="tnohg" id="5IQEFjDGFJ0" role="tncku">
<node concept="3clFbS" id="5IQEFjDGFJ1" role="2VODD2">
<node concept="3clFbF" id="YGA9S5V9kG" role="3cqZAp">
Expand Down Expand Up @@ -2081,7 +2081,7 @@
<node concept="sE7Ow" id="5IQEFjDH2SU">
<property role="TrG5h" value="Diagram_FitSizeAndAutolayout" />
<property role="2uzpH1" value="Diagram: Fit Size on Selected Boxes and Run Layouter" />
<property role="2YLI8m" value="6u2MFnph2wS/none" />
<property role="2YLI8m" value="6u2MFnph2yk/editorCommand" />
<property role="1rBW0U" value="true" />
<node concept="tnohg" id="5IQEFjDH2SV" role="tncku">
<node concept="3clFbS" id="5IQEFjDH2SW" role="2VODD2">
Expand Down Expand Up @@ -2142,7 +2142,7 @@
<node concept="sE7Ow" id="5q$QTTw90T$">
<property role="TrG5h" value="Diagram_ZoomIn" />
<property role="2uzpH1" value="Diagram: Zoom In" />
<property role="1rBW0U" value="true" />
<property role="2YLI8m" value="6u2MFnph2yk/editorCommand" />
<node concept="1DS2jV" id="5q$QTTw90UX" role="1NuT2Z">
<property role="TrG5h" value="editorContext" />
<ref role="1DUlNI" to="k3nr:~MPSEditorDataKeys.EDITOR_CONTEXT" resolve="EDITOR_CONTEXT" />
Expand Down Expand Up @@ -2187,7 +2187,7 @@
<node concept="sE7Ow" id="7tfNqqCmxXm">
<property role="TrG5h" value="Diagram_ZoomOut" />
<property role="2uzpH1" value="Diagram: Zoom Out" />
<property role="1rBW0U" value="true" />
<property role="2YLI8m" value="6u2MFnph2yk/editorCommand" />
<node concept="1DS2jV" id="7tfNqqCmxXL" role="1NuT2Z">
<property role="TrG5h" value="editorContext" />
<ref role="1DUlNI" to="k3nr:~MPSEditorDataKeys.EDITOR_CONTEXT" resolve="EDITOR_CONTEXT" />
Expand Down Expand Up @@ -2298,7 +2298,7 @@
<node concept="sE7Ow" id="1VCXHWuhkT$">
<property role="TrG5h" value="Diagram_SelectAll" />
<property role="2uzpH1" value="Diagram: Select All" />
<property role="2YLI8m" value="6u2MFnph2wS/none" />
<property role="2YLI8m" value="6u2MFnph2yk/editorCommand" />
<node concept="1DS2jV" id="1VCXHWuhvDd" role="1NuT2Z">
<property role="TrG5h" value="editorContext" />
<ref role="1DUlNI" to="k3nr:~MPSEditorDataKeys.EDITOR_CONTEXT" resolve="EDITOR_CONTEXT" />
Expand Down Expand Up @@ -2343,6 +2343,7 @@
<node concept="sE7Ow" id="YGA9S6m0pQ">
<property role="TrG5h" value="Diagram_FlipPortsSideVertically" />
<property role="2uzpH1" value="Diagram: Flip All Port's Side Vertically" />
<property role="2YLI8m" value="6u2MFnph2yk/editorCommand" />
<node concept="tnohg" id="YGA9S6m0pR" role="tncku">
<node concept="3clFbS" id="YGA9S6m0pS" role="2VODD2">
<node concept="3cpWs8" id="YGA9S6m0pT" role="3cqZAp">
Expand Down
79 changes: 79 additions & 0 deletions ...olutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,85 @@
<property role="TrG5h" value="Changelog" />
<property role="15SkSo" value="Po4Z58IlRA/monthYear" />
<property role="2hl1$G" value="md" />
<node concept="15bmVD" id="7Px_cmus87G" role="15bmVC">
<node concept="15ShDW" id="7Px_cmus87D" role="15bq2Y">
<property role="15ShDY" value="Po4Z58IgAp/March" />
<property role="15ShDw" value="2025" />
</node>
<node concept="15bAme" id="7Px_cmus87E" role="15bAlL">
<node concept="2DRihI" id="7Px_cmus87F" role="15bAlk">
<node concept="2hgSXJ" id="7Px_cmus87T" role="1PaTwD">
<node concept="1PaTwC" id="7Px_cmus87U" role="2hiFM$">
<node concept="15Ami3" id="7Px_cmus87V" role="1PaTwD">
<node concept="37shsh" id="7Px_cmus87W" role="15Aodc">
<node concept="1dCxOk" id="7Px_cmus87X" 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="7Px_cmus87Y" role="1PaTwD">
<property role="3oM_SC" value=":" />
</node>
</node>
</node>
<node concept="3oM_SD" id="7Px_cmus883" role="1PaTwD">
<property role="3oM_SC" value="An" />
</node>
<node concept="3oM_SD" id="7Px_cmus884" role="1PaTwD">
<property role="3oM_SC" value="issue" />
</node>
<node concept="3oM_SD" id="7Px_cmus885" role="1PaTwD">
<property role="3oM_SC" value="was" />
</node>
<node concept="3oM_SD" id="7Px_cmus886" role="1PaTwD">
<property role="3oM_SC" value="fixed" />
</node>
<node concept="3oM_SD" id="7Px_cmus887" role="1PaTwD">
<property role="3oM_SC" value="where" />
</node>
<node concept="3oM_SD" id="7Px_cmus888" role="1PaTwD">
<property role="3oM_SC" value="edges" />
</node>
<node concept="3oM_SD" id="7Px_cmus889" role="1PaTwD">
<property role="3oM_SC" value="of" />
</node>
<node concept="3oM_SD" id="7Px_cmus88a" role="1PaTwD">
<property role="3oM_SC" value="sub-diagrams" />
</node>
<node concept="3oM_SD" id="7Px_cmus88b" role="1PaTwD">
<property role="3oM_SC" value="where" />
</node>
<node concept="3oM_SD" id="7Px_cmus88c" role="1PaTwD">
<property role="3oM_SC" value="not" />
</node>
<node concept="3oM_SD" id="7Px_cmus88d" role="1PaTwD">
<property role="3oM_SC" value="correctly" />
</node>
<node concept="3oM_SD" id="7Px_cmus88e" role="1PaTwD">
<property role="3oM_SC" value="displayed" />
</node>
<node concept="3oM_SD" id="7Px_cmus88f" role="1PaTwD">
<property role="3oM_SC" value="when" />
</node>
<node concept="3oM_SD" id="7Px_cmus88g" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="7Px_cmus88h" role="1PaTwD">
<property role="3oM_SC" value="diagram" />
</node>
<node concept="3oM_SD" id="7Px_cmus88i" role="1PaTwD">
<property role="3oM_SC" value="was" />
</node>
<node concept="3oM_SD" id="7Px_cmus88j" role="1PaTwD">
<property role="3oM_SC" value="first" />
</node>
<node concept="3oM_SD" id="7Px_cmus88k" role="1PaTwD">
<property role="3oM_SC" value="opened" />
</node>
</node>
</node>
</node>
<node concept="15bmVD" id="1HjGWYxfrII" role="15bmVC">
<node concept="15ShDW" id="1HjGWYxfrIF" role="15bq2Y">
<property role="15ShDY" value="Po4Z58IgAl/January" />
Expand Down

0 comments on commit 5f98f05

Please sign in to comment.