Skip to content

Commit bfa2b1a

Browse files
authored
Merge pull request #1602 from IETS3/bugfix/improve_stability_of_skeltree_viewer_1601
Fix various problems of skeleton tree viewer
2 parents 909f7b2 + 349195b commit bfa2b1a

File tree

3 files changed

+480
-112
lines changed

3 files changed

+480
-112
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1212
- Physical units:
1313
- The units `Joule`, `Coulomb` and `Watt` can now have also prefixes with negative metric scaling, e.g., `mW` (Milliwatt). Additionally, some typos have been corrected in the physical units documentation.
1414
- The precision of number types with prefixed units (e.g. `mW` or `km`) was always set to `infinite` by the typesystem. Now, the precision is as precise as possible.
15-
15+
- Variability: Viewer for skeleton trees has been improved (better error reporting, more stable, does not break on nodes which are string literals).
1616

1717
## December 2025
1818

code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps

Lines changed: 56 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,9 @@
376376
</concept>
377377
<concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
378378
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
379+
<concept id="1200397529627" name="jetbrains.mps.baseLanguage.structure.CharConstant" flags="nn" index="1Xhbcc">
380+
<property id="1200397540847" name="charConstant" index="1XhdNS" />
381+
</concept>
379382
<concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
380383
<reference id="1170346070688" name="classifier" index="1Y3XeK" />
381384
</concept>
@@ -6608,6 +6611,43 @@
66086611
</node>
66096612
</node>
66106613
</node>
6614+
<node concept="3SKdUt" id="4MuaMivtFM3" role="3cqZAp">
6615+
<node concept="1PaTwC" id="4MuaMivtFM4" role="1aUNEU">
6616+
<node concept="3oM_SD" id="4MuaMivtJqN" role="1PaTwD">
6617+
<property role="3oM_SC" value="If" />
6618+
</node>
6619+
<node concept="3oM_SD" id="4MuaMivtJr4" role="1PaTwD">
6620+
<property role="3oM_SC" value="orig.concept" />
6621+
</node>
6622+
<node concept="3oM_SD" id="4MuaMivtJrA" role="1PaTwD">
6623+
<property role="3oM_SC" value="is" />
6624+
</node>
6625+
<node concept="3oM_SD" id="4MuaMivtJrR" role="1PaTwD">
6626+
<property role="3oM_SC" value="a" />
6627+
</node>
6628+
<node concept="3oM_SD" id="4MuaMivtJs8" role="1PaTwD">
6629+
<property role="3oM_SC" value="KernelF" />
6630+
</node>
6631+
<node concept="3oM_SD" id="4MuaMivtJsT" role="1PaTwD">
6632+
<property role="3oM_SC" value="StringLiteral," />
6633+
</node>
6634+
<node concept="3oM_SD" id="4MuaMivtJta" role="1PaTwD">
6635+
<property role="3oM_SC" value="then" />
6636+
</node>
6637+
<node concept="3oM_SD" id="4MuaMivtJtZ" role="1PaTwD">
6638+
<property role="3oM_SC" value="its" />
6639+
</node>
6640+
<node concept="3oM_SD" id="4MuaMivtJvy" role="1PaTwD">
6641+
<property role="3oM_SC" value="getPresentation" />
6642+
</node>
6643+
<node concept="3oM_SD" id="4MuaMivtJug" role="1PaTwD">
6644+
<property role="3oM_SC" value="contains" />
6645+
</node>
6646+
<node concept="3oM_SD" id="4MuaMivtJux" role="1PaTwD">
6647+
<property role="3oM_SC" value="&quot;-characters." />
6648+
</node>
6649+
</node>
6650+
</node>
66116651
<node concept="3cpWs8" id="220xVKplinz" role="3cqZAp">
66126652
<node concept="3cpWsn" id="220xVKplin$" role="3cpWs9">
66136653
<property role="TrG5h" value="label" />
@@ -6632,12 +6672,23 @@
66326672
<ref role="3cqZAo" node="2wdh$FhK6ud" resolve="origConcept" />
66336673
</node>
66346674
<node concept="3cpWs3" id="2wdh$FhKsz6" role="3uHU7B">
6635-
<node concept="2OqwBi" id="220xVKplinI" role="3uHU7B">
6636-
<node concept="2qgKlT" id="220xVKplinM" role="2OqNvi">
6637-
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
6675+
<node concept="2OqwBi" id="4MuaMivkQDx" role="3uHU7B">
6676+
<node concept="2OqwBi" id="220xVKplinI" role="2Oq$k0">
6677+
<node concept="2qgKlT" id="220xVKplinM" role="2OqNvi">
6678+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
6679+
</node>
6680+
<node concept="37vLTw" id="hc_FFnE7p4" role="2Oq$k0">
6681+
<ref role="3cqZAo" node="hc_FFnE7p0" resolve="orig" />
6682+
</node>
66386683
</node>
6639-
<node concept="37vLTw" id="hc_FFnE7p4" role="2Oq$k0">
6640-
<ref role="3cqZAo" node="hc_FFnE7p0" resolve="orig" />
6684+
<node concept="liA8E" id="4MuaMivkXlt" role="2OqNvi">
6685+
<ref role="37wK5l" to="wyt6:~String.replace(char,char)" resolve="replace" />
6686+
<node concept="1Xhbcc" id="4MuaMivl32C" role="37wK5m">
6687+
<property role="1XhdNS" value="&quot;" />
6688+
</node>
6689+
<node concept="1Xhbcc" id="4MuaMivleHu" role="37wK5m">
6690+
<property role="1XhdNS" value="\'" />
6691+
</node>
66416692
</node>
66426693
</node>
66436694
<node concept="Xl_RD" id="2wdh$FhKs$q" role="3uHU7w">

0 commit comments

Comments
 (0)