From 846f4db8fc16bcb6f9420932891789d0c35d770d Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 31 Jul 2024 17:56:52 +0200
Subject: [PATCH] Fix used languages cache in AspectLookup

---
 .../jetbrains.mps.lang.coderules.aspect.mps   | 294 +++++++++---------
 1 file changed, 151 insertions(+), 143 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
index 21bdea48..5b13a1c4 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -1506,11 +1506,38 @@
               <ref role="3uigEE" to="mpcv:~Reference" resolve="Reference" />
               <node concept="3qTvmN" id="3GJd70ph8er" role="11_B2D" />
             </node>
-            <node concept="10Nm6u" id="3GJd70pgnuV" role="33vP2m" />
           </node>
         </node>
         <node concept="2$JKZl" id="3GJd70pfk3v" role="3cqZAp">
           <node concept="3clFbS" id="3GJd70pfk3x" role="2LFqv$">
+            <node concept="3clFbF" id="3GJd70pl1LR" role="3cqZAp">
+              <node concept="2OqwBi" id="3GJd70pl73I" role="3clFbG">
+                <node concept="37vLTw" id="3GJd70pl1LP" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelId" />
+                </node>
+                <node concept="kI3uX" id="3GJd70pleKK" role="2OqNvi">
+                  <node concept="2YIFZM" id="55vERwjti0G" role="kIiFs">
+                    <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object)" resolve="identityHashCode" />
+                    <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                    <node concept="2OqwBi" id="4nDRG5_Vmo1" role="37wK5m">
+                      <node concept="2OwXpG" id="4nDRG5_WybX" role="2OqNvi">
+                        <ref role="2Oxat5" node="3GJd70pcJQ2" resolve="userModel" />
+                      </node>
+                      <node concept="1eOMI4" id="4nDRG5_Vsdh" role="2Oq$k0">
+                        <node concept="10QFUN" id="4nDRG5_Vsdi" role="1eOMHV">
+                          <node concept="3uibUv" id="4nDRG5_Vsdj" role="10QFUM">
+                            <ref role="3uigEE" node="3GJd70paCjO" resolve="UsedLanguagesCache" />
+                          </node>
+                          <node concept="37vLTw" id="4nDRG5_Vsdk" role="10QFUP">
+                            <ref role="3cqZAo" node="3GJd70pfXD1" resolve="cached" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3clFbF" id="3GJd70pjHgJ" role="3cqZAp">
               <node concept="2OqwBi" id="3GJd70pk0cr" role="3clFbG">
                 <node concept="1eOMI4" id="3GJd70pjHgH" role="2Oq$k0">
@@ -1528,22 +1555,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="3GJd70pl1LR" role="3cqZAp">
-              <node concept="2OqwBi" id="3GJd70pl73I" role="3clFbG">
-                <node concept="37vLTw" id="3GJd70pl1LP" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelId" />
-                </node>
-                <node concept="kI3uX" id="3GJd70pleKK" role="2OqNvi">
-                  <node concept="2YIFZM" id="55vERwjti0G" role="kIiFs">
-                    <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object)" resolve="identityHashCode" />
-                    <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                    <node concept="37vLTw" id="55vERwjtnHh" role="37wK5m">
-                      <ref role="3cqZAo" node="3GJd70pfXD1" resolve="cached" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
           </node>
           <node concept="3y3z36" id="3GJd70pgI9M" role="2$JKZa">
             <node concept="10Nm6u" id="3GJd70pgLP6" role="3uHU7w" />
