Skip to content

Commit 05d6296

Browse files
wsafonovwsafonov
committed
pre-migration fixes
* fixed usages of Hamcrest (moved to JUnit library) * reloaded build script * regenerated allScripts * fixed some check errors in languages
1 parent d4e5503 commit 05d6296

File tree

11 files changed

+63
-93
lines changed

11 files changed

+63
-93
lines changed

‎build/scripts/build-allScripts.xml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
<library file="${artifacts.mps}/languages/baseLanguage/closures.runtime.jar" />
123123
<library file="${artifacts.mps}/languages/baseLanguage/collections.runtime.jar" />
124124
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
125-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
126125
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
127126
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
128127
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
@@ -154,7 +153,6 @@
154153
<library file="${artifacts.mps}/languages/editor/typesystemIntegration.jar" />
155154
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
156155
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
157-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
158156
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
159157
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
160158
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
@@ -172,7 +170,6 @@
172170
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.jar" />
173171
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.messages.jar" />
174172
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.problem.childAndProp.jar" />
175-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.problem.failingRule.jar" />
176173
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.problem.jar" />
177174
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.problem.scopes.jar" />
178175
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.feedback.skeleton.jar" />
@@ -195,14 +192,12 @@
195192
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
196193
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
197194
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
198-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.slanguage.jar" />
199195
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
200196
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
201197
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
202198
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
203199
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
204200
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
205-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
206201
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
207202
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
208203
<library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
@@ -220,11 +215,9 @@
220215
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.behavior.api.jar" />
221216
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.behavior.runtime.jar" />
222217
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.constraints.rules.runtime.jar" />
223-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.api.jar" />
224218
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.context.jar" />
225219
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.rt.jar" />
226220
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.rules.jar" />
227-
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.messages.api.jar" />
228221
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.migration.runtime.jar" />
229222
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.smodel.query.runtime.jar" />
230223
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.refactoring.runtime.jar" />
@@ -300,9 +293,7 @@
300293
<fileset file="${artifacts.mps}/lib/mps-context.jar" />
301294
<fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
302295
<fileset file="${artifacts.mps}/lib/mps-problem.jar" />
303-
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
304296
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
305-
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
306297
<fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
307298
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
308299
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
@@ -362,9 +353,7 @@
362353
<fileset file="${artifacts.mps}/lib/mps-context.jar" />
363354
<fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
364355
<fileset file="${artifacts.mps}/lib/mps-problem.jar" />
365-
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
366356
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
367-
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
368357
<fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
369358
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
370359
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
@@ -419,8 +408,7 @@
419408
<classpath>
420409
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
421410
<fileset file="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib/takari-cpsuite-1.2.7.jar" />
422-
<fileset file="${artifacts.mps}/lib/hamcrest-core-1.3.jar" />
423-
<fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
411+
<fileset file="${artifacts.mps}/lib/junit4.jar" />
424412
</classpath>
425413
</javac>
426414
<copy todir="${build.tmp}/java/out/org.iets3.opensource.build.gentests.rt">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/migration.mps‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="-1" />
99
<use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="2" />
1010
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
11+
<use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
1112
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
1213
</languages>
1314
<imports>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<language slang="l:817e4e70-961e-4a95-98a1-15e9f32231f1:jetbrains.mps.ide.httpsupport" version="0" />
5353
<language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
5454
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
55-
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
5655
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
5756
<language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="1" />
5857
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
@@ -72,7 +71,6 @@
7271
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
7372
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
7473
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
75-
<language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
7674
<language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="2" />
7775
<language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
7876
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
@@ -93,8 +91,6 @@
9391
<language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
9492
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
9593
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
96-
<language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
97-
<language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
9894
</languageVersions>
9995
<dependencyVersions>
10096
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -129,7 +125,6 @@
129125
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
130126
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
131127
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
132-
<module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
133128
<module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
134129
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
135130
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/generator/template/[email protected]‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<import index="rjhg" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.junit(JUnit/)" />
2121
<import index="oq0c" ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.plugin)" />
2222
<import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" />
23-
<import index="4k19" ref="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86/java:org.hamcrest(Hamcrest/)" />
2423
<import index="baa3" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.junit.matchers(JUnit/)" />
2524
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
25+
<import index="4k19" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.hamcrest(JUnit/)" />
2626
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
2727
<import index="tpe5" ref="r:00000000-0000-4000-0000-011c895902d1(jetbrains.mps.baseLanguage.unitTest.behavior)" implicit="true" />
2828
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -603,8 +603,8 @@
603603
<ref role="30HIoZ" to="av4b:5Pgo_ASrZfv" resolve="ContainsString" />
604604
<node concept="gft3U" id="1LYmOIWMpXH" role="1lVwrX">
605605
<node concept="2YIFZM" id="1LYmOIWMqp1" role="gfFT$">
606-
<ref role="37wK5l" to="4k19:~CoreMatchers.containsString(java.lang.String)" resolve="containsString" />
607606
<ref role="1Pybhc" to="4k19:~CoreMatchers" resolve="CoreMatchers" />
607+
<ref role="37wK5l" to="4k19:~CoreMatchers.containsString(java.lang.String)" resolve="containsString" />
608608
<node concept="Xl_RD" id="1LYmOIWMqpB" role="37wK5m">
609609
<property role="Xl_RC" value="xyz" />
610610
<node concept="29HgVG" id="1LYmOIWMqr7" role="lGtFl">
@@ -629,11 +629,11 @@
629629
<ref role="30HIoZ" to="av4b:1ESmOTbCHcU" resolve="AndMatcher" />
630630
<node concept="gft3U" id="1vVFmkXGS1s" role="1lVwrX">
631631
<node concept="2YIFZM" id="1vVFmkXGWmK" role="gfFT$">
632-
<ref role="37wK5l" to="4k19:~CoreMatchers.allOf(org.hamcrest.Matcher,org.hamcrest.Matcher):org.hamcrest.Matcher" resolve="allOf" />
633632
<ref role="1Pybhc" to="4k19:~CoreMatchers" resolve="CoreMatchers" />
633+
<ref role="37wK5l" to="4k19:~CoreMatchers.allOf(org.hamcrest.Matcher,org.hamcrest.Matcher)" resolve="allOf" />
634634
<node concept="2YIFZM" id="1vVFmkXGYF4" role="37wK5m">
635-
<ref role="37wK5l" to="4k19:~CoreMatchers.anything():org.hamcrest.Matcher" resolve="anything" />
636635
<ref role="1Pybhc" to="4k19:~CoreMatchers" resolve="CoreMatchers" />
636+
<ref role="37wK5l" to="4k19:~CoreMatchers.anything()" resolve="anything" />
637637
<node concept="29HgVG" id="1vVFmkXGZ0d" role="lGtFl">
638638
<node concept="3NFfHV" id="1vVFmkXGZ0e" role="3NFExx">
639639
<node concept="3clFbS" id="1vVFmkXGZ0f" role="2VODD2">
@@ -650,8 +650,8 @@
650650
</node>
651651
</node>
652652
<node concept="2YIFZM" id="1vVFmkXGYVD" role="37wK5m">
653-
<ref role="37wK5l" to="4k19:~CoreMatchers.anything():org.hamcrest.Matcher" resolve="anything" />
654653
<ref role="1Pybhc" to="4k19:~CoreMatchers" resolve="CoreMatchers" />
654+
<ref role="37wK5l" to="4k19:~CoreMatchers.anything()" resolve="anything" />
655655
<node concept="29HgVG" id="1vVFmkXGZaU" role="lGtFl">
656656
<node concept="3NFfHV" id="1vVFmkXGZaV" role="3NFExx">
657657
<node concept="3clFbS" id="1vVFmkXGZaW" role="2VODD2">
@@ -674,8 +674,8 @@
674674
<ref role="30HIoZ" to="av4b:5Pgo_ASae6g" resolve="IsValidRecord" />
675675
<node concept="gft3U" id="6imM90AmT$M" role="1lVwrX">
676676
<node concept="2YIFZM" id="6imM90AmUmh" role="gfFT$">
677-
<ref role="37wK5l" to="4k19:~CoreMatchers.notNullValue()" resolve="notNullValue" />
678677
<ref role="1Pybhc" to="4k19:~CoreMatchers" resolve="CoreMatchers" />
678+
<ref role="37wK5l" to="4k19:~CoreMatchers.notNullValue()" resolve="notNullValue" />
679679
</node>
680680
</node>
681681
</node>
@@ -1485,8 +1485,8 @@
14851485
</node>
14861486
</node>
14871487
<node concept="2YIFZM" id="1LYmOIWLSWK" role="37wK5m">
1488-
<ref role="37wK5l" to="4k19:~CoreMatchers.equalTo(java.lang.Object)" resolve="equalTo" />
14891488
<ref role="1Pybhc" to="4k19:~CoreMatchers" resolve="CoreMatchers" />
1489+
<ref role="37wK5l" to="4k19:~CoreMatchers.equalTo(java.lang.Object)" resolve="equalTo" />
14901490
<node concept="Xl_RD" id="1LYmOIWLT4O" role="37wK5m">
14911491
<property role="Xl_RC" value="xyz" />
14921492
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<import index="tpe5" ref="r:00000000-0000-4000-0000-011c895902d1(jetbrains.mps.baseLanguage.unitTest.behavior)" />
4949
<import index="tpe3" ref="r:00000000-0000-4000-0000-011c895902d7(jetbrains.mps.baseLanguage.unitTest.structure)" />
5050
<import index="tp6m" ref="r:00000000-0000-4000-0000-011c895903a2(jetbrains.mps.lang.test.runtime)" />
51-
<import index="4k19" ref="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86/java:org.hamcrest(Hamcrest/)" />
5251
<import index="6yn5" ref="r:2bfc35a4-8334-4342-8e2a-a54b7cda4a4c(org.iets3.core.expr.testExecution.structure)" />
5352
<import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
5453
<import index="w474" ref="r:06b241ed-1779-4f34-8d6f-e61e9dd94387(org.iets3.core.expr.testExecution.plugin)" />
@@ -58,6 +57,7 @@
5857
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
5958
<import index="pq1l" ref="r:93cd1fe8-b296-405c-a6e6-040c940ccfa1(org.iets3.core.expr.toplevel.plugin)" />
6059
<import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
60+
<import index="4k19" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.hamcrest(JUnit/)" />
6161
<import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" implicit="true" />
6262
</imports>
6363
<registry>
@@ -14838,9 +14838,6 @@
1483814838
<node concept="3fqX7Q" id="6vw$0gDxj0X" role="3uHU7w">
1483914839
<node concept="1eOMI4" id="6vw$0gDxj0Z" role="3fr31v">
1484014840
<node concept="2ZW3vV" id="6vw$0gDxkOP" role="1eOMHV">
14841-
<node concept="3uibUv" id="5Pgo_AS6YuH" role="2ZW6by">
14842-
<ref role="3uigEE" to="4k19:~Matcher" resolve="Matcher" />
14843-
</node>
1484414841
<node concept="2OqwBi" id="6vw$0gDxjKG" role="2ZW6bz">
1484514842
<node concept="37vLTw" id="6vw$0gDxj_i" role="2Oq$k0">
1484614843
<ref role="3cqZAo" node="6vw$0gDuVWW" resolve="matcherVat" />
@@ -14849,6 +14846,9 @@
1484914846
<ref role="2Oxat5" to="pbu6:7lHetQyBz3x" resolve="value" />
1485014847
</node>
1485114848
</node>
14849+
<node concept="3uibUv" id="PaMsOE3r8x" role="2ZW6by">
14850+
<ref role="3uigEE" to="4k19:~Matcher" resolve="Matcher" />
14851+
</node>
1485214852
</node>
1485314853
</node>
1485414854
</node>
@@ -15314,7 +15314,7 @@
1531415314
<ref role="3uigEE" to="4k19:~Description" resolve="Description" />
1531515315
</node>
1531615316
<node concept="2ShNRf" id="5Pgo_AS7p2i" role="33vP2m">
15317-
<node concept="1pGfFk" id="5Pgo_AS7p2k" role="2ShVmc">
15317+
<node concept="1pGfFk" id="PaMsOE3u1u" role="2ShVmc">
1531815318
<ref role="37wK5l" to="4k19:~StringDescription.&lt;init&gt;()" resolve="StringDescription" />
1531915319
</node>
1532015320
</node>
@@ -15965,14 +15965,6 @@
1596515965
</node>
1596615966
</node>
1596715967
</node>
15968-
<node concept="2OqwBi" id="1e59C2Q$DFB" role="3clFbw">
15969-
<node concept="2GrUjf" id="1e59C2Q$DgA" role="2Oq$k0">
15970-
<ref role="2Gs0qQ" node="1IW19eYFaq2" resolve="item" />
15971-
</node>
15972-
<node concept="2qgKlT" id="1e59C2Q$Ezh" role="2OqNvi">
15973-
<ref role="37wK5l" to="gdgh:3R3AIvumwpO" resolve="hasExistingResult" />
15974-
</node>
15975-
</node>
1597615968
<node concept="9aQIb" id="1e59C2Q$FnC" role="9aQIa">
1597715969
<node concept="3clFbS" id="1e59C2Q$FnD" role="9aQI4">
1597815970
<node concept="3clFbF" id="1e59C2Q$F$1" role="3cqZAp">
@@ -15987,6 +15979,14 @@
1598715979
</node>
1598815980
</node>
1598915981
</node>
15982+
<node concept="2OqwBi" id="1e59C2Q$DFB" role="3clFbw">
15983+
<node concept="2GrUjf" id="1e59C2Q$DgA" role="2Oq$k0">
15984+
<ref role="2Gs0qQ" node="1IW19eYFaq2" resolve="item" />
15985+
</node>
15986+
<node concept="2qgKlT" id="1e59C2Q$Ezh" role="2OqNvi">
15987+
<ref role="37wK5l" to="gdgh:3R3AIvumwpO" resolve="hasExistingResult" />
15988+
</node>
15989+
</node>
1599015990
</node>
1599115991
</node>
1599215992
<node concept="BsUDl" id="6vTsh3ZZ9Do" role="2GsD0m">

0 commit comments

Comments
 (0)