Skip to content

Commit 32985d0

Browse files
dbinkeledbinkele
authored
Merge pull request #1387 from IETS3/feature/Ease-the-Testing-of-Error-Highlightning-of-ISolvable-#1386
Feature/ease the testing of error highlightning of i solvable #1386
2 parents 7ab40c3 + 2b9f99f commit 32985d0

File tree

11 files changed

+956
-18
lines changed

11 files changed

+956
-18
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps‎

Lines changed: 58 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5143,21 +5143,65 @@
51435143
<node concept="3uibUv" id="2f_Mi5n7QvR" role="1tU5fm">
51445144
<ref role="3uigEE" node="2f_Mi5n7Neo" resolve="SolverChecker" />
51455145
</node>
5146+
<node concept="2ShNRf" id="4R78VpRSw3P" role="33vP2m">
5147+
<node concept="HV5vD" id="4R78VpRTkc_" role="2ShVmc">
5148+
<property role="373rjd" value="true" />
5149+
<ref role="HV5vE" node="2f_Mi5n7Neo" resolve="SolverChecker" />
5150+
</node>
5151+
</node>
51465152
</node>
51475153
<node concept="2uRRBT" id="2f_Mi5n7Ldo" role="2uRRB$">
51485154
<node concept="3clFbS" id="2f_Mi5n7Ldp" role="2VODD2">
5149-
<node concept="3clFbF" id="2f_Mi5n7QNu" role="3cqZAp">
5150-
<node concept="37vLTI" id="2f_Mi5n7Rqk" role="3clFbG">
5151-
<node concept="2ShNRf" id="2f_Mi5n7RqO" role="37vLTx">
5152-
<node concept="HV5vD" id="2f_Mi5n7RW1" role="2ShVmc">
5153-
<ref role="HV5vE" node="2f_Mi5n7Neo" resolve="SolverChecker" />
5154-
</node>
5155+
<node concept="3SKdUt" id="2F3xlwaS1ih" role="3cqZAp">
5156+
<node concept="1PaTwC" id="2F3xlwaS1ii" role="1aUNEU">
5157+
<node concept="3oM_SD" id="2F3xlwaS1ij" role="1PaTwD">
5158+
<property role="3oM_SC" value="Keep" />
51555159
</node>
5156-
<node concept="2OqwBi" id="2f_Mi5n7QXY" role="37vLTJ">
5157-
<node concept="2WthIp" id="2f_Mi5n7QNs" role="2Oq$k0" />
5158-
<node concept="2BZ7hE" id="2f_Mi5n7R9u" role="2OqNvi">
5159-
<ref role="2WH_rO" node="2f_Mi5n7Q1c" resolve="checker" />
5160-
</node>
5160+
<node concept="3oM_SD" id="2F3xlwaS1wk" role="1PaTwD">
5161+
<property role="3oM_SC" value="this" />
5162+
</node>
5163+
<node concept="3oM_SD" id="2F3xlwaS1wF" role="1PaTwD">
5164+
<property role="3oM_SC" value="code" />
5165+
</node>
5166+
<node concept="3oM_SD" id="2F3xlwaS1x5" role="1PaTwD">
5167+
<property role="3oM_SC" value="in" />
5168+
</node>
5169+
<node concept="3oM_SD" id="2F3xlwaS1xt" role="1PaTwD">
5170+
<property role="3oM_SC" value="order" />
5171+
</node>
5172+
<node concept="3oM_SD" id="2F3xlwaS1xS" role="1PaTwD">
5173+
<property role="3oM_SC" value="to" />
5174+
</node>
5175+
<node concept="3oM_SD" id="2F3xlwaS1yg" role="1PaTwD">
5176+
<property role="3oM_SC" value="enable" />
5177+
</node>
5178+
<node concept="3oM_SD" id="2F3xlwaS1yG" role="1PaTwD">
5179+
<property role="3oM_SC" value="error" />
5180+
</node>
5181+
<node concept="3oM_SD" id="2F3xlwaS1z7" role="1PaTwD">
5182+
<property role="3oM_SC" value="highlightning" />
5183+
</node>
5184+
<node concept="3oM_SD" id="2F3xlwaS1$i" role="1PaTwD">
5185+
<property role="3oM_SC" value="stemming" />
5186+
</node>
5187+
<node concept="3oM_SD" id="2F3xlwaS1_4" role="1PaTwD">
5188+
<property role="3oM_SC" value="from" />
5189+
</node>
5190+
</node>
5191+
</node>
5192+
<node concept="3SKdUt" id="2F3xlwaS1Kg" role="3cqZAp">
5193+
<node concept="1PaTwC" id="2F3xlwaS1Kh" role="1aUNEU">
5194+
<node concept="3oM_SD" id="2F3xlwaS1MW" role="1PaTwD">
5195+
<property role="3oM_SC" value="errors" />
5196+
</node>
5197+
<node concept="3oM_SD" id="2F3xlwaS1Nq" role="1PaTwD">
5198+
<property role="3oM_SC" value="detected" />
5199+
</node>
5200+
<node concept="3oM_SD" id="2F3xlwaS1OP" role="1PaTwD">
5201+
<property role="3oM_SC" value="by" />
5202+
</node>
5203+
<node concept="3oM_SD" id="2F3xlwaS1Pd" role="1PaTwD">
5204+
<property role="3oM_SC" value="'ISolvable'" />
51615205
</node>
51625206
</node>
51635207
</node>
@@ -5244,6 +5288,7 @@
52445288
<node concept="312cEu" id="2f_Mi5n7Neo">
52455289
<property role="TrG5h" value="SolverChecker" />
52465290
<property role="3GE5qa" value="AsyncISolvable" />
5291+
<node concept="2tJIrI" id="50SLpTeALIK" role="jymVt" />
52475292
<node concept="312cEg" id="5lWcBwKPvxe" role="jymVt">
52485293
<property role="TrG5h" value="changeCounts" />
52495294
<node concept="3Tm6S6" id="5lWcBwKPvxf" role="1B3o_S" />
@@ -5268,13 +5313,14 @@
52685313
</node>
52695314
</node>
52705315
<node concept="2tJIrI" id="3K_gMq6RgTa" role="jymVt" />
5271-
<node concept="2tJIrI" id="3K_gMq6RgVp" role="jymVt" />
5316+
<node concept="2tJIrI" id="50SLpTeARat" role="jymVt" />
52725317
<node concept="3Tm1VV" id="2f_Mi5n7Nep" role="1B3o_S" />
52735318
<node concept="3uibUv" id="2f_Mi5n7NWO" role="1zkMxy">
52745319
<ref role="3uigEE" to="n70j:~BaseEditorChecker" resolve="BaseEditorChecker" />
52755320
</node>
52765321
<node concept="3clFb_" id="2f_Mi5n7O6a" role="jymVt">
52775322
<property role="TrG5h" value="needsUpdate" />
5323+
<property role="od$2w" value="true" />
52785324
<node concept="3Tm1VV" id="2f_Mi5n7O6b" role="1B3o_S" />
52795325
<node concept="10P_77" id="2f_Mi5n7O6d" role="3clF45" />
52805326
<node concept="37vLTG" id="2f_Mi5n7O6e" role="3clF46">

