From 5305e5d82f409082d04dbaa4120c347d1374c4b5 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Sat, 2 May 2020 13:42:33 +0300
Subject: [PATCH] Fix generator of macros for case of applying them in alt body
 blocks

Previously body parts from macros applied in alt body branches
were merged into original, first body branch.
---
 .../generator/template/main@generator.mps     | 111 ++++++++++++++++--
 .../jetbrains.mps.lang.coderules.template.mps |  52 +++++++-
 2 files changed, 155 insertions(+), 8 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 9cb79466..9d333c38 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -64,6 +64,7 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="1153417849900" name="jetbrains.mps.baseLanguage.structure.GreaterThanOrEqualsExpression" flags="nn" index="2d3UOw" />
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
@@ -3343,8 +3344,8 @@
           <node concept="30H73N" id="2_NfR5wokQr" role="2Oq$k0" />
           <node concept="2Xjw5R" id="2_NfR5wol8V" role="2OqNvi">
             <node concept="1xMEDy" id="2_NfR5wol8X" role="1xVPHs">
-              <node concept="chp4Y" id="2_NfR5wol9B" role="ri$Ld">
-                <ref role="cht4Q" to="wq2x:6p0DfM0a3TO" resolve="Body" />
+              <node concept="chp4Y" id="4p2fwwrT1AG" role="ri$Ld">
+                <ref role="cht4Q" to="wq2x:6E2cNiboHlA" resolve="BodyBlock" />
               </node>
             </node>
           </node>
@@ -4033,9 +4034,9 @@
     <property role="3GE5qa" value="rulemethod" />
     <ref role="3gUMe" to="tpee:fIYIFW9" resolve="StaticMethodCall" />
     <node concept="1N15co" id="2_NfR5wokLA" role="1s_3oS">
-      <property role="TrG5h" value="body" />
+      <property role="TrG5h" value="bodyAlt" />
       <node concept="3Tqbb2" id="2_NfR5wolP3" role="1N15GL">
-        <ref role="ehGHo" to="wq2x:6p0DfM0a3TO" resolve="Body" />
+        <ref role="ehGHo" to="wq2x:6E2cNiboHlA" resolve="BodyBlock" />
       </node>
     </node>
     <node concept="312cEu" id="6FQzrygU_0X" role="13RCb5">
@@ -4123,7 +4124,7 @@
                         <node concept="3clFbF" id="2_NfR5womnq" role="3cqZAp">
                           <node concept="2OqwBi" id="2_NfR5womrx" role="3clFbG">
                             <node concept="v3LJS" id="2_NfR5womnp" role="2Oq$k0">
-                              <ref role="v3LJV" node="2_NfR5wokLA" resolve="body" />
+                              <ref role="v3LJV" node="2_NfR5wokLA" resolve="bodyAlt" />
                             </node>
                             <node concept="2bSWHS" id="2_NfR5womxw" role="2OqNvi" />
                           </node>