@@ -1564,23 +1575,62 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbJ" id="5Zr$fBYRW9G" role="3cqZAp">
-          <node concept="3fqX7Q" id="3GJd70podFr" role="3clFbw">
-            <node concept="2OqwBi" id="3GJd70podFs" role="3fr31v">
-              <node concept="37vLTw" id="3GJd70podFt" role="2Oq$k0">
-                <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelId" />
+        <node concept="3cpWs8" id="4nDRG5_WZXJ" role="3cqZAp">
+          <node concept="3cpWsn" id="4nDRG5_WZXK" role="3cpWs9">
+            <property role="TrG5h" value="cache" />
+            <node concept="3uibUv" id="4nDRG5_WXmE" role="1tU5fm">
+              <ref role="3uigEE" node="3GJd70paCjO" resolve="AspectLookup.UsedLanguagesCache" />
+            </node>
+            <node concept="3EllGN" id="4nDRG5_WZXL" role="33vP2m">
+              <node concept="37vLTw" id="4nDRG5_WZXM" role="3ElQJh">
+                <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelSystemId" />
               </node>
-              <node concept="2Nt0df" id="3GJd70podFu" role="2OqNvi">
-                <node concept="2YIFZM" id="55vERwjttpC" role="38cxEo">
-                  <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object)" resolve="identityHashCode" />
-                  <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                  <node concept="37vLTw" id="55vERwjttpD" role="37wK5m">
-                    <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
-                  </node>
+              <node concept="2YIFZM" id="4nDRG5_WZXN" role="3ElVtu">
+                <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object)" resolve="identityHashCode" />
+                <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                <node concept="37vLTw" id="4nDRG5_WZXO" role="37wK5m">
+                  <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
                 </node>
               </node>
             </node>
           </node>
+        </node>
+        <node concept="3clFbJ" id="4nDRG5_Y99$" role="3cqZAp">
+          <node concept="3clFbS" id="4nDRG5_Y99A" role="3clFbx">
+            <node concept="3clFbF" id="4nDRG5_Yzrx" role="3cqZAp">
+              <node concept="37vLTI" id="4nDRG5_YEr2" role="3clFbG">
+                <node concept="10Nm6u" id="4nDRG5_YI0e" role="37vLTx" />
+                <node concept="37vLTw" id="4nDRG5_Yzrv" role="37vLTJ">
+                  <ref role="3cqZAo" node="4nDRG5_WZXK" resolve="cache" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Wc70l" id="4nDRG5A0sjQ" role="3clFbw">
+            <node concept="3y3z36" id="4nDRG5A0CMZ" role="3uHU7B">
+              <node concept="10Nm6u" id="4nDRG5A0HIN" role="3uHU7w" />
+              <node concept="37vLTw" id="4nDRG5A0zVH" role="3uHU7B">
+                <ref role="3cqZAo" node="4nDRG5_WZXK" resolve="cache" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4nDRG5_YiYD" role="3uHU7w">
+              <node concept="37vLTw" id="4nDRG5_Ye7p" role="2Oq$k0">
+                <ref role="3cqZAo" node="4nDRG5_WZXK" resolve="cache" />
+              </node>
+              <node concept="liA8E" id="4nDRG5_YoV$" role="2OqNvi">
+                <ref role="37wK5l" to="mpcv:~Reference.refersTo(java.lang.Object)" resolve="refersTo" />
+                <node concept="10Nm6u" id="4nDRG5_Yu$e" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="5Zr$fBYRW9G" role="3cqZAp">
+          <node concept="3clFbC" id="4nDRG5_YXNJ" role="3clFbw">
+            <node concept="10Nm6u" id="4nDRG5_Z1z2" role="3uHU7w" />
+            <node concept="37vLTw" id="4nDRG5_YSWR" role="3uHU7B">
+              <ref role="3cqZAo" node="4nDRG5_WZXK" resolve="cache" />
+            </node>
+          </node>
           <node concept="3clFbS" id="5Zr$fBYRW9I" role="3clFbx">
             <node concept="3cpWs8" id="3KN3A4v3Kac" role="3cqZAp">
               <node concept="3cpWsn" id="3KN3A4v3Kad" role="3cpWs9">
