Skip to content

Commit 3e4143f

Browse files
author
Alexander Pann
authored
Merge pull request #1176 from IETS3/bugfix/use_indent_layout_when_possible
2 parents 0e062e5 + 4605d10 commit 3e4143f

File tree

51 files changed

+1163
-1094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1163
-1094
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
55
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
77

8+
## December 2024
9+
10+
### Changed
11+
12+
- The line wrapping ability of some concepts was improved.
13+
814
## November 2024
915

1016
### Fixed

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
2121
<child id="1140524464360" name="cellLayout" index="2czzBx" />
2222
</concept>
23-
<concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
2423
<concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
2524
<concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
2625
<concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
@@ -202,7 +201,7 @@
202201
<property role="VOm3f" value="true" />
203202
</node>
204203
</node>
205-
<node concept="2iRfu4" id="2GQBRFCFw0_" role="2iSdaV" />
204+
<node concept="l2Vlx" id="1ASK_Hec6P6" role="2iSdaV" />
206205
<node concept="pkWqt" id="2ZalWa8IziB" role="pqm2j">
207206
<node concept="3clFbS" id="2ZalWa8IziC" role="2VODD2">
208207
<node concept="3clFbF" id="2ZalWa8IzpN" role="3cqZAp">

‎code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps‎

