From 82b04c23ae4ec5588fb3363d377d3275440c3eae Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 21 Sep 2021 16:55:33 +0200
Subject: [PATCH] Introduce TYPE_COLLECTOR parameter to pass to template
 application session

The older technique that passed "typeCollector" to query is replaced
with passing this object as a session parameter.
Can be accessed with "CustomSessionParameter".
---
 ...ains.mps.coderules.testhelper.testutil.mps |  17 ++
 ...rains.mps.coderules.typechecking@tests.mps |  17 ++
 ...s.mps.coderules.typechecking.ui.plugin.mps | 218 ++++++++++++++++--
 ...ins.mps.coderules.typechecking.service.mps | 212 +++++++++++------
 4 files changed, 377 insertions(+), 87 deletions(-)

diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
index 44cadc2b..4655c4c3 100644
--- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
@@ -974,6 +974,23 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="4LE1vMPe9nF" role="3cqZAp">
+          <node concept="2OqwBi" id="4LE1vMPecfd" role="3clFbG">
+            <node concept="37vLTw" id="4LE1vMPe9nD" role="2Oq$k0">
+              <ref role="3cqZAo" node="61G6TdBqAxt" resolve="macroProcessing" />
+            </node>
+            <node concept="liA8E" id="4LE1vMPefCy" role="2OqNvi">
+              <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
+              <node concept="10M0yZ" id="4LE1vMPeo6s" role="37wK5m">
+                <ref role="3cqZAo" to="tj24:4qGA5WCVux3" resolve="TYPES_COLLECTOR" />
+                <ref role="1PxDUh" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
+              </node>
+              <node concept="37vLTw" id="4LE1vMPeu6R" role="37wK5m">
+                <ref role="3cqZAo" node="5fMWD6Iop7s" resolve="typeCollector" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="1XKnVQwJTO" role="3cqZAp">
           <node concept="37vLTI" id="1XKnVQwJTP" role="3clFbG">
             <node concept="2OqwBi" id="1XKnVQwJTQ" role="37vLTJ">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index 274bf584..0c10cb03 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -3406,6 +3406,23 @@
                   </node>
                 </node>
               </node>
+              <node concept="3clFbF" id="4LE1vMPaYTo" role="3cqZAp">
+                <node concept="2OqwBi" id="4LE1vMPaZHf" role="3clFbG">
+                  <node concept="37vLTw" id="4LE1vMPaYTm" role="2Oq$k0">
+                    <ref role="3cqZAo" node="61G6TdBqDRk" resolve="macroProcessing" />
+                  </node>
+                  <node concept="liA8E" id="4LE1vMPb0OL" role="2OqNvi">
+                    <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
+                    <node concept="10M0yZ" id="4LE1vMPb34s" role="37wK5m">
+                      <ref role="3cqZAo" to="tj24:4qGA5WCVux3" resolve="TYPES_COLLECTOR" />
+                      <ref role="1PxDUh" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
+                    </node>
+                    <node concept="37vLTw" id="4LE1vMPb4D_" role="37wK5m">
+                      <ref role="3cqZAo" node="7gOEBI$hd0J" resolve="typeCollector" />
+                    </node>
+                  </node>
+                </node>
+              </node>
               <node concept="3cpWs8" id="6$7vuu2ugt2" role="3cqZAp">
                 <node concept="3cpWsn" id="6$7vuu2ugt3" role="3cpWs9">
                   <property role="TrG5h" value="tplApp" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index dd822537..5b91898a 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -64,6 +64,7 @@
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="tqvn" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.tempmodel(MPS.Core/)" />
+    <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
   </imports>
   <registry>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -136,6 +137,9 @@
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
+      <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
+        <reference id="2820489544401957798" name="classifier" index="HV5vE" />
+      </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -193,6 +197,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -1785,27 +1792,34 @@
                           </node>
                         </node>
                       </node>