@@ -9513,7 +9514,55 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5itBwM7X0x0" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:77AxcO4ZwMR" resolve="merge" />
+                  <ref role="37wK5l" to="i348:2_NfR5wo4nJ" resolve="merge" />
+                  <node concept="3cmrfG" id="4p2fwwrRRsD" role="37wK5m">
+                    <property role="3cmrfH" value="0" />
+                    <node concept="17Uvod" id="4p2fwwrRV5L" role="lGtFl">
+                      <property role="2qtEX9" value="value" />
+                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
+                      <node concept="3zFVjK" id="4p2fwwrRV5M" role="3zH0cK">
+                        <node concept="3clFbS" id="4p2fwwrRV5N" role="2VODD2">
+                          <node concept="3cpWs8" id="4p2fwwrWiRN" role="3cqZAp">
+                            <node concept="3cpWsn" id="4p2fwwrWiRQ" role="3cpWs9">
+                              <property role="TrG5h" value="i" />
+                              <node concept="10Oyi0" id="4p2fwwrWiRL" role="1tU5fm" />
+                              <node concept="2OqwBi" id="4p2fwwrT2iF" role="33vP2m">
+                                <node concept="2OqwBi" id="4p2fwwrRW2I" role="2Oq$k0">
+                                  <node concept="30H73N" id="4p2fwwrRVJi" role="2Oq$k0" />
+                                  <node concept="2Xjw5R" id="4p2fwwrRWlQ" role="2OqNvi">
+                                    <node concept="1xMEDy" id="4p2fwwrRWlS" role="1xVPHs">
+                                      <node concept="chp4Y" id="4p2fwwrT290" role="ri$Ld">
+                                        <ref role="cht4Q" to="wq2x:6E2cNiboHlA" resolve="BodyBlock" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="2bSWHS" id="4p2fwwrT2yP" role="2OqNvi" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbF" id="4p2fwwrRVJj" role="3cqZAp">
+                            <node concept="3K4zz7" id="4p2fwwrWklq" role="3clFbG">
+                              <node concept="37vLTw" id="4p2fwwrWkmE" role="3K4E3e">
+                                <ref role="3cqZAo" node="4p2fwwrWiRQ" resolve="i" />
+                              </node>
+                              <node concept="3cmrfG" id="4p2fwwrWknK" role="3K4GZi">
+                                <property role="3cmrfH" value="0" />
+                              </node>
+                              <node concept="2d3UOw" id="4p2fwwrWk2f" role="3K4Cdx">
+                                <node concept="3cmrfG" id="4p2fwwrWk39" role="3uHU7w">
+                                  <property role="3cmrfH" value="0" />
+                                </node>
+                                <node concept="37vLTw" id="4p2fwwrWjc$" role="3uHU7B">
+                                  <ref role="3cqZAo" node="4p2fwwrWiRQ" resolve="i" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                   <node concept="2OqwBi" id="5itBwM7X0GH" role="37wK5m">
                     <node concept="37vLTw" id="5itBwM7X0z$" role="2Oq$k0">
                       <ref role="3cqZAo" node="5itBwM7X0cc" resolve="session" />
@@ -9807,7 +9856,55 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="5itBwMbdiKk" role="2OqNvi">
-                      <ref role="37wK5l" to="i348:77AxcO4ZwMR" resolve="merge" />
+                      <ref role="37wK5l" to="i348:2_NfR5wo4nJ" resolve="merge" />
+                      <node concept="3cmrfG" id="4p2fwwrRSwL" role="37wK5m">
+                        <property role="3cmrfH" value="0" />
+                        <node concept="17Uvod" id="4p2fwwrT2Pl" role="lGtFl">
+                          <property role="2qtEX9" value="value" />
+                          <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
+                          <node concept="3zFVjK" id="4p2fwwrT2Pm" role="3zH0cK">
+                            <node concept="3clFbS" id="4p2fwwrT2Pn" role="2VODD2">
+                              <node concept="3cpWs8" id="4p2fwwrWky1" role="3cqZAp">
+                                <node concept="3cpWsn" id="4p2fwwrWky2" role="3cpWs9">
+                                  <property role="TrG5h" value="i" />
+                                  <node concept="10Oyi0" id="4p2fwwrWky3" role="1tU5fm" />
+                                  <node concept="2OqwBi" id="4p2fwwrWky4" role="33vP2m">
+                                    <node concept="2OqwBi" id="4p2fwwrWky5" role="2Oq$k0">
+                                      <node concept="30H73N" id="4p2fwwrWky6" role="2Oq$k0" />
+                                      <node concept="2Xjw5R" id="4p2fwwrWky7" role="2OqNvi">
+                                        <node concept="1xMEDy" id="4p2fwwrWky8" role="1xVPHs">
+                                          <node concept="chp4Y" id="4p2fwwrWky9" role="ri$Ld">
+                                            <ref role="cht4Q" to="wq2x:6E2cNiboHlA" resolve="BodyBlock" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="2bSWHS" id="4p2fwwrWkya" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbF" id="4p2fwwrWkyb" role="3cqZAp">
+                                <node concept="3K4zz7" id="4p2fwwrWkyc" role="3clFbG">
+                                  <node concept="37vLTw" id="4p2fwwrWkyd" role="3K4E3e">
+                                    <ref role="3cqZAo" node="4p2fwwrWky2" resolve="i" />
+                                  </node>
+                                  <node concept="3cmrfG" id="4p2fwwrWkye" role="3K4GZi">
+                                    <property role="3cmrfH" value="0" />
+                                  </node>
+                                  <node concept="2d3UOw" id="4p2fwwrWkyf" role="3K4Cdx">
+                                    <node concept="3cmrfG" id="4p2fwwrWkyg" role="3uHU7w">
+                                      <property role="3cmrfH" value="0" />
+                                    </node>
+                                    <node concept="37vLTw" id="4p2fwwrWkyh" role="3uHU7B">
+                                      <ref role="3cqZAo" node="4p2fwwrWky2" resolve="i" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                       <node concept="2OqwBi" id="5itBwMbdiKl" role="37wK5m">
                         <node concept="37vLTw" id="5itBwMbdiKm" role="2Oq$k0">
                           <ref role="3cqZAo" node="5itBwMbdiJf" resolve="session" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 90757c55..76d08554 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -4841,7 +4841,7 @@
             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
             <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
             <node concept="Xl_RD" id="3KXGt7WsbrR" role="37wK5m">
