Skip to content

Commit 2f8d52a

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1659 from JetBrains/merge/master
Merge maintenance/mps20251 into master
2 parents d4ea6b8 + 1da4fbd commit 2f8d52a

File tree

13 files changed

+3485
-2072
lines changed

13 files changed

+3485
-2072
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
66

77
## November 2025
88

9+
### Added
10+
11+
- *de.itemis.mps.editor.diagram.runtime* Add an experimental static flag to disable autolayout-on-init. Useful for batch autolayouting.
12+
913
### Fixed
1014

1115
- *de.slisson.mps.tables* IllegalArgumentException thrown when copy-paste support is not defined for a table node (#1650).
1216
- *de.slisson.mps.tables* Textgen warning about duplicate unit name when an editor model contains multiple tables without an action map.
1317
- *de.itemis.mps.editor.pagination* A NullPointerException was fixed for cases where the clicked node was null.
18+
- *de.itemis.mps.spellcheck* Custom dictionaries are not saved in the .mps/dictionaries/project.xml files anymore and pollute the file that is normally used for words saved manually by the user.
1419

1520
## October 2025
1621

‎code/.mps/dictionaries/project.xml‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9986,18 +9986,13 @@
99869986
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
99879987
</node>
99889988
</node>
9989-
<node concept="1SiIV0" id="5Jv8_iJO19f" role="3bR37C">
9990-
<node concept="3bR9La" id="5Jv8_iJO19g" role="1SiIV1">
9991-
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
9992-
</node>
9993-
</node>
99949989
<node concept="1SiIV0" id="Guk09KIEVR" role="3bR37C">
99959990
<node concept="3bR9La" id="Guk09KIEVS" role="1SiIV1">
99969991
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
99979992
</node>
99989993
</node>
9999-
<node concept="1SiIV0" id="BlBNLZwmLB" role="3bR37C">
10000-
<node concept="3bR9La" id="BlBNLZwmLC" role="1SiIV1">
9994+
<node concept="1SiIV0" id="4yWnwrWM$vf" role="3bR37C">
9995+
<node concept="3bR9La" id="4yWnwrWM$vg" role="1SiIV1">
100019996
<ref role="3bR37D" to="ffeo:6k1uIrxXxBO" resolve="jetbrains.mps.spellchecker.idea.stubs" />
100029997
</node>
100039998
</node>
@@ -10010,23 +10005,24 @@
1001010005
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
1001110006
</node>
1001210007
</node>
10013-
<node concept="1SiIV0" id="5Jv8_iJO199" role="3bR37C">
10014-
<node concept="Rbm2T" id="5Jv8_iJO19a" role="1SiIV1">
10015-
<ref role="1E1Vl2" to="ffeo:7Kfy9QB6L8K" resolve="jetbrains.mps.lang.plugin" />
10016-
</node>
10017-
</node>
1001810008
<node concept="1SiIV0" id="5Jv8_iJO19b" role="3bR37C">
1001910009
<node concept="Rbm2T" id="5Jv8_iJO19c" role="1SiIV1">
1002010010
<ref role="1E1Vl2" to="ffeo:2eDSGe9d1pJ" resolve="jetbrains.mps.lang.plugin.standalone" />
1002110011
</node>
1002210012
</node>
10013+
<node concept="1SiIV0" id="6zQhlqNEZYE" role="3bR37C">
10014+
<node concept="3bR9La" id="6zQhlqNEZYF" role="1SiIV1">
10015+
<property role="3bR36h" value="true" />
10016+
<ref role="3bR37D" to="ffeo:3SKb_4JujfJ" resolve="jetbrains.mps.editor.spellcheck" />
10017+
</node>
10018+
</node>
1002310019
<node concept="1SiIV0" id="Guk09KIEVE" role="3bR37C">
1002410020
<node concept="3bR9La" id="Guk09KIEVF" role="1SiIV1">
1002510021
<ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
1002610022
</node>
1002710023
</node>
10028-
<node concept="1SiIV0" id="BlBNLZwmLq" role="3bR37C">
10029-
<node concept="3bR9La" id="BlBNLZwmLr" role="1SiIV1">
10024+
<node concept="1SiIV0" id="4yWnwrWM$v2" role="3bR37C">
10025+
<node concept="3bR9La" id="4yWnwrWM$v3" role="1SiIV1">
1003010026
<ref role="3bR37D" to="ffeo:6k1uIrxXxBO" resolve="jetbrains.mps.spellchecker.idea.stubs" />
1003110027
</node>
1003210028
</node>
@@ -10124,8 +10120,8 @@
1012410120
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
1012510121
</node>
1012610122
</node>
10127-
<node concept="1SiIV0" id="7gY7BQcwjPt" role="3bR37C">
10128-
<node concept="3bR9La" id="7gY7BQcwjPu" role="1SiIV1">
10123+
<node concept="1SiIV0" id="4yWnwrWLoks" role="3bR37C">
10124+
<node concept="3bR9La" id="4yWnwrWLokt" role="1SiIV1">
1012910125
<ref role="3bR37D" to="ffeo:6k1uIrxXxBO" resolve="jetbrains.mps.spellchecker.idea.stubs" />
1013010126
</node>
1013110127
</node>

‎code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps‎

Lines changed: 143 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -561,17 +561,31 @@
561561
</concept>
562562
</language>
563563
<language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
564+
<concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
565+
<concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
566+
<reference id="6832197706140518108" name="param" index="zr_51" />
567+
</concept>
564568
<concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
565569
<child id="8465538089690331502" name="body" index="TZ5H$" />
566570
<child id="5383422241790532083" name="tags" index="3nqlJM" />
567571
</concept>
568572
<concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
573+
<concept id="8465538089690881930" name="jetbrains.mps.baseLanguage.javadoc.structure.ParameterBlockDocTag" flags="ng" index="TUZQ0">
574+
<property id="8465538089690881934" name="text" index="TUZQ4" />
575+
<child id="6832197706140518123" name="parameter" index="zr_5Q" />
576+
</concept>
569577
<concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
570578
<child id="8970989240999019149" name="part" index="1dT_Ay" />
571579
</concept>
572580
<concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
573581
<child id="2667874559098216723" name="text" index="3HnX3l" />
574582
</concept>
583+
<concept id="2217234381367049075" name="jetbrains.mps.baseLanguage.javadoc.structure.CodeInlineDocTag" flags="ng" index="VVOAv">
584+
<child id="3106559687488741665" name="line" index="2Xj1qM" />
585+
</concept>
586+
<concept id="8970989240999019145" name="jetbrains.mps.baseLanguage.javadoc.structure.InlineTagCommentLinePart" flags="ng" index="1dT_AA">
587+
<child id="6962838954693749192" name="tag" index="qph3F" />
588+
</concept>
575589
<concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
576590
<property id="8970989240999019144" name="text" index="1dT_AB" />
577591
</concept>
@@ -1815,22 +1829,28 @@
18151829
</node>
18161830
</node>
18171831
</node>
1818-
<node concept="1Wc70l" id="45g3j8ig9Q0" role="3clFbw">
1819-
<node concept="2OqwBi" id="apJ4OPRaw4" role="3uHU7B">
1820-
<node concept="2OqwBi" id="apJ4OPOBNj" role="2Oq$k0">
1821-
<node concept="37vLTw" id="apJ4OPOB4K" role="2Oq$k0">
1822-
<ref role="3cqZAo" node="2ujdR6vx99S" resolve="node" />
1823-
</node>
1824-
<node concept="3CFZ6_" id="apJ4OPODML" role="2OqNvi">
1825-
<node concept="3CFYIy" id="apJ4OPOGy9" role="3CFYIz">
1826-
<ref role="3CFYIx" to="suqv:7L$rKAVfLie" resolve="LayoutMap" />
1832+
<node concept="1Wc70l" id="70jf6EckOtU" role="3clFbw">
1833+
<node concept="10M0yZ" id="70jf6EcluBR" role="3uHU7w">
1834+
<ref role="3cqZAo" node="2NK7RZ3folA" resolve="enableAutoLayoutOnInit" />
1835+
<ref role="1PxDUh" node="2NK7RZ3fioq" resolve="DiagramControls" />
1836+
</node>
1837+
<node concept="1Wc70l" id="45g3j8ig9Q0" role="3uHU7B">
1838+
<node concept="2OqwBi" id="apJ4OPRaw4" role="3uHU7B">
1839+
<node concept="2OqwBi" id="apJ4OPOBNj" role="2Oq$k0">
1840+
<node concept="37vLTw" id="apJ4OPOB4K" role="2Oq$k0">
1841+
<ref role="3cqZAo" node="2ujdR6vx99S" resolve="node" />
1842+
</node>
1843+
<node concept="3CFZ6_" id="apJ4OPODML" role="2OqNvi">
1844+
<node concept="3CFYIy" id="apJ4OPOGy9" role="3CFYIz">
1845+
<ref role="3CFYIx" to="suqv:7L$rKAVfLie" resolve="LayoutMap" />
1846+
</node>
18271847
</node>
18281848
</node>
1849+
<node concept="3w_OXm" id="apJ4OPRebI" role="2OqNvi" />
1850+
</node>
1851+
<node concept="37vLTw" id="45g3j8igcwp" role="3uHU7w">
1852+
<ref role="3cqZAo" node="45g3j8i6y_n" resolve="runLayouter" />
18291853
</node>
1830-
<node concept="3w_OXm" id="apJ4OPRebI" role="2OqNvi" />
1831-
</node>
1832-
<node concept="37vLTw" id="45g3j8igcwp" role="3uHU7w">
1833-
<ref role="3cqZAo" node="45g3j8i6y_n" resolve="runLayouter" />
18341854
</node>
18351855
</node>
18361856
</node>
@@ -152658,5 +152678,115 @@
152658152678
</node>
152659152679
</node>
152660152680
</node>
152681+
<node concept="312cEu" id="2NK7RZ3fioq">
152682+
<property role="TrG5h" value="DiagramControls" />
152683+
<node concept="Wx3nA" id="2NK7RZ3folA" role="jymVt">
152684+
<property role="TrG5h" value="enableAutoLayoutOnInit" />
152685+
<node concept="3Tm1VV" id="70jf6Echtow" role="1B3o_S" />
152686+
<node concept="10P_77" id="2NK7RZ3fols" role="1tU5fm" />
152687+
<node concept="3clFbT" id="70jf6Eclyjj" role="33vP2m">
152688+
<property role="3clFbU" value="true" />
152689+
</node>
152690+
</node>
152691+
<node concept="2tJIrI" id="2NK7RZ3folO" role="jymVt" />
152692+
<node concept="2YIFZL" id="2NK7RZ3fpGx" role="jymVt">
152693+
<property role="TrG5h" value="runWithoutAutoLayoutOnInit" />
152694+
<node concept="3clFbS" id="2NK7RZ3fpG$" role="3clF47">
152695+
<node concept="3cpWs8" id="2NK7RZ3fHrv" role="3cqZAp">
152696+
<node concept="3cpWsn" id="2NK7RZ3fHry" role="3cpWs9">
152697+
<property role="TrG5h" value="oldValue" />
152698+
<property role="3TUv4t" value="true" />
152699+
<node concept="10P_77" id="2NK7RZ3fHru" role="1tU5fm" />
152700+
<node concept="37vLTw" id="2NK7RZ3fHSM" role="33vP2m">
152701+
<ref role="3cqZAo" node="2NK7RZ3folA" resolve="enableAutoLayoutOnInit" />
152702+
</node>
152703+
</node>
152704+
</node>
152705+
<node concept="3J1_TO" id="2NK7RZ3fIoy" role="3cqZAp">
152706+
<node concept="3clFbS" id="2NK7RZ3fIo$" role="1zxBo7">
152707+
<node concept="3clFbF" id="2NK7RZ3fJ2R" role="3cqZAp">
152708+
<node concept="37vLTI" id="2NK7RZ3fLA7" role="3clFbG">
152709+
<node concept="3clFbT" id="2NK7RZ3fM32" role="37vLTx" />
152710+
<node concept="37vLTw" id="2NK7RZ3fJ2P" role="37vLTJ">
152711+
<ref role="3cqZAo" node="2NK7RZ3folA" resolve="enableAutoLayoutOnInit" />
152712+
</node>
152713+
</node>
152714+
</node>
152715+
<node concept="3clFbF" id="2NK7RZ3fOnX" role="3cqZAp">
152716+
<node concept="2OqwBi" id="2NK7RZ3fOT9" role="3clFbG">
152717+
<node concept="37vLTw" id="2NK7RZ3fOnV" role="2Oq$k0">
152718+
<ref role="3cqZAo" node="2NK7RZ3fqnT" resolve="runnable" />
152719+
</node>
152720+
<node concept="liA8E" id="2NK7RZ3fQPX" role="2OqNvi">
152721+
<ref role="37wK5l" to="wyt6:~Runnable.run()" resolve="run" />
152722+
</node>
152723+
</node>
152724+
</node>
152725+
</node>
152726+
<node concept="1wplmZ" id="2NK7RZ3fM3T" role="1zxBo6">
152727+
<node concept="3clFbS" id="2NK7RZ3fM3U" role="1wplMD">
152728+
<node concept="3clFbF" id="2NK7RZ3fMH9" role="3cqZAp">
152729+
<node concept="37vLTI" id="2NK7RZ3fMPc" role="3clFbG">
152730+
<node concept="37vLTw" id="2NK7RZ3fN47" role="37vLTx">
152731+
<ref role="3cqZAo" node="2NK7RZ3fHry" resolve="oldValue" />
152732+
</node>
152733+
<node concept="37vLTw" id="2NK7RZ3fMH8" role="37vLTJ">
152734+
<ref role="3cqZAo" node="2NK7RZ3folA" resolve="enableAutoLayoutOnInit" />
152735+
</node>
152736+
</node>
152737+
</node>
152738+
</node>
152739+
</node>
152740+
</node>
152741+
</node>
152742+
<node concept="3Tm1VV" id="2NK7RZ3foQm" role="1B3o_S" />
152743+
<node concept="3cqZAl" id="2NK7RZ3fpGl" role="3clF45" />
152744+
<node concept="37vLTG" id="2NK7RZ3fqnT" role="3clF46">
152745+
<property role="TrG5h" value="runnable" />
152746+
<node concept="3uibUv" id="2NK7RZ3fqnS" role="1tU5fm">
152747+
<ref role="3uigEE" to="wyt6:~Runnable" resolve="Runnable" />
152748+
</node>
152749+
</node>
152750+
<node concept="P$JXv" id="2NK7RZ3fqoO" role="lGtFl">
152751+
<node concept="TZ5HA" id="2NK7RZ3fqoP" role="TZ5H$">
152752+
<node concept="1dT_AC" id="2NK7RZ3fqoQ" role="1dT_Ay">
152753+
<property role="1dT_AB" value="Run " />
152754+
</node>
152755+
<node concept="1dT_AA" id="2NK7RZ3fqpo" role="1dT_Ay">
152756+
<node concept="VVOAv" id="2NK7RZ3fqpq" role="qph3F">
152757+
<node concept="TZ5HA" id="2NK7RZ3fqps" role="2Xj1qM">
152758+
<node concept="1dT_AC" id="2NK7RZ3fqpI" role="1dT_Ay">
152759+
<property role="1dT_AB" value="runnable" />
152760+
</node>
152761+
</node>
152762+
</node>
152763+
</node>
152764+
<node concept="1dT_AC" id="2NK7RZ3fqpn" role="1dT_Ay">
152765+
<property role="1dT_AB" value=" with 'autolayout on init', 'fit to size on init', etc. disabled. This is useful in headless" />
152766+
</node>
152767+
</node>
152768+
<node concept="TZ5HA" id="70jf6EciJsy" role="TZ5H$">
152769+
<node concept="1dT_AC" id="70jf6EciJsz" role="1dT_Ay">
152770+
<property role="1dT_AB" value="batch scenarios where multiple diagrams are being laid out. Since 'autolayout on init' is asynchronous, it would" />
152771+
</node>
152772+
</node>
152773+
<node concept="TZ5HA" id="70jf6EciJvA" role="TZ5H$">
152774+
<node concept="1dT_AC" id="70jf6EciJvB" role="1dT_Ay">
152775+
<property role="1dT_AB" value="interfere with the batch task." />
152776+
</node>
152777+
</node>
152778+
<node concept="TUZQ0" id="2NK7RZ3fqoR" role="3nqlJM">
152779+
<property role="TUZQ4" value="code to run" />
152780+
<node concept="zr_55" id="2NK7RZ3fqoT" role="zr_5Q">
152781+
<ref role="zr_51" node="2NK7RZ3fqnT" resolve="runnable" />
152782+
</node>
152783+
</node>
152784+
</node>
152785+
</node>
152786+
<node concept="3Tm1VV" id="2NK7RZ3fior" role="1B3o_S" />
152787+
<node concept="2AHcQZ" id="70jf6Ecn8Ru" role="2AJF6D">
152788+
<ref role="2AI5Lk" to="mhfm:~ApiStatus$Experimental" resolve="ApiStatus.Experimental" />
152789+
</node>
152790+
</node>
152661152791
</model>
152662152792

0 commit comments

Comments
 (0)