@@ -1715,6 +1765,31 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbF" id="4nDRG5_Z7vC" role="3cqZAp">
+              <node concept="37vLTI" id="4nDRG5_ZdgJ" role="3clFbG">
+                <node concept="37vLTw" id="4nDRG5_Z7vA" role="37vLTJ">
+                  <ref role="3cqZAo" node="4nDRG5_WZXK" resolve="cache" />
+                </node>
+                <node concept="2ShNRf" id="4nDRG5_ZdgM" role="37vLTx">
+                  <node concept="1pGfFk" id="4nDRG5_ZdgN" role="2ShVmc">
+                    <property role="373rjd" value="true" />
+                    <ref role="37wK5l" node="3GJd70pcbpJ" />
+                    <node concept="37vLTw" id="4nDRG5_ZdgO" role="37wK5m">
+                      <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
+                    </node>
+                    <node concept="2OqwBi" id="4nDRG5_ZdgP" role="37wK5m">
+                      <node concept="37vLTw" id="4nDRG5_ZdgQ" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5lR$kylkWw7" resolve="result" />
+                      </node>
+                      <node concept="26Dbio" id="4nDRG5_ZdgR" role="2OqNvi" />
+                    </node>
+                    <node concept="37vLTw" id="4nDRG5_ZdgS" role="37wK5m">
+                      <ref role="3cqZAo" node="3GJd70pdYgA" resolve="referenceQueue" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3clFbF" id="5Zr$fBYSFJd" role="3cqZAp">
               <node concept="37vLTI" id="5Zr$fBYTbPy" role="3clFbG">
                 <node concept="3EllGN" id="5Zr$fBYSSG6" role="37vLTJ">
@@ -1729,41 +1804,30 @@
                     </node>
                   </node>
                 </node>
-                <node concept="2ShNRf" id="3GJd70powH9" role="37vLTx">
-                  <node concept="1pGfFk" id="3GJd70poBzp" role="2ShVmc">
-                    <property role="373rjd" value="true" />
-                    <ref role="37wK5l" node="3GJd70pcbpJ" resolve="AspectLookup.UsedLanguagesCache" />
-                    <node concept="37vLTw" id="3GJd70pq81X" role="37wK5m">
-                      <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
-                    </node>
-                    <node concept="2OqwBi" id="3GJd70pqjEj" role="37wK5m">
-                      <node concept="37vLTw" id="3GJd70pqdRC" role="2Oq$k0">
-                        <ref role="3cqZAo" node="5lR$kylkWw7" resolve="result" />
-                      </node>
-                      <node concept="26Dbio" id="3GJd70pqqpc" role="2OqNvi" />
-                    </node>
-                    <node concept="37vLTw" id="3GJd70pq_Sx" role="37wK5m">
-                      <ref role="3cqZAo" node="3GJd70pdYgA" resolve="referenceQueue" />
-                    </node>
-                  </node>
+                <node concept="37vLTw" id="4nDRG5_ZoR6" role="37vLTx">
+                  <ref role="3cqZAo" node="4nDRG5_WZXK" resolve="cache" />
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="1gVbGN" id="4nDRG5_Xd8m" role="3cqZAp">
+          <node concept="3fqX7Q" id="4nDRG5_XF7I" role="1gVkn0">
+            <node concept="2OqwBi" id="4nDRG5_XF7K" role="3fr31v">
+              <node concept="37vLTw" id="4nDRG5_XF7L" role="2Oq$k0">
+                <ref role="3cqZAo" node="4nDRG5_WZXK" resolve="cache" />
+              </node>
+              <node concept="liA8E" id="4nDRG5_XF7M" role="2OqNvi">
+                <ref role="37wK5l" to="mpcv:~Reference.refersTo(java.lang.Object)" resolve="refersTo" />
+                <node concept="10Nm6u" id="4nDRG5_XF7N" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="5Zr$fBYTxar" role="3cqZAp">
           <node concept="2OqwBi" id="3GJd70pnUQp" role="3clFbG">
