Skip to content

fix DecTab bug not respecting the default value #1497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nkoester wants to merge 1 commit into from
Closed

fix DecTab bug not respecting the default value #1497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
- Configurations might become inconsistent due to errors during manual conflict merges. A couple of model checks have been added to detect this. Additionally, there are quickfixes to fix such errors.
- The internal storage of configurations has changed, this requires a language migration. Note that after the execution of the migration, extended configurations must be adapted via intention to their changed base configuration.
- A VCS merge hint has been added for the `__hash` property (e.g., for variant configurations). This avoids merge conflicts which cannot be resolved manually anyway (in those cases, the hash value has to be recomputed anyway).
- A DecTab bug not respecting the default value was fixed and a corresponding warning was added to warn users which default value takes precedence

### Fixed
- Improved the readability of lists by enforcing a new line when a threshold of three elements per list is exeeded.
Expand Down
229 changes: 223 additions & 6 deletions ....core.expr.genjava.util/generator/template/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@
<child id="1144104376918" name="parameter" index="1xVPHs" />
</concept>
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
Expand All @@ -318,6 +319,9 @@
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
</concept>
<concept id="1172326502327" name="jetbrains.mps.lang.smodel.structure.Concept_IsExactlyOperation" flags="nn" index="3O6GUB">
<child id="1206733650006" name="conceptArgument" index="3QVz_e" />
</concept>
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
<reference id="1138405853777" name="concept" index="ehGHo" />
Expand Down Expand Up @@ -386,6 +390,7 @@
<concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
<reference id="1153944258490" name="variable" index="2Gs0qQ" />
</concept>
<concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
<concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
Expand Down Expand Up @@ -1382,14 +1387,56 @@
<node concept="3IZrLx" id="49vukPR_gtk" role="3IZSJc">
<node concept="3clFbS" id="49vukPR_gtl" role="2VODD2">
<node concept="3clFbF" id="49vukPR_he1" role="3cqZAp">
<node concept="3y3z36" id="49vukPR_jEY" role="3clFbG">
<node concept="10Nm6u" id="49vukPR_jFk" role="3uHU7w" />
<node concept="2OqwBi" id="49vukPR_hzP" role="3uHU7B">
<node concept="30H73N" id="49vukPR_he0" role="2Oq$k0" />
<node concept="3TrEf2" id="49vukPR_iRO" role="2OqNvi">
<ref role="3Tt5mk" to="kfo3:3DYDRw0NJeI" resolve="default" />
<node concept="1Wc70l" id="7BAjciNeXgS" role="3clFbG">
<node concept="3fqX7Q" id="7BAjciNeX_9" role="3uHU7w">
<node concept="2OqwBi" id="7BAjciNf6mR" role="3fr31v">
<node concept="2OqwBi" id="7BAjciNf1P5" role="2Oq$k0">
<node concept="2OqwBi" id="7BAjciNeYb6" role="2Oq$k0">
<node concept="30H73N" id="7BAjciNeXAi" role="2Oq$k0" />
<node concept="3Tsc0h" id="7BAjciNeYS0" role="2OqNvi">
<ref role="3TtcxE" to="kfo3:3DYDRw0K4d4" resolve="colHeaders" />
</node>
</node>
<node concept="13MTOL" id="7BAjciNf5fu" role="2OqNvi">
<ref role="13MTZf" to="kfo3:3DYDRw0K4cg" resolve="expressions" />
</node>
</node>
<node concept="2HwmR7" id="7BAjciNf7gA" role="2OqNvi">
<node concept="1bVj0M" id="7BAjciNf7gC" role="23t8la">
<node concept="3clFbS" id="7BAjciNf7gD" role="1bW5cS">
<node concept="3clFbF" id="7BAjciNf7nT" role="3cqZAp">
<node concept="2OqwBi" id="7BAjciNfag6" role="3clFbG">
<node concept="2OqwBi" id="7BAjciNf7Co" role="2Oq$k0">
<node concept="37vLTw" id="7BAjciNf7nS" role="2Oq$k0">
<ref role="3cqZAo" node="7BAjciNf7gE" resolve="it" />
</node>
<node concept="2yIwOk" id="7BAjciNf9j5" role="2OqNvi" />
</node>
<node concept="3O6GUB" id="7BAjciNfb3b" role="2OqNvi">
<node concept="chp4Y" id="7BAjciNfbw3" role="3QVz_e">
<ref role="cht4Q" to="5qo5:6UxFDrx50pu" resolve="OtherwiseLiteral" />
</node>
</node>
</node>
</node>
</node>
<node concept="gl6BB" id="7BAjciNf7gE" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="7BAjciNf7gF" role="1tU5fm" />
</node>
</node>
</node>
</node>
</node>
<node concept="3y3z36" id="49vukPR_jEY" role="3uHU7B">
<node concept="2OqwBi" id="49vukPR_hzP" role="3uHU7B">
<node concept="30H73N" id="49vukPR_he0" role="2Oq$k0" />
<node concept="3TrEf2" id="49vukPR_iRO" role="2OqNvi">
<ref role="3Tt5mk" to="kfo3:3DYDRw0NJeI" resolve="default" />
</node>
</node>
<node concept="10Nm6u" id="49vukPR_jFk" role="3uHU7w" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -2423,6 +2470,91 @@
</node>
</node>
</node>
<node concept="2fGnzd" id="7BAjciN_lHp" role="2fGnxs">
<node concept="2fHqz8" id="7BAjciN_o5f" role="2fGnzS" />
<node concept="30bXRB" id="7BAjciN_oXs" role="2fGnzA">
<property role="30bXRw" value="11" />
<node concept="29HgVG" id="7BAjciN_q77" role="lGtFl">
<node concept="3NFfHV" id="7BAjciN_r32" role="3NFExx">
<node concept="3clFbS" id="7BAjciN_r33" role="2VODD2">
<node concept="3clFbF" id="7BAjciN_rmS" role="3cqZAp">
<node concept="2OqwBi" id="7BAjciNA2kJ" role="3clFbG">
<node concept="v3LJS" id="7BAjciNA1Vs" role="2Oq$k0">
<ref role="v3LJV" node="5crSXM9DLF" resolve="dectab" />
</node>
<node concept="3TrEf2" id="7BAjciNA4qj" role="2OqNvi">
<ref role="3Tt5mk" to="kfo3:3DYDRw0NJeI" resolve="default" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1W57fq" id="7BAjciN_m_v" role="lGtFl">
<node concept="3IZrLx" id="7BAjciN_m_w" role="3IZSJc">
<node concept="3clFbS" id="7BAjciN_m_x" role="2VODD2">
<node concept="3clFbF" id="7BAjciN_mS9" role="3cqZAp">
<node concept="1Wc70l" id="7BAjciN_Uph" role="3clFbG">
<node concept="2OqwBi" id="7BAjciN_PmR" role="3uHU7B">
<node concept="2OqwBi" id="7BAjciN_MdZ" role="2Oq$k0">
<node concept="v3LJS" id="7BAjciN_LMJ" role="2Oq$k0">
<ref role="v3LJV" node="5crSXM9DLF" resolve="dectab" />
</node>
<node concept="3TrEf2" id="7BAjciN_NtP" role="2OqNvi">
<ref role="3Tt5mk" to="kfo3:3DYDRw0NJeI" resolve="default" />
</node>
</node>
<node concept="3x8VRR" id="7BAjciN_PXF" role="2OqNvi" />
</node>
<node concept="3fqX7Q" id="7BAjciN_W6j" role="3uHU7w">
<node concept="2OqwBi" id="7BAjciN_W6k" role="3fr31v">
<node concept="2OqwBi" id="7BAjciN_W6l" role="2Oq$k0">
<node concept="13MTOL" id="7BAjciN_W6p" role="2OqNvi">
<ref role="13MTZf" to="kfo3:3DYDRw0K4cg" />
</node>
<node concept="2OqwBi" id="7BAjciN_Zny" role="2Oq$k0">
<node concept="v3LJS" id="7BAjciN_YnP" role="2Oq$k0">
<ref role="v3LJV" node="5crSXM9DLF" resolve="dectab" />
</node>
<node concept="3Tsc0h" id="7BAjciNA0pk" role="2OqNvi">
<ref role="3TtcxE" to="kfo3:3DYDRw0K4d1" resolve="rowHeaders" />
</node>
</node>
</node>
<node concept="2HwmR7" id="7BAjciN_W6q" role="2OqNvi">
<node concept="1bVj0M" id="7BAjciN_W6r" role="23t8la">
<node concept="3clFbS" id="7BAjciN_W6s" role="1bW5cS">
<node concept="3clFbF" id="7BAjciN_W6t" role="3cqZAp">
<node concept="2OqwBi" id="7BAjciN_W6u" role="3clFbG">
<node concept="2OqwBi" id="7BAjciN_W6v" role="2Oq$k0">
<node concept="37vLTw" id="7BAjciN_W6w" role="2Oq$k0">
<ref role="3cqZAo" node="7BAjciN_W6$" resolve="it" />
</node>
<node concept="2yIwOk" id="7BAjciN_W6x" role="2OqNvi" />
</node>
<node concept="3O6GUB" id="7BAjciN_W6y" role="2OqNvi">
<node concept="chp4Y" id="7BAjciN_W6z" role="3QVz_e">
<ref role="cht4Q" to="5qo5:6UxFDrx50pu" resolve="OtherwiseLiteral" />
</node>
</node>
</node>
</node>
</node>
<node concept="gl6BB" id="7BAjciN_W6$" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="7BAjciN_W6_" role="1tU5fm" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2vmpn$" id="5crSXM9SEN" role="2fGnzS">
<node concept="29HgVG" id="5crSXM9SEO" role="lGtFl">
Expand Down Expand Up @@ -2541,6 +2673,91 @@
</node>
</node>
</node>
<node concept="2fGnzd" id="7BAjciNA59A" role="2fGnxs">
<node concept="2fHqz8" id="7BAjciNA59B" role="2fGnzS" />
<node concept="30bXRB" id="7BAjciNA59C" role="2fGnzA">
<property role="30bXRw" value="11" />
<node concept="29HgVG" id="7BAjciNA59D" role="lGtFl">
<node concept="3NFfHV" id="7BAjciNA59E" role="3NFExx">
<node concept="3clFbS" id="7BAjciNA59F" role="2VODD2">
<node concept="3clFbF" id="7BAjciNA59G" role="3cqZAp">
<node concept="2OqwBi" id="7BAjciNA59H" role="3clFbG">
<node concept="v3LJS" id="7BAjciNA59I" role="2Oq$k0">
<ref role="v3LJV" node="5crSXM9DLF" resolve="dectab" />
</node>
<node concept="3TrEf2" id="7BAjciNA59J" role="2OqNvi">
<ref role="3Tt5mk" to="kfo3:3DYDRw0NJeI" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1W57fq" id="7BAjciNA59K" role="lGtFl">
<node concept="3IZrLx" id="7BAjciNA59L" role="3IZSJc">
<node concept="3clFbS" id="7BAjciNA59M" role="2VODD2">
<node concept="3clFbF" id="7BAjciNA59N" role="3cqZAp">
<node concept="1Wc70l" id="7BAjciNA59O" role="3clFbG">
<node concept="2OqwBi" id="7BAjciNA59P" role="3uHU7B">
<node concept="2OqwBi" id="7BAjciNA59Q" role="2Oq$k0">
<node concept="v3LJS" id="7BAjciNA59R" role="2Oq$k0">
<ref role="v3LJV" node="5crSXM9DLF" resolve="dectab" />
</node>
<node concept="3TrEf2" id="7BAjciNA59S" role="2OqNvi">
<ref role="3Tt5mk" to="kfo3:3DYDRw0NJeI" />
</node>
</node>
<node concept="3x8VRR" id="7BAjciNA59T" role="2OqNvi" />
</node>
<node concept="3fqX7Q" id="7BAjciNA59U" role="3uHU7w">
<node concept="2OqwBi" id="7BAjciNA59V" role="3fr31v">
<node concept="2OqwBi" id="7BAjciNA59W" role="2Oq$k0">
<node concept="13MTOL" id="7BAjciNA59X" role="2OqNvi">
<ref role="13MTZf" to="kfo3:3DYDRw0K4cg" />
</node>
<node concept="2OqwBi" id="7BAjciNA59Y" role="2Oq$k0">
<node concept="v3LJS" id="7BAjciNA59Z" role="2Oq$k0">
<ref role="v3LJV" node="5crSXM9DLF" resolve="dectab" />
</node>
<node concept="3Tsc0h" id="7BAjciNA5a0" role="2OqNvi">
<ref role="3TtcxE" to="kfo3:3DYDRw0K4d1" />
</node>
</node>
</node>
<node concept="2HwmR7" id="7BAjciNA5a1" role="2OqNvi">
<node concept="1bVj0M" id="7BAjciNA5a2" role="23t8la">
<node concept="3clFbS" id="7BAjciNA5a3" role="1bW5cS">
<node concept="3clFbF" id="7BAjciNA5a4" role="3cqZAp">
<node concept="2OqwBi" id="7BAjciNA5a5" role="3clFbG">
<node concept="2OqwBi" id="7BAjciNA5a6" role="2Oq$k0">
<node concept="37vLTw" id="7BAjciNA5a7" role="2Oq$k0">
<ref role="3cqZAo" node="7BAjciNA5ab" resolve="it" />
</node>
<node concept="2yIwOk" id="7BAjciNA5a8" role="2OqNvi" />
</node>
<node concept="3O6GUB" id="7BAjciNA5a9" role="2OqNvi">
<node concept="chp4Y" id="7BAjciNA5aa" role="3QVz_e">
<ref role="cht4Q" to="5qo5:6UxFDrx50pu" resolve="OtherwiseLiteral" />
</node>
</node>
</node>
</node>
</node>
<node concept="gl6BB" id="7BAjciNA5ab" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="7BAjciNA5ac" role="1tU5fm" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2vmpn$" id="5crSXMaghX" role="2fGnzS">
<node concept="1sPUBX" id="2naflW43Myl" role="lGtFl">
Expand Down
Loading