Skip to content

Commit a6bc3eb

Browse files
mgronovermgronover
committed
fixes/simplifies dependency check for CustomRunnerAspect #1144 
1 parent 246256a commit a6bc3eb

File tree

1 file changed

+57
-81
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models

1 file changed

+57
-81
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/typesystem.mps‎

Lines changed: 57 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<property id="1070475926801" name="value" index="Xl_RC" />
4141
</concept>
4242
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
43-
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
4443
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
4544
<child id="1068431790190" name="initializer" index="33vP2m" />
4645
</concept>
@@ -230,6 +229,7 @@
230229
<child id="1197932525128" name="key" index="3ElVtu" />
231230
</concept>
232231
<concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
232+
<concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
233233
</language>
234234
</registry>
235235
<node concept="18kY7G" id="3R4s7SZjW5J">
@@ -335,14 +335,6 @@
335335
<node concept="37vLTw" id="3gAGr91fBXc" role="2XxRq1">
336336
<ref role="3cqZAo" node="3R4s7SZEKY0" resolve="it" />
337337
</node>
338-
<node concept="3cpWs3" id="3gAGr91lcWI" role="2XxRq1">
339-
<node concept="3cmrfG" id="3gAGr91lcWL" role="3uHU7w">
340-
<property role="3cmrfH" value="4" />
341-
</node>
342-
<node concept="37vLTw" id="3gAGr91lafE" role="3uHU7B">
343-
<ref role="3cqZAo" node="3gAGr91kZo4" resolve="indent" />
344-
</node>
345-
</node>
346338
</node>
347339
</node>
348340
</node>
@@ -370,79 +362,67 @@
370362
</node>
371363
</node>
372364
</node>
373-
<node concept="3clFbJ" id="3gAGr91rOqM" role="3cqZAp">
374-
<node concept="3clFbS" id="3gAGr91rOqO" role="3clFbx">
375-
<node concept="3clFbF" id="3R4s7SZF2eJ" role="3cqZAp">
376-
<node concept="2OqwBi" id="3R4s7SZF5h2" role="3clFbG">
377-
<node concept="37vLTw" id="3R4s7SZF2eH" role="2Oq$k0">
378-
<ref role="3cqZAo" node="3R4s7SZEw2V" resolve="retval" />
379-
</node>
380-
<node concept="liA8E" id="3R4s7SZFbdR" role="2OqNvi">
381-
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
382-
<node concept="2OqwBi" id="3R4s7SZEd3d" role="37wK5m">
383-
<node concept="2OqwBi" id="3R4s7SZE6fN" role="2Oq$k0">
384-
<node concept="2OqwBi" id="3gAGr91tiej" role="2Oq$k0">
385-
<node concept="2OqwBi" id="3R4s7SZE6fO" role="2Oq$k0">
386-
<node concept="37vLTw" id="3R4s7SZE6fP" role="2Oq$k0">
387-
<ref role="3cqZAo" node="3R4s7SZE6e_" resolve="ideaPlugIn" />
388-
</node>
389-
<node concept="3Tsc0h" id="3R4s7SZE6fQ" role="2OqNvi">
390-
<ref role="3TtcxE" to="kdzh:5HVSRHdUrJE" resolve="content" />
391-
</node>
392-
</node>
393-
<node concept="v3k3i" id="3gAGr91tnxb" role="2OqNvi">
394-
<node concept="chp4Y" id="3gAGr91tont" role="v3oSu">
395-
<ref role="cht4Q" to="kdzh:5HVSRHdUL81" resolve="BuildMps_IdeaPluginGroup" />
396-
</node>
397-
</node>
365+
<node concept="3clFbF" id="3R4s7SZF2eJ" role="3cqZAp">
366+
<node concept="2OqwBi" id="3R4s7SZF5h2" role="3clFbG">
367+
<node concept="37vLTw" id="3R4s7SZF2eH" role="2Oq$k0">
368+
<ref role="3cqZAo" node="3R4s7SZEw2V" resolve="retval" />
369+
</node>
370+
<node concept="liA8E" id="3R4s7SZFbdR" role="2OqNvi">
371+
<ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
372+
<node concept="2OqwBi" id="3R4s7SZEd3d" role="37wK5m">
373+
<node concept="2OqwBi" id="3R4s7SZE6fN" role="2Oq$k0">
374+
<node concept="2OqwBi" id="3gAGr91tiej" role="2Oq$k0">
375+
<node concept="2OqwBi" id="3R4s7SZE6fO" role="2Oq$k0">
376+
<node concept="37vLTw" id="3R4s7SZE6fP" role="2Oq$k0">
377+
<ref role="3cqZAo" node="3R4s7SZE6e_" resolve="ideaPlugIn" />
398378
</node>
399-
<node concept="3goQfb" id="3R4s7SZE6fR" role="2OqNvi">
400-
<node concept="1bVj0M" id="3R4s7SZE6fS" role="23t8la">
401-
<node concept="3clFbS" id="3R4s7SZE6fT" role="1bW5cS">
402-
<node concept="3clFbF" id="3R4s7SZE6fU" role="3cqZAp">
403-
<node concept="2OqwBi" id="3R4s7SZE6fV" role="3clFbG">
404-
<node concept="2OqwBi" id="3R4s7SZE6fW" role="2Oq$k0">
405-
<node concept="2OqwBi" id="3R4s7SZE6fX" role="2Oq$k0">
406-
<node concept="3TrEf2" id="3gAGr91tu5c" role="2OqNvi">
407-
<ref role="3Tt5mk" to="kdzh:5HVSRHdUL82" resolve="group" />
408-
</node>
409-
<node concept="37vLTw" id="3gAGr91tsF3" role="2Oq$k0">
410-
<ref role="3cqZAo" node="3R4s7SZE6ga" resolve="it" />
411-
</node>
412-
</node>
413-
<node concept="3Tsc0h" id="3gAGr91tvht" role="2OqNvi">
414-
<ref role="3TtcxE" to="kdzh:1jjYQYSgYJu" resolve="modules" />
415-
</node>
379+
<node concept="3Tsc0h" id="3R4s7SZE6fQ" role="2OqNvi">
380+
<ref role="3TtcxE" to="kdzh:5HVSRHdUrJE" resolve="content" />
381+
</node>
382+
</node>
383+
<node concept="v3k3i" id="3gAGr91tnxb" role="2OqNvi">
384+
<node concept="chp4Y" id="3gAGr91tont" role="v3oSu">
385+
<ref role="cht4Q" to="kdzh:5HVSRHdUL81" resolve="BuildMps_IdeaPluginGroup" />
386+
</node>
387+
</node>
388+
</node>
389+
<node concept="3goQfb" id="3R4s7SZE6fR" role="2OqNvi">
390+
<node concept="1bVj0M" id="3R4s7SZE6fS" role="23t8la">
391+
<node concept="3clFbS" id="3R4s7SZE6fT" role="1bW5cS">
392+
<node concept="3clFbF" id="3R4s7SZE6fU" role="3cqZAp">
393+
<node concept="2OqwBi" id="3R4s7SZE6fV" role="3clFbG">
394+
<node concept="2OqwBi" id="3R4s7SZE6fW" role="2Oq$k0">
395+
<node concept="2OqwBi" id="3R4s7SZE6fX" role="2Oq$k0">
396+
<node concept="3TrEf2" id="3gAGr91tu5c" role="2OqNvi">
397+
<ref role="3Tt5mk" to="kdzh:5HVSRHdUL82" resolve="group" />
416398
</node>
417-
<node concept="v3k3i" id="3R4s7SZE6g8" role="2OqNvi">
418-
<node concept="chp4Y" id="3R4s7SZE6g9" role="v3oSu">
419-
<ref role="cht4Q" to="kdzh:hS0KzPOwoe" resolve="BuildMps_DevKit" />
420-
</node>
399+
<node concept="37vLTw" id="3gAGr91tsF3" role="2Oq$k0">
400+
<ref role="3cqZAo" node="3R4s7SZE6ga" resolve="it" />
421401
</node>
422402
</node>
403+
<node concept="3Tsc0h" id="3gAGr91tvht" role="2OqNvi">
404+
<ref role="3TtcxE" to="kdzh:1jjYQYSgYJu" resolve="modules" />
405+
</node>
406+
</node>
407+
<node concept="v3k3i" id="3R4s7SZE6g8" role="2OqNvi">
408+
<node concept="chp4Y" id="3R4s7SZE6g9" role="v3oSu">
409+
<ref role="cht4Q" to="kdzh:hS0KzPOwoe" resolve="BuildMps_DevKit" />
410+
</node>
423411
</node>
424-
</node>
425-
<node concept="gl6BB" id="3R4s7SZE6ga" role="1bW2Oz">
426-
<property role="TrG5h" value="it" />
427-
<node concept="2jxLKc" id="3R4s7SZE6gb" role="1tU5fm" />
428412
</node>
429413
</node>
430414
</node>
415+
<node concept="gl6BB" id="3R4s7SZE6ga" role="1bW2Oz">
416+
<property role="TrG5h" value="it" />
417+
<node concept="2jxLKc" id="3R4s7SZE6gb" role="1tU5fm" />
418+
</node>
431419
</node>
432-
<node concept="ANE8D" id="3R4s7SZEenR" role="2OqNvi" />
433420
</node>
434421
</node>
422+
<node concept="ANE8D" id="3R4s7SZEenR" role="2OqNvi" />
435423
</node>
436424
</node>
437425
</node>
438-
<node concept="3eOSWO" id="3gAGr91rSzw" role="3clFbw">
439-
<node concept="3cmrfG" id="3gAGr91rSzz" role="3uHU7w">
440-
<property role="3cmrfH" value="0" />
441-
</node>
442-
<node concept="37vLTw" id="3gAGr91rPf4" role="3uHU7B">
443-
<ref role="3cqZAo" node="3gAGr91kZo4" resolve="indent" />
444-
</node>
445-
</node>
446426
</node>
447427
<node concept="3clFbF" id="3gAGr91sNvE" role="3cqZAp">
448428
<node concept="2OqwBi" id="3gAGr91sNvF" role="3clFbG">
@@ -529,10 +509,6 @@
529509
<ref role="ehGHo" to="kdzh:5HVSRHdUrHO" resolve="BuildMps_IdeaPlugin" />
530510
</node>
531511
</node>
532-
<node concept="37vLTG" id="3gAGr91kZo4" role="3clF46">
533-
<property role="TrG5h" value="indent" />
534-
<node concept="10Oyi0" id="3gAGr91l04K" role="1tU5fm" />
535-
</node>
536512
<node concept="_YKpA" id="3R4s7SZE9KW" role="3clF45">
537513
<node concept="3Tqbb2" id="3R4s7SZE9R0" role="_ZDj9">
538514
<ref role="ehGHo" to="kdzh:hS0KzPOwoe" resolve="BuildMps_DevKit" />
@@ -736,17 +712,17 @@
736712
<ref role="ehGHo" to="kdzh:hS0KzPOwoe" resolve="BuildMps_DevKit" />
737713
</node>
738714
</node>
739-
<node concept="2OqwBi" id="3gAGr91fHEG" role="33vP2m">
740-
<node concept="2WthIp" id="3gAGr91fHEJ" role="2Oq$k0" />
741-
<node concept="2XshWL" id="3gAGr91fHEL" role="2OqNvi">
742-
<ref role="2WH_rO" node="3R4s7SZE4Cm" resolve="getDevKistFromIdeaPlugin" />
743-
<node concept="37vLTw" id="3gAGr91fJLL" role="2XxRq1">
744-
<ref role="3cqZAo" node="5oK6FmqbWvM" resolve="ideaPlugIn" />
745-
</node>
746-
<node concept="3cmrfG" id="3gAGr91leox" role="2XxRq1">
747-
<property role="3cmrfH" value="0" />
715+
<node concept="2OqwBi" id="392I_bcVtMm" role="33vP2m">
716+
<node concept="2OqwBi" id="3gAGr91fHEG" role="2Oq$k0">
717+
<node concept="2WthIp" id="3gAGr91fHEJ" role="2Oq$k0" />
718+
<node concept="2XshWL" id="3gAGr91fHEL" role="2OqNvi">
719+
<ref role="2WH_rO" node="3R4s7SZE4Cm" resolve="getDevKistFromIdeaPlugin" />
720+
<node concept="37vLTw" id="3gAGr91fJLL" role="2XxRq1">
721+
<ref role="3cqZAo" node="5oK6FmqbWvM" resolve="ideaPlugIn" />
722+
</node>
748723
</node>
749724
</node>
725+
<node concept="1VAtEI" id="392I_bcVyBn" role="2OqNvi" />
750726
</node>
751727
</node>
752728
</node>

0 commit comments

Comments
 (0)