From f13691668c08abd94a6957456e44c723e2c20d82 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Thu, 23 Jul 2020 16:22:05 +0300
Subject: [PATCH] Fix accidental var shadowing that led to report items not
 collected with IncrementalStrategy

---
 ...ins.mps.coderules.typechecking.service.mps | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

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 487bd123..808f7536 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
@@ -17424,7 +17424,7 @@
         <node concept="3clFbS" id="5Qx6_65qdzO" role="3clF47">
           <node concept="3cpWs8" id="q1hCiycet8" role="3cqZAp">
             <node concept="3cpWsn" id="q1hCiycetb" role="3cpWs9">
-              <property role="TrG5h" value="items" />
+              <property role="TrG5h" value="allReporttems" />
               <node concept="_YKpA" id="q1hCiycet4" role="1tU5fm">
                 <node concept="3uibUv" id="q1hCiycfJj" role="_ZDj9">
                   <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
@@ -17455,7 +17455,7 @@
                     <node concept="3clFbF" id="5Qx6_65rzB1" role="3cqZAp">
                       <node concept="2OqwBi" id="5Qx6_65r$ER" role="3clFbG">
                         <node concept="37vLTw" id="q1hCiychWN" role="2Oq$k0">
-                          <ref role="3cqZAo" node="q1hCiycetb" resolve="items" />
+                          <ref role="3cqZAo" node="q1hCiycetb" resolve="allReporttems" />
                         </node>
                         <node concept="X8dFx" id="5Qx6_65r_bb" role="2OqNvi">
                           <node concept="37vLTw" id="5iJsa3_iZdO" role="25WWJ7">
@@ -17493,7 +17493,7 @@
                     <node concept="3clFbF" id="5iJsa3_j036" role="3cqZAp">
                       <node concept="2OqwBi" id="5iJsa3_j037" role="3clFbG">
                         <node concept="37vLTw" id="q1hCiycj0O" role="2Oq$k0">
-                          <ref role="3cqZAo" node="q1hCiycetb" resolve="items" />
+                          <ref role="3cqZAo" node="q1hCiycetb" resolve="allReporttems" />
                         </node>
                         <node concept="X8dFx" id="5iJsa3_j039" role="2OqNvi">
                           <node concept="37vLTw" id="5iJsa3_j03a" role="25WWJ7">
@@ -17539,7 +17539,7 @@
                             <ref role="3cqZAo" node="5iJsa3_j6he" resolve="traceEvents" />
                           </node>
                           <node concept="37vLTw" id="q1hCiyckuj" role="37wK5m">
-                            <ref role="3cqZAo" node="q1hCiycetb" resolve="items" />
+                            <ref role="3cqZAo" node="q1hCiycetb" resolve="allReporttems" />
                           </node>
                         </node>
                       </node>
@@ -17562,7 +17562,7 @@
               </node>
               <node concept="X8dFx" id="q1hCiycze9" role="2OqNvi">
                 <node concept="37vLTw" id="q1hCiyczGD" role="25WWJ7">
-                  <ref role="3cqZAo" node="q1hCiycetb" resolve="items" />
+                  <ref role="3cqZAo" node="q1hCiycetb" resolve="allReporttems" />
                 </node>
               </node>
             </node>
@@ -18798,7 +18798,7 @@
           <node concept="3clFbH" id="5Qx6_65sjSJ" role="3cqZAp" />
           <node concept="3cpWs8" id="q1hCiybRQn" role="3cqZAp">
             <node concept="3cpWsn" id="q1hCiybRQq" role="3cpWs9">
-              <property role="TrG5h" value="items" />
+              <property role="TrG5h" value="allReportItems" />
               <node concept="_YKpA" id="q1hCiybRQj" role="1tU5fm">
                 <node concept="3uibUv" id="q1hCiybTvl" role="_ZDj9">
                   <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
@@ -18836,14 +18836,14 @@
                   <node concept="3clFbS" id="5iJsa3_b1iA" role="1bW5cS">
                     <node concept="3clFbF" id="5iJsa3_b6u8" role="3cqZAp">
                       <node concept="2OqwBi" id="5iJsa3_b7jS" role="3clFbG">
-                        <node concept="37vLTw" id="q1hCiybUEA" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5iJsa3_b1mj" resolve="items" />
-                        </node>
                         <node concept="X8dFx" id="5iJsa3_b83G" role="2OqNvi">
                           <node concept="37vLTw" id="5iJsa3_b8L$" role="25WWJ7">
                             <ref role="3cqZAo" node="5iJsa3_b1mj" resolve="items" />
                           </node>
                         </node>
+                        <node concept="37vLTw" id="scOg5x_f2W" role="2Oq$k0">
+                          <ref role="3cqZAo" node="q1hCiybRQq" resolve="allReportItems" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -18874,14 +18874,14 @@
                   <node concept="3clFbS" id="5iJsa3_ds5j" role="1bW5cS">
                     <node concept="3clFbF" id="5iJsa3_ds5k" role="3cqZAp">
                       <node concept="2OqwBi" id="5iJsa3_ds5l" role="3clFbG">
-                        <node concept="37vLTw" id="q1hCiybVSo" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5iJsa3_ds5g" resolve="items" />
-                        </node>
                         <node concept="X8dFx" id="5iJsa3_ds5n" role="2OqNvi">
                           <node concept="37vLTw" id="5iJsa3_ds5o" role="25WWJ7">
                             <ref role="3cqZAo" node="5iJsa3_ds5g" resolve="items" />
                           </node>
                         </node>
+                        <node concept="37vLTw" id="scOg5x_fl_" role="2Oq$k0">
+                          <ref role="3cqZAo" node="q1hCiybRQq" resolve="allReportItems" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -18921,7 +18921,7 @@
                                 <ref role="3cqZAo" node="5iJsa3_bmFG" resolve="traceEvents" />
                               </node>
                               <node concept="37vLTw" id="q1hCiybXlG" role="37wK5m">
-                                <ref role="3cqZAo" node="q1hCiybRQq" resolve="items" />
+                                <ref role="3cqZAo" node="q1hCiybRQq" resolve="allReportItems" />
                               </node>
                             </node>
                           </node>
@@ -18946,7 +18946,7 @@
               </node>
               <node concept="X8dFx" id="q1hCiycbxk" role="2OqNvi">
                 <node concept="37vLTw" id="q1hCiyccVP" role="25WWJ7">
-                  <ref role="3cqZAo" node="q1hCiybRQq" resolve="items" />
+                  <ref role="3cqZAo" node="q1hCiybRQq" resolve="allReportItems" />
                 </node>
               </node>
             </node>