Skip to content

Commit 0a9505f

Browse files
author
Alexander Pann
authored
Merge pull request #1215 from IETS3/merge/mps20232
2 parents 045bf32 + 4cb7afa commit 0a9505f

File tree

57 files changed

+1276
-1071
lines changed

Some content is hidden

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

57 files changed

+1276
-1071
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ 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+
## Feburary 2025
9+
10+
### Fixed
11+
12+
- Strings are not comparable with strings with constraints.
13+
- The usability of editors (code completion menu, color) was improved.
14+
815
## January 2025
916

1017
### Added

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

Lines changed: 85 additions & 68 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,6 +1157,7 @@
11571157
<property role="TrG5h" value="PortTypeSpecificPortType" />
11581158
<property role="EcuMT" value="2244552513307947405" />
11591159
<property role="R4oN_" value="a port type of a specific port type" />
1160+
<property role="34LRSv" value="port" />
11601161
<ref role="1TJDcQ" to="hm2y:6sdnDbSlaok" resolve="Type" />
11611162
<node concept="1TJgyj" id="1WAg9Tzrz6g" role="1TKVEi">
11621163
<property role="20lmBu" value="fLJjDmT/aggregation" />

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

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<import index="330h" ref="r:23d7e401-548b-485c-bdf1-c060e259073c(org.iets3.core.assessment.structure)" />
1111
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
1212
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
13+
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
1314
</imports>
1415
<registry>
1516
<language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -25,6 +26,12 @@
2526
<concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
2627
<child id="1080736633877" name="cellModel" index="2wV5jI" />
2728
</concept>
29+
<concept id="1164824717996" name="jetbrains.mps.lang.editor.structure.CellMenuDescriptor" flags="ng" index="OXEIz">
30+
<child id="1164824815888" name="cellMenuPart" index="OY2wv" />
31+
</concept>
32+
<concept id="1164914519156" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReplaceNode_CustomNodeConcept" flags="ng" index="UkePV">
33+
<reference id="1164914727930" name="replacementConcept" index="Ul1FP" />
34+
</concept>
2835
<concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
2936
<property id="1186403713874" name="color" index="Vb096" />
3037
</concept>
@@ -39,9 +46,13 @@
3946
</concept>
4047
<concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
4148
<concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
49+
<property id="1139852716018" name="noTargetText" index="1$x2rV" />
4250
<property id="1140017977771" name="readOnly" index="1Intyy" />
4351
<reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
4452
</concept>
53+
<concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
54+
<child id="1164826688380" name="menuDescriptor" index="P5bDN" />
55+
</concept>
4556
<concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
4657
<child id="1106270802874" name="cellLayout" index="2iSdaV" />
4758
<child id="1073389446424" name="childCellModel" index="3EZMnx" />
@@ -282,25 +293,22 @@
282293
<node concept="3EZMnI" id="5ZLQMNq2l6w" role="2wV5jI">
283294
<node concept="3F0ifn" id="5ZLQMNq2l6B" role="3EZMnx">
284295
<property role="3F0ifm" value="generic trace query" />
296+
<node concept="OXEIz" id="4MeRni499VS" role="P5bDN">
297+
<node concept="UkePV" id="4MeRni499VT" role="OY2wv">
298+
<ref role="Ul1FP" to="vs0r:K292flwD4r" resolve="AssessmentQuery" />
299+
</node>
300+
</node>
285301
</node>
286302
<node concept="3F0ifn" id="5ZLQMNq2l6V" role="3EZMnx">
287-
<property role="3F0ifm" value="kind&lt;" />
288-
<node concept="11LMrY" id="5ZLQMNq7BlE" role="3F10Kt">
289-
<property role="VOm3f" value="true" />
290-
</node>
303+
<property role="3F0ifm" value="of kind" />
291304
</node>
292305
<node concept="3F1sOY" id="5ZLQMNq2l7d" role="3EZMnx">
306+
<property role="1$x2rV" value="no kind" />
293307
<ref role="1NtTu8" to="330h:5ZLQMNq2hPP" resolve="traceKind" />
294308
<node concept="VechU" id="1SeAacxoe9D" role="3F10Kt">
295309
<property role="Vb096" value="g1_qRwE/darkGreen" />
296310
</node>
297311
</node>
298-
<node concept="3F0ifn" id="5ZLQMNq2l7p" role="3EZMnx">
299-
<property role="3F0ifm" value="&gt;" />
300-
<node concept="11L4FC" id="5ZLQMNq7BpT" role="3F10Kt">
301-
<property role="VOm3f" value="true" />
302-
</node>
303-
</node>
304312
<node concept="3F0ifn" id="5ZLQMNq2l7B" role="3EZMnx">
305313
<property role="3F0ifm" value="from:" />
306314
</node>
@@ -364,6 +372,11 @@
364372
<node concept="3EZMnI" id="378sigX35m1" role="2wV5jI">
365373
<node concept="3F0ifn" id="378sigX35ma" role="3EZMnx">
366374
<property role="3F0ifm" value="elements like" />
375+
<node concept="OXEIz" id="4MeRni45Kdq" role="P5bDN">
376+
<node concept="UkePV" id="4MeRni45Kfs" role="OY2wv">
377+
<ref role="Ul1FP" to="vs0r:K292flwD4r" resolve="AssessmentQuery" />
378+
</node>
379+
</node>
367380
</node>
368381
<node concept="1iCGBv" id="378sigX4UXW" role="3EZMnx">
369382
<ref role="1NtTu8" to="330h:378sigX35lt" resolve="like" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<property role="EcuMT" value="6913547888673489335" />
7777
<property role="TrG5h" value="GenericTraceQuery" />
7878
<property role="R4oN_" value="a generic trace query" />
79+
<property role="34LRSv" value="generic trace query" />
7980
<ref role="1TJDcQ" to="vs0r:K292flwD4r" resolve="AssessmentQuery" />
8081
<node concept="1TJgyj" id="5ZLQMNq2hPS" role="1TKVEi">
8182
<property role="IQ2ns" value="6913547888673496440" />

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

