From c15c6694dee5ea67e39868ebaa0ff5118adfb730 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 5 Feb 2020 16:46:14 +0100
Subject: [PATCH] Ensure all rule parameters of same type are displayed on
 separate lines. Deprecte ParameterContainer. Migration.

---
 .../jetbrains.mps.lang.coderules.mpl          |   2 +-
 .../languageModels/behavior.mps               |  99 ++++++--
 .../languageModels/editor.mps                 | 110 +++++++--
 .../languageModels/migration.mps              | 229 ++++++++++++++++++
 .../languageModels/structure.mps              |  12 +
 5 files changed, 411 insertions(+), 41 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index a252053e..36b24761 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<language namespace="jetbrains.mps.lang.coderules" uuid="c4803b19-6d89-4a3b-bf82-390769514add" languageVersion="17" moduleVersion="0">
+<language namespace="jetbrains.mps.lang.coderules" uuid="c4803b19-6d89-4a3b-bf82-390769514add" languageVersion="18" moduleVersion="0">
   <models>
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="languageModels" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index f9ad1e4c..db9b73e1 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -974,35 +974,67 @@
           </node>
         </node>
         <node concept="3clFbF" id="7lt0LtPIy7B" role="3cqZAp">
-          <node concept="2OqwBi" id="7lt0LtPIy7C" role="3clFbG">
-            <node concept="37vLTw" id="7lt0LtPIy7D" role="2Oq$k0">
-              <ref role="3cqZAo" node="7lt0LtPIy7n" resolve="varDecls" />
-            </node>
-            <node concept="3QWeyG" id="7lt0LtPIy7E" role="2OqNvi">
-              <node concept="2OqwBi" id="7lt0LtPIy7F" role="576Qk">
-                <node concept="2OqwBi" id="7lt0LtPIy7G" role="2Oq$k0">
-                  <node concept="13iPFW" id="7lt0LtPIy7H" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="7lt0LtPI$jD" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
+          <node concept="2OqwBi" id="4beNoh2th9$" role="3clFbG">
+            <node concept="2OqwBi" id="7lt0LtPIy7C" role="2Oq$k0">
+              <node concept="37vLTw" id="7lt0LtPIy7D" role="2Oq$k0">
+                <ref role="3cqZAo" node="7lt0LtPIy7n" resolve="varDecls" />
+              </node>
+              <node concept="3QWeyG" id="7lt0LtPIy7E" role="2OqNvi">
+                <node concept="2OqwBi" id="7lt0LtPIy7F" role="576Qk">
+                  <node concept="2OqwBi" id="7lt0LtPIy7G" role="2Oq$k0">
+                    <node concept="13iPFW" id="7lt0LtPIy7H" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="4beNoh2entW" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
+                    </node>
+                  </node>
+                  <node concept="3goQfb" id="7lt0LtPIy7J" role="2OqNvi">
+                    <node concept="1bVj0M" id="7lt0LtPIy7K" role="23t8la">
+                      <node concept="3clFbS" id="7lt0LtPIy7L" role="1bW5cS">
+                        <node concept="3clFbF" id="7lt0LtPIy7M" role="3cqZAp">
+                          <node concept="2OqwBi" id="7lt0LtPIy7N" role="3clFbG">
+                            <node concept="37vLTw" id="7lt0LtPIy7O" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7lt0LtPIy7Q" resolve="it" />
+                            </node>
+                            <node concept="2qgKlT" id="5TXeSYSxPiA" role="2OqNvi">
+                              <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="7lt0LtPIy7Q" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="7lt0LtPIy7R" role="1tU5fm" />
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="3goQfb" id="7lt0LtPIy7J" role="2OqNvi">
-                  <node concept="1bVj0M" id="7lt0LtPIy7K" role="23t8la">
-                    <node concept="3clFbS" id="7lt0LtPIy7L" role="1bW5cS">
-                      <node concept="3clFbF" id="7lt0LtPIy7M" role="3cqZAp">
-                        <node concept="2OqwBi" id="7lt0LtPIy7N" role="3clFbG">
-                          <node concept="37vLTw" id="7lt0LtPIy7O" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7lt0LtPIy7Q" resolve="it" />
+              </node>
+            </node>
+            <node concept="3QWeyG" id="4beNoh2thmY" role="2OqNvi">
+              <node concept="2OqwBi" id="4beNoh2thmZ" role="576Qk">
+                <node concept="2OqwBi" id="4beNoh2thn0" role="2Oq$k0">
+                  <node concept="13iPFW" id="4beNoh2thn1" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="4beNoh2thn2" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:4beNoh24Wi0" resolve="parameter" />
+                  </node>
+                </node>
+                <node concept="3goQfb" id="4beNoh2thn3" role="2OqNvi">
+                  <node concept="1bVj0M" id="4beNoh2thn4" role="23t8la">
+                    <node concept="3clFbS" id="4beNoh2thn5" role="1bW5cS">
+                      <node concept="3clFbF" id="4beNoh2thn6" role="3cqZAp">
+                        <node concept="2OqwBi" id="4beNoh2thn7" role="3clFbG">
+                          <node concept="37vLTw" id="4beNoh2thn8" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4beNoh2thna" resolve="it" />
                           </node>