-                    </node>
-                    <node concept="3y3z36" id="2daneBOUDJ6" role="3clFbw">
-                      <node concept="10Nm6u" id="2daneBOUEku" role="3uHU7w" />
-                      <node concept="37vLTw" id="2daneBOUCRq" role="3uHU7B">
-                        <ref role="3cqZAo" node="2daneBOT1Cl" resolve="activationTrace" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="2daneBOUGNA" role="3cqZAp" />
-                  <node concept="3clFbF" id="2ceN1hCIoTH" role="3cqZAp">
-                    <node concept="2OqwBi" id="2ceN1hCIqJG" role="3clFbG">
-                      <node concept="37vLTw" id="2ceN1hCIoTF" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
-                      </node>
-                      <node concept="liA8E" id="2ceN1hCIseF" role="2OqNvi">
-                        <ref role="37wK5l" to="o35r:2ceN1hCFYVI" resolve="dump" />
-                        <node concept="37vLTw" id="2ceN1hCIt59" role="37wK5m">
-                          <ref role="3cqZAo" node="443LGHBSGGx" resolve="mpsProject" />
+                      <node concept="3clFbF" id="2ceN1hCIoTH" role="3cqZAp">
+                        <node concept="2OqwBi" id="2ceN1hCIqJG" role="3clFbG">
+                          <node concept="37vLTw" id="2ceN1hCIoTF" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
+                          </node>
+                          <node concept="liA8E" id="2ceN1hCIseF" role="2OqNvi">
+                            <ref role="37wK5l" to="o35r:2ceN1hCFYVI" resolve="dump" />
+                            <node concept="37vLTw" id="2ceN1hCIt59" role="37wK5m">
+                              <ref role="3cqZAo" node="443LGHBSGGx" resolve="mpsProject" />
+                            </node>
+                          </node>
                         </node>
                       </node>
                     </node>
+                    <node concept="1Wc70l" id="4qGA5WE6mML" role="3clFbw">
+                      <node concept="3y3z36" id="4qGA5WE6rfg" role="3uHU7w">
+                        <node concept="10Nm6u" id="4qGA5WE6sCH" role="3uHU7w" />
+                        <node concept="37vLTw" id="4qGA5WE6pSd" role="3uHU7B">
+                          <ref role="3cqZAo" node="1_AnebxCruV" resolve="templateTraceData" />
+                        </node>
+                      </node>
+                      <node concept="3y3z36" id="2daneBOUDJ6" role="3uHU7B">
+                        <node concept="37vLTw" id="2daneBOUCRq" role="3uHU7B">
+                          <ref role="3cqZAo" node="2daneBOT1Cl" resolve="activationTrace" />
+                        </node>
+                        <node concept="10Nm6u" id="2daneBOUEku" role="3uHU7w" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -3146,6 +3160,38 @@
               </node>
             </node>
           </node>
+          <node concept="3cpWs8" id="4LE1vMP67A4" role="3cqZAp">
+            <node concept="3cpWsn" id="4LE1vMP67A5" role="3cpWs9">
+              <property role="TrG5h" value="typeCollector" />
+              <node concept="3uibUv" id="4LE1vMP673a" role="1tU5fm">
+                <ref role="3uigEE" to="tj24:5MNibENhpkH" resolve="TypeCollector" />
+              </node>
+              <node concept="2ShNRf" id="4LE1vMP67A6" role="33vP2m">
+                <node concept="HV5vD" id="4LE1vMP67A7" role="2ShVmc">
+                  <property role="373rjd" value="true" />
+                  <ref role="HV5vE" to="tj24:5MNibENhpkH" resolve="TypeCollector" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="3OUB6BASVxs" role="3cqZAp">
+            <node concept="2OqwBi" id="4qGA5WCXRHC" role="3clFbG">
+              <node concept="37vLTw" id="4qGA5WCXL_w" role="2Oq$k0">
+                <ref role="3cqZAo" node="61G6TdBDyzL" resolve="macroProcessing" />
+              </node>
+              <node concept="liA8E" id="4qGA5WCXTPI" role="2OqNvi">
+                <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
+                <node concept="10M0yZ" id="4qGA5WCY0e0" role="37wK5m">
+                  <ref role="3cqZAo" to="tj24:4qGA5WCVux3" resolve="TYPES_COLLECTOR" />
+                  <ref role="1PxDUh" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
+                </node>
+                <node concept="37vLTw" id="4LE1vMP67A8" role="37wK5m">
+                  <ref role="3cqZAo" node="4LE1vMP67A5" resolve="collector" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="4LE1vMP4f8f" role="3cqZAp" />
           <node concept="3clFbF" id="2j1FRbwV8JT" role="3cqZAp">
             <node concept="2OqwBi" id="2j1FRbwVaoF" role="3clFbG">
               <node concept="37vLTw" id="2j1FRbwV8JR" role="2Oq$k0">