-            <node concept="3EllGN" id="5Zr$fBYTxat" role="2Oq$k0">
-              <node concept="37vLTw" id="5Zr$fBYTxay" role="3ElQJh">
-                <ref role="3cqZAo" node="5Zr$fBYRFKG" resolve="usedLanguagesBySModelId" />
-              </node>
-              <node concept="2YIFZM" id="55vERwjtKyI" role="3ElVtu">
-                <ref role="37wK5l" to="wyt6:~System.identityHashCode(java.lang.Object)" resolve="identityHashCode" />
-                <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                <node concept="37vLTw" id="55vERwjtKyJ" role="37wK5m">
-                  <ref role="3cqZAo" node="500mE4_sraF" resolve="model" />
-                </node>
-              </node>
+            <node concept="37vLTw" id="4nDRG5_WZXP" role="2Oq$k0">
+              <ref role="3cqZAo" node="4nDRG5_WZXK" resolve="cache" />
             </node>
             <node concept="liA8E" id="3GJd70po2nC" role="2OqNvi">
               <ref role="37wK5l" to="mpcv:~SoftReference.get()" resolve="get" />
@@ -1792,40 +1856,6 @@
       </node>
       <node concept="3Tm6S6" id="9UUIHM0yoz" role="1B3o_S" />
       <node concept="3clFbS" id="9UUIHLWXjj" role="3clF47">
-        <node concept="3SKdUt" id="1AsznI2$d5p" role="3cqZAp">
-          <node concept="1PaTwC" id="1AsznI2$d5q" role="1aUNEU">
-            <node concept="3oM_SD" id="1AsznI2$ibb" role="1PaTwD">
-              <property role="3oM_SC" value="FIXME" />
-            </node>
-            <node concept="3oM_SD" id="1AsznI2$ibd" role="1PaTwD">
-              <property role="3oM_SC" value="listen" />
-            </node>
-            <node concept="3oM_SD" id="1AsznI2$ibg" role="1PaTwD">
-              <property role="3oM_SC" value="for" />
-            </node>
-            <node concept="3oM_SD" id="1AsznI2$ibk" role="1PaTwD">
-              <property role="3oM_SC" value="changes" />
-            </node>
-            <node concept="3oM_SD" id="1AsznI2$ibp" role="1PaTwD">
-              <property role="3oM_SC" value="in" />
-            </node>
-            <node concept="3oM_SD" id="1AsznI2$ibv" role="1PaTwD">
-              <property role="3oM_SC" value="imports" />
-            </node>
-            <node concept="3oM_SD" id="1AsznI2$ibA" role="1PaTwD">
-              <property role="3oM_SC" value="and" />
-            </node>
-            <node concept="3oM_SD" id="1AsznI2$ibI" role="1PaTwD">
-              <property role="3oM_SC" value="update" />
-            </node>
-            <node concept="3oM_SD" id="1AsznI2$ibR" role="1PaTwD">
-              <property role="3oM_SC" value="the" />
-            </node>
-            <node concept="3oM_SD" id="1AsznI2$ic1" role="1PaTwD">
-              <property role="3oM_SC" value="cache!" />
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="9UUIHLXF$Q" role="3cqZAp">
           <node concept="3cpWsn" id="9UUIHLXF$R" role="3cpWs9">
             <property role="TrG5h" value="usedLangs" />
@@ -2566,20 +2596,14 @@
           <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
         </node>
       </node>
-      <node concept="312cEg" id="3GJd70phuUB" role="jymVt">
-        <property role="TrG5h" value="modelId" />
-        <node concept="3Tm6S6" id="3GJd70phuU_" role="1B3o_S" />
-        <node concept="3uibUv" id="3GJd70phuUA" role="1tU5fm">
-          <ref role="3uigEE" to="mhbf:~SModelId" resolve="SModelId" />
-        </node>
-      </node>
       <node concept="312cEg" id="3GJd70piqj8" role="jymVt">