‎code/languages/org.iets3.opensource/languages/test.org.iets3.analysis.base.solvable/models/test.org.iets3.analysis.base.solvable.behavior.mps‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@
146146
<concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
147147
</language>
148148
<language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
149+
<concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
150+
<reference id="5455284157994012188" name="link" index="2pIpSl" />
151+
<child id="1595412875168045827" name="initValue" index="28nt2d" />
152+
</concept>
149153
<concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
150154
<reference id="5455284157993911078" name="property" index="2pJxcJ" />
151155
<child id="1595412875168045201" name="initValue" index="28ntcv" />
@@ -160,6 +164,9 @@
160164
<concept id="6985522012210254362" name="jetbrains.mps.lang.quotation.structure.NodeBuilderPropertyExpression" flags="nn" index="WxPPo">
161165
<child id="6985522012210254363" name="expression" index="WxPPp" />
162166
</concept>
167+
<concept id="8182547171709752110" name="jetbrains.mps.lang.quotation.structure.NodeBuilderExpression" flags="nn" index="36biLy">
168+
<child id="8182547171709752112" name="expression" index="36biLW" />
169+
</concept>
163170
</language>
164171
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
165172
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
@@ -168,9 +175,13 @@
168175
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
169176
<reference id="1138056395725" name="property" index="3TsBF5" />
170177
</concept>
178+
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
179+
<reference id="1138056516764" name="link" index="3Tt5mk" />
180+
</concept>
171181
</language>
172182
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
173183
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
184+
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
174185
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
175186
</concept>
176187
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
@@ -179,6 +190,7 @@
179190
</language>
180191
</registry>
181192
<node concept="13h7C7" id="7wEqFvbO4F7">
193+
<property role="3GE5qa" value="test.solvertaskfactory" />
182194
<ref role="13h7C2" to="6w03:7wEqFvbO3UV" resolve="DummySolverTask" />
183195
<node concept="13hLZK" id="7wEqFvbO4F8" role="13h7CW">
184196
<node concept="3clFbS" id="7wEqFvbO4F9" role="2VODD2" />
@@ -313,6 +325,7 @@
313325
</node>
314326
</node>
315327
<node concept="13h7C7" id="7wEqFvbOzp$">
328+
<property role="3GE5qa" value="test.solvertaskfactory" />
316329
<ref role="13h7C2" to="6w03:7wEqFvbOyMV" resolve="DummyISolvable" />
317330
<node concept="13hLZK" id="7wEqFvbOzp_" role="13h7CW">
318331
<node concept="3clFbS" id="7wEqFvbOzpA" role="2VODD2" />
@@ -422,6 +435,7 @@
422435
</node>
423436
</node>
424437
<node concept="13h7C7" id="7Vgw$ZVF8xz">
438+
<property role="3GE5qa" value="test.solvertaskfactory" />
425439
<ref role="13h7C2" to="6w03:7Vgw$ZVEZE6" resolve="Unrelated" />
426440
<node concept="13hLZK" id="7Vgw$ZVF8x$" role="13h7CW">
427441
<node concept="3clFbS" id="7Vgw$ZVF8x_" role="2VODD2" />
@@ -452,5 +466,108 @@
452466
</node>
453467
</node>
454468
</node>
469+
<node concept="13h7C7" id="1fRru3Du4P9">
470+
<property role="3GE5qa" value="test.highlighter" />
471+
<ref role="13h7C2" to="6w03:1fRru3Du4P8" resolve="UITestSolverTask" />
472+
<node concept="13hLZK" id="1fRru3Du4Pa" role="13h7CW">
473+
<node concept="3clFbS" id="1fRru3Du4Pb" role="2VODD2" />
474+
</node>
475+
<node concept="13i0hz" id="1fRru3Du4Ps" role="13h7CS">
476+
<property role="TrG5h" value="run" />
477+
<ref role="13i0hy" to="1jcu:7rOSrvnGeUQ" resolve="run" />
478+
<node concept="3Tm1VV" id="1fRru3Du4Pt" role="1B3o_S" />
479+
<node concept="3clFbS" id="1fRru3Du4Pw" role="3clF47">
480+
<node concept="3clFbF" id="1fRru3Du6cq" role="3cqZAp">
481+
<node concept="2YIFZM" id="1fRru3Du6lD" role="3clFbG">
482+
<ref role="37wK5l" to="gdgh:1E4g5b2MHto" resolve="make" />
483+
<ref role="1Pybhc" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
484+
<node concept="3clFbT" id="1fRru3Du6_p" role="37wK5m" />
485+
<node concept="Rm8GO" id="1fRru3Du7Hr" role="37wK5m">
486+
<ref role="Rm8GQ" to="gdgh:57dmM_UsBRA" resolve="Error" />
487+
<ref role="1Px2BO" to="gdgh:57dmM_Us_jZ" resolve="IResult.MessageType" />
488+
</node>
489+
<node concept="Xl_RD" id="1fRru3Du7Mg" role="37wK5m">
490+
<property role="Xl_RC" value="UITest errors propagated" />
491+
</node>
492+
<node concept="2YIFZM" id="1fRru3Du91w" role="37wK5m">
493+
<ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
494+
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
495+
<node concept="2OqwBi" id="32V3Yf$VWuM" role="37wK5m">
496+
<node concept="13iPFW" id="32V3Yf$VVJt" role="2Oq$k0" />
497+
<node concept="3TrEf2" id="32V3Yf$VXeQ" role="2OqNvi">
498+
<ref role="3Tt5mk" to="6w03:32V3Yf$VOIg" resolve="target" />
499+
</node>
500+
</node>
501+
</node>
502+
<node concept="10Nm6u" id="1fRru3DuaRl" role="37wK5m" />
503+
</node>
504+
</node>
505+
</node>
506+
<node concept="3uibUv" id="1fRru3Du4Px" role="3clF45">
507+
<ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
508+
</node>
509+
</node>
510+
<node concept="13i0hz" id="1fRru3Du4P$" role="13h7CS">
511+
<property role="TrG5h" value="finishAndCleanup" />
512+
<ref role="13i0hy" to="1jcu:7rOSrvnHe0i" resolve="finishAndCleanup" />
513+
<node concept="3Tm1VV" id="1fRru3Du4P_" role="1B3o_S" />
514+
<node concept="3clFbS" id="1fRru3Du4PC" role="3clF47" />
515+
<node concept="3cqZAl" id="1fRru3Du4PD" role="3clF45" />
516+
</node>
517+
<node concept="13i0hz" id="1fRru3Du4PE" role="13h7CS">
518+
<property role="TrG5h" value="getWarning" />
519+
<ref role="13i0hy" to="1jcu:7rOSrvnH60y" resolve="getWarning" />
520+
<node concept="3Tm1VV" id="1fRru3Du4PF" role="1B3o_S" />
521+
<node concept="3clFbS" id="1fRru3Du4PI" role="3clF47">
522+
<node concept="3clFbF" id="1fRru3Du4PL" role="3cqZAp">
523+
<node concept="Xl_RD" id="1fRru3Du4PK" role="3clFbG">
524+
<property role="Xl_RC" value="" />
525+
</node>
526+
</node>
527+
</node>
528+
<node concept="17QB3L" id="1fRru3Du4PJ" role="3clF45" />
529+
</node>
530+
<node concept="13i0hz" id="1fRru3Du4PM" role="13h7CS">
531+
<property role="TrG5h" value="setCreationTime" />
532+
<ref role="13i0hy" to="1jcu:4u26ju1JEr$" resolve="setCreationTime" />
533+
<node concept="3Tm1VV" id="1fRru3Du4PN" role="1B3o_S" />
534+
<node concept="3clFbS" id="1fRru3Du4PS" role="3clF47" />
535+
<node concept="37vLTG" id="1fRru3Du4PT" role="3clF46">
536+
<property role="TrG5h" value="t" />
537+
<node concept="3cpWsb" id="1fRru3Du4PU" role="1tU5fm" />
538+
</node>
539+
<node concept="3cqZAl" id="1fRru3Du4PV" role="3clF45" />
540+
</node>
541+
</node>
542+
<node concept="13h7C7" id="1fRru3DubfG">
543+
<property role="3GE5qa" value="test.highlighter" />
544+
<ref role="13h7C2" to="6w03:1fRru3DubfE" resolve="UITestSolvable" />
545+
<node concept="13hLZK" id="1fRru3DubfH" role="13h7CW">
546+
<node concept="3clFbS" id="1fRru3DubfI" role="2VODD2" />
547+
</node>
548+
<node concept="13i0hz" id="1fRru3DubgL" role="13h7CS">
549+
<property role="TrG5h" value="createSolverTask" />
550+
<ref role="13i0hy" to="1jcu:4pkidg67Lgb" resolve="createSolverTask" />
551+
<node concept="3Tm1VV" id="1fRru3DubgM" role="1B3o_S" />
552+
<node concept="3clFbS" id="1fRru3Dubh5" role="3clF47">
553+
<node concept="3clFbF" id="1fRru3Dubyz" role="3cqZAp">
554+
<node concept="2pJPEk" id="1fRru3Dubyx" role="3clFbG">
555+
<node concept="2pJPED" id="1fRru3Dubyy" role="2pJPEn">
556+
<ref role="2pJxaS" to="6w03:1fRru3Du4P8" resolve="UITestSolverTask" />
557+
<node concept="2pIpSj" id="32V3Yf$VQ0i" role="2pJxcM">
558+
<ref role="2pIpSl" to="6w03:32V3Yf$VOIg" resolve="target" />
559+
<node concept="36biLy" id="32V3Yf$VQqn" role="28nt2d">
560+
<node concept="13iPFW" id="32V3Yf$VQye" role="36biLW" />
561+
</node>
562+
</node>
563+
</node>
564+
</node>
565+
</node>
566+
</node>
567+
<node concept="3Tqbb2" id="1fRru3Dubh6" role="3clF45">
568+
<ref role="ehGHo" to="l80j:7rOSrvnFUQX" resolve="AbstractSolverTask" />
569+
</node>
570+
</node>
571+
</node>
455572
</model>
456573

