Skip to content

Commit 8f98b81

Browse files
author
Alexander Pann
authored
Merge pull request #1181 from IETS3/merge/mps20223
2 parents 86e6809 + 92b4b3e commit 8f98b81

File tree

49 files changed

+1671
-1608
lines changed

Some content is hidden

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

49 files changed

+1671
-1608
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1212
- All custom views are deactivated by default. You can enable each of them through their own extension point: components explorer (`components` extension point), specification explorer (`spec` extension point), requirements explorer (`requirements` extension point), bookmark explorer (`bookmark` extension point).
1313
- Empty list literals now have automatically the length constraint 0.
1414
- Lists of lists now derive the correct size.
15+
- The line wrapping ability of some concepts was improved.
1516

1617
## November 2024
1718

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

Lines changed: 4 additions & 5 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" />
@@ -69,7 +68,7 @@
6968
<property id="1073389577007" name="text" index="3F0ifm" />
7069
</concept>
7170
<concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
72-
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
71+
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
7372
<child id="1219418656006" name="styleItem" index="3F10Kt" />
7473
</concept>
7574
<concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -121,7 +120,7 @@
121120
</concept>
122121
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
123122
<concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
124-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
123+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
125124
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
126125
<child id="1068499141038" name="actualArgument" index="37wK5m" />
127126
</concept>
@@ -143,7 +142,7 @@
143142
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
144143
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
145144
</concept>
146-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
145+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
147146
<property id="1169194664001" name="name" index="TrG5h" />
148147
</concept>
149148
</language>
@@ -202,7 +201,6 @@
202201
<property role="VOm3f" value="true" />
203202
</node>
204203
</node>
205-
<node concept="2iRfu4" id="2GQBRFCFw0_" role="2iSdaV" />
206204
<node concept="pkWqt" id="2ZalWa8IziB" role="pqm2j">
207205
<node concept="3clFbS" id="2ZalWa8IziC" role="2VODD2">
208206
<node concept="3clFbF" id="2ZalWa8IzpN" role="3cqZAp">
@@ -220,6 +218,7 @@
220218
</node>
221219
</node>
222220
</node>
221+
<node concept="l2Vlx" id="1ASK_Hec6P6" role="2iSdaV" />
223222
</node>
224223
</node>
225224
<node concept="2SsqMj" id="3DYDRw0WRuq" role="3EZMnx">

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

Lines changed: 175 additions & 154 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 4 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" />
@@ -44,7 +44,7 @@
4444
<concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
4545
<property id="1073389577007" name="text" index="3F0ifm" />
4646
</concept>
47-
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
47+
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
4848
<child id="1219418656006" name="styleItem" index="3F10Kt" />
4949
</concept>
5050
<concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -75,7 +75,7 @@
7575
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
7676
<property id="1068580320021" name="value" index="3cmrfH" />
7777
</concept>
78-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
78+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
7979
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
8080
<child id="1068499141038" name="actualArgument" index="37wK5m" />
8181
</concept>
@@ -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: 8 additions & 7 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" />
@@ -49,7 +50,7 @@
4950
<property id="1073389577007" name="text" index="3F0ifm" />
5051
</concept>
5152
<concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
52-
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
53+
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
5354
<child id="1219418656006" name="styleItem" index="3F10Kt" />
5455
</concept>
5556
<concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -94,7 +95,7 @@
9495
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
9596
</concept>
9697
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
97-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
98+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
9899
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
99100
</concept>
100101
<concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -128,7 +129,7 @@
128129
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
129130
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
130131
</concept>
131-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
132+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
132133
<property id="1169194664001" name="name" index="TrG5h" />
133134
</concept>
134135
</language>
@@ -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: 10 additions & 11 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" />
@@ -79,10 +78,10 @@
7978
</concept>
8079
<concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
8180
<concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
82-
<concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
81+
<concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
8382
<reference id="1630016958698373342" name="concept" index="2ZyFGn" />
8483
</concept>
85-
<concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
84+
<concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
8685
<reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
8786
<child id="5991739802479788259" name="type" index="22hAXT" />
8887
</concept>
@@ -121,7 +120,7 @@
121120
<concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
122121
<property id="1073389577007" name="text" index="3F0ifm" />
123122
</concept>
124-
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
123+
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
125124
<child id="1219418656006" name="styleItem" index="3F10Kt" />
126125
</concept>
127126
<concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -184,7 +183,7 @@
184183
<property id="1068580123138" name="value" index="3clFbU" />
185184
</concept>
186185
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
187-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
186+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
188187
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
189188
<child id="1068499141038" name="actualArgument" index="37wK5m" />
190189
</concept>
@@ -268,7 +267,7 @@
268267
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
269268
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
270269
</concept>
271-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
270+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
272271
<property id="1169194664001" name="name" index="TrG5h" />
273272
</concept>
274273
</language>
@@ -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)