@@ -3382,6 +3428,142 @@
                           <node concept="3cqZAl" id="3MwxBzG61nc" role="3clF45" />
                           <node concept="3Tm1VV" id="3MwxBzG61nd" role="1B3o_S" />
                           <node concept="3clFbS" id="3MwxBzG61ng" role="3clF47">
+                            <node concept="3SKdUt" id="4qGA5WDXC6I" role="3cqZAp">
+                              <node concept="1PaTwC" id="4qGA5WDXC6J" role="1aUNEU">
+                                <node concept="3oM_SD" id="4qGA5WDXDa5" role="1PaTwD">
+                                  <property role="3oM_SC" value="log" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbJ" id="4qGA5WE41Fb" role="3cqZAp">
+                              <node concept="3clFbS" id="4qGA5WE41Fd" role="3clFbx">
+                                <node concept="3cpWs8" id="4qGA5WE49BU" role="3cqZAp">
+                                  <node concept="3cpWsn" id="4qGA5WE49BV" role="3cpWs9">
+                                    <property role="TrG5h" value="kind" />
+                                    <node concept="3uibUv" id="4qGA5WE49BW" role="1tU5fm">
+                                      <ref role="3uigEE" to="et5u:~MessageKind" resolve="MessageKind" />
+                                    </node>
+                                    <node concept="3K4zz7" id="6gnqipLtKIH" role="33vP2m">
+                                      <node concept="Rm8GO" id="6cGbuqOdzx8" role="3K4E3e">
+                                        <ref role="Rm8GQ" to="et5u:~MessageKind.WARNING" resolve="WARNING" />
+                                        <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+                                      </node>
+                                      <node concept="Rm8GO" id="6cGbuqOd$Q2" role="3K4GZi">
+                                        <ref role="Rm8GQ" to="et5u:~MessageKind.ERROR" resolve="ERROR" />
+                                        <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+                                      </node>
+                                      <node concept="2OqwBi" id="4qGA5WDVGuH" role="3K4Cdx">
+                                        <node concept="37vLTw" id="4qGA5WDVFXY" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
+                                        </node>
+                                        <node concept="liA8E" id="6cGbuqOdylK" role="2OqNvi">
+                                          <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3cpWs8" id="4qGA5WE49BX" role="3cqZAp">
+                                  <node concept="3cpWsn" id="4qGA5WE49BY" role="3cpWs9">
+                                    <property role="TrG5h" value="cause" />
+                                    <node concept="3uibUv" id="4qGA5WE49BZ" role="1tU5fm">
+                                      <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+                                    </node>
+                                    <node concept="2OqwBi" id="6cGbuqOoY1R" role="33vP2m">
+                                      <node concept="37vLTw" id="6cGbuqOoWFI" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
+                                      </node>
+                                      <node concept="liA8E" id="6cGbuqOoZ0e" role="2OqNvi">
+                                        <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3cpWs8" id="4qGA5WE49C8" role="3cqZAp">
+                                  <node concept="3cpWsn" id="4qGA5WE49C9" role="3cpWs9">
+                                    <property role="TrG5h" value="msg" />
+                                    <node concept="3uibUv" id="4qGA5WE49Ca" role="1tU5fm">
+                                      <ref role="3uigEE" to="et5u:~Message" resolve="Message" />
+                                    </node>
+                                    <node concept="2ShNRf" id="4qGA5WE49Cb" role="33vP2m">
+                                      <node concept="1pGfFk" id="4qGA5WE49Cc" role="2ShVmc">
+                                        <ref role="37wK5l" to="et5u:~Message.&lt;init&gt;(jetbrains.mps.messages.MessageKind,java.lang.String)" resolve="Message" />
+                                        <node concept="37vLTw" id="4qGA5WE49Cd" role="37wK5m">
+                                          <ref role="3cqZAo" node="4qGA5WE49BV" resolve="kind" />
+                                        </node>
+                                        <node concept="2OqwBi" id="4qGA5WE49Ce" role="37wK5m">
+                                          <node concept="37vLTw" id="4qGA5WE49Cf" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
+                                          </node>
+                                          <node concept="liA8E" id="4qGA5WE49Cg" role="2OqNvi">
+                                            <ref role="37wK5l" to="psoy:7Oc59RSJr0t" resolve="toString" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="4qGA5WE49Ch" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4qGA5WE49Ci" role="3clFbG">
+                                    <node concept="37vLTw" id="4qGA5WE49Cj" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="4qGA5WE49C9" resolve="msg" />
+                                    </node>
+                                    <node concept="liA8E" id="4qGA5WE49Ck" role="2OqNvi">
+                                      <ref role="37wK5l" to="et5u:~Message.setException(java.lang.Throwable)" resolve="setException" />
+                                      <node concept="37vLTw" id="4qGA5WE49Cl" role="37wK5m">
+                                        <ref role="3cqZAo" node="4qGA5WE49BY" resolve="cause" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="4qGA5WDVyB7" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4qGA5WDVz9r" role="3clFbG">
+                                    <node concept="2YIFZM" id="4qGA5WDXXjg" role="2Oq$k0">
+                                      <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                                      <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
+                                      <node concept="37vLTw" id="4qGA5WDY0gH" role="37wK5m">
+                                        <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="4qGA5WDVzx0" role="2OqNvi">
+                                      <ref role="37wK5l" to="31yc:4MaHsBDgiaT" resolve="handle" />
+                                      <node concept="37vLTw" id="4qGA5WDW9OW" role="37wK5m">
+                                        <ref role="3cqZAo" node="4qGA5WE49C9" resolve="msg" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="6cGbuqOmSB7" role="3cqZAp">
+                                  <node concept="2OqwBi" id="6cGbuqOmTJT" role="3clFbG">
+                                    <node concept="37vLTw" id="6cGbuqOmSB5" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
+                                    </node>
+                                    <node concept="liA8E" id="6cGbuqOmV81" role="2OqNvi">
+                                      <ref role="37wK5l" to="psoy:6cGbuqOk51p" resolve="clearCause" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3y3z36" id="6cGbuqOoSvR" role="3clFbw">
+                                <node concept="10Nm6u" id="6cGbuqOoTKs" role="3uHU7w" />
+                                <node concept="2OqwBi" id="6cGbuqOds2J" role="3uHU7B">
+                                  <node concept="37vLTw" id="6cGbuqOdrty" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
+                                  </node>
+                                  <node concept="liA8E" id="6cGbuqOdvzy" role="2OqNvi">
+                                    <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbH" id="4qGA5WDXyjA" role="3cqZAp" />
+                            <node concept="3SKdUt" id="4qGA5WDXAIx" role="3cqZAp">
+                              <node concept="1PaTwC" id="4qGA5WDXAIy" role="1aUNEU">
+                                <node concept="3oM_SD" id="4qGA5WDXAJ6" role="1PaTwD">
+                                  <property role="3oM_SC" value="balloon" />
+                                </node>
+                              </node>
+                            </node>
                             <node concept="1QHqEQ" id="7WKNeR8SQyM" role="3cqZAp">
                               <node concept="1QHqEC" id="7WKNeR8SQyN" role="1QHqEI">
                                 <node concept="3clFbS" id="7WKNeR8SQyO" role="1bW5cS">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 5d064f43..cbe1ed9b 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -12116,6 +12116,21 @@
     <property role="TrG5h" value="TypecheckingState" />
     <property role="3GE5qa" value="cache" />
     <node concept="2tJIrI" id="1T5MAgPhC9J" role="jymVt" />