Lines changed: 20 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
1111
<use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
1212
<use id="b1ab8c10-c118-4755-bf2a-cebab35cf533" name="jetbrains.mps.lang.editor.tooltips" version="0" />
13+
<use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
1314
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
1415
</languages>
1516
<imports>
@@ -41,9 +42,6 @@
4142
<child id="1140524464359" name="emptyCellModel" index="2czzBI" />
4243
<child id="6046489571270834038" name="foldedCellModel" index="3EmGlc" />
4344
</concept>
44-
<concept id="1078308402140" name="jetbrains.mps.lang.editor.structure.CellModel_Custom" flags="sg" stub="8104358048506730068" index="gc7cB">
45-
<child id="1176795024817" name="cellProvider" index="3YsKMw" />
46-
</concept>
4745
<concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
4846
<concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
4947
<concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
@@ -63,6 +61,9 @@
6361
<concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
6462
<reference id="1078939183255" name="editorComponent" index="PMmxG" />
6563
</concept>
64+
<concept id="1164914519156" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReplaceNode_CustomNodeConcept" flags="ng" index="UkePV">
65+
<reference id="1164914727930" name="replacementConcept" index="Ul1FP" />
66+
</concept>
6667
<concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
6768
<property id="1186403713874" name="color" index="Vb096" />
6869
<child id="1186403803051" name="query" index="VblUZ" />
@@ -110,6 +111,7 @@
110111
</concept>
111112
<concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
112113
<child id="1142887637401" name="renderingCondition" index="pqm2j" />
114+
<child id="1164826688380" name="menuDescriptor" index="P5bDN" />
113115
<child id="4202667662392416064" name="transformationMenu" index="3vIgyS" />
114116
</concept>
115117
<concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
@@ -136,7 +138,6 @@
136138
<child id="1225900141900" name="modelAccessor" index="1HlULh" />
137139
</concept>
138140
<concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
139-
<concept id="1176749715029" name="jetbrains.mps.lang.editor.structure.QueryFunction_CellProvider" flags="in" index="3VJUX4" />
140141
<concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
141142
<reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
142143
</concept>
@@ -162,9 +163,6 @@
162163
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
163164
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
164165
</concept>
165-
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
166-
<reference id="1144433057691" name="classifier" index="1PxDUh" />
167-
</concept>
168166
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
169167
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
170168
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
@@ -186,7 +184,6 @@
186184
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
187185
<child id="1068499141038" name="actualArgument" index="37wK5m" />
188186
</concept>
189-
<concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
190187
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
191188
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
192189
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -220,6 +217,10 @@
220217
</concept>
221218
<concept id="6349233906483558394" name="com.mbeddr.mpsutil.grammarcells.structure.Parameter_wrappedConcept" flags="ng" index="1ZN7lz" />
222219
</language>
220+
<language id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout">
221+
<concept id="4682418030828844315" name="de.itemis.mps.editor.celllayout.structure.HorizontalLineColorStyle" flags="lg" index="2T_bXS" />
222+
<concept id="4682418030828725523" name="de.itemis.mps.editor.celllayout.structure.HorizontalLineCell" flags="ng" index="2T_mXK" />
223+
</language>
223224
<language id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist">
224225
<concept id="6202678563380238499" name="com.mbeddr.mpsutil.editor.querylist.structure.Function_GetElements" flags="ig" index="s8sZD" />
225226
<concept id="6202678563380233810" name="com.mbeddr.mpsutil.editor.querylist.structure.CellModel_QueryList" flags="ng" index="s8t4o">
@@ -304,22 +305,9 @@
304305
<property role="3F0ifm" value="Attributes" />
305306
</node>
306307
<node concept="2iRkQZ" id="3NBP8_OgMYj" role="2iSdaV" />
307-
<node concept="gc7cB" id="3NBP8_OgMYx" role="3EZMnx">
308-
<node concept="3VJUX4" id="3NBP8_OgMYz" role="3YsKMw">
309-
<node concept="3clFbS" id="3NBP8_OgMY_" role="2VODD2">
310-
<node concept="3clFbF" id="3NBP8_OgMZ5" role="3cqZAp">
311-
<node concept="2ShNRf" id="3NBP8_OgMZ3" role="3clFbG">
312-
<node concept="1pGfFk" id="3NBP8_OgZP2" role="2ShVmc">
313-
<ref role="37wK5l" to="r4b4:5gTlpakv6nY" resolve="HorizLineCell" />
314-
<node concept="pncrf" id="3NBP8_OgZPG" role="37wK5m" />
315-
<node concept="10M0yZ" id="38mO9wfTp0_" role="37wK5m">
316-
<ref role="3cqZAo" to="lzb2:~JBColor.gray" resolve="gray" />
317-
<ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
318-
</node>
319-
</node>
320-
</node>
321-
</node>
322-
</node>
308+
<node concept="2T_mXK" id="1znK7yYSqZq" role="3EZMnx">
309+
<node concept="2T_bXS" id="1znK7yYSrhg" role="3F10Kt">
310+
<property role="Vb096" value="fLJRk5_/gray" />
323311
</node>
324312
</node>
325313
<node concept="3F2HdR" id="3NBP8_Oh0ap" role="3EZMnx">
@@ -339,22 +327,9 @@
339327
</node>
340328
<node concept="2EHx9g" id="1HqphBIQEz$" role="2czzBx" />
341329
</node>
342-
<node concept="gc7cB" id="3NBP8_Ohq9D" role="3EZMnx">
343-
<node concept="3VJUX4" id="3NBP8_Ohq9E" role="3YsKMw">
344-
<node concept="3clFbS" id="3NBP8_Ohq9F" role="2VODD2">
345-
<node concept="3clFbF" id="3NBP8_Ohq9G" role="3cqZAp">
346-
<node concept="2ShNRf" id="3NBP8_Ohq9H" role="3clFbG">
347-
<node concept="1pGfFk" id="3NBP8_Ohq9I" role="2ShVmc">
348-
<ref role="37wK5l" to="r4b4:5gTlpakv6nY" resolve="HorizLineCell" />
349-
<node concept="pncrf" id="3NBP8_Ohq9J" role="37wK5m" />
350-
<node concept="10M0yZ" id="38mO9wfTpb6" role="37wK5m">
351-
<ref role="3cqZAo" to="lzb2:~JBColor.gray" resolve="gray" />
352-
<ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
353-
</node>
354-
</node>
355-
</node>
356-
</node>
357-
</node>
330+
<node concept="2T_mXK" id="1znK7yYSrx7" role="3EZMnx">
331+
<node concept="2T_bXS" id="1znK7yYSrx8" role="3F10Kt">
332+
<property role="Vb096" value="fLJRk5_/gray" />
358333
</node>
359334
</node>
360335
</node>
@@ -930,6 +905,11 @@
930905
<node concept="3EZMnI" id="43MQ47XI4aZ" role="2wV5jI">
931906
<node concept="PMmxH" id="43MQ47XI4bc" role="3EZMnx">
932907
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
908+
<node concept="OXEIz" id="1znK7yYStfN" role="P5bDN">
909+
<node concept="UkePV" id="1znK7yYSthP" role="OY2wv">
910+
<ref role="Ul1FP" to="138:3NBP8_OgMyV" resolve="IAttribute" />
911+
</node>
912+
</node>
933913
</node>
934914
<node concept="3F0ifn" id="43MQ47XI4bn" role="3EZMnx">
935915
<property role="3F0ifm" value=":" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
2424
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
2525
<language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
26+
<language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
2627
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
2728
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
2829
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,5 +1389,9 @@
13891389
<ref role="aqKnT" to="4kwy:7z6TQkzL3oZ" resolve="OriginalNodeInfo" />
13901390
<node concept="22hDWj" id="7z6TQkzL3p3" role="22hAXT" />
13911391
</node>
1392+
<node concept="22mcaB" id="1znK7yYSSFq">
1393+
<ref role="aqKnT" to="4kwy:cJpacq408a" resolve="OptionalNameSpecifier" />
1394+
<node concept="22hDWj" id="1znK7yYSSJt" role="22hAXT" />
1395+
</node>
13921396
</model>
13931397

0 commit comments

Comments
 (0)