‎code/languages/org.iets3.opensource/languages/test.org.iets3.analysis.base.solvable/models/test.org.iets3.analysis.base.solvable.editor.mps‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,42 @@
66
<use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
77
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
88
</languages>
9-
<imports />
10-
<registry />
9+
<imports>
10+
<import index="6w03" ref="r:2b6823f7-1c48-47b9-9a41-e04ac80f7887(test.org.iets3.analysis.base.solvable.structure)" implicit="true" />
11+
</imports>
12+
<registry>
13+
<language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
14+
<concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
15+
<concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
16+
<concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
17+
<child id="1080736633877" name="cellModel" index="2wV5jI" />
18+
</concept>
19+
<concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
20+
<child id="1106270802874" name="cellLayout" index="2iSdaV" />
21+
<child id="1073389446424" name="childCellModel" index="3EZMnx" />
22+
</concept>
23+
<concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
24+
<property id="1073389577007" name="text" index="3F0ifm" />
25+
</concept>
26+
<concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
27+
<reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
28+
</concept>
29+
</language>
30+
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
31+
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
32+
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
33+
</concept>
34+
</language>
35+
</registry>
36+
<node concept="24kQdi" id="1fRru3DubJi">
37+
<property role="3GE5qa" value="test.highlighter" />
38+
<ref role="1XX52x" to="6w03:1fRru3DubfE" resolve="UITestSolvable" />
39+
<node concept="3EZMnI" id="1fRru3DubJm" role="2wV5jI">
40+
<node concept="2iRfu4" id="1fRru3DubJn" role="2iSdaV" />
41+
<node concept="3F0ifn" id="1fRru3DubJk" role="3EZMnx">
42+
<property role="3F0ifm" value="TestUI:" />
43+
</node>
44+
</node>
45+
</node>
1146
</model>
1247

0 commit comments

Comments
 (0)