+    <node concept="Wx3nA" id="4qGA5WCVux3" role="jymVt">
+      <property role="TrG5h" value="TYPES_COLLECTOR" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm1VV" id="4qGA5WCWK7y" role="1B3o_S" />
+      <node concept="17QB3L" id="4qGA5WCWKqk" role="1tU5fm" />
+      <node concept="3cpWs3" id="4qGA5WCVEir" role="33vP2m">
+        <node concept="3VsKOn" id="4qGA5WCVFiw" role="3uHU7B">
+          <ref role="3VsUkX" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+        </node>
+        <node concept="Xl_RD" id="4qGA5WCVEeg" role="3uHU7w">
+          <property role="Xl_RC" value=".TypesCollector" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4qGA5WCVksQ" role="jymVt" />
     <node concept="312cEu" id="5MNibENhpkH" role="jymVt">
       <property role="TrG5h" value="TypeCollector" />
       <node concept="2tJIrI" id="3OUB6BBdtiU" role="jymVt" />
@@ -12134,7 +12149,7 @@
         </node>
       </node>
       <node concept="2tJIrI" id="5MNibENhCoC" role="jymVt" />
-      <node concept="3Tmbuc" id="61G6TdCqKLz" role="1B3o_S" />
+      <node concept="3Tm1VV" id="4LE1vMP4XD1" role="1B3o_S" />
       <node concept="3uibUv" id="5MNibENhzkE" role="EKbjA">
         <ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
         <node concept="2sp9CU" id="5MNibENh_43" role="11_B2D" />