-                          <node concept="2qgKlT" id="5TXeSYSxPiA" role="2OqNvi">
+                          <node concept="2qgKlT" id="4beNoh2thn9" role="2OqNvi">
                             <ref role="37wK5l" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7lt0LtPIy7Q" role="1bW2Oz">
+                    <node concept="Rh6nW" id="4beNoh2thna" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7lt0LtPIy7R" role="1tU5fm" />
+                      <node concept="2jxLKc" id="4beNoh2thnb" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -1366,5 +1398,32 @@
       </node>
     </node>
   </node>
+  <node concept="13h7C7" id="4beNoh2IxzM">
+    <property role="3GE5qa" value="constraint.variable" />
+    <ref role="13h7C2" to="wq2x:PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
+    <node concept="13hLZK" id="4beNoh2IxzN" role="13h7CW">
+      <node concept="3clFbS" id="4beNoh2IxzO" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="4beNoh2IxzX" role="13h7CS">
+      <property role="TrG5h" value="availableLogicalVariable" />
+      <ref role="13i0hy" to="ha02:6YKq674fNYS" resolve="availableLogicalVariable" />
+      <node concept="3Tm1VV" id="4beNoh2IxzY" role="1B3o_S" />
+      <node concept="3clFbS" id="4beNoh2Ix$4" role="3clF47">
+        <node concept="3clFbF" id="4beNoh2Izuk" role="3cqZAp">
+          <node concept="2OqwBi" id="4beNoh2Izul" role="3clFbG">
+            <node concept="13iPFW" id="4beNoh2IzzO" role="2Oq$k0" />
+            <node concept="3Tsc0h" id="4beNoh2Izun" role="2OqNvi">
+              <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="4beNoh2Ix$5" role="3clF45">
+        <node concept="3Tqbb2" id="4beNoh2Ix$6" role="A3Ik2">
+          <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 5b99e9d6..59da8c18 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -3836,27 +3836,53 @@
         <property role="3F0ifm" value="on" />
         <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
       </node>
-      <node concept="3F2HdR" id="7lt0LtPHSzb" role="3EZMnx">
-        <property role="2czwfO" value=" " />
-        <ref role="1NtTu8" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
-        <node concept="1Bsynf" id="b5g$pBorpb" role="3F10Kt">
-          <property role="VOm3f" value="true" />
+      <node concept="3EZMnI" id="4beNoh26cJw" role="3EZMnx">
+        <node concept="VPM3Z" id="4beNoh26cJy" role="3F10Kt" />
+        <node concept="l2Vlx" id="4beNoh26cJ_" role="2iSdaV" />
+        <node concept="3F0ifn" id="4beNoh26cQK" role="3EZMnx">
+          <property role="3F0ifm" value="&lt;" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+          <node concept="11LMrY" id="4beNoh26dcM" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
         </node>