-        <property role="TrG5h" value="myModelListener" />
+        <property role="TrG5h" value="modelListener" />
         <node concept="3Tm6S6" id="3GJd70piqj6" role="1B3o_S" />
         <node concept="3uibUv" id="3GJd70piqj7" role="1tU5fm">
           <ref role="3uigEE" node="3GJd70pebfK" resolve="AspectLookup.UsedLanguagesCache.MyModelListener" />
         </node>
       </node>
+      <node concept="2tJIrI" id="4nDRG5_UhkV" role="jymVt" />
       <node concept="3clFbW" id="3GJd70pcbpJ" role="jymVt">
         <node concept="37vLTG" id="3GJd70pcd36" role="3clF46">
           <property role="TrG5h" value="userModel" />
@@ -2614,26 +2638,6 @@
               <ref role="3cqZAo" node="3GJd70poIrQ" resolve="queue" />
             </node>
           </node>
-          <node concept="3clFbF" id="3GJd70phuUL" role="3cqZAp">
-            <node concept="37vLTI" id="3GJd70phuUM" role="3clFbG">
-              <node concept="2OqwBi" id="3GJd70phuUN" role="37vLTJ">
-                <node concept="Xjq3P" id="3GJd70phuUO" role="2Oq$k0" />
-                <node concept="2OwXpG" id="3GJd70phuUP" role="2OqNvi">
-                  <ref role="2Oxat5" node="3GJd70phuUB" resolve="modelId" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="3GJd70phuUQ" role="37vLTx">
-                <node concept="2JrnkZ" id="3GJd70phuUR" role="2Oq$k0">
-                  <node concept="37vLTw" id="3GJd70phuUS" role="2JrQYb">
-                    <ref role="3cqZAo" node="3GJd70pcd36" resolve="userModel" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="3GJd70phuUT" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SModel.getModelId()" resolve="getModelId" />
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3clFbF" id="3GJd70pcJQa" role="3cqZAp">
             <node concept="37vLTI" id="3GJd70pcJQb" role="3clFbG">
               <node concept="2OqwBi" id="3GJd70pcJQc" role="37vLTJ">
@@ -2649,22 +2653,6 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="3GJd70piqjg" role="3cqZAp">
-            <node concept="37vLTI" id="3GJd70piqjh" role="3clFbG">
-              <node concept="2OqwBi" id="3GJd70piqji" role="37vLTJ">
-                <node concept="Xjq3P" id="3GJd70piqjj" role="2Oq$k0" />
-                <node concept="2OwXpG" id="3GJd70piqjk" role="2OqNvi">
-                  <ref role="2Oxat5" node="3GJd70piqj8" resolve="myModelListener" />
-                </node>
-              </node>
-              <node concept="2ShNRf" id="3GJd70piqjl" role="37vLTx">
-                <node concept="HV5vD" id="3GJd70piqjm" role="2ShVmc">
-                  <property role="373rjd" value="true" />
-                  <ref role="HV5vE" node="3GJd70pebfK" resolve="AspectLookup.UsedLanguagesCache.MyModelListener" />
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3clFbF" id="3GJd70pcdH3" role="3cqZAp">
             <node concept="2OqwBi" id="3GJd70pcF2F" role="3clFbG">
               <node concept="1eOMI4" id="3GJd70pcEen" role="2Oq$k0">
@@ -2682,10 +2670,18 @@
               </node>
               <node concept="liA8E" id="3GJd70pcFwQ" role="2OqNvi">
                 <ref role="37wK5l" to="w1kc:~SModelInternal.addModelListener(jetbrains.mps.smodel.event.SModelListener)" resolve="addModelListener" />
