Skip to content

Commit 009e904

Browse files
dbinkeledbinkele
committed
bugfix/fixDoubleMessages: Fix cause for double messages.
1 parent b3d7cdb commit 009e904

File tree

2 files changed

+114
-78
lines changed

2 files changed

+114
-78
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,9 @@
689689
<ref role="37wK5l" to="dzyv:~ChronoUnit.getDuration()" resolve="getDuration" />
690690
</node>
691691
</node>
692+
<node concept="3clFbT" id="cwnBfE0FNP" role="37wK5m">
693+
<property role="3clFbU" value="true" />
694+
</node>
692695
</node>
693696
</node>
694697
</node>
@@ -1388,6 +1391,9 @@
13881391
<ref role="37wK5l" to="dzyv:~ChronoUnit.getDuration()" resolve="getDuration" />
13891392
</node>
13901393
</node>
1394+
<node concept="3clFbT" id="cwnBfE0G29" role="37wK5m">
1395+
<property role="3clFbU" value="true" />
1396+
</node>
13911397
</node>
13921398
</node>
13931399
</node>

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

Lines changed: 108 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,7 @@
551551
<concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
552552
<child id="1226511765987" name="elementType" index="2hN53Y" />
553553
</concept>
554+
<concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
554555
<concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
555556
<child id="1151688676805" name="elementType" index="_ZDj9" />
556557
</concept>
@@ -605,7 +606,6 @@
605606
<child id="1197932525128" name="key" index="3ElVtu" />
606607
</concept>
607608
<concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
608-
<concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
609609
<concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
610610
<child id="5686963296372573084" name="elementType" index="3O5elw" />
611611
</concept>
@@ -2492,6 +2492,38 @@
24922492
<ref role="37wK5l" to="33ny:~Optional.isEmpty()" resolve="isEmpty" />
24932493
</node>
24942494
</node>
2495+
<node concept="9aQIb" id="cwnBfDYkfR" role="9aQIa">
2496+
<node concept="3clFbS" id="cwnBfDYkfS" role="9aQI4">
2497+
<node concept="3clFbJ" id="cwnBfDZpLf" role="3cqZAp">
2498+
<node concept="3clFbS" id="cwnBfDZpLh" role="3clFbx">
2499+
<node concept="3clFbF" id="wj7bQpIy1c" role="3cqZAp">
2500+
<node concept="2OqwBi" id="wj7bQpIy1d" role="3clFbG">
2501+
<node concept="37vLTw" id="cwnBfDYmYK" role="2Oq$k0">
2502+
<ref role="3cqZAo" node="7S7fpHY0LyZ" resolve="messageBuffer" />
2503+
</node>
2504+
<node concept="liA8E" id="wj7bQpIy1f" role="2OqNvi">
2505+
<ref role="37wK5l" node="7S7fpHXZutG" resolve="add" />
2506+
<node concept="1rXfSq" id="wj7bQpIy1g" role="37wK5m">
2507+
<ref role="37wK5l" node="6QuUnma$l2x" resolve="messageOf" />
2508+
<node concept="2OqwBi" id="cwnBfDYtxZ" role="37wK5m">
2509+
<node concept="37vLTw" id="cwnBfDYqBj" role="2Oq$k0">
2510+
<ref role="3cqZAo" node="20DGXE2TniU" resolve="exceptionResult" />
2511+
</node>
2512+
<node concept="liA8E" id="cwnBfDYx7L" role="2OqNvi">
2513+
<ref role="37wK5l" to="33ny:~Optional.get()" resolve="get" />
2514+
</node>
2515+
</node>
2516+
</node>
2517+
</node>
2518+
</node>
2519+
</node>
2520+
</node>
2521+
<node concept="37vLTw" id="cwnBfDZsAo" role="3clFbw">
2522+
<ref role="3cqZAo" node="cwnBfDZaz8" resolve="messaging" />
2523+
</node>
2524+
</node>
2525+
</node>
2526+
</node>
24952527
</node>
24962528
<node concept="3clFbF" id="4a_JiLn75r3" role="3cqZAp">
24972529
<node concept="2OqwBi" id="4a_JiLn76AP" role="3clFbG">
@@ -2552,18 +2584,39 @@
25522584
</node>
25532585
</node>
25542586
</node>
2555-
<node concept="3clFbF" id="5BRQP3Ri6os" role="3cqZAp">
2556-
<node concept="NRdvd" id="5BRQP3RiflO" role="3clFbG">
2557-
<ref role="1Pybhc" node="2f_Mi5mAhjh" resolve="AsyncSolverTaskExecutor" />
2558-
<ref role="37wK5l" node="5BRQP3Ri6om" resolve="addResultsToMessageBuffer" />
2559-
<node concept="37vLTw" id="5BRQP3RiflP" role="37wK5m">
2560-
<ref role="3cqZAo" node="5BRQP3RilRR" resolve="results" />
2587+
<node concept="3clFbJ" id="cwnBfDZIFd" role="3cqZAp">
2588+
<node concept="3clFbS" id="cwnBfDZIFf" role="3clFbx">
2589+
<node concept="3clFbF" id="5BRQP3Ri6os" role="3cqZAp">
2590+
<node concept="NRdvd" id="5BRQP3RiflO" role="3clFbG">
2591+
<ref role="1Pybhc" node="2f_Mi5mAhjh" resolve="AsyncSolverTaskExecutor" />
2592+
<ref role="37wK5l" node="5BRQP3Ri6om" resolve="addResultsToMessageBuffer" />
2593+
<node concept="37vLTw" id="5BRQP3RiflP" role="37wK5m">
2594+
<ref role="3cqZAo" node="5BRQP3RilRR" resolve="results" />
2595+
</node>
2596+
<node concept="37vLTw" id="5BRQP3RiflQ" role="37wK5m">
2597+
<ref role="3cqZAo" node="3hn7H_$gQev" resolve="forWho" />
2598+
</node>
2599+
</node>
2600+
</node>
2601+
</node>
2602+
<node concept="37vLTw" id="cwnBfDZL_K" role="3clFbw">
2603+
<ref role="3cqZAo" node="cwnBfDZaz8" resolve="messaging" />
2604+
</node>
2605+
</node>
2606+
<node concept="3clFbF" id="5BRQP3Ri6o6" role="3cqZAp">
2607+
<node concept="2OqwBi" id="5BRQP3Ri6o7" role="3clFbG">
2608+
<node concept="37vLTw" id="cwnBfDZC4I" role="2Oq$k0">
2609+
<ref role="3cqZAo" node="1NtQ3jUgzzb" resolve="nodeToQueuedTask" />
25612610
</node>
2562-
<node concept="37vLTw" id="5BRQP3RiflQ" role="37wK5m">
2563-
<ref role="3cqZAo" node="3hn7H_$gQev" resolve="forWho" />
2611+
<node concept="liA8E" id="5BRQP3Ri6o9" role="2OqNvi">
2612+
<ref role="37wK5l" to="33ny:~Map.remove(java.lang.Object)" resolve="remove" />
2613+
<node concept="37vLTw" id="5BRQP3Ri6oj" role="37wK5m">
2614+
<ref role="3cqZAo" node="3hn7H_$gQev" resolve="forWho" />
2615+
</node>
25642616
</node>
25652617
</node>
25662618
</node>
2619+
<node concept="3clFbH" id="cwnBfDZ_uq" role="3cqZAp" />
25672620
<node concept="3cpWs6" id="20DGXE33MwE" role="3cqZAp">
25682621
<node concept="37vLTw" id="5BRQP3RilS6" role="3cqZAk">
25692622
<ref role="3cqZAo" node="5BRQP3RilRR" resolve="results" />
@@ -2655,6 +2708,10 @@
26552708
<ref role="3uigEE" to="28m1:~Duration" resolve="Duration" />
26562709
</node>
26572710
</node>
2711+
<node concept="37vLTG" id="cwnBfDZaz8" role="3clF46">
2712+
<property role="TrG5h" value="messaging" />
2713+
<node concept="10P_77" id="cwnBfDZdXb" role="1tU5fm" />
2714+
</node>
26582715
</node>
26592716
<node concept="2tJIrI" id="4a_JiLndbLl" role="jymVt" />
26602717
<node concept="2YIFZL" id="3hn7H_$lmns" role="jymVt">
@@ -2697,6 +2754,9 @@
26972754
<node concept="37vLTw" id="5BRQP3Rm6Nk" role="37wK5m">
26982755
<ref role="3cqZAo" node="5BRQP3Rm4zr" resolve="timeout" />
26992756
</node>
2757+
<node concept="37vLTw" id="cwnBfE0E3Z" role="37wK5m">
2758+
<ref role="3cqZAo" node="cwnBfE0Bht" resolve="messaging" />
2759+
</node>
27002760
</node>
27012761
</node>
27022762
</node>
@@ -2723,6 +2783,10 @@
27232783
<ref role="3uigEE" to="28m1:~Duration" resolve="Duration" />
27242784
</node>
27252785
</node>
2786+
<node concept="37vLTG" id="cwnBfE0Bht" role="3clF46">
2787+
<property role="TrG5h" value="messaging" />
2788+
<node concept="10P_77" id="cwnBfE0CSv" role="1tU5fm" />
2789+
</node>
27262790
</node>
27272791
<node concept="2tJIrI" id="20DGXE24Pal" role="jymVt" />
27282792
<node concept="2YIFZL" id="20DGXE24wnv" role="jymVt">
@@ -2762,6 +2826,9 @@
27622826
<node concept="37vLTw" id="5BRQP3Rm3tI" role="37wK5m">
27632827
<ref role="3cqZAo" node="5BRQP3RlZ28" resolve="timeout" />
27642828
</node>
2829+
<node concept="37vLTw" id="cwnBfE0fWP" role="37wK5m">
2830+
<ref role="3cqZAo" node="cwnBfE0cjf" resolve="messaging" />
2831+
</node>
27652832
</node>
27662833
</node>
27672834
</node>
@@ -2905,6 +2972,10 @@
29052972
<ref role="3uigEE" to="28m1:~Duration" resolve="Duration" />
29062973
</node>
29072974
</node>
2975+
<node concept="37vLTG" id="cwnBfE0cjf" role="3clF46">
2976+
<property role="TrG5h" value="messaging" />
2977+
<node concept="10P_77" id="cwnBfE0ebV" role="1tU5fm" />
2978+
</node>
29082979
<node concept="3Tm1VV" id="20DGXE24won" role="1B3o_S" />
29092980
<node concept="3uibUv" id="20DGXE24woo" role="3clF45">
29102981
<ref role="3uigEE" to="5zyv:~CompletableFuture" resolve="CompletableFuture" />
@@ -3079,19 +3150,6 @@
30793150
</node>
30803151
</node>
30813152
</node>
3082-
<node concept="3clFbF" id="5BRQP3Ri6o6" role="3cqZAp">
3083-
<node concept="2OqwBi" id="5BRQP3Ri6o7" role="3clFbG">
3084-
<node concept="37vLTw" id="5BRQP3Ri6o8" role="2Oq$k0">
3085-
<ref role="3cqZAo" node="1NtQ3jUgzzb" resolve="nodeToQueuedTask" />
3086-
</node>
3087-
<node concept="liA8E" id="5BRQP3Ri6o9" role="2OqNvi">
3088-
<ref role="37wK5l" to="33ny:~Map.remove(java.lang.Object)" resolve="remove" />
3089-
<node concept="37vLTw" id="5BRQP3Ri6oj" role="37wK5m">
3090-
<ref role="3cqZAo" node="5BRQP3Ri6oe" resolve="forWho" />
3091-
</node>
3092-
</node>
3093-
</node>
3094-
</node>
30953153
</node>
30963154
</node>
30973155
<node concept="2tJIrI" id="4a_JiLn6xM8" role="jymVt" />
@@ -3529,22 +3587,6 @@
35293587
</node>
35303588
</node>
35313589
</node>
3532-
<node concept="3clFbF" id="wj7bQpIy1c" role="3cqZAp">
3533-
<node concept="2OqwBi" id="wj7bQpIy1d" role="3clFbG">
3534-
<node concept="37vLTw" id="wj7bQpIy1e" role="2Oq$k0">
3535-
<ref role="3cqZAo" node="7S7fpHY0LyZ" resolve="messageBuffer" />
3536-
</node>
3537-
<node concept="liA8E" id="wj7bQpIy1f" role="2OqNvi">
3538-
<ref role="37wK5l" node="7S7fpHXZutG" resolve="add" />
3539-
<node concept="1rXfSq" id="wj7bQpIy1g" role="37wK5m">
3540-
<ref role="37wK5l" node="6QuUnma$l2x" resolve="messageOf" />
3541-
<node concept="37vLTw" id="20DGXE2SUKv" role="37wK5m">
3542-
<ref role="3cqZAo" node="20DGXE2SUKm" resolve="errorResult" />
3543-
</node>
3544-
</node>
3545-
</node>
3546-
</node>
3547-
</node>
35483590
<node concept="RRSsy" id="wj7bQpIy1p" role="3cqZAp">
35493591
<property role="RRSoG" value="h1akgim/info" />
35503592
<node concept="37vLTw" id="wj7bQpIy1q" role="RRSoy">
@@ -3730,6 +3772,9 @@
37303772
<node concept="37vLTw" id="5BRQP3RlYAq" role="37wK5m">
37313773
<ref role="3cqZAo" node="5BRQP3RlU9U" resolve="timeout" />
37323774
</node>
3775+
<node concept="37vLTw" id="cwnBfE0bOx" role="37wK5m">
3776+
<ref role="3cqZAo" node="cwnBfE03BP" resolve="messaging" />
3777+
</node>
37333778
</node>
37343779
</node>
37353780
</node>
@@ -3775,6 +3820,10 @@
37753820
<ref role="3uigEE" to="28m1:~Duration" resolve="Duration" />
37763821
</node>
37773822
</node>
3823+
<node concept="37vLTG" id="cwnBfE03BP" role="3clF46">
3824+
<property role="TrG5h" value="messaging" />
3825+
<node concept="10P_77" id="cwnBfE054W" role="1tU5fm" />
3826+
</node>
37783827
</node>
37793828
<node concept="2tJIrI" id="4a_JiLn1e4S" role="jymVt" />
37803829
<node concept="2YIFZL" id="4a_JiLn1kAZ" role="jymVt">
@@ -4199,6 +4248,9 @@
41994248
<node concept="37vLTw" id="5BRQP3RlPG1" role="37wK5m">
42004249
<ref role="3cqZAo" node="5BRQP3RlIwE" resolve="timeout" />
42014250
</node>
4251+
<node concept="37vLTw" id="cwnBfE00Um" role="37wK5m">
4252+
<ref role="3cqZAo" node="cwnBfDZU6x" resolve="messaging" />
4253+
</node>
42024254
</node>
42034255
</node>
42044256
<node concept="3clFbH" id="20DGXE2e2Q$" role="3cqZAp" />
@@ -4334,6 +4386,10 @@
43344386
<ref role="3uigEE" to="28m1:~Duration" resolve="Duration" />
43354387
</node>
43364388
</node>
4389+
<node concept="37vLTG" id="cwnBfDZU6x" role="3clF46">
4390+
<property role="TrG5h" value="messaging" />
4391+
<node concept="10P_77" id="cwnBfDZX7V" role="1tU5fm" />
4392+
</node>
43374393
<node concept="3Tm6S6" id="4a_JiLn1kB1" role="1B3o_S" />
43384394
<node concept="P$JXv" id="5BRQP3SasAT" role="lGtFl">
43394395
<node concept="TZ5HA" id="5BRQP3SasAU" role="TZ5H$">
@@ -5095,14 +5151,14 @@
50955151
<node concept="3cpWs8" id="7iY3uI$U8XV" role="3cqZAp">
50965152
<node concept="3cpWsn" id="7iY3uI$U8XY" role="3cpWs9">
50975153
<property role="TrG5h" value="totalHighlighterMessages" />
5098-
<node concept="_YKpA" id="7iY3uI$U8XR" role="1tU5fm">
5099-
<node concept="3uibUv" id="7iY3uI$Uaea" role="_ZDj9">
5154+
<node concept="2hMVRd" id="cwnBfDVvdw" role="1tU5fm">
5155+
<node concept="3uibUv" id="cwnBfDVvdy" role="2hN53Y">
51005156
<ref role="3uigEE" to="exr9:~EditorMessage" resolve="EditorMessage" />
51015157
</node>
51025158
</node>
51035159
<node concept="2ShNRf" id="7iY3uI$UaDq" role="33vP2m">
5104-
<node concept="Tc6Ow" id="7iY3uI$Ua$M" role="2ShVmc">
5105-
<node concept="3uibUv" id="7iY3uI$Ua$N" role="HW$YZ">
5160+
<node concept="2i4dXS" id="cwnBfDVwAj" role="2ShVmc">
5161+
<node concept="3uibUv" id="cwnBfDVwAl" role="HW$YZ">
51065162
<ref role="3uigEE" to="exr9:~EditorMessage" resolve="EditorMessage" />
51075163
</node>
51085164
</node>
@@ -5506,43 +5562,17 @@
55065562
</node>
55075563
</node>
55085564
<node concept="3clFbS" id="7S7fpHXZutJ" role="3clF47">
5509-
<node concept="2Gpval" id="6celbXwK0Sr" role="3cqZAp">
5510-
<node concept="2GrKxI" id="6celbXwK0St" role="2Gsz3X">
5511-
<property role="TrG5h" value="msg" />
5512-
</node>
5513-
<node concept="37vLTw" id="6celbXwK1Sz" role="2GsD0m">
5514-
<ref role="3cqZAo" node="7S7fpHXZuy1" resolve="messages" />
5515-
</node>
5516-
<node concept="3clFbS" id="6celbXwK0Sx" role="2LFqv$">
5517-
<node concept="3clFbJ" id="6celbXwK24c" role="3cqZAp">
5518-
<node concept="3fqX7Q" id="6celbXwK3h9" role="3clFbw">
5519-
<node concept="2OqwBi" id="6celbXwK3hb" role="3fr31v">
5520-
<node concept="37vLTw" id="6celbXwK3hc" role="2Oq$k0">
5521-
<ref role="3cqZAo" node="7S7fpHXZuy1" resolve="messages" />
5522-
</node>
5523-
<node concept="3JPx81" id="6celbXwReqE" role="2OqNvi">
5524-
<node concept="2GrUjf" id="6celbXwReB8" role="25WWJ7">
5525-
<ref role="2Gs0qQ" node="6celbXwK0St" resolve="msg" />
5526-
</node>
5527-
</node>
5528-
</node>
5565+
<node concept="3clFbF" id="cwnBfDXJbj" role="3cqZAp">
5566+
<node concept="2OqwBi" id="cwnBfDXKr2" role="3clFbG">
5567+
<node concept="2OqwBi" id="cwnBfDXJob" role="2Oq$k0">
5568+
<node concept="Xjq3P" id="cwnBfDXJbh" role="2Oq$k0" />
5569+
<node concept="2OwXpG" id="cwnBfDXJG2" role="2OqNvi">
5570+
<ref role="2Oxat5" node="7S7fpHXZpGK" resolve="messages" />
55295571
</node>
5530-
<node concept="3clFbS" id="6celbXwK24e" role="3clFbx">
5531-
<node concept="3clFbF" id="6celbXwK3tz" role="3cqZAp">
5532-
<node concept="2OqwBi" id="6celbXwK4n_" role="3clFbG">
5533-
<node concept="2OqwBi" id="6celbXwK3DM" role="2Oq$k0">
5534-
<node concept="Xjq3P" id="6celbXwK3ty" role="2Oq$k0" />
5535-
<node concept="2OwXpG" id="6celbXwK3Gu" role="2OqNvi">
5536-
<ref role="2Oxat5" node="7S7fpHXZpGK" resolve="messages" />
5537-
</node>
5538-
</node>
5539-
<node concept="TSZUe" id="1Va87LjvPaw" role="2OqNvi">
5540-
<node concept="2GrUjf" id="1Va87LjvQ38" role="25WWJ7">
5541-
<ref role="2Gs0qQ" node="6celbXwK0St" resolve="msg" />
5542-
</node>
5543-
</node>
5544-
</node>
5545-
</node>
5572+
</node>
5573+
<node concept="X8dFx" id="cwnBfDXMhQ" role="2OqNvi">
5574+
<node concept="37vLTw" id="cwnBfDXMJw" role="25WWJ7">
5575+
<ref role="3cqZAo" node="7S7fpHXZuy1" resolve="messages" />
55465576
</node>
55475577
</node>
55485578
</node>

0 commit comments

Comments
 (0)