@@ -17263,38 +17278,44 @@
           </node>
         </node>
         <node concept="3clFbS" id="3OUB6BASVxr" role="3clF47">
-          <node concept="3clFbF" id="3OUB6BASVxs" role="3cqZAp">
-            <node concept="2OqwBi" id="3OUB6BASVxt" role="3clFbG">
-              <node concept="3nyPlj" id="3OUB6BASVxu" role="2Oq$k0">
-                <ref role="37wK5l" node="61G6TdB_yxW" resolve="createMacroProcessing" />
-                <node concept="37vLTw" id="3OUB6BASVxv" role="37wK5m">
-                  <ref role="3cqZAo" node="3OUB6BASVxm" resolve="aspectClique" />
-                </node>
-                <node concept="37vLTw" id="3OUB6BASVxw" role="37wK5m">
-                  <ref role="3cqZAo" node="3OUB6BASVxp" resolve="session" />
-                </node>
+          <node concept="3cpWs8" id="4qGA5WCXL_f" role="3cqZAp">
+            <node concept="3cpWsn" id="4qGA5WCXL_g" role="3cpWs9">
+              <property role="TrG5h" value="macroProcessing" />
+              <node concept="3uibUv" id="4qGA5WCX$3h" role="1tU5fm">
+                <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
               </node>
-              <node concept="liA8E" id="3OUB6BASVxx" role="2OqNvi">
-                <ref role="37wK5l" to="ksgm:6PWFJfG6VOq" resolve="withMemo" />
-                <node concept="2OqwBi" id="3OUB6BASVxy" role="37wK5m">
-                  <node concept="1rXfSq" id="3OUB6BBwvwD" role="2Oq$k0">
-                    <ref role="37wK5l" node="3OUB6BBwqkM" resolve="getAspectCachedData" />
-                    <node concept="37vLTw" id="3OUB6BBwvwE" role="37wK5m">
-                      <ref role="3cqZAo" node="3OUB6BASVxm" resolve="aspectClique" />
-                    </node>
+              <node concept="2OqwBi" id="4qGA5WCXL_h" role="33vP2m">
+                <node concept="3nyPlj" id="4qGA5WCXL_i" role="2Oq$k0">
+                  <ref role="37wK5l" node="61G6TdB_yxW" resolve="createMacroProcessing" />
+                  <node concept="37vLTw" id="4qGA5WCXL_j" role="37wK5m">
+                    <ref role="3cqZAo" node="3OUB6BASVxm" resolve="aspectClique" />
                   </node>
