Skip to content

Commit 695830d

Browse files
arimerarimer
authored
Merge branch 'maintenance/mps20232' into bugfix/1392-coverage-ignored-concepts
2 parents 0cac31d + 707f99d commit 695830d

File tree

2 files changed

+30
-19
lines changed

2 files changed

+30
-19
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
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+
## November 2025
9+
10+
### Fixed
11+
- A bug was fixed that caused the editor of NumberLiteral to break if a property macro was used for its value.
12+
813
## October 2025
914

1015
### Added
@@ -14,7 +19,6 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1419
### Fixed
1520
- A DecTab bug not respecting the default value was fixed and a corresponding warning was added to warn users which default value takes precedence
1621

17-
1822
## September 2025
1923

2024
### Fixed

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

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,9 @@
246246
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
247247
<child id="1068581517665" name="statement" index="3cqZAp" />
248248
</concept>
249+
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
250+
<property id="1068580123138" name="value" index="3clFbU" />
251+
</concept>
249252
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
250253
<property id="1068580320021" name="value" index="3cmrfH" />
251254
</concept>
@@ -273,6 +276,9 @@
273276
<child id="1178549979242" name="visibility" index="1B3o_S" />
274277
</concept>
275278
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
279+
<concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
280+
<reference id="1116615189566" name="classifier" index="3VsUkX" />
281+
</concept>
276282
</language>
277283
<language id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells">
278284
<concept id="1954385921685809440" name="com.mbeddr.mpsutil.grammarcells.structure.Parameter_node" flags="ng" index="313q4" />
@@ -417,6 +423,7 @@
417423
<node concept="1WcQYu" id="D5oLwMtua0" role="2wV5jI">
418424
<node concept="2ElW$n" id="D5oLwMtuay" role="2El2Yn" />
419425
<node concept="3EZMnI" id="53_W9lll902" role="1LiK7o">
426+
<node concept="l2Vlx" id="1ASK_HedIsT" role="2iSdaV" />
420427
<node concept="1kIj98" id="1Ia5rYltMfn" role="3EZMnx">
421428
<node concept="315t4" id="6uFWVHJRvzf" role="31dnY">
422429
<node concept="3clFbS" id="6uFWVHJRvzg" role="2VODD2">
@@ -521,24 +528,27 @@
521528
</node>
522529
<node concept="3VJUX4" id="6QsMU1GUYNg" role="3ZZHOD">
523530
<node concept="3clFbS" id="6QsMU1GUYNh" role="2VODD2">
524-
<node concept="3cpWs8" id="6QsMU1GUYS0" role="3cqZAp">
525-
<node concept="3cpWsn" id="6QsMU1GUYS1" role="3cpWs9">
526-
<property role="TrG5h" value="propCell" />
527-
<node concept="3uibUv" id="6QsMU1GUYS2" role="1tU5fm">
528-
<ref role="3uigEE" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
529-
</node>
530-
<node concept="1eOMI4" id="6QsMU1GUYUC" role="33vP2m">
531-
<node concept="10QFUN" id="6QsMU1GUYU_" role="1eOMHV">
532-
<node concept="3uibUv" id="6QsMU1GUYUE" role="10QFUM">
531+
<node concept="3clFbJ" id="1drMthg17uD" role="3cqZAp">
532+
<node concept="3clFbS" id="1drMthg17uF" role="3clFbx">
533+
<node concept="3cpWs8" id="6QsMU1GUYS0" role="3cqZAp">
534+
<node concept="3cpWsn" id="6QsMU1GUYS1" role="3cpWs9">
535+
<property role="TrG5h" value="propCell" />
536+
<node concept="3uibUv" id="6QsMU1GUYS2" role="1tU5fm">
533537
<ref role="3uigEE" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
534538
</node>
535-
<node concept="1Q80Hy" id="6QsMU1GUYVk" role="10QFUP" />
539+
<node concept="2YIFZM" id="1BN5MJwdEtO" role="33vP2m">
540+
<ref role="37wK5l" to="g51k:~CellFinderUtil.findChildByClass(jetbrains.mps.openapi.editor.cells.EditorCell,java.lang.Class,boolean)" resolve="findChildByClass" />
541+
<ref role="1Pybhc" to="g51k:~CellFinderUtil" resolve="CellFinderUtil" />
542+
<node concept="1Q80Hy" id="1BN5MJwdE_0" role="37wK5m" />
543+
<node concept="3VsKOn" id="1BN5MJwdF55" role="37wK5m">
544+
<ref role="3VsUkX" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
545+
</node>
546+
<node concept="3clFbT" id="1BN5MJwdFxl" role="37wK5m">
547+
<property role="3clFbU" value="true" />
548+
</node>
549+
</node>
536550
</node>
537551
</node>
538-
</node>
539-
</node>
540-
<node concept="3clFbJ" id="1drMthg17uD" role="3cqZAp">
541-
<node concept="3clFbS" id="1drMthg17uF" role="3clFbx">
542552
<node concept="3cpWs8" id="6UIgoJyD6uX" role="3cqZAp">
543553
<node concept="3cpWsn" id="6UIgoJyD6uY" role="3cpWs9">
544554
<property role="TrG5h" value="modelAccessor" />
@@ -622,15 +632,12 @@
622632
</node>
623633
</node>
624634
<node concept="3clFbF" id="6UIgoJyDnhy" role="3cqZAp">
625-
<node concept="37vLTw" id="6UIgoJyDnhw" role="3clFbG">
626-
<ref role="3cqZAo" node="6QsMU1GUYS1" resolve="propCell" />
627-
</node>
635+
<node concept="1Q80Hy" id="2wgSHIAAcB1" role="3clFbG" />
628636
</node>
629637
</node>
630638
</node>
631639
</node>
632640
</node>
633-
<node concept="l2Vlx" id="1ASK_HedIsT" role="2iSdaV" />
634641
</node>
635642
</node>
636643
</node>

0 commit comments

Comments
 (0)