Skip to content

Commit 84efa37

Browse files
arimerarimer
authored
Merge pull request #1422 from eyn9xwy/bugfix/bug_1421_improve_layout_of_imbricated_list_literals
Improved formatting for ListLiterals in multi dimensional lists
2 parents 9977b3b + 0ebd1ef commit 84efa37

File tree

3 files changed

+516
-0
lines changed

3 files changed

+516
-0
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ 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+
## October 2025
9+
10+
### Fixed
11+
- Improved the readability of lists by enforcing a new line when a threshold of three elements per list is exeeded.
12+
813
## September 2025
914

1015
### Added

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
</concept>
4747
<concept id="6089045305654894366" name="jetbrains.mps.lang.editor.structure.SubstituteMenuReference_Default" flags="ng" index="2kknPJ" />
4848
<concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
49+
<concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
4950
<concept id="784421273959492578" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_IncludeMenu" flags="ng" index="mvV$s">
5051
<child id="784421273959492606" name="nodeFunction" index="mvV$0" />
5152
</concept>
@@ -175,11 +176,13 @@
175176
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
176177
<reference id="1144433057691" name="classifier" index="1PxDUh" />
177178
</concept>
179+
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
178180
<concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
179181
<child id="1070534934091" name="type" index="10QFUM" />
180182
<child id="1070534934092" name="expression" index="10QFUP" />
181183
</concept>
182184
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
185+
<property id="1176718929932" name="isFinal" index="3TUv4t" />
183186
<child id="1068431790190" name="initializer" index="33vP2m" />
184187
</concept>
185188
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
@@ -215,6 +218,7 @@
215218
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
216219
<child id="1079359253376" name="expression" index="1eOMHV" />
217220
</concept>
221+
<concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
218222
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
219223
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
220224
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -490,6 +494,74 @@
490494
<property role="VOm3f" value="true" />
491495
</node>
492496
</node>
497+
<node concept="pVoyu" id="1B_b0w81IxR" role="3F10Kt">
498+
<property role="VOm3f" value="true" />
499+
<node concept="3nzxsE" id="1B_b0w833HR" role="3n$kyP">
500+
<node concept="3clFbS" id="1B_b0w833HS" role="2VODD2">
501+
<node concept="3cpWs8" id="qeznuD1TxR" role="3cqZAp">
502+
<node concept="3cpWsn" id="qeznuD1TxS" role="3cpWs9">
503+
<property role="TrG5h" value="THRESHOLD_FOR_NEW_LINES" />
504+
<property role="3TUv4t" value="true" />
505+
<node concept="10Oyi0" id="qeznuD1RGt" role="1tU5fm" />
506+
<node concept="3cmrfG" id="qeznuD1TxT" role="33vP2m">
507+
<property role="3cmrfH" value="3" />
508+
</node>
509+
</node>
510+
</node>
511+
<node concept="3clFbF" id="1B_b0w837L0" role="3cqZAp">
512+
<node concept="1Wc70l" id="qeznuD07mQ" role="3clFbG">
513+
<node concept="2OqwBi" id="1B_b0w8380K" role="3uHU7B">
514+
<node concept="2OqwBi" id="1B_b0w837Lx" role="2Oq$k0">
515+
<node concept="pncrf" id="1B_b0w837KZ" role="2Oq$k0" />
516+
<node concept="1mfA1w" id="1B_b0w837PF" role="2OqNvi" />
517+
</node>
518+
<node concept="1mIQ4w" id="1B_b0w838lP" role="2OqNvi">
519+
<node concept="chp4Y" id="1B_b0w838ot" role="cj9EA">
520+
<ref role="cht4Q" to="700h:6zmBjqUinVn" resolve="ListLiteral" />
521+
</node>
522+
</node>
523+
</node>
524+
<node concept="1eOMI4" id="qeznuD1Ph3" role="3uHU7w">
525+
<node concept="3eOSWO" id="qeznuD0jD$" role="1eOMHV">
526+
<node concept="37vLTw" id="qeznuD1TxU" role="3uHU7w">
527+
<ref role="3cqZAo" node="qeznuD1TxS" resolve="THRESHOLD_FOR_NEW_LINES" />
528+
</node>
529+
<node concept="2OqwBi" id="qeznuD0cQJ" role="3uHU7B">
530+
<node concept="2OqwBi" id="qeznuD07QZ" role="2Oq$k0">
531+
<node concept="pncrf" id="qeznuD07ob" role="2Oq$k0" />
532+
<node concept="3Tsc0h" id="qeznuD09Sn" role="2OqNvi">
533+
<ref role="3TtcxE" to="700h:6zmBjqUinVo" resolve="elements" />
534+
</node>
535+
</node>
536+
<node concept="34oBXx" id="qeznuD0gJp" role="2OqNvi" />
537+
</node>
538+
</node>
539+
</node>
540+
</node>
541+
</node>
542+
</node>
543+
</node>
544+
</node>
545+
<node concept="lj46D" id="1B_b0w84d$8" role="3F10Kt">
546+
<property role="VOm3f" value="true" />
547+
<node concept="3nzxsE" id="1B_b0w84d_6" role="3n$kyP">
548+
<node concept="3clFbS" id="1B_b0w84d_7" role="2VODD2">
549+
<node concept="3clFbF" id="1B_b0w84ecS" role="3cqZAp">
550+
<node concept="2OqwBi" id="1B_b0w84ecT" role="3clFbG">
551+
<node concept="2OqwBi" id="1B_b0w84ecU" role="2Oq$k0">
552+
<node concept="pncrf" id="1B_b0w84ecV" role="2Oq$k0" />
553+
<node concept="1mfA1w" id="1B_b0w84ecW" role="2OqNvi" />
554+
</node>
555+
<node concept="1mIQ4w" id="1B_b0w84ecX" role="2OqNvi">
556+
<node concept="chp4Y" id="1B_b0w84ecY" role="cj9EA">
557+
<ref role="cht4Q" to="700h:6zmBjqUinVn" resolve="ListLiteral" />
558+
</node>
559+
</node>
560+
</node>
561+
</node>
562+
</node>
563+
</node>
564+
</node>
493565
</node>
494566
<node concept="3EZMnI" id="4399ITQA59t" role="6VMZX">
495567
<node concept="3F0ifn" id="4399ITQA59x" role="3EZMnx">

0 commit comments

Comments
 (0)