Skip to content

Merge maintenance/mps20243 into master #1108

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
mps-ci-buildbot merged 15 commits into from
Dec 18, 2024
Merged

Merge maintenance/mps20243 into master #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2c8a00a
fix(treenotation): overlapping buttons
slisson Dec 13, 2024
69f8028
mpsutil.intentions: rewrite code to use the intention menu producer
Dec 15, 2024
d39ceae
Merge pull request #1096 from JetBrains/bugfix/intention_meniu_producer
Dec 15, 2024
32a49fa
editor.dropdown: improve border color and arrow drawing
Dec 15, 2024
12af958
Merge pull request #1098 from JetBrains/bugfix/dropdown_better_arrow
Dec 15, 2024
a4ab1ca
editor.diagram: keep the fitted layout in the PortLayouter
Dec 17, 2024
f9c73d8
Merge pull request #1102 from JetBrains/bugfix/more_stable_port_layou…
Dec 17, 2024
c4350fb
fix resolve infos
Dec 18, 2024
9eff993
Merge pull request #1095 from JetBrains/bugfix/treenotation-overlappi…
slisson Dec 18, 2024
3ff09a1
Merge remote-tracking branch 'refs/remotes/origin/maintenance/mps2024…
Dec 18, 2024
f5729d2
add a dependency from shadowmodels to blutil
Dec 18, 2024
dffff8e
mpsutil.intentions: remove an unnecessary overwritten method
Dec 18, 2024
70da8fb
force save all
Dec 18, 2024
c30911e
Merge pull request #1097 from JetBrains/merge/mps20241
mps-ci-buildbot Dec 18, 2024
42350f2
Merge pull request #1107 from JetBrains/merge/mps20243
mps-ci-buildbot Dec 18, 2024
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
23 changes: 23 additions & 0 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9912,6 +9912,9 @@
<node concept="m$_yC" id="5U8hsWC7jgn" role="m$_yJ">
<ref role="m$_y1" node="5U8hsWC762L" resolve="org.modelix.model.api" />
</node>
<node concept="m$_yC" id="494a_O9Mc4K" role="m$_yJ">
<ref role="m$_y1" node="2NyZxKpUXYJ" resolve="de.itemis.mps.blutil" />
</node>
</node>
<node concept="m$_wf" id="2OJNL7ElZsF" role="3989C9">
<property role="m$_wk" value="de.q60.mps.collections.libs" />
Expand Down Expand Up @@ -14331,6 +14334,26 @@
<ref role="3bR37D" to="ffeo:7Kfy9QB6L7y" resolve="jetbrains.mps.lang.intentions" />
</node>
</node>
<node concept="1SiIV0" id="2jDew6504Tc" role="3bR37C">
<node concept="3bR9La" id="2jDew6504Td" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
<node concept="1SiIV0" id="2jDew6504Te" role="3bR37C">
<node concept="3bR9La" id="2jDew6504Tf" role="1SiIV1">
<ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
</node>
</node>
<node concept="1SiIV0" id="2jDew6504Tg" role="3bR37C">
<node concept="3bR9La" id="2jDew6504Th" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
</node>
</node>
<node concept="1SiIV0" id="2jDew6504Ti" role="3bR37C">
<node concept="3bR9La" id="2jDew6504Tj" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
</node>
</node>
<node concept="m$_wf" id="hCVXosGNJH" role="3989C9">
Expand Down
104 changes: 80 additions & 24 deletions ....itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11696,7 +11696,7 @@
<node concept="3clFbF" id="1tbbSi4Sn63" role="3cqZAp">
<node concept="2YIFZM" id="1tbbSi4SnNC" role="3clFbG">
<ref role="1Pybhc" node="3FRjz$vys4Z" resolve="PortLayouter" />
<ref role="37wK5l" node="2BjZSlQJ_ry" resolve="layoutPortCells" />
<ref role="37wK5l" node="6O6KyRn8ret" resolve="layoutPortCells" />
<node concept="1eOMI4" id="1tbbSi4SoFi" role="37wK5m">
<node concept="10QFUN" id="1tbbSi4SoFh" role="1eOMHV">
<node concept="37vLTw" id="1tbbSi4SoFg" role="10QFUP">
Expand All @@ -11707,6 +11707,7 @@
</node>
</node>
</node>
<node concept="3clFbT" id="6O6KyRn9RFZ" role="37wK5m" />
</node>
</node>
</node>
Expand Down Expand Up @@ -108854,6 +108855,9 @@
</node>
<node concept="liA8E" id="3FRjz$vGeTq" role="2OqNvi">
<ref role="37wK5l" node="3FRjz$vyxaH" resolve="layoutPortCells" />
<node concept="3clFbT" id="6O6KyRn8AIg" role="37wK5m">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -108881,41 +108885,75 @@
<property role="DiZV1" value="false" />
<property role="od$2w" value="false" />
<node concept="3clFbS" id="2BjZSlQJ_rz" role="3clF47">
<node concept="3clFbF" id="2BjZSlQJ_r$" role="3cqZAp">
<node concept="2OqwBi" id="2BjZSlQJ_r_" role="3clFbG">
<node concept="2ShNRf" id="2BjZSlQJ_rA" role="2Oq$k0">
<node concept="1pGfFk" id="2BjZSlQJ_rB" role="2ShVmc">
<node concept="3clFbF" id="6O6KyRn8CWl" role="3cqZAp">
<node concept="1rXfSq" id="6O6KyRn8CWk" role="3clFbG">
<ref role="37wK5l" node="6O6KyRn8ret" resolve="layoutPortCells" />
<node concept="37vLTw" id="6O6KyRn8D7Y" role="37wK5m">
<ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
</node>
<node concept="3clFbT" id="6O6KyRnsXRn" role="37wK5m">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
</node>
<node concept="37vLTG" id="2BjZSlQJ_rI" role="3clF46">
<property role="TrG5h" value="parentCell" />
<node concept="3uibUv" id="xqQxwszNam" role="1tU5fm">
<ref role="3uigEE" node="f4v_NgJPyX" resolve="BoxDCell" />
</node>
</node>
<node concept="3cqZAl" id="2BjZSlQJ_rK" role="3clF45" />
<node concept="3Tm1VV" id="2BjZSlQJ_rL" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="6O6KyRn8req" role="jymVt" />
<node concept="2YIFZL" id="6O6KyRn8ret" role="jymVt">
<property role="TrG5h" value="layoutPortCells" />
<property role="DiZV1" value="false" />
<property role="od$2w" value="false" />
<node concept="3clFbS" id="6O6KyRn8reu" role="3clF47">
<node concept="3clFbF" id="6O6KyRn8rev" role="3cqZAp">
<node concept="2OqwBi" id="6O6KyRn8rew" role="3clFbG">
<node concept="2ShNRf" id="6O6KyRn8rex" role="2Oq$k0">
<node concept="1pGfFk" id="6O6KyRn8rey" role="2ShVmc">
<ref role="37wK5l" node="3FRjz$vyT_L" resolve="PortLayouter" />
<node concept="2OqwBi" id="xqQxwsKNoj" role="37wK5m">
<node concept="2OqwBi" id="2BjZSlQJDBi" role="2Oq$k0">
<node concept="37vLTw" id="2BjZSlQJD$H" role="2Oq$k0">
<ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
<node concept="2OqwBi" id="6O6KyRn8rez" role="37wK5m">
<node concept="2OqwBi" id="6O6KyRn8re$" role="2Oq$k0">
<node concept="37vLTw" id="6O6KyRn8re_" role="2Oq$k0">
<ref role="3cqZAo" node="6O6KyRn8reF" resolve="parentCell" />
</node>
<node concept="liA8E" id="2BjZSlQJDKg" role="2OqNvi">
<node concept="liA8E" id="6O6KyRn8reA" role="2OqNvi">
<ref role="37wK5l" node="xqQxwsyFUA" resolve="getPorts" />
</node>
</node>
<node concept="ANE8D" id="xqQxwsKP5t" role="2OqNvi" />
<node concept="ANE8D" id="6O6KyRn8reB" role="2OqNvi" />
</node>
<node concept="37vLTw" id="2BjZSlQJ_rD" role="37wK5m">
<ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
<node concept="37vLTw" id="6O6KyRn8reC" role="37wK5m">
<ref role="3cqZAo" node="6O6KyRn8reF" resolve="parentCell" />
</node>
</node>
</node>
<node concept="liA8E" id="2BjZSlQJ_rE" role="2OqNvi">
<node concept="liA8E" id="6O6KyRn8reD" role="2OqNvi">
<ref role="37wK5l" node="3FRjz$vyxaH" resolve="layoutPortCells" />
<node concept="37vLTw" id="6O6KyRn8reE" role="37wK5m">
<ref role="3cqZAo" node="6O6KyRn8reH" resolve="keepFittedSize" />
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTG" id="2BjZSlQJ_rI" role="3clF46">
<node concept="37vLTG" id="6O6KyRn8reF" role="3clF46">
<property role="TrG5h" value="parentCell" />
<node concept="3uibUv" id="xqQxwszNam" role="1tU5fm">
<node concept="3uibUv" id="6O6KyRn8reG" role="1tU5fm">
<ref role="3uigEE" node="f4v_NgJPyX" resolve="BoxDCell" />
</node>
</node>
<node concept="3cqZAl" id="2BjZSlQJ_rK" role="3clF45" />
<node concept="3Tm1VV" id="2BjZSlQJ_rL" role="1B3o_S" />
<node concept="37vLTG" id="6O6KyRn8reH" role="3clF46">
<property role="TrG5h" value="keepFittedSize" />
<node concept="10P_77" id="6O6KyRn8reI" role="1tU5fm" />
</node>
<node concept="3cqZAl" id="6O6KyRn8reJ" role="3clF45" />
<node concept="3Tm1VV" id="6O6KyRn8reK" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="3FRjz$vz2gC" role="jymVt" />
<node concept="312cEg" id="3FRjz$vyOx4" role="jymVt">
Expand Down Expand Up @@ -109223,6 +109261,9 @@
<node concept="3clFbF" id="61tQzM6bsb0" role="3cqZAp">
<node concept="1rXfSq" id="61tQzM6bsaY" role="3clFbG">
<ref role="37wK5l" node="61tQzM6beoK" resolve="doLayoutPorts" />
<node concept="37vLTw" id="6O6KyRniKhD" role="37wK5m">
<ref role="3cqZAo" node="6O6KyRniB6Z" resolve="keepFittedSize" />
</node>
</node>
</node>
<node concept="3clFbF" id="147Asf0q3OA" role="3cqZAp">
Expand All @@ -109236,6 +109277,10 @@
</node>
</node>
</node>
<node concept="37vLTG" id="6O6KyRniB6Z" role="3clF46">
<property role="TrG5h" value="keepFittedSize" />
<node concept="10P_77" id="6O6KyRniB6Y" role="1tU5fm" />
</node>
</node>
<node concept="2tJIrI" id="61tQzM672xv" role="jymVt" />
<node concept="3clFb_" id="61tQzM6beoK" role="jymVt">
Expand Down Expand Up @@ -109597,18 +109642,29 @@
</node>
</node>
</node>
<node concept="3fqX7Q" id="5eqlYwi$jmV" role="3clFbw">
<node concept="2OqwBi" id="5eqlYwi$pVU" role="3fr31v">
<node concept="37vLTw" id="5eqlYwi$nel" role="2Oq$k0">
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
<node concept="1Wc70l" id="6O6KyRnYdHB" role="3clFbw">
<node concept="3fqX7Q" id="6O6KyRnYse6" role="3uHU7w">
<node concept="37vLTw" id="6O6KyRnYse8" role="3fr31v">
<ref role="3cqZAo" node="6O6KyRniNzy" resolve="keepFittedSize" />
</node>
<node concept="liA8E" id="5eqlYwi$vZ_" role="2OqNvi">
<ref role="37wK5l" node="5eqlYwiatMq" resolve="containsSubdiagram" />
</node>
<node concept="3fqX7Q" id="5eqlYwi$jmV" role="3uHU7B">
<node concept="2OqwBi" id="5eqlYwi$pVU" role="3fr31v">
<node concept="37vLTw" id="5eqlYwi$nel" role="2Oq$k0">
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
</node>
<node concept="liA8E" id="5eqlYwi$vZ_" role="2OqNvi">
<ref role="37wK5l" node="5eqlYwiatMq" resolve="containsSubdiagram" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTG" id="6O6KyRniNzy" role="3clF46">
<property role="TrG5h" value="keepFittedSize" />
<node concept="10P_77" id="6O6KyRniWxY" role="1tU5fm" />
</node>
</node>
<node concept="2tJIrI" id="61tQzM6bcoE" role="jymVt" />
<node concept="312cEg" id="67wtfYkgacz" role="jymVt">
Expand Down
4 changes: 4 additions & 0 deletions ...tionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
<dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
<dependency reexport="false">b92f861d-0184-446d-b88b-6dcf0e070241(com.mbeddr.mpsutil.intentions)</dependency>
<dependency reexport="false">d7a92d38-f7db-40d0-8431-763b0c3c9f20(jetbrains.mps.lang.intentions)</dependency>
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
<dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
</dependencies>
<languageVersions>
<language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" version="0" />
Expand Down
Loading
Loading