Skip to content

Commit

Permalink
Merge branch 'maintenance/mps20222' into feature/ifInstanceOf_with_el…
Browse files Browse the repository at this point in the history 
…se_block_2022.2
  • Loading branch information
@alexanderpann
alexanderpann authored Feb 13, 2024
2 parents f3d6378 + aa2d7a8 commit 2cffe18
Show file tree
Hide file tree
Showing 5 changed files with 188 additions and 67 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented

### Fixed

- de.itemis.mps.editor.diagram: Avoid unnecessary layouting of sub-diagrams.
- de.itemis.mps.editor.diagram: A layouting bug related to ports was fixed.

## January 2024
Expand Down
120 changes: 101 additions & 19 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 @@ -10023,6 +10023,17 @@
<node concept="37vLTw" id="4MPZfBDWkga" role="37wK5m">
<ref role="3cqZAo" node="4KKQOHIOec7" resolve="myGraph" />
</node>
<node concept="3y3z36" id="4msYRQGsvaq" role="37wK5m">
<node concept="2OqwBi" id="2u7UHDFa8G7" role="3uHU7B">
<node concept="37vLTw" id="2u7UHDFa8G8" role="2Oq$k0">
<ref role="3cqZAo" node="6rrvvVe3kzu" resolve="dmodel" />
</node>
<node concept="liA8E" id="2u7UHDFa8G9" role="2OqNvi">
<ref role="37wK5l" to="nkm5:6rrvvVdEqoK" resolve="getParentModel" />
</node>
</node>
<node concept="10Nm6u" id="2u7UHDFa8G6" role="3uHU7w" />
</node>
</node>
</node>
<node concept="liA8E" id="4MPZfBDJaV7" role="2OqNvi">
Expand Down Expand Up @@ -93444,7 +93455,12 @@
<ref role="3uigEE" node="190K99KhFiz" resolve="MyGraph" />
</node>
</node>
<node concept="2tJIrI" id="4MPZfBDPCdi" role="jymVt" />
<node concept="312cEg" id="2u7UHDF9$tT" role="jymVt">
<property role="TrG5h" value="isSubDiagram" />
<node concept="10P_77" id="2u7UHDF9z_A" role="1tU5fm" />
<node concept="3clFbT" id="2u7UHDF9_TS" role="33vP2m" />
</node>
<node concept="2tJIrI" id="2u7UHDF9xqt" role="jymVt" />
<node concept="3clFbW" id="4MPZfBDPDaX" role="jymVt">
<node concept="3cqZAl" id="4MPZfBDPDaY" role="3clF45" />
<node concept="3Tm1VV" id="4MPZfBDPDaZ" role="1B3o_S" />
Expand All @@ -93459,13 +93475,30 @@
</node>
</node>
</node>
<node concept="3clFbF" id="2u7UHDF9ByW" role="3cqZAp">
<node concept="37vLTI" id="2u7UHDF9CB1" role="3clFbG">
<node concept="37vLTw" id="2u7UHDF9D81" role="37vLTx">
<ref role="3cqZAo" node="2u7UHDF9_W9" resolve="topMost" />
</node>
<node concept="2OqwBi" id="2u7UHDF9BGn" role="37vLTJ">
<node concept="Xjq3P" id="2u7UHDF9ByU" role="2Oq$k0" />
<node concept="2OwXpG" id="2u7UHDF9C7R" role="2OqNvi">
<ref role="2Oxat6" node="2u7UHDF9$tT" resolve="topMost" />
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTG" id="4MPZfBDPDb4" role="3clF46">
<property role="TrG5h" value="graph" />
<node concept="3uibUv" id="4MPZfBDPDb3" role="1tU5fm">
<ref role="3uigEE" node="190K99KhFiz" resolve="MyGraph" />
</node>
</node>
<node concept="37vLTG" id="2u7UHDF9_W9" role="3clF46">
<property role="TrG5h" value="isSubDiagram" />
<node concept="10P_77" id="2u7UHDF9A_U" role="1tU5fm" />
</node>
</node>
<node concept="2tJIrI" id="4MPZfBDPCQj" role="jymVt" />
<node concept="3clFb_" id="4MPZfBDJeqZ" role="jymVt">
Expand Down Expand Up @@ -94083,30 +94116,79 @@
</node>
</node>
<node concept="3clFbH" id="6aI3wo9DsN2" role="3cqZAp" />
<node concept="3clFbJ" id="6aI3wo9DsUH" role="3cqZAp">
<node concept="3clFbS" id="6aI3wo9DsUJ" role="3clFbx">
<node concept="3clFbF" id="6aI3wo9DEnn" role="3cqZAp">
<node concept="1rXfSq" id="6aI3wo9DEnl" role="3clFbG">
<ref role="37wK5l" node="6aI3wo9DuFT" resolve="processSubECell" />
<node concept="1eOMI4" id="6aI3wo9DEoc" role="37wK5m">
<node concept="10QFUN" id="6aI3wo9DEo9" role="1eOMHV">
<node concept="3uibUv" id="6aI3wo9DEoe" role="10QFUM">
<ref role="3uigEE" node="5S8_I2FXUUF" resolve="SubDiagramECell" />
</node>
<node concept="37vLTw" id="6aI3wo9DEof" role="10QFUP">
<ref role="3cqZAo" node="6aI3wo9DjKJ" resolve="ecell" />
<node concept="3clFbJ" id="2u7UHDF9FgJ" role="3cqZAp">
<node concept="3clFbS" id="2u7UHDF9FgL" role="3clFbx">
<node concept="3SKdUt" id="4msYRQGsPbP" role="3cqZAp">
<node concept="1PaTwC" id="4msYRQGsPbQ" role="1aUNEU">
<node concept="3oM_SD" id="4msYRQGsPG3" role="1PaTwD">
<property role="3oM_SC" value="for" />
</node>
<node concept="3oM_SD" id="4msYRQGsPG5" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="4msYRQGsPG8" role="1PaTwD">
<property role="3oM_SC" value="top" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGc" role="1PaTwD">
<property role="3oM_SC" value="diagram" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGh" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGn" role="1PaTwD">
<property role="3oM_SC" value="layout" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGu" role="1PaTwD">
<property role="3oM_SC" value="is" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGA" role="1PaTwD">
<property role="3oM_SC" value="ran" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGJ" role="1PaTwD">
<property role="3oM_SC" value="recursively" />
</node>
<node concept="3oM_SD" id="4msYRQGsPHD" role="1PaTwD">
<property role="3oM_SC" value="to" />
</node>
<node concept="3oM_SD" id="4msYRQGsPHO" role="1PaTwD">
<property role="3oM_SC" value="all" />
</node>
<node concept="3oM_SD" id="4msYRQGsPI0" role="1PaTwD">
<property role="3oM_SC" value="sub-diagrams" />
</node>
</node>
</node>
<node concept="3clFbJ" id="6aI3wo9DsUH" role="3cqZAp">
<node concept="3clFbS" id="6aI3wo9DsUJ" role="3clFbx">
<node concept="3clFbF" id="6aI3wo9DEnn" role="3cqZAp">
<node concept="1rXfSq" id="6aI3wo9DEnl" role="3clFbG">
<ref role="37wK5l" node="6aI3wo9DuFT" resolve="processSubECell" />
<node concept="1eOMI4" id="6aI3wo9DEoc" role="37wK5m">
<node concept="10QFUN" id="6aI3wo9DEo9" role="1eOMHV">
<node concept="3uibUv" id="6aI3wo9DEoe" role="10QFUM">
<ref role="3uigEE" node="5S8_I2FXUUF" resolve="SubDiagramECell" />
</node>
<node concept="37vLTw" id="6aI3wo9DEof" role="10QFUP">
<ref role="3cqZAo" node="6aI3wo9DjKJ" resolve="ecell" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2ZW3vV" id="6aI3wo9DsZv" role="3clFbw">
<node concept="3uibUv" id="6aI3wo9Dtve" role="2ZW6by">
<ref role="3uigEE" node="5S8_I2FXUUF" resolve="SubDiagramECell" />
</node>
<node concept="37vLTw" id="6aI3wo9DsXu" role="2ZW6bz">
<ref role="3cqZAo" node="6aI3wo9DjKJ" resolve="ecell" />
</node>
</node>
</node>
</node>
<node concept="2ZW3vV" id="6aI3wo9DsZv" role="3clFbw">
<node concept="3uibUv" id="6aI3wo9Dtve" role="2ZW6by">
<ref role="3uigEE" node="5S8_I2FXUUF" resolve="SubDiagramECell" />
</node>
<node concept="37vLTw" id="6aI3wo9DsXu" role="2ZW6bz">
<ref role="3cqZAo" node="6aI3wo9DjKJ" resolve="ecell" />
<node concept="3fqX7Q" id="4msYRQGsN1N" role="3clFbw">
<node concept="37vLTw" id="4msYRQGsN1P" role="3fr31v">
<ref role="3cqZAo" node="2u7UHDF9$tT" resolve="isSubDiagram" />
</node>
</node>
</node>
Expand Down
33 changes: 10 additions & 23 deletions ...olutions/de.itemis.mps.selection.runtime/models/de/itemis/mps/selection/runtime/mouse.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" implicit="true" />
<import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" implicit="true" />
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
Expand Down Expand Up @@ -98,6 +97,7 @@
</concept>
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
<concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
Expand Down Expand Up @@ -209,9 +209,6 @@
</concept>
<concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
</language>
<language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
<concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
</language>
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
<child id="1199569906740" name="parameter" index="1bW2Oz" />
Expand Down Expand Up @@ -2634,28 +2631,18 @@
</node>
</node>
<node concept="1Wc70l" id="630t2b8eeIY" role="3clFbw">
<node concept="3clFbC" id="630t2b8eeIZ" role="3uHU7w">
<node concept="2EnYce" id="630t2b8eeJ0" role="3uHU7w">
<node concept="2OqwBi" id="1k1VwvtQHgN" role="2Oq$k0">
<node concept="37vLTw" id="1k1VwvtQHgO" role="2Oq$k0">
<ref role="3cqZAo" node="630t2b8eeIF" resolve="toNode" />
</node>
<node concept="2NL2c5" id="1k1VwvtQHgP" role="2OqNvi" />
</node>
<node concept="liA8E" id="1k1VwvtQHgQ" role="2OqNvi">
<ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
<node concept="17R0WA" id="3oJDVADAKcB" role="3uHU7w">
<node concept="2OqwBi" id="3oJDVADAKcC" role="3uHU7B">
<node concept="37vLTw" id="3oJDVADAKcD" role="2Oq$k0">
<ref role="3cqZAo" node="630t2b8eeI_" resolve="fromNode" />
</node>
<node concept="2NL2c5" id="3oJDVADAKcE" role="2OqNvi" />
</node>
<node concept="2EnYce" id="630t2b8eeJ3" role="3uHU7B">
<node concept="2OqwBi" id="1k1VwvtQHgS" role="2Oq$k0">
<node concept="37vLTw" id="1k1VwvtQHgT" role="2Oq$k0">
<ref role="3cqZAo" node="630t2b8eeI_" resolve="fromNode" />
</node>
<node concept="2NL2c5" id="1k1VwvtQHgU" role="2OqNvi" />
</node>
<node concept="liA8E" id="1k1VwvtQHgV" role="2OqNvi">
<ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
<node concept="2OqwBi" id="3oJDVADAKcF" role="3uHU7w">
<node concept="37vLTw" id="3oJDVADAKcG" role="2Oq$k0">
<ref role="3cqZAo" node="630t2b8eeIF" resolve="toNode" />
</node>
<node concept="2NL2c5" id="3oJDVADAKcH" role="2OqNvi" />
</node>
</node>
<node concept="1Wc70l" id="630t2b8eeJ6" role="3uHU7B">
Expand Down
52 changes: 52 additions & 0 deletions .../com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
<import index="yyf4" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.util(MPS.OpenAPI/)" />
<import index="mmaq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.jdom(MPS.Core/)" />
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
<import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
<import index="9ti4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.extensions(MPS.IDEA/)" implicit="true" />
</imports>
<registry>
<language id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection">
Expand Down Expand Up @@ -7002,6 +7004,32 @@
</node>
</node>
</node>
<node concept="3clFbF" id="56aJbp3MbDG" role="3cqZAp">
<node concept="2OqwBi" id="56aJbp3MtJb" role="3clFbG">
<node concept="2OqwBi" id="56aJbp3MhDc" role="2Oq$k0">
<node concept="10M0yZ" id="56aJbp3MecH" role="2Oq$k0">
<ref role="1PxDUh" to="k21q:~AbstractProjectViewPane" resolve="AbstractProjectViewPane" />
<ref role="3cqZAo" to="k21q:~AbstractProjectViewPane.EP" resolve="EP" />
</node>
<node concept="liA8E" id="56aJbp3Ml$n" role="2OqNvi">
<ref role="37wK5l" to="9ti4:~ProjectExtensionPointName.getPoint(com.intellij.openapi.extensions.AreaInstance)" resolve="getPoint" />
<node concept="37vLTw" id="56aJbp3M_t4" role="37wK5m">
<ref role="3cqZAo" node="2ZGhpRffcqr" resolve="ideaProject" />
</node>
</node>
</node>
<node concept="liA8E" id="56aJbp3MCHq" role="2OqNvi">
<ref role="37wK5l" to="9ti4:~ExtensionPoint.registerExtension(java.lang.Object,com.intellij.openapi.Disposable)" resolve="registerExtension" />
<node concept="37vLTw" id="56aJbp3N5pS" role="37wK5m">
<ref role="3cqZAo" node="VPgi8etJvN" resolve="pane" />
</node>
<node concept="2YIFZM" id="56aJbp3NULh" role="37wK5m">
<ref role="1Pybhc" to="zn9m:~Disposer" resolve="Disposer" />
<ref role="37wK5l" to="zn9m:~Disposer.newDisposable()" resolve="newDisposable" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -7047,6 +7075,7 @@
</node>
</node>
</node>
<node concept="3clFbH" id="56aJbp3NqF8" role="3cqZAp" />
<node concept="3clFbF" id="25jQj6XP1zC" role="3cqZAp">
<node concept="2OqwBi" id="25jQj6XP2uo" role="3clFbG">
<node concept="3EllGN" id="25jQj6XP2dw" role="2Oq$k0">
Expand Down Expand Up @@ -7127,6 +7156,29 @@
</node>
</node>
</node>
<node concept="3clFbF" id="56aJbp3NtF5" role="3cqZAp">
<node concept="2OqwBi" id="56aJbp3NtF6" role="3clFbG">
<node concept="2OqwBi" id="56aJbp3NtF7" role="2Oq$k0">
<node concept="10M0yZ" id="56aJbp3NtF8" role="2Oq$k0">
<ref role="1PxDUh" to="k21q:~AbstractProjectViewPane" resolve="AbstractProjectViewPane" />
<ref role="3cqZAo" to="k21q:~AbstractProjectViewPane.EP" resolve="EP" />
</node>
<node concept="liA8E" id="56aJbp3NtF9" role="2OqNvi">
<ref role="37wK5l" to="9ti4:~ProjectExtensionPointName.getPoint(com.intellij.openapi.extensions.AreaInstance)" resolve="getPoint" />
<node concept="37vLTw" id="56aJbp3NtFa" role="37wK5m">
<ref role="3cqZAo" node="VPgi8eujhM" resolve="ideaProject" />
</node>
</node>
</node>
<node concept="liA8E" id="56aJbp3NtFb" role="2OqNvi">
<ref role="37wK5l" to="9ti4:~ExtensionPoint.unregisterExtension(java.lang.Object)" resolve="unregisterExtension" />
<node concept="37vLTw" id="56aJbp3NtFc" role="37wK5m">
<ref role="3cqZAo" node="VPgi8eujhx" resolve="pane" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="56aJbp3PsVr" role="3cqZAp" />
<node concept="3clFbF" id="6B7erwvFIwS" role="3cqZAp">
<node concept="2OqwBi" id="6B7erwvFIGa" role="3clFbG">
<node concept="37vLTw" id="6B7erwvFIwQ" role="2Oq$k0">
Expand Down
Loading

0 comments on commit 2cffe18

Please sign in to comment.