-        <node concept="1Bt7hp" id="b5g$pBorpc" role="3F10Kt">
-          <property role="VOm3f" value="true" />
+        <node concept="3F2HdR" id="7lt0LtPHSzb" role="3EZMnx">
+          <property role="2czwfO" value=";" />
+          <ref role="1NtTu8" to="wq2x:4beNoh24Wi0" resolve="parameter" />
+          <node concept="1Bsynf" id="b5g$pBorpb" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="1Bt7hp" id="b5g$pBorpc" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="VPM3Z" id="b5g$pBorpd" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="l2Vlx" id="7lt0LtPHSzc" role="2czzBx" />
+          <node concept="tppnM" id="7lt0LtPHSzl" role="sWeuL">
+            <node concept="11L4FC" id="4beNoh26eal" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+            <node concept="ljvvj" id="7lt0LtPHSzm" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
         </node>
-        <node concept="VPM3Z" id="b5g$pBorpd" role="3F10Kt">
-          <property role="VOm3f" value="false" />
+        <node concept="3F0ifn" id="4beNoh26dnM" role="3EZMnx">
+          <property role="3F0ifm" value="&gt;" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+          <node concept="11L4FC" id="4beNoh26dnS" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
         </node>
-        <node concept="l2Vlx" id="7lt0LtPHSzc" role="2czzBx" />
-        <node concept="pkWqt" id="7lt0LtPHSzd" role="pqm2j">
-          <node concept="3clFbS" id="7lt0LtPHSze" role="2VODD2">
+        <node concept="pkWqt" id="4beNoh26ds2" role="pqm2j">
+          <node concept="3clFbS" id="4beNoh26ds3" role="2VODD2">
             <node concept="3clFbF" id="7lt0LtPHSzf" role="3cqZAp">
               <node concept="2OqwBi" id="7lt0LtPHSzg" role="3clFbG">
                 <node concept="2OqwBi" id="7lt0LtPHSzh" role="2Oq$k0">
                   <node concept="pncrf" id="7lt0LtPHSzi" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="7lt0LtPHSzj" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
+                  <node concept="3Tsc0h" id="4beNoh26dRa" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:4beNoh24Wi0" resolve="parameter" />
                   </node>
                 </node>
                 <node concept="3GX2aA" id="7lt0LtPHSzk" role="2OqNvi" />
@@ -3864,11 +3890,46 @@
             </node>
           </node>
         </node>
-        <node concept="tppnM" id="7lt0LtPHSzl" role="sWeuL">
-          <node concept="ljvvj" id="7lt0LtPHSzm" role="3F10Kt">
+      </node>
+      <node concept="3F2HdR" id="4beNoh26ehA" role="3EZMnx">
+        <property role="2czwfO" value=" " />
+        <ref role="1NtTu8" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
+        <node concept="l2Vlx" id="4beNoh26ehC" role="2czzBx" />
+        <node concept="pkWqt" id="4beNoh26ej3" role="pqm2j">
+          <node concept="3clFbS" id="4beNoh26ej4" role="2VODD2">
+            <node concept="3clFbF" id="4beNoh26ejP" role="3cqZAp">
+              <node concept="2OqwBi" id="4beNoh26gI1" role="3clFbG">
+                <node concept="2OqwBi" id="4beNoh26ey5" role="2Oq$k0">
+                  <node concept="pncrf" id="4beNoh26ejO" role="2Oq$k0" />
+                  <node concept="3Tsc0h" id="4beNoh26eMr" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
+                  </node>
+                </node>
+                <node concept="3GX2aA" id="4beNoh26iUr" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="tppnM" id="4beNoh26j0c" role="sWeuL">
+          <node concept="ljvvj" id="4beNoh26j7f" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
         </node>