-                  <node concept="liA8E" id="3OUB6BASVxF" role="2OqNvi">
-                    <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
-                    <node concept="10M0yZ" id="3OUB6BASVxG" role="37wK5m">
-                      <ref role="3cqZAo" node="6PWFJfG61KF" resolve="MEMO" />
-                      <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                  <node concept="37vLTw" id="4qGA5WCXL_k" role="37wK5m">
+                    <ref role="3cqZAo" node="3OUB6BASVxp" resolve="session" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="4qGA5WCXL_l" role="2OqNvi">
+                  <ref role="37wK5l" to="ksgm:6PWFJfG6VOq" resolve="withMemo" />
+                  <node concept="2OqwBi" id="4qGA5WCXL_m" role="37wK5m">
+                    <node concept="1rXfSq" id="4qGA5WCXL_n" role="2Oq$k0">
+                      <ref role="37wK5l" node="3OUB6BBwqkM" resolve="getAspectCachedData" />
+                      <node concept="37vLTw" id="4qGA5WCXL_o" role="37wK5m">
+                        <ref role="3cqZAo" node="3OUB6BASVxm" resolve="aspectClique" />
+                      </node>
                     </node>
-                    <node concept="1bVj0M" id="3OUB6BASVxH" role="37wK5m">
-                      <node concept="3clFbS" id="3OUB6BASVxI" role="1bW5cS">
-                        <node concept="3clFbF" id="3OUB6BASVxJ" role="3cqZAp">
-                          <node concept="2ShNRf" id="3OUB6BASVxK" role="3clFbG">
-                            <node concept="HV5vD" id="3OUB6BASVxL" role="2ShVmc">
-                              <ref role="HV5vE" node="5HVB6JRkwKp" resolve="TypecheckingStrategy.MemoImpl" />
+                    <node concept="liA8E" id="4qGA5WCXL_p" role="2OqNvi">
+                      <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                      <node concept="10M0yZ" id="4qGA5WCXL_q" role="37wK5m">
+                        <ref role="3cqZAo" node="6PWFJfG61KF" resolve="MEMO" />
+                        <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                      </node>
+                      <node concept="1bVj0M" id="4qGA5WCXL_r" role="37wK5m">
+                        <node concept="3clFbS" id="4qGA5WCXL_s" role="1bW5cS">
+                          <node concept="3clFbF" id="4qGA5WCXL_t" role="3cqZAp">
+                            <node concept="2ShNRf" id="4qGA5WCXL_u" role="3clFbG">
+                              <node concept="HV5vD" id="4qGA5WCXL_v" role="2ShVmc">
+                                <ref role="HV5vE" node="5HVB6JRkwKp" resolve="MemoImpl" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -17305,6 +17326,28 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="3OUB6BASVxs" role="3cqZAp">
+            <node concept="2OqwBi" id="4qGA5WCXRHC" role="3clFbG">
+              <node concept="37vLTw" id="4qGA5WCXL_w" role="2Oq$k0">
+                <ref role="3cqZAo" node="4qGA5WCXL_g" resolve="macroProcessing" />
+              </node>
+              <node concept="liA8E" id="4qGA5WCXTPI" role="2OqNvi">
+                <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
+                <node concept="10M0yZ" id="4qGA5WCY0e0" role="37wK5m">
+                  <ref role="3cqZAo" node="4qGA5WCVux3" resolve="TYPES_COLLECTOR" />
+                  <ref role="1PxDUh" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+                </node>
+                <node concept="37vLTw" id="4qGA5WCY3_M" role="37wK5m">
+                  <ref role="3cqZAo" node="6XnUDeiGg3F" resolve="typeCollector" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4qGA5WCXQ8f" role="3cqZAp">
+            <node concept="37vLTw" id="4qGA5WCXQ8g" role="3clFbG">
+              <ref role="3cqZAo" node="4qGA5WCXL_g" resolve="macroProcessing" />
+            </node>
+          </node>
         </node>
         <node concept="2AHcQZ" id="3OUB6BASVxM" role="2AJF6D">
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
@@ -18028,42 +18071,48 @@
           </node>
         </node>
         <node concept="3clFbS" id="6PWFJfG8yzl" role="3clF47">