-                <node concept="2OqwBi" id="3GJd70piqjn" role="37wK5m">
-                  <node concept="Xjq3P" id="3GJd70piqjo" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="3GJd70piqjp" role="2OqNvi">
-                    <ref role="2Oxat5" node="3GJd70piqj8" resolve="myModelListener" />
+                <node concept="37vLTI" id="4nDRG5_TMI2" role="37wK5m">
+                  <node concept="2ShNRf" id="4nDRG5_TSj6" role="37vLTx">
+                    <node concept="HV5vD" id="4nDRG5_TYTf" role="2ShVmc">
+                      <property role="373rjd" value="true" />
+                      <ref role="HV5vE" node="3GJd70pebfK" resolve="AspectLookup.UsedLanguagesCache.MyModelListener" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="3GJd70piqjn" role="37vLTJ">
+                    <node concept="Xjq3P" id="3GJd70piqjo" role="2Oq$k0" />
+                    <node concept="2OwXpG" id="3GJd70piqjp" role="2OqNvi">
+                      <ref role="2Oxat5" node="3GJd70piqj8" resolve="modelListener" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -2693,11 +2689,11 @@
           </node>
         </node>
       </node>
-      <node concept="2tJIrI" id="3GJd70pij6X" role="jymVt" />
+      <node concept="2tJIrI" id="4nDRG5_U_CB" role="jymVt" />
       <node concept="312cEu" id="3GJd70pebfK" role="jymVt">
         <property role="2bfB8j" value="true" />
         <property role="TrG5h" value="MyModelListener" />
-        <node concept="3Tm1VV" id="3GJd70pebfL" role="1B3o_S" />
+        <node concept="3Tm6S6" id="4nDRG5_Uuey" role="1B3o_S" />
         <node concept="3uibUv" id="3GJd70peevP" role="1zkMxy">
           <ref role="3uigEE" to="w1kc:~SModelAdapter" resolve="SModelAdapter" />
         </node>
@@ -2828,6 +2824,7 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="4nDRG5_U9Q3" role="jymVt" />
       <node concept="3clFb_" id="3GJd70pbn2_" role="jymVt">
         <property role="TrG5h" value="invalidate" />
         <node concept="3cqZAl" id="3GJd70pbn2B" role="3clF45" />
@@ -2839,7 +2836,7 @@
                 <node concept="2OqwBi" id="3GJd70phOmv" role="3clFbG">
                   <node concept="liA8E" id="3GJd70phUfi" role="2OqNvi">
                     <ref role="37wK5l" to="w1kc:~SModelInternal.removeModelListener(jetbrains.mps.smodel.event.SModelListener)" resolve="removeModelListener" />
-                    <node concept="37vLTw" id="3GJd70piw9N" role="37wK5m">
+                    <node concept="37vLTw" id="4nDRG5_T_Sz" role="37wK5m">
                       <ref role="3cqZAo" node="3GJd70piqj8" resolve="myModelListener" />
                     </node>
                   </node>
@@ -2877,9 +2874,20 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="4nDRG5_SLHD" role="3cqZAp">
+            <node concept="37vLTI" id="4nDRG5_T3$u" role="3clFbG">
+              <node concept="10Nm6u" id="4nDRG5_T9iU" role="37vLTx" />
+              <node concept="2OqwBi" id="4nDRG5_SQAT" role="37vLTJ">
+                <node concept="Xjq3P" id="4nDRG5_SLHB" role="2Oq$k0" />
+                <node concept="2OwXpG" id="4nDRG5_SXT2" role="2OqNvi">
+                  <ref role="2Oxat5" node="3GJd70piqj8" resolve="myModelListener" />
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="3GJd70ps7of" role="3cqZAp">
             <node concept="1rXfSq" id="3GJd70ps7od" role="3clFbG">
-              <ref role="37wK5l" to="mpcv:~Reference.clear()" resolve="clear" />
+              <ref role="37wK5l" to="mpcv:~Reference.enqueue()" resolve="enqueue" />
             </node>
           </node>
         </node>