+        <node concept="3nxI2P" id="4beNoh26j7k" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pVoyu" id="4beNoh26jll" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="1Bsynf" id="4beNoh26jsq" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="1Bt7hp" id="4beNoh26jsr" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="VPM3Z" id="4beNoh26jss" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
       </node>
       <node concept="3F2HdR" id="36tQV5AmMLS" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:36tQV5AmIsU" resolve="head" />
@@ -4251,12 +4312,18 @@
         <node concept="11LMrY" id="7lt0LtPpFqf" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
+        <node concept="3nxI2P" id="4beNoh2tGlB" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="3F2HdR" id="7lt0LtPpFqg" role="3EZMnx">
         <property role="2czwfO" value="," />
         <ref role="1NtTu8" to="wq2x:7lt0LtPpF3M" resolve="parameter" />
         <node concept="l2Vlx" id="7lt0LtPpFqh" role="2czzBx" />
         <node concept="3F0ifn" id="7lt0LtPpFqi" role="2czzBI" />
+        <node concept="3nxI2P" id="4beNoh2tGlM" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="3F0ifn" id="7lt0LtPpFqj" role="3EZMnx">
         <property role="3F0ifm" value="&gt;" />
@@ -4264,6 +4331,9 @@
         <node concept="11L4FC" id="7lt0LtPpFqk" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
+        <node concept="3nxI2P" id="4beNoh2tGlI" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="l2Vlx" id="7lt0LtPpFqa" role="2iSdaV" />
     </node>
@@ -4288,8 +4358,8 @@
               <node concept="2OqwBi" id="7lt0LtPHTOI" role="3clFbG">
                 <node concept="2OqwBi" id="7lt0LtPHTOJ" role="2Oq$k0">
                   <node concept="7Obwk" id="7lt0LtPHTOK" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="7lt0LtPHTOL" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
+                  <node concept="3Tsc0h" id="4beNoh25fYD" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:4beNoh24Wi0" resolve="parameter" />
                   </node>
                 </node>
                 <node concept="2DeJg1" id="24ciDNzvt1G" role="2OqNvi" />
@@ -4303,8 +4373,8 @@
               <node concept="2OqwBi" id="7lt0LtPHTOQ" role="3clFbG">
                 <node concept="2OqwBi" id="7lt0LtPHTOR" role="2Oq$k0">
                   <node concept="7Obwk" id="7lt0LtPHTOS" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="7lt0LtPHTOT" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
+                  <node concept="3Tsc0h" id="4beNoh25fPt" role="2OqNvi">
+                    <ref role="3TtcxE" to="wq2x:4beNoh24Wi0" resolve="parameter" />
                   </node>
                 </node>
                 <node concept="1v1jN8" id="7lt0LtPHTOU" role="2OqNvi" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
index 2ccf0791..49d7bee8 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps
@@ -215,10 +215,19 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
+      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
   <node concept="3SyAh_" id="7smgEqgGBKb">
@@ -1605,5 +1614,225 @@
       <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
     </node>
   </node>