-          <node concept="3clFbF" id="6PWFJfG8yzp" role="3cqZAp">
-            <node concept="2OqwBi" id="6PWFJfG8HIz" role="3clFbG">
-              <node concept="3nyPlj" id="6PWFJfG8yzo" role="2Oq$k0">
-                <ref role="37wK5l" node="61G6TdB_yxW" resolve="createMacroProcessing" />
-                <node concept="37vLTw" id="6PWFJfG9eiA" role="37wK5m">
-                  <ref role="3cqZAo" node="6PWFJfG90Zx" resolve="aspectClique" />
-                </node>
-                <node concept="37vLTw" id="6PWFJfG8yzn" role="37wK5m">
-                  <ref role="3cqZAo" node="6PWFJfG8yyy" resolve="session" />
-                </node>
+          <node concept="3cpWs8" id="4qGA5WCY5qB" role="3cqZAp">
+            <node concept="3cpWsn" id="4qGA5WCY5qC" role="3cpWs9">
+              <property role="TrG5h" value="macroProcessing" />
+              <node concept="3uibUv" id="4qGA5WCXzZC" role="1tU5fm">
+                <ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
               </node>
-              <node concept="liA8E" id="6PWFJfG8HTO" role="2OqNvi">
-                <ref role="37wK5l" to="ksgm:6PWFJfG6VOq" resolve="withMemo" />
-                <node concept="2OqwBi" id="6PWFJfG9ave" role="37wK5m">
-                  <node concept="1rXfSq" id="3OUB6BBBM_W" role="2Oq$k0">
-                    <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getAspectCachedData" />
-                    <node concept="37vLTw" id="3OUB6BBBM_X" role="37wK5m">
-                      <ref role="3cqZAo" node="6PWFJfG90Zx" resolve="aspectClique" />
-                    </node>
+              <node concept="2OqwBi" id="4qGA5WCY5qD" role="33vP2m">
+                <node concept="3nyPlj" id="4qGA5WCY5qE" role="2Oq$k0">
+                  <ref role="37wK5l" node="61G6TdB_yxW" resolve="createMacroProcessing" />
+                  <node concept="37vLTw" id="4qGA5WCY5qF" role="37wK5m">
+                    <ref role="3cqZAo" node="6PWFJfG90Zx" resolve="aspectClique" />
                   </node>
-                  <node concept="liA8E" id="6PWFJfG9bjC" role="2OqNvi">
-                    <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
-                    <node concept="10M0yZ" id="6PWFJfG9dsr" role="37wK5m">
-                      <ref role="3cqZAo" node="6PWFJfG61KF" resolve="MEMO" />
-                      <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                  <node concept="37vLTw" id="4qGA5WCY5qG" role="37wK5m">
+                    <ref role="3cqZAo" node="6PWFJfG8yyy" resolve="session" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="4qGA5WCY5qH" role="2OqNvi">
+                  <ref role="37wK5l" to="ksgm:6PWFJfG6VOq" resolve="withMemo" />
+                  <node concept="2OqwBi" id="4qGA5WCY5qI" role="37wK5m">
+                    <node concept="1rXfSq" id="4qGA5WCY5qJ" role="2Oq$k0">
+                      <ref role="37wK5l" node="3OUB6BBwRT6" resolve="getAspectCachedData" />
+                      <node concept="37vLTw" id="4qGA5WCY5qK" role="37wK5m">
+                        <ref role="3cqZAo" node="6PWFJfG90Zx" resolve="aspectClique" />
+                      </node>
                     </node>
-                    <node concept="1bVj0M" id="5HVB6JRkk4B" role="37wK5m">
-                      <node concept="3clFbS" id="5HVB6JRkk4D" role="1bW5cS">
-                        <node concept="3clFbF" id="5HVB6JRli3n" role="3cqZAp">
-                          <node concept="2ShNRf" id="5HVB6JRli3j" role="3clFbG">
-                            <node concept="HV5vD" id="5HVB6JRlj0s" role="2ShVmc">
-                              <ref role="HV5vE" node="5HVB6JRkwKp" resolve="TypecheckingStrategy.MemoImpl" />
+                    <node concept="liA8E" id="4qGA5WCY5qL" role="2OqNvi">
+                      <ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
+                      <node concept="10M0yZ" id="4qGA5WCY5qM" role="37wK5m">
+                        <ref role="3cqZAo" node="6PWFJfG61KF" resolve="MEMO" />
+                        <ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                      </node>
+                      <node concept="1bVj0M" id="4qGA5WCY5qN" role="37wK5m">
+                        <node concept="3clFbS" id="4qGA5WCY5qO" role="1bW5cS">
+                          <node concept="3clFbF" id="4qGA5WCY5qP" role="3cqZAp">
+                            <node concept="2ShNRf" id="4qGA5WCY5qQ" role="3clFbG">
+                              <node concept="HV5vD" id="4qGA5WCY5qR" role="2ShVmc">
+                                <ref role="HV5vE" node="5HVB6JRkwKp" resolve="MemoImpl" />
+                              </node>
                             </node>
                           </node>
