Skip to content

Commit 4bd39d1

Browse files
kbirkenkbirken
committed
Execute runAllManuallyOnRoot instead of runManuallyOnNode if root node is a ICanRunCheckManually (issue #480).
1 parent bd7658f commit 4bd39d1

File tree

1 file changed

+39
-49
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin

1 file changed

+39
-49
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.plugin/models/org/iets3/core/plugin/plugin.mps‎

Lines changed: 39 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,6 @@
180180
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
181181
<child id="1079359253376" name="expression" index="1eOMHV" />
182182
</concept>
183-
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
184-
<child id="1081516765348" name="expression" index="3fr31v" />
185-
</concept>
186183
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
187184
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
188185
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -292,9 +289,7 @@
292289
<reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
293290
</concept>
294291
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
295-
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
296-
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
297-
</concept>
292+
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
298293
<concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
299294
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
300295
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
@@ -813,21 +808,32 @@
813808
</node>
814809
</node>
815810
<node concept="3clFbF" id="31wEG_giRk1" role="3cqZAp">
816-
<node concept="1Wc70l" id="3SU4Z7AXXh8" role="3clFbG">
817-
<node concept="2OqwBi" id="3SU4Z7AXXh9" role="3uHU7B">
818-
<node concept="37vLTw" id="3SU4Z7AXXha" role="2Oq$k0">
819-
<ref role="3cqZAo" node="7TU$2foe_kx" resolve="checkable" />
820-
</node>
821-
<node concept="2qgKlT" id="3SU4Z7AXXhb" role="2OqNvi">
822-
<ref role="37wK5l" to="gdgh:3R3AIvumAZH" resolve="mustBeRunManually" />
811+
<node concept="1Wc70l" id="3Q7NrjuPzAF" role="3clFbG">
812+
<node concept="2OqwBi" id="3Q7NrjuP$Jz" role="3uHU7w">
813+
<node concept="2OqwBi" id="3Q7NrjuPzWe" role="2Oq$k0">
814+
<node concept="37vLTw" id="3Q7NrjuPzLg" role="2Oq$k0">
815+
<ref role="3cqZAo" node="7TU$2foe_kx" resolve="checkable" />
816+
</node>
817+
<node concept="1mfA1w" id="3Q7NrjuP$uM" role="2OqNvi" />
823818
</node>
819+
<node concept="3x8VRR" id="3Q7NrjuP$Wi" role="2OqNvi" />
824820
</node>
825-
<node concept="2OqwBi" id="3SU4Z7AXXhc" role="3uHU7w">
826-
<node concept="37vLTw" id="3SU4Z7AXXhd" role="2Oq$k0">
827-
<ref role="3cqZAo" node="7TU$2foe_kx" resolve="checkable" />
821+
<node concept="1Wc70l" id="3SU4Z7AXXh8" role="3uHU7B">
822+
<node concept="2OqwBi" id="3SU4Z7AXXh9" role="3uHU7B">
823+
<node concept="37vLTw" id="3SU4Z7AXXha" role="2Oq$k0">
824+
<ref role="3cqZAo" node="7TU$2foe_kx" resolve="checkable" />
825+
</node>
826+
<node concept="2qgKlT" id="3SU4Z7AXXhb" role="2OqNvi">
827+
<ref role="37wK5l" to="gdgh:3R3AIvumAZH" resolve="mustBeRunManually" />
828+
</node>
828829
</node>
829-
<node concept="2qgKlT" id="3SU4Z7AXXhe" role="2OqNvi">
830-
<ref role="37wK5l" to="gdgh:3R3AIvumwpv" resolve="readyToRunManually" />
830+
<node concept="2OqwBi" id="3SU4Z7AXXhc" role="3uHU7w">
831+
<node concept="37vLTw" id="3SU4Z7AXXhd" role="2Oq$k0">
832+
<ref role="3cqZAo" node="7TU$2foe_kx" resolve="checkable" />
833+
</node>
834+
<node concept="2qgKlT" id="3SU4Z7AXXhe" role="2OqNvi">
835+
<ref role="37wK5l" to="gdgh:3R3AIvumwpv" resolve="readyToRunManually" />
836+
</node>
831837
</node>
832838
</node>
833839
</node>
@@ -866,6 +872,7 @@
866872
<ref role="cht4Q" to="4kwy:3R3AIvumrSU" resolve="ICanRunCheckManually" />
867873
</node>
868874
</node>
875+
<node concept="1xIGOp" id="3Q7NrjuPBZB" role="1xVPHs" />
869876
</node>
870877
</node>
871878
</node>
@@ -1092,44 +1099,27 @@
10921099
<node concept="2ScWuX" id="4bmM0avMBSC" role="tmbBb">
10931100
<node concept="3clFbS" id="4bmM0avMBSD" role="2VODD2">
10941101
<node concept="3clFbF" id="4uMJoRGbn8y" role="3cqZAp">
1095-
<node concept="1Wc70l" id="7PPxtDZ$ON" role="3clFbG">
1096-
<node concept="3fqX7Q" id="7PPxtDZ$We" role="3uHU7w">
1097-
<node concept="2OqwBi" id="7PPxtDZ_P6" role="3fr31v">
1098-
<node concept="2OqwBi" id="7PPxtDZ_dO" role="2Oq$k0">
1099-
<node concept="2WthIp" id="7PPxtDZ$Wx" role="2Oq$k0" />
1100-
<node concept="3gHZIF" id="7PPxtDZ_Bm" role="2OqNvi">
1101-
<ref role="2WH_rO" node="4bmM0avMBS$" resolve="root" />
1102-
</node>
1103-
</node>
1104-
<node concept="1mIQ4w" id="7PPxtDZA64" role="2OqNvi">
1105-
<node concept="chp4Y" id="7PPxtDZAed" role="cj9EA">
1106-
<ref role="cht4Q" to="4kwy:3R3AIvumrSU" resolve="ICanRunCheckManually" />
1107-
</node>
1102+
<node concept="1Wc70l" id="4uMJoRGboyY" role="3clFbG">
1103+
<node concept="3y3z36" id="4uMJoRGbooG" role="3uHU7B">
1104+
<node concept="2OqwBi" id="4uMJoRGbnom" role="3uHU7B">
1105+
<node concept="2WthIp" id="4uMJoRGbn8w" role="2Oq$k0" />
1106+
<node concept="3gHZIF" id="4uMJoRGbnVl" role="2OqNvi">
1107+
<ref role="2WH_rO" node="4bmM0avMBS$" resolve="root" />
11081108
</node>
11091109
</node>
1110+
<node concept="10Nm6u" id="4uMJoRGbopg" role="3uHU7w" />
11101111
</node>
1111-
<node concept="1Wc70l" id="4uMJoRGboyY" role="3uHU7B">
1112-
<node concept="3y3z36" id="4uMJoRGbooG" role="3uHU7B">
1113-
<node concept="2OqwBi" id="4uMJoRGbnom" role="3uHU7B">
1114-
<node concept="2WthIp" id="4uMJoRGbn8w" role="2Oq$k0" />
1115-
<node concept="3gHZIF" id="4uMJoRGbnVl" role="2OqNvi">
1112+
<node concept="3clFbC" id="4bmM0avMGh1" role="3uHU7w">
1113+
<node concept="2OqwBi" id="4bmM0avMFZz" role="3uHU7B">
1114+
<node concept="2OqwBi" id="4bmM0avMFPF" role="2Oq$k0">
1115+
<node concept="2WthIp" id="4bmM0avMFNp" role="2Oq$k0" />
1116+
<node concept="3gHZIF" id="4bmM0avMFU8" role="2OqNvi">
11161117
<ref role="2WH_rO" node="4bmM0avMBS$" resolve="root" />
11171118
</node>
11181119
</node>
1119-
<node concept="10Nm6u" id="4uMJoRGbopg" role="3uHU7w" />
1120-
</node>
1121-
<node concept="3clFbC" id="4bmM0avMGh1" role="3uHU7w">
1122-
<node concept="2OqwBi" id="4bmM0avMFZz" role="3uHU7B">
1123-
<node concept="2OqwBi" id="4bmM0avMFPF" role="2Oq$k0">
1124-
<node concept="2WthIp" id="4bmM0avMFNp" role="2Oq$k0" />
1125-
<node concept="3gHZIF" id="4bmM0avMFU8" role="2OqNvi">
1126-
<ref role="2WH_rO" node="4bmM0avMBS$" resolve="root" />
1127-
</node>
1128-
</node>
1129-
<node concept="1mfA1w" id="4bmM0avMG3g" role="2OqNvi" />
1130-
</node>
1131-
<node concept="10Nm6u" id="4bmM0avMGil" role="3uHU7w" />
1120+
<node concept="1mfA1w" id="4bmM0avMG3g" role="2OqNvi" />
11321121
</node>
1122+
<node concept="10Nm6u" id="4bmM0avMGil" role="3uHU7w" />
11331123
</node>
11341124
</node>
11351125
</node>

0 commit comments

Comments
 (0)