+  <node concept="3SyAh_" id="4beNoh2Fimt">
+    <property role="qMTe8" value="17" />
+    <property role="TrG5h" value="DropParameterContainer" />
+    <node concept="3Tm1VV" id="4beNoh2Fimu" role="1B3o_S" />
+    <node concept="3tTeZs" id="4beNoh2Fimv" role="jymVt">
+      <property role="3tTeZt" value="&lt;no execute after&gt;" />
+      <ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
+    </node>
+    <node concept="3tTeZs" id="4beNoh2Fimw" role="jymVt">
+      <property role="3tTeZt" value="&lt;no required data&gt;" />
+      <ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
+    </node>
+    <node concept="3tTeZs" id="4beNoh2Fimx" role="jymVt">
+      <property role="3tTeZt" value="&lt;no produced data&gt;" />
+      <ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
+    </node>
+    <node concept="2tJIrI" id="4beNoh2Fimy" role="jymVt" />
+    <node concept="3tYpMH" id="4beNoh2Fimz" role="jymVt">
+      <property role="TrG5h" value="isRerunnable" />
+      <property role="3tYpME" value="true" />
+      <ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
+      <node concept="3Tm1VV" id="4beNoh2Fim$" role="1B3o_S" />
+      <node concept="10P_77" id="4beNoh2Fim_" role="1tU5fm" />
+    </node>
+    <node concept="3tYpXE" id="4beNoh2Fiuu" role="jymVt">
+      <property role="TrG5h" value="description" />
+      <property role="3tYpXF" value="Drop ParameterContainer, move all parameter declarations to upper level" />
+      <ref role="25KYV2" to="slm6:1_lSsE3RFpE" resolve="description" />
+      <node concept="3Tm1VV" id="4beNoh2Fiuw" role="1B3o_S" />
+      <node concept="17QB3L" id="4beNoh2Fiux" role="1tU5fm" />
+    </node>
+    <node concept="q3mfD" id="4beNoh2FimB" role="jymVt">
+      <property role="TrG5h" value="execute" />
+      <ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
+      <node concept="3Tm1VV" id="4beNoh2FimD" role="1B3o_S" />
+      <node concept="3clFbS" id="4beNoh2FimF" role="3clF47">
+        <node concept="L3pyB" id="4beNoh2FiHT" role="3cqZAp">
+          <node concept="3clFbS" id="4beNoh2FiHU" role="L3pyw">
+            <node concept="3clFbF" id="4beNoh2FiHV" role="3cqZAp">
+              <node concept="2OqwBi" id="4beNoh2FiHW" role="3clFbG">
+                <node concept="2OqwBi" id="4beNoh2FjCf" role="2Oq$k0">
+                  <node concept="qVDSY" id="4beNoh2FiHX" role="2Oq$k0">
+                    <node concept="chp4Y" id="4beNoh2Fj3d" role="qVDSX">
+                      <ref role="cht4Q" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                    </node>
+                    <node concept="1dO9Bo" id="4beNoh2FiHZ" role="1dOa5D">
+                      <node concept="3Z_Q4n" id="4beNoh2FiI0" role="1dp2q7" />
+                    </node>
+                  </node>
+                  <node concept="3zZkjj" id="4beNoh2FkeY" role="2OqNvi">
+                    <node concept="1bVj0M" id="4beNoh2Fkf0" role="23t8la">
+                      <node concept="3clFbS" id="4beNoh2Fkf1" role="1bW5cS">
+                        <node concept="3clFbF" id="4beNoh2Fk_S" role="3cqZAp">
+                          <node concept="2OqwBi" id="4beNoh2FnOT" role="3clFbG">
+                            <node concept="2OqwBi" id="4beNoh2FkSk" role="2Oq$k0">
+                              <node concept="37vLTw" id="4beNoh2Fk_R" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4beNoh2Fkf2" resolve="cr" />
+                              </node>
+                              <node concept="3Tsc0h" id="4beNoh2FlkV" role="2OqNvi">
+                                <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
+                              </node>
+                            </node>
+                            <node concept="3GX2aA" id="4beNoh2FqIE" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="4beNoh2Fkf2" role="1bW2Oz">
+                        <property role="TrG5h" value="cr" />
+                        <node concept="2jxLKc" id="4beNoh2Fkf3" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2es0OD" id="4beNoh2FiI1" role="2OqNvi">
+                  <node concept="1bVj0M" id="4beNoh2FiI2" role="23t8la">
+                    <node concept="3clFbS" id="4beNoh2FiI3" role="1bW5cS">
+                      <node concept="3cpWs8" id="4beNoh2FAnI" role="3cqZAp">
+                        <node concept="3cpWsn" id="4beNoh2FAnJ" role="3cpWs9">
+                          <property role="TrG5h" value="allpd" />
+                          <node concept="_YKpA" id="4beNoh2FAkE" role="1tU5fm">
+                            <node concept="3Tqbb2" id="4beNoh2FAkH" role="_ZDj9">
+                              <ref role="ehGHo" to="wq2x:PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="4beNoh2FAnK" role="33vP2m">
+                            <node concept="2OqwBi" id="4beNoh2FAnL" role="2Oq$k0">
+                              <node concept="2OqwBi" id="4beNoh2FAnM" role="2Oq$k0">
+                                <node concept="37vLTw" id="4beNoh2FAnN" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4beNoh2FiIy" resolve="cr" />
+                                </node>
+                                <node concept="3Tsc0h" id="4beNoh2FAnO" role="2OqNvi">
+                                  <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
+                                </node>
+                              </node>
+                              <node concept="3goQfb" id="4beNoh2FAnP" role="2OqNvi">
+                                <node concept="1bVj0M" id="4beNoh2FAnQ" role="23t8la">
+                                  <node concept="3clFbS" id="4beNoh2FAnR" role="1bW5cS">
+                                    <node concept="3clFbF" id="4beNoh2FAnS" role="3cqZAp">
+                                      <node concept="2OqwBi" id="4beNoh2FAnT" role="3clFbG">
+                                        <node concept="37vLTw" id="4beNoh2FAnU" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="4beNoh2FAnW" resolve="it" />
+                                        </node>
+                                        <node concept="3Tsc0h" id="4beNoh2FAnV" role="2OqNvi">
+                                          <ref role="3TtcxE" to="wq2x:7lt0LtPpF3M" resolve="parameter" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="Rh6nW" id="4beNoh2FAnW" role="1bW2Oz">
+                                    <property role="TrG5h" value="it" />
+                                    <node concept="2jxLKc" id="4beNoh2FAnX" role="1tU5fm" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="ANE8D" id="4beNoh2FAnY" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1DcWWT" id="4beNoh2FBo$" role="3cqZAp">
+                        <node concept="3clFbS" id="4beNoh2FBoB" role="2LFqv$">
+                          <node concept="3clFbF" id="4beNoh2G03X" role="3cqZAp">
+                            <node concept="2OqwBi" id="4beNoh2G6Km" role="3clFbG">
+                              <node concept="2OqwBi" id="4beNoh2G1HD" role="2Oq$k0">
+                                <node concept="37vLTw" id="4beNoh2G03V" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="4beNoh2FiIy" resolve="cr" />
+                                </node>
+                                <node concept="3Tsc0h" id="4beNoh2G3I6" role="2OqNvi">
+                                  <ref role="3TtcxE" to="wq2x:4beNoh24Wi0" resolve="parameter" />
+                                </node>
+                              </node>
+                              <node concept="TSZUe" id="4beNoh2GbvW" role="2OqNvi">
+                                <node concept="2OqwBi" id="4beNoh2Gf3S" role="25WWJ7">
+                                  <node concept="37vLTw" id="4beNoh2Gdhu" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="4beNoh2FBoC" resolve="pd" />
+                                  </node>
+                                  <node concept="3YRAZt" id="4beNoh2GgGu" role="2OqNvi" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3cpWsn" id="4beNoh2FBoC" role="1Duv9x">
+                          <property role="TrG5h" value="pd" />
+                          <node concept="3Tqbb2" id="4beNoh2FBoG" role="1tU5fm">
+                            <ref role="ehGHo" to="wq2x:PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="4beNoh2FBoH" role="1DdaDG">
+                          <ref role="3cqZAo" node="4beNoh2FAnJ" resolve="allpd" />
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="4beNoh2HRON" role="3cqZAp">
+                        <node concept="2OqwBi" id="4beNoh2IkBJ" role="3clFbG">
+                          <node concept="2OqwBi" id="4beNoh2Idi$" role="2Oq$k0">
+                            <node concept="2OqwBi" id="4beNoh2HTdR" role="2Oq$k0">
+                              <node concept="37vLTw" id="4beNoh2HROL" role="2Oq$k0">
+                                <ref role="3cqZAo" node="4beNoh2FiIy" resolve="cr" />
+                              </node>
+                              <node concept="3Tsc0h" id="4beNoh2I9IB" role="2OqNvi">
+                                <ref role="3TtcxE" to="wq2x:7lt0LtPHSaf" resolve="parameter" />
+                              </node>
+                            </node>
+                            <node concept="ANE8D" id="4beNoh2IhPJ" role="2OqNvi" />
+                          </node>
+                          <node concept="2es0OD" id="4beNoh2IoHt" role="2OqNvi">
+                            <node concept="1bVj0M" id="4beNoh2IoHv" role="23t8la">
+                              <node concept="3clFbS" id="4beNoh2IoHw" role="1bW5cS">
+                                <node concept="3clFbF" id="4beNoh2Iqen" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4beNoh2IrEW" role="3clFbG">
+                                    <node concept="37vLTw" id="4beNoh2Iqem" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="4beNoh2IoHx" resolve="it" />
+                                    </node>
+                                    <node concept="3YRAZt" id="4beNoh2ItlR" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Rh6nW" id="4beNoh2IoHx" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="4beNoh2IoHy" role="1tU5fm" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="4beNoh2FiIy" role="1bW2Oz">
+                      <property role="TrG5h" value="cr" />
+                      <node concept="2jxLKc" id="4beNoh2FiIz" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="4beNoh2FiI$" role="L3pyr">
+            <ref role="3cqZAo" node="4beNoh2FimH" resolve="m" />
+          </node>
+        </node>
+      </node>
+      <node concept="ffn8J" id="4beNoh2FimH" role="3clF46">
+        <property role="TrG5h" value="m" />
+        <ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
+        <node concept="3uibUv" id="4beNoh2FimG" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
+      <node concept="q3mfm" id="4beNoh2FimI" role="3clF45">
+        <ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
+        <ref role="1QQUv3" node="4beNoh2FimB" resolve="execute" />
+      </node>
+    </node>
+    <node concept="3tTeZs" id="4beNoh2FimJ" role="jymVt">
+      <property role="3tTeZt" value="&lt;no result checking&gt;" />
+      <ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
+    </node>
+    <node concept="3uibUv" id="4beNoh2FimK" role="1zkMxy">
+      <ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index f195f945..bae495a0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -498,6 +498,9 @@
     <node concept="PrWs8" id="75vUFrS_flD" role="PzmwI">
       <ref role="PrY4T" to="5j4j:75vUFrS_9Sg" resolve="LogicalVariableDeclarationContainer" />
     </node>