+                          <node concept="3clFbH" id="4qGA5WCY5qS" role="3cqZAp" />
                         </node>
-                        <node concept="3clFbH" id="3OUB6BBBNsj" role="3cqZAp" />
                       </node>
                     </node>
                   </node>
@@ -18071,6 +18120,28 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="6PWFJfG8yzp" role="3cqZAp">
+            <node concept="2OqwBi" id="4qGA5WCYtc8" role="3clFbG">
+              <node concept="37vLTw" id="4qGA5WCY5qT" role="2Oq$k0">
+                <ref role="3cqZAo" node="4qGA5WCY5qC" resolve="macroProcessing" />
+              </node>
+              <node concept="liA8E" id="4qGA5WCY_0O" role="2OqNvi">
+                <ref role="37wK5l" to="i348:7DvO2M9IiMh" resolve="putParameter" />
+                <node concept="10M0yZ" id="4qGA5WCYVsB" role="37wK5m">
+                  <ref role="3cqZAo" node="4qGA5WCVux3" resolve="TYPES_COLLECTOR" />
+                  <ref role="1PxDUh" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
+                </node>
+                <node concept="37vLTw" id="4qGA5WCZb5s" role="37wK5m">
+                  <ref role="3cqZAo" node="5Qx6_65twII" resolve="typeCollector" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="4qGA5WCYmJH" role="3cqZAp">
+            <node concept="37vLTw" id="4qGA5WCYmJI" role="3clFbG">
+              <ref role="3cqZAo" node="4qGA5WCY5qC" resolve="macroProcessing" />
+            </node>
+          </node>
         </node>
         <node concept="2AHcQZ" id="6PWFJfG8yzm" role="2AJF6D">
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
@@ -20075,18 +20146,21 @@
                       <node concept="3clFbS" id="3VwM5b6fJ6q" role="3clFbx">
                         <node concept="3clFbF" id="2xx8OBytkUs" role="3cqZAp">
                           <node concept="37vLTI" id="2xx8OBytkUu" role="3clFbG">
-                            <node concept="2OqwBi" id="2xx8OBythi0" role="37vLTx">
-                              <node concept="2OqwBi" id="2xx8OBythi1" role="2Oq$k0">
-                                <node concept="37vLTw" id="2xx8OBythi2" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6nFpYluGWA6" resolve="effect" />
+                            <node concept="2OqwBi" id="6cGbuqO7$w0" role="37vLTx">
+                              <node concept="2OqwBi" id="2xx8OBythi0" role="2Oq$k0">
+                                <node concept="2OqwBi" id="2xx8OBythi1" role="2Oq$k0">
+                                  <node concept="37vLTw" id="2xx8OBythi2" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="6nFpYluGWA6" resolve="effect" />
+                                  </node>
+                                  <node concept="liA8E" id="2xx8OBythi3" role="2OqNvi">
+                                    <ref role="37wK5l" to="1yqb:7TC1XcdSe_i" resolve="result" />
+                                  </node>
                                 </node>
-                                <node concept="liA8E" id="2xx8OBythi3" role="2OqNvi">
-                                  <ref role="37wK5l" to="1yqb:7TC1XcdSe_i" resolve="result" />
+                                <node concept="liA8E" id="6cGbuqO7y_$" role="2OqNvi">
+                                  <ref role="37wK5l" to="psoy:5X1yxJI3E6N" resolve="allCauses" />
                                 </node>
                               </node>
-                              <node concept="liA8E" id="2xx8OBythi4" role="2OqNvi">
-                                <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
-                              </node>
+                              <node concept="1uHKPH" id="6cGbuqO7A_g" role="2OqNvi" />
                             </node>
                             <node concept="37vLTw" id="2xx8OBytkUy" role="37vLTJ">
                               <ref role="3cqZAo" node="2xx8OBythhZ" resolve="firstCause" />