Skip to content

Commit ab7fa9c

Browse files
committed
Merge remote-tracking branch 'origin/maintenance/mps20213' into bugfix/missing-hashcode-in-temporalvalue
# Conflicts: # code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.runtime/org.iets3.core.expr.temporal.runtime.msd # code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
2 parents b10cc63 + e4b55f1 commit ab7fa9c

File tree

46 files changed

+14234
-7328
lines changed

Some content is hidden

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

46 files changed

+14234
-7328
lines changed

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,25 @@ All notable changes to this project are documented in this file.
44

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.
7+
## October 2023
8+
9+
### Fixed
10+
11+
- Generation of nested short lambda expression now use the correct type for "it" as a variable.
12+
13+
## November 2023
14+
15+
### Fixed
16+
17+
- String validation: A bug in the number detection logic was fixed
18+
19+
## November 2023
20+
21+
### Added
22+
23+
- The `sort` method of collections now supports more types: all primitive types, the option type, all datetime types, the temporal type and the record type
24+
- Records: The sorting order can be added through the intention `Add a Comparison Order`, otherwise, the records are sorted based on the declaration order of the members
25+
- Option: Sorting removes all `none` values since the underlying data structure of collections doesn't support null values.
726

827
## November 2023
928

@@ -46,3 +65,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
4665
- Tuples are now handled within the typesystem.
4766
Instead of allowing JoinTypes within tuples we merge different tuple types by JoinTypes.
4867
- Each subconcept of IValidNamedConcept can now contribute and customize naming constraints
68+
69+
### Changed
70+
71+
- `IETS3ExprEvalHelper` methods no longer log exceptions that they re-throw. Some callers may ignore exceptions thrown by the interpreter, and having them logged unnecessarily clutters the logs. It is now the caller's responsibility to log exceptions where needed.

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
5656
<import index="itrz" ref="r:80fb0853-eb3b-4e84-aebd-cc7fdb011d97(org.iets3.core.base.editor)" implicit="true" />
5757
<import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
58+
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
5859
<import index="138" ref="r:2c1007f3-e814-47ba-b729-c3ea0297f627(org.iets3.core.attributes.structure)" implicit="true" />
5960
</imports>
6061
<registry>
@@ -110,12 +111,18 @@
110111
<property id="5944657839012629576" name="presentation" index="2BUmq6" />
111112
</concept>
112113
<concept id="1239814640496" name="jetbrains.mps.lang.editor.structure.CellLayout_VerticalGrid" flags="nn" index="2EHx9g" />
114+
<concept id="1164824717996" name="jetbrains.mps.lang.editor.structure.CellMenuDescriptor" flags="ng" index="OXEIz">
115+
<child id="1164824815888" name="cellMenuPart" index="OY2wv" />
116+
</concept>
113117
<concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW">
114118
<child id="7033942394258392116" name="overridenEditorComponent" index="1PM95z" />
115119
</concept>
116120
<concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
117121
<reference id="1078939183255" name="editorComponent" index="PMmxG" />
118122
</concept>
123+
<concept id="1164914519156" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReplaceNode_CustomNodeConcept" flags="ng" index="UkePV">
124+
<reference id="1164914727930" name="replacementConcept" index="Ul1FP" />
125+
</concept>
119126
<concept id="1186402211651" name="jetbrains.mps.lang.editor.structure.StyleSheet" flags="ng" index="V5hpn">
120127
<child id="1186402402630" name="styles" index="V601i" />
121128
</concept>
@@ -177,6 +184,7 @@
177184
<concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
178185
<reference id="1139959269582" name="actionMap" index="1ERwB7" />
179186
<child id="1142887637401" name="renderingCondition" index="pqm2j" />
187+
<child id="1164826688380" name="menuDescriptor" index="P5bDN" />
180188
</concept>
181189
<concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
182190
<property id="1160590353935" name="usesFolding" index="S$Qs1" />
@@ -11933,6 +11941,11 @@
1193311941
<node concept="11LMrY" id="1WAg9Tzrz8T" role="3F10Kt">
1193411942
<property role="VOm3f" value="true" />
1193511943
</node>
11944+
<node concept="OXEIz" id="yfp7edvEmW" role="P5bDN">
11945+
<node concept="UkePV" id="yfp7edvEmX" role="OY2wv">
11946+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" />
11947+
</node>
11948+
</node>
1193611949
</node>
1193711950
<node concept="3F1sOY" id="1WAg9Tzrz6S" role="3EZMnx">
1193811951
<ref role="1NtTu8" to="w9y2:1WAg9Tzrz6g" resolve="portType" />

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,17 @@
4949
<child id="1080736633877" name="cellModel" index="2wV5jI" />
5050
</concept>
5151
<concept id="1239814640496" name="jetbrains.mps.lang.editor.structure.CellLayout_VerticalGrid" flags="nn" index="2EHx9g" />
52+
<concept id="1164824717996" name="jetbrains.mps.lang.editor.structure.CellMenuDescriptor" flags="ng" index="OXEIz">
53+
<child id="1164824815888" name="cellMenuPart" index="OY2wv" />
54+
</concept>
5255
<concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
5356
<concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
5457
<reference id="1078939183255" name="editorComponent" index="PMmxG" />
5558
</concept>
5659
<concept id="1149850725784" name="jetbrains.mps.lang.editor.structure.CellModel_AttributedNodeCell" flags="ng" index="2SsqMj" />
60+
<concept id="1164914519156" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReplaceNode_CustomNodeConcept" flags="ng" index="UkePV">
61+
<reference id="1164914727930" name="replacementConcept" index="Ul1FP" />
62+
</concept>
5763
<concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
5864
<property id="1186403713874" name="color" index="Vb096" />
5965
</concept>
@@ -92,6 +98,7 @@
9298
</concept>
9399
<concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
94100
<child id="1142887637401" name="renderingCondition" index="pqm2j" />
101+
<child id="1164826688380" name="menuDescriptor" index="P5bDN" />
95102
</concept>
96103
<concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
97104
<child id="1106270802874" name="cellLayout" index="2iSdaV" />
@@ -1417,6 +1424,11 @@
14171424
<node concept="3F0ifn" id="28$LOSAcnoE" role="3EZMnx">
14181425
<property role="3F0ifm" value="quoted" />
14191426
<ref role="1k5W1q" to="itrz:7D7uZV2g_XJ" resolve="iets3Type" />
1427+
<node concept="OXEIz" id="yfp7edvEmQ" role="P5bDN">
1428+
<node concept="UkePV" id="yfp7edvEmR" role="OY2wv">
1429+
<ref role="Ul1FP" to="hm2y:6sdnDbSlaok" resolve="Type" />
1430+
</node>
1431+
</node>
14201432
</node>
14211433
<node concept="3F0ifn" id="28$LOSAflsL" role="3EZMnx">
14221434
<property role="3F0ifm" value="&lt;" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/structure.mps

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@
454454
<property role="3GE5qa" value="quote" />
455455
<property role="TrG5h" value="QuotedTermType" />
456456
<property role="R4oN_" value="a quoted term type" />
457+
<property role="34LRSv" value="quoted" />
457458
<ref role="1TJDcQ" to="hm2y:6sdnDbSlaok" resolve="Type" />
458459
<node concept="1TJgyj" id="28$LOSAflsv" role="1TKVEi">
459460
<property role="IQ2ns" value="2460310434914064159" />

0 commit comments

Comments
 (0)