-              <property role="Xl_RC" value="%s (%d,%d,%d,%d)" />
+              <property role="Xl_RC" value="%s (%d,%d,%d,%d[%d])" />
             </node>
             <node concept="37vLTw" id="3KXGt7WsbET" role="37wK5m">
               <ref role="3cqZAo" node="6lpwCiZjjEm" resolve="tag" />
@@ -4870,6 +4870,9 @@
                 <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
               </node>
             </node>
+            <node concept="1rXfSq" id="4p2fwwrSUtS" role="37wK5m">
+              <ref role="37wK5l" node="4p2fwwrSEfY" resolve="bodySize" />
+            </node>
             <node concept="2OqwBi" id="3KXGt7Wse6B" role="37wK5m">
               <node concept="37vLTw" id="3KXGt7WsdTh" role="2Oq$k0">
                 <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
@@ -4885,6 +4888,53 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="4p2fwwrSqp9" role="jymVt" />
+    <node concept="3clFb_" id="4p2fwwrSEfY" role="jymVt">
+      <property role="TrG5h" value="bodySize" />
+      <node concept="3clFbS" id="4p2fwwrSEg1" role="3clF47">
+        <node concept="3cpWs8" id="4p2fwwrSJz$" role="3cqZAp">
+          <node concept="3cpWsn" id="4p2fwwrSJzB" role="3cpWs9">
+            <property role="TrG5h" value="s" />
+            <node concept="10Oyi0" id="4p2fwwrSJzz" role="1tU5fm" />
+            <node concept="3cmrfG" id="4p2fwwrSJ$D" role="33vP2m">
+              <property role="3cmrfH" value="0" />
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="4p2fwwrSO58" role="3cqZAp">
+          <node concept="2GrKxI" id="4p2fwwrSO5a" role="2Gsz3X">
+            <property role="TrG5h" value="bodyAlt" />
+          </node>
+          <node concept="37vLTw" id="4p2fwwrSO6C" role="2GsD0m">
+            <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
+          </node>
+          <node concept="3clFbS" id="4p2fwwrSO5e" role="2LFqv$">
+            <node concept="3clFbF" id="4p2fwwrSO_G" role="3cqZAp">
+              <node concept="d57v9" id="4p2fwwrSP9k" role="3clFbG">
+                <node concept="2OqwBi" id="4p2fwwrSPYs" role="37vLTx">
+                  <node concept="2GrUjf" id="4p2fwwrSP9X" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="4p2fwwrSO5a" resolve="bodyAlt" />
+                  </node>
+                  <node concept="liA8E" id="4p2fwwrSQUZ" role="2OqNvi">
+                    <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="4p2fwwrSO_F" role="37vLTJ">
+                  <ref role="3cqZAo" node="4p2fwwrSJzB" resolve="s" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4p2fwwrSSjw" role="3cqZAp">
+          <node concept="37vLTw" id="4p2fwwrSSju" role="3clFbG">
+            <ref role="3cqZAo" node="4p2fwwrSJzB" resolve="s" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="4p2fwwrS$Qb" role="1B3o_S" />
+      <node concept="10Oyi0" id="4p2fwwrSEaN" role="3clF45" />
+    </node>
     <node concept="2tJIrI" id="7eGEHDlc$dC" role="jymVt" />
     <node concept="3clFb_" id="2$F5QpusUuS" role="jymVt">
       <property role="TrG5h" value="doMerge" />