Skip to content

Commit fdc12ee

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1585 from JetBrains/merge/master
Merge maintenance/mps20251 into master
2 parents f2a3e3a + ff01c53 commit fdc12ee

File tree

4 files changed

+73
-138
lines changed

4 files changed

+73
-138
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
2020
- *de.itemis.mps.linenumbers* Line numbers are now rendered center-aligned in the left column.
2121
- Copying of custom cells and editors with custom swing components to plain text was improved.
2222
- *de.itemis.mps.compare* When the generation fails, the full log of the generation is now shown.
23+
- *de.itemis.mps.editor.math* Wrong layouting of some math cells was fixed.
2324

2425
### Changed
2526

‎code/math/solutions/de.itemis.mps.editor.math.runtime/de.itemis.mps.editor.math.runtime.msd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
2222
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
2323
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
24+
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
25+
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
2426
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
2527
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
2628
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />

‎code/math/solutions/de.itemis.mps.editor.math.runtime/models/de/itemis/mps/editor/math/runtime.mps‎

Lines changed: 36 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
1010
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
1111
<use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="-1" />
12+
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
13+
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
1214
</languages>
1315
<imports>
1416
<import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
@@ -288,10 +290,28 @@
288290
<child id="1199569916463" name="body" index="1bW5cS" />
289291
</concept>
290292
</language>
293+
<language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
294+
<concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
295+
<child id="5383422241790532083" name="tags" index="3nqlJM" />
296+
</concept>
297+
<concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
298+
<concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
299+
<child id="8970989240999019149" name="part" index="1dT_Ay" />
300+
</concept>
301+
<concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
302+
<child id="2667874559098216723" name="text" index="3HnX3l" />
303+
</concept>
304+
<concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
305+
<property id="8970989240999019144" name="text" index="1dT_AB" />
306+
</concept>
307+
</language>
291308
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
292309
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
293310
</language>
294311
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
312+
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
313+
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
314+
</concept>
295315
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
296316
<property id="1169194664001" name="name" index="TrG5h" />
297317
</concept>
@@ -6555,140 +6575,6 @@
65556575
<property role="DiZV1" value="false" />
65566576
<property role="od$2w" value="false" />
65576577
<node concept="3clFbS" id="1kQiixlxlkD" role="3clF47">
6558-
<node concept="3clFbJ" id="1kQiixlxlqh" role="3cqZAp">
6559-
<node concept="3clFbS" id="1kQiixlxlqi" role="3clFbx">
6560-
<node concept="3cpWs8" id="1kQiixlxmSZ" role="3cqZAp">
6561-
<node concept="3cpWsn" id="1kQiixlxmT0" role="3cpWs9">
6562-
<property role="TrG5h" value="collection" />
6563-
<node concept="3uibUv" id="1kQiixlxmT1" role="1tU5fm">
6564-
<ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
6565-
</node>
6566-
<node concept="10QFUN" id="1kQiixlxn5N" role="33vP2m">
6567-
<node concept="3uibUv" id="1kQiixlxn5S" role="10QFUM">
6568-
<ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
6569-
</node>
6570-
<node concept="37vLTw" id="1kQiixlxn5T" role="10QFUP">
6571-
<ref role="3cqZAo" node="1kQiixlxlo$" resolve="cell" />
6572-
</node>
6573-
</node>
6574-
</node>
6575-
</node>
6576-
<node concept="3cpWs8" id="1kQiixlxngk" role="3cqZAp">
6577-
<node concept="3cpWsn" id="1kQiixlxngl" role="3cpWs9">
6578-
<property role="TrG5h" value="layout" />
6579-
<node concept="3uibUv" id="1kQiixlxngm" role="1tU5fm">
6580-
<ref role="3uigEE" to="f4zo:~CellLayout" resolve="CellLayout" />
6581-
</node>
6582-
<node concept="2OqwBi" id="1kQiixlxnKy" role="33vP2m">
6583-
<node concept="37vLTw" id="1kQiixlxnpS" role="2Oq$k0">
6584-
<ref role="3cqZAo" node="1kQiixlxmT0" resolve="collection" />
6585-
</node>
6586-
<node concept="liA8E" id="1kQiixlxoAe" role="2OqNvi">
6587-
<ref role="37wK5l" to="f4zo:~EditorCell_Collection.getCellLayout()" resolve="getCellLayout" />
6588-
</node>
6589-
</node>
6590-
</node>
6591-
</node>
6592-
<node concept="3clFbJ" id="1kQiixlxoId" role="3cqZAp">
6593-
<node concept="3clFbS" id="1kQiixlxoIg" role="3clFbx">
6594-
<node concept="3cpWs8" id="1kQiixlxoSW" role="3cqZAp">
6595-
<node concept="3cpWsn" id="1kQiixlxoSZ" role="3cpWs9">
6596-
<property role="TrG5h" value="maxAccent" />
6597-
<node concept="10P55v" id="1kQiixlxoSV" role="1tU5fm" />
6598-
<node concept="3cmrfG" id="1kQiixlxp3r" role="33vP2m">
6599-
<property role="3cmrfH" value="0" />
6600-
</node>
6601-
</node>
6602-
</node>
6603-
<node concept="1DcWWT" id="1kQiixlxp7k" role="3cqZAp">
6604-
<node concept="3clFbS" id="1kQiixlxp7n" role="2LFqv$">
6605-
<node concept="3cpWs8" id="1kQiixlxpVh" role="3cqZAp">
6606-
<node concept="3cpWsn" id="1kQiixlxpVk" role="3cpWs9">
6607-
<property role="TrG5h" value="accent" />
6608-
<node concept="10P55v" id="1kQiixlxpVg" role="1tU5fm" />
6609-
<node concept="3cpWsd" id="1kQiixlxriK" role="33vP2m">
6610-
<node concept="2OqwBi" id="1kQiixlxrWB" role="3uHU7w">
6611-
<node concept="37vLTw" id="1kQiixlxryC" role="2Oq$k0">
6612-
<ref role="3cqZAo" node="1kQiixlxmT0" resolve="collection" />
6613-
</node>
6614-
<node concept="liA8E" id="1kQiixlxs_y" role="2OqNvi">
6615-
<ref role="37wK5l" to="f4zo:~EditorCell.getY()" resolve="getY" />
6616-
</node>
6617-
</node>
6618-
<node concept="3cpWs3" id="1kQiixlxq_X" role="3uHU7B">
6619-
<node concept="2OqwBi" id="1kQiixlxq73" role="3uHU7B">
6620-
<node concept="37vLTw" id="1kQiixlxq4b" role="2Oq$k0">
6621-
<ref role="3cqZAo" node="1kQiixlxp7q" resolve="child" />
6622-
</node>
6623-
<node concept="liA8E" id="1kQiixlxqk5" role="2OqNvi">
6624-
<ref role="37wK5l" to="f4zo:~EditorCell.getAscent()" resolve="getAscent" />
6625-
</node>
6626-
</node>
6627-
<node concept="2OqwBi" id="1kQiixlxqSN" role="3uHU7w">
6628-
<node concept="37vLTw" id="1kQiixlxqDi" role="2Oq$k0">
6629-
<ref role="3cqZAo" node="1kQiixlxp7q" resolve="child" />
6630-
</node>
6631-
<node concept="liA8E" id="1kQiixlxr10" role="2OqNvi">
6632-
<ref role="37wK5l" to="f4zo:~EditorCell.getY()" resolve="getY" />
6633-
</node>
6634-
</node>
6635-
</node>
6636-
</node>
6637-
</node>
6638-
</node>
6639-
<node concept="3clFbF" id="1kQiixlxsSJ" role="3cqZAp">
6640-
<node concept="37vLTI" id="1kQiixlxtiV" role="3clFbG">
6641-
<node concept="2YIFZM" id="1kQiixlxts0" role="37vLTx">
6642-
<ref role="37wK5l" to="wyt6:~Math.max(double,double)" resolve="max" />
6643-
<ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
6644-
<node concept="37vLTw" id="1kQiixlxtu9" role="37wK5m">
6645-
<ref role="3cqZAo" node="1kQiixlxoSZ" resolve="maxAccent" />
6646-
</node>
6647-
<node concept="37vLTw" id="1kQiixlxtAc" role="37wK5m">
6648-
<ref role="3cqZAo" node="1kQiixlxpVk" resolve="accent" />
6649-
</node>
6650-
</node>
6651-
<node concept="37vLTw" id="1kQiixlxsSI" role="37vLTJ">
6652-
<ref role="3cqZAo" node="1kQiixlxoSZ" resolve="maxAccent" />
6653-
</node>
6654-
</node>
6655-
</node>
6656-
</node>
6657-
<node concept="3cpWsn" id="1kQiixlxp7q" role="1Duv9x">
6658-
<property role="TrG5h" value="child" />
6659-
<node concept="3uibUv" id="1kQiixlxpma" role="1tU5fm">
6660-
<ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
6661-
</node>
6662-
</node>
6663-
<node concept="37vLTw" id="1kQiixlxpLc" role="1DdaDG">
6664-
<ref role="3cqZAo" node="1kQiixlxmT0" resolve="collection" />
6665-
</node>
6666-
</node>
6667-
<node concept="3cpWs6" id="1kQiixlxtYg" role="3cqZAp">
6668-
<node concept="37vLTw" id="1kQiixlxu_5" role="3cqZAk">
6669-
<ref role="3cqZAo" node="1kQiixlxoSZ" resolve="maxAccent" />
6670-
</node>
6671-
</node>
6672-
</node>
6673-
<node concept="2ZW3vV" id="1kQiixlxoNV" role="3clFbw">
6674-
<node concept="3uibUv" id="1kQiixlxoQt" role="2ZW6by">
6675-
<ref role="3uigEE" to="kcid:~CellLayout_Indent" resolve="CellLayout_Indent" />
6676-
</node>
6677-
<node concept="37vLTw" id="1kQiixlxoLm" role="2ZW6bz">
6678-
<ref role="3cqZAo" node="1kQiixlxngl" resolve="layout" />
6679-
</node>
6680-
</node>
6681-
</node>
6682-
</node>
6683-
<node concept="2ZW3vV" id="1kQiixlxlrB" role="3clFbw">
6684-
<node concept="3uibUv" id="1kQiixlxlKe" role="2ZW6by">
6685-
<ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
6686-
</node>
6687-
<node concept="37vLTw" id="1kQiixlxlqH" role="2ZW6bz">
6688-
<ref role="3cqZAo" node="1kQiixlxlo$" resolve="cell" />
6689-
</node>
6690-
</node>
6691-
</node>
66926578
<node concept="3cpWs6" id="1kQiixlxlti" role="3cqZAp">
66936579
<node concept="2OqwBi" id="1kQiixlxlwS" role="3cqZAk">
66946580
<node concept="37vLTw" id="1kQiixlxluV" role="2Oq$k0">
@@ -6708,6 +6594,18 @@
67086594
</node>
67096595
<node concept="10P55v" id="1kQiixlxlov" role="3clF45" />
67106596
<node concept="3Tm1VV" id="1kQiixlxlkC" role="1B3o_S" />
6597+
<node concept="P$JXv" id="2XNvtWZ6SkO" role="lGtFl">
6598+
<node concept="TZ5HI" id="2XNvtWZ6SkP" role="3nqlJM">
6599+
<node concept="TZ5HA" id="2XNvtWZ6SkQ" role="3HnX3l">
6600+
<node concept="1dT_AC" id="2XNvtWZ6TLe" role="1dT_Ay">
6601+
<property role="1dT_AB" value="call getAscent() directly on the editorCell" />
6602+
</node>
6603+
</node>
6604+
</node>
6605+
</node>
6606+
<node concept="2AHcQZ" id="2XNvtWZ6SkR" role="2AJF6D">
6607+
<ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
6608+
</node>
67116609
</node>
67126610
<node concept="3Tm1VV" id="70CVChR8Ul8" role="1B3o_S" />
67136611
</node>
@@ -11312,6 +11210,10 @@
1131211210
<node concept="3Tm1VV" id="4r1mNB_YJjH" role="1B3o_S" />
1131311211
<node concept="3clFbS" id="4r1mNB_YJjI" role="3clF47" />
1131411212
</node>
11213+
<node concept="3Tm1VV" id="7UiI8Oo6H1T" role="1B3o_S" />
11214+
<node concept="3uibUv" id="7UiI8OodCZO" role="3HQHJm">
11215+
<ref role="3uigEE" node="7UiI8OodC$4" resolve="ILayoutableSymbol" />
11216+
</node>
1131511217
<node concept="3clFb_" id="inTShgXupP" role="jymVt">
1131611218
<property role="TrG5h" value="renderText" />
1131711219
<node concept="3clFbS" id="inTShgXupS" role="3clF47">
@@ -11330,10 +11232,6 @@
1133011232
</node>
1133111233
<node concept="2JFqV2" id="inTShh5Fds" role="2frcjj" />
1133211234
</node>
11333-
<node concept="3Tm1VV" id="7UiI8Oo6H1T" role="1B3o_S" />
11334-
<node concept="3uibUv" id="7UiI8OodCZO" role="3HQHJm">
11335-
<ref role="3uigEE" node="7UiI8OodC$4" resolve="ILayoutableSymbol" />
11336-
</node>
1133711235
</node>
1133811236
<node concept="312cEu" id="7UiI8Oo6H83">
1133911237
<property role="TrG5h" value="AbstractMathSymbol" />

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,40 @@
619619
<property role="3oM_SC" value="shown." />
620620
</node>
621621
</node>
622+
<node concept="2DRihI" id="6njDQ_YyuNo" role="15bAlk">
623+
<node concept="15Ami3" id="6njDQ_YyuNt" role="1PaTwD">
624+
<node concept="37shsh" id="6njDQ_YyuNu" role="15Aodc">
625+
<node concept="1dCxOk" id="6njDQ_YyuNv" role="37shsm">
626+
<property role="1XweGW" value="766348f7-6a67-4b85-9323-384840132299" />
627+
<property role="1XxBO9" value="de.itemis.mps.editor.math" />
628+
</node>
629+
</node>
630+
</node>
631+
<node concept="3oM_SD" id="6njDQ_YyuNw" role="1PaTwD">
632+
<property role="3oM_SC" value="Wrong" />
633+
</node>
634+
<node concept="3oM_SD" id="6njDQ_YyuNx" role="1PaTwD">
635+
<property role="3oM_SC" value="layouting" />
636+
</node>
637+
<node concept="3oM_SD" id="6njDQ_YyuNy" role="1PaTwD">
638+
<property role="3oM_SC" value="of" />
639+
</node>
640+
<node concept="3oM_SD" id="6njDQ_YyuNz" role="1PaTwD">
641+
<property role="3oM_SC" value="some" />
642+
</node>
643+
<node concept="3oM_SD" id="6njDQ_YyuN$" role="1PaTwD">
644+
<property role="3oM_SC" value="math" />
645+
</node>
646+
<node concept="3oM_SD" id="6njDQ_YyuN_" role="1PaTwD">
647+
<property role="3oM_SC" value="cells" />
648+
</node>
649+
<node concept="3oM_SD" id="6njDQ_YyuNA" role="1PaTwD">
650+
<property role="3oM_SC" value="was" />
651+
</node>
652+
<node concept="3oM_SD" id="6njDQ_YyuNB" role="1PaTwD">
653+
<property role="3oM_SC" value="fixed." />
654+
</node>
655+
</node>
622656
</node>
623657
<node concept="15bAme" id="7wH7VDSCZqv" role="15bAlL">
624658
<property role="15bAli" value="Po4Z58tnOF/changed" />

0 commit comments

Comments
 (0)