+    <node concept="PrWs8" id="4beNoh2IxyQ" role="PzmwI">
+      <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
+    </node>
   </node>
   <node concept="1TIwiD" id="1hX44vMFoce">
     <property role="EcuMT" value="1476354154047570702" />
@@ -1025,6 +1028,14 @@
       <property role="20kJfa" value="parameter" />
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <ref role="20lvS9" node="7lt0LtPpEVM" resolve="ParameterContainer" />
+      <node concept="asaX9" id="4beNoh250AK" role="lGtFl" />
+    </node>
+    <node concept="1TJgyj" id="4beNoh24Wi0" role="1TKVEi">
+      <property role="IQ2ns" value="4814011019633607808" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <property role="20kJfa" value="parameter" />
+      <ref role="20lvS9" node="PB1R3Y7Ed7" resolve="RulePartParameterDeclaration" />
     </node>
     <node concept="1TJgyj" id="36tQV5AmIsU" role="1TKVEi">
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -1098,6 +1109,7 @@
     <node concept="PrWs8" id="7lt0LtPpF3K" role="PzmwI">
       <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
     </node>
+    <node concept="asaX9" id="4beNoh24WhY" role="lGtFl" />
   </node>
   <node concept="1TIwiD" id="1mdVbTS8GIV">
     <property role="EcuMT" value="1553157749316176827" />