Lines changed: 165 additions & 144 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<concept id="1078308402140" name="jetbrains.mps.lang.editor.structure.CellModel_Custom" flags="sg" stub="8104358048506730068" index="gc7cB">
2525
<child id="1176795024817" name="cellProvider" index="3YsKMw" />
2626
</concept>
27-
<concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
2827
<concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
28+
<concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
2929
<concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
3030
<concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
3131
<child id="1080736633877" name="cellModel" index="2wV5jI" />
@@ -159,7 +159,7 @@
159159
</node>
160160
</node>
161161
</node>
162-
<node concept="2iRfu4" id="cJpacq5XBF" role="2iSdaV" />
162+
<node concept="l2Vlx" id="1ASK_HedIzs" role="2iSdaV" />
163163
</node>
164164
<node concept="gc7cB" id="cJpacq6vPB" role="3EZMnx">
165165
<node concept="3VJUX4" id="cJpacq6vPC" role="3YsKMw">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/editor.mps‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<child id="1140524464360" name="cellLayout" index="2czzBx" />
2121
</concept>
2222
<concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
23+
<concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
2324
<concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
2425
<concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
2526
<child id="1080736633877" name="cellModel" index="2wV5jI" />
@@ -273,7 +274,7 @@
273274
<ref role="1NtTu8" to="330h:5ZLQMNq2g6M" resolve="traceTargets" />
274275
<node concept="2iRfu4" id="5ZLQMNq2kcu" role="2czzBx" />
275276
</node>
276-
<node concept="2iRfu4" id="5ZLQMNq2iky" role="2iSdaV" />
277+
<node concept="l2Vlx" id="1ASK_HedI_5" role="2iSdaV" />
277278
</node>
278279
</node>
279280
<node concept="24kQdi" id="5ZLQMNq2l6u">
@@ -330,7 +331,7 @@
330331
<node concept="3F1sOY" id="5ZLQMNq2laq" role="3EZMnx">
331332
<ref role="1NtTu8" to="330h:5ZLQMNq2hPN" resolve="scope" />
332333
</node>
333-
<node concept="2iRfu4" id="5ZLQMNq2l6z" role="2iSdaV" />
334+
<node concept="l2Vlx" id="1ASK_HedI_6" role="2iSdaV" />
334335
</node>
335336
</node>
336337
<node concept="24kQdi" id="1lUgLJUk$sf">
@@ -397,14 +398,13 @@
397398
<node concept="3F1sOY" id="378sigX35nl" role="3EZMnx">
398399
<ref role="1NtTu8" to="330h:378sigX35lr" resolve="scope" />
399400
</node>
400-
<node concept="2iRfu4" id="378sigX35m4" role="2iSdaV" />
401+
<node concept="l2Vlx" id="1ASK_HedI_7" role="2iSdaV" />
401402
</node>
402403
</node>
403404
<node concept="24kQdi" id="378sigX4OUJ">
404405
<property role="3GE5qa" value="result" />
405406
<ref role="1XX52x" to="330h:378sigX3YpU" resolve="UntracedResult" />
406407
<node concept="3EZMnI" id="378sigX4OV4" role="2wV5jI">
407-
<node concept="2iRfu4" id="378sigX4OV7" role="2iSdaV" />
408408
<node concept="1iCGBv" id="6_Ift$_CY$T" role="3EZMnx">
409409
<ref role="1NtTu8" to="330h:378sigX3YpV" resolve="element" />
410410
<node concept="1sVBvm" id="6_Ift$_CY$U" role="1sWHZn">
@@ -445,6 +445,7 @@
445445
</node>
446446
</node>
447447
</node>
448+
<node concept="l2Vlx" id="1ASK_HedI_8" role="2iSdaV" />
448449
</node>
449450
</node>
450451
</model>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<concept id="1078308402140" name="jetbrains.mps.lang.editor.structure.CellModel_Custom" flags="sg" stub="8104358048506730068" index="gc7cB">
4646
<child id="1176795024817" name="cellProvider" index="3YsKMw" />
4747
</concept>
48-
<concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
4948
<concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
5049
<concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
5150
<concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
@@ -632,7 +631,6 @@
632631
</node>
633632
</node>
634633
</node>
635-
<node concept="2iRfu4" id="3Nl4besgRzm" role="2iSdaV" />
636634
<node concept="VPM3Z" id="3Nl4besgRzn" role="3F10Kt">
637635
<property role="VOm3f" value="false" />
638636
</node>
@@ -642,6 +640,7 @@
642640
<node concept="3F1sOY" id="3Nl4besgRzp" role="3EZMnx">
643641
<ref role="1NtTu8" to="138:1HqphBIBJyQ" resolve="value" />
644642
</node>
643+
<node concept="l2Vlx" id="1ASK_HedIzf" role="2iSdaV" />
645644
</node>
646645
</node>
647646
<node concept="pkWqt" id="3Nl4besgRzq" role="1p_IA6">
@@ -674,14 +673,13 @@
674673
</node>
675674
</node>
676675
</node>
677-
<node concept="2iRfu4" id="1HqphBIQDHN" role="2iSdaV" />
676+
<node concept="l2Vlx" id="1ASK_HedIze" role="2iSdaV" />
678677
</node>
679678
</node>
680679
<node concept="24kQdi" id="1HqphBIZ3zL">
681680
<property role="3GE5qa" value="attributes" />
682681
<ref role="1XX52x" to="138:1HqphBIxQFX" resolve="IValueAttribute" />
683682
<node concept="3EZMnI" id="1HqphBIQDqs" role="2wV5jI">
684-
<node concept="2iRfu4" id="1HqphBIQDqt" role="2iSdaV" />
685683
<node concept="1HlG4h" id="1HqphBIQDc5" role="3EZMnx">
686684
<node concept="1HfYo3" id="1HqphBIQDc7" role="1HlULh">
687685
<node concept="3TQlhw" id="1HqphBIQDc9" role="1Hhtcw">
@@ -710,6 +708,7 @@
710708
<node concept="3F1sOY" id="1HqphBIQDAI" role="3EZMnx">
711709
<ref role="1NtTu8" to="138:1HqphBIBJyQ" resolve="value" />
712710
</node>
711+
<node concept="l2Vlx" id="1ASK_HedIzg" role="2iSdaV" />
713712
</node>
714713
</node>
715714
<node concept="PKFIW" id="4um6WxnZYeG">
@@ -911,7 +910,6 @@
911910
</node>
912911
</node>
913912
</node>
914-
<node concept="2iRfu4" id="165w3u_zeWp" role="2iSdaV" />
915913
<node concept="pkWqt" id="5yaPPfdA2S5" role="pqm2j">
916914
<node concept="3clFbS" id="5yaPPfdA2S6" role="2VODD2">
917915
<node concept="3clFbF" id="5yaPPfdA4p1" role="3cqZAp">
@@ -924,6 +922,7 @@
924922
</node>
925923
</node>
926924
</node>
925+
<node concept="l2Vlx" id="1ASK_HedIzh" role="2iSdaV" />
927926
</node>
928927
</node>
929928
<node concept="24kQdi" id="43MQ47XI4aS">
@@ -939,7 +938,7 @@
939938
<node concept="3F1sOY" id="43MQ47XI4cO" role="3EZMnx">
940939
<ref role="1NtTu8" to="138:43MQ47XHSpR" resolve="value" />
941940
</node>
942-
<node concept="2iRfu4" id="43MQ47XI4b2" role="2iSdaV" />
941+
<node concept="l2Vlx" id="1ASK_HedIzi" role="2iSdaV" />
943942
</node>
944943
</node>
945944
<node concept="24kQdi" id="4fgA7QrG5MD">

0 commit comments

Comments
 (0)