From 530ace6399b5feb14d2b87d2fbc0cf124f6763f0 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 4 Oct 2023 12:38:31 +0200
Subject: [PATCH] Rework editor for expand macro template and prototype

Expand macro prototype: "virtual macro".
Expand macro template: "override".
Override macro displays parameters declared in the prototype as R/O.
Introduce "usages" of prototype parameters to serve as local anchors;
this avoids problems with generation.
The existing code is going to work as before, but marked as erroneous
until migrated.
---
 .../generator/template/main@generator.mps     | 480 ++++++++++++------
 .../jetbrains.mps.lang.coderules.mpl          |   5 +
 .../languageModels/behavior.mps               |   8 +-
 .../languageModels/constraints.mps            | 158 +++---
 .../languageModels/editor.mps                 | 460 ++++++++++++++---
 .../languageModels/intentions.mps             | 361 ++++++++++++-
 .../languageModels/structure.mps              |  43 +-
 .../languageModels/typesystem.mps             | 178 ++++++-
 8 files changed, 1379 insertions(+), 314 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 5bd99ddc..3f5c179d 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
@@ -5392,10 +5392,15 @@
       <ref role="2rTdP9" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
     </node>
     <node concept="2rT7sh" id="4qGA5WD10sU" role="2rTMjI">
-      <property role="TrG5h" value="expandMacroParam_field" />
+      <property role="TrG5h" value="expandMacroParamDecl_field" />
       <ref role="2rTdP9" to="wq2x:5itBwM6wvc4" resolve="ExpandMacroParameterDeclaration" />
       <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
     </node>
+    <node concept="2rT7sh" id="3swcsd17R96" role="2rTMjI">
+      <property role="TrG5h" value="expandMacroParam_field" />
+      <ref role="2rTdP9" to="wq2x:3swcsd17JEl" resolve="ExpandMacroParameterUsage" />
+      <ref role="2rZz_L" to="tpee:fz12cDC" resolve="FieldDeclaration" />
+    </node>
     <node concept="3lhOvk" id="2N2MQGCMWNw" role="3lj3bC">
       <ref role="30HIoZ" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
       <ref role="3lhOvi" node="2N2MQGCMHqo" resolve="_MacroTable" />
@@ -5463,123 +5468,6 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="5itBwM8cqKf" role="3acgRq">
-      <ref role="30HIoZ" to="wq2x:5itBwM6_4x3" resolve="ExpandMacroParameterReference" />
-      <node concept="1Koe21" id="5itBwM8ctd4" role="1lVwrX">
-        <node concept="3clFb_" id="5itBwM8ctd5" role="1Koe22">
-          <property role="TrG5h" value="context" />
-          <node concept="37vLTG" id="5itBwM8ctd6" role="3clF46">
-            <property role="TrG5h" value="session" />
-            <node concept="3uibUv" id="5itBwM8ctd7" role="1tU5fm">
-              <ref role="3uigEE" to="i348:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-            </node>
-          </node>
-          <node concept="3Tm6S6" id="5itBwM8ctd8" role="1B3o_S" />
-          <node concept="3cqZAl" id="5itBwM8ctd9" role="3clF45" />
-          <node concept="3clFbS" id="5itBwM8ctda" role="3clF47">
-            <node concept="3clFbF" id="5itBwM8ctdb" role="3cqZAp">
-              <node concept="2OqwBi" id="5itBwM8ctdc" role="3clFbG">
-                <node concept="37vLTw" id="5itBwM8ctdd" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5itBwM8ctd6" resolve="session" />
-                  <node concept="1sPUBX" id="C1f6iEOAq4" role="lGtFl">
-                    <ref role="v9R2y" node="1L74NXExmCW" resolve="session_variable" />
-                    <node concept="3NFfHV" id="C1f6iEOAxe" role="1sPUBK">
-                      <node concept="3clFbS" id="C1f6iEOAxf" role="2VODD2">
-                        <node concept="3clFbF" id="C1f6iEOAxj" role="3cqZAp">
-                          <node concept="2OqwBi" id="C1f6iEOAxk" role="3clFbG">
-                            <node concept="30H73N" id="C1f6iEOAxl" role="2Oq$k0" />
-                            <node concept="2Xjw5R" id="C1f6iEOAxm" role="2OqNvi">
-                              <node concept="3gmYPX" id="C1f6iEOAxn" role="1xVPHs">
-                                <node concept="3gn64h" id="C1f6iEOAxo" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="wq2x:7IysFeBd3kI" resolve="ApplicationSessionParticipant" />
-                                </node>
-                                <node concept="3gn64h" id="C1f6iEOAxp" role="3gmYPZ">
-                                  <ref role="3gnhBz" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="5itBwM8ctdq" role="2OqNvi">
-                  <ref role="37wK5l" to="i348:7DvO2M9IiMz" resolve="getParameter" />
-                  <node concept="Xl_RD" id="5itBwM8ctdr" role="37wK5m">
-                    <property role="Xl_RC" value="" />
-                    <node concept="17Uvod" id="5itBwM8ctds" role="lGtFl">
-                      <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                      <property role="2qtEX9" value="value" />
-                      <node concept="3zFVjK" id="5itBwM8ctdt" role="3zH0cK">
-                        <node concept="3clFbS" id="5itBwM8ctdu" role="2VODD2">
-                          <node concept="3clFbF" id="5itBwM8ctdv" role="3cqZAp">
-                            <node concept="2OqwBi" id="5itBwM8ctdw" role="3clFbG">
-                              <node concept="2OqwBi" id="5itBwM8ctdx" role="2Oq$k0">
-                                <node concept="30H73N" id="5itBwM8ctdy" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="5itBwM8cuo5" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:5itBwM6_hXY" resolve="declaration" />
-                                </node>
-                              </node>
-                              <node concept="2qgKlT" id="5itBwM8ctd$" role="2OqNvi">
-                                <ref role="37wK5l" to="tpcu:hEwIO9y" resolve="getFqName" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3VsKOn" id="5itBwM8ctd_" role="37wK5m">
-                    <ref role="3VsUkX" to="wyt6:~Object" resolve="Object" />
-                    <node concept="1ZhdrF" id="5itBwM8ctdA" role="lGtFl">
-                      <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1116615150612/1116615189566" />
-                      <property role="2qtEX8" value="classifier" />
-                      <node concept="3$xsQk" id="5itBwM8ctdB" role="3$ytzL">
-                        <node concept="3clFbS" id="5itBwM8ctdC" role="2VODD2">
-                          <node concept="3clFbF" id="5itBwM8ctdD" role="3cqZAp">
-                            <node concept="2OqwBi" id="5itBwM8ctdE" role="3clFbG">
-                              <node concept="1UaxmW" id="5itBwM8ctdF" role="2Oq$k0">
-                                <node concept="1YaCAy" id="5itBwM8ctdG" role="1Ub_4A">
-                                  <property role="TrG5h" value="ct" />
-                                  <ref role="1YaFvo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                                </node>
-                                <node concept="2OqwBi" id="5itBwM8ctdH" role="1Ub_4B">
-                                  <node concept="2OqwBi" id="5itBwM8ctdI" role="2Oq$k0">
-                                    <node concept="30H73N" id="5itBwM8ctdJ" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="5itBwM8cvGY" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="wq2x:5itBwM6_hXY" resolve="declaration" />
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="5itBwM8cw8F" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="5itBwM8ctdM" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="raruj" id="5itBwM8ctdN" role="lGtFl" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="4qGA5WD1kHb" role="30HLyM">
-        <node concept="3clFbS" id="4qGA5WD1kHc" role="2VODD2">
-          <node concept="3clFbF" id="4qGA5WD1l7Q" role="3cqZAp">
-            <node concept="3clFbT" id="4qGA5WD1l7P" role="3clFbG" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="4qGA5WD1kjt" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:5itBwM6_4x3" resolve="ExpandMacroParameterReference" />
       <node concept="1Koe21" id="4qGA5WD1kju" role="1lVwrX">
@@ -5605,7 +5493,7 @@
                           <node concept="2OqwBi" id="4qGA5WD1m8g" role="3clFbG">
                             <node concept="1iwH7S" id="4qGA5WD1lX2" role="2Oq$k0" />
                             <node concept="1iwH70" id="4qGA5WD1mgk" role="2OqNvi">
-                              <ref role="1iwH77" node="4qGA5WD10sU" resolve="expandMacroParam_field" />
+                              <ref role="1iwH77" node="4qGA5WD10sU" resolve="expandMacroParamDecl_field" />
                               <node concept="2OqwBi" id="4qGA5WD1mFN" role="1iwH7V">
                                 <node concept="30H73N" id="4qGA5WD1mxT" role="2Oq$k0" />
                                 <node concept="3TrEf2" id="4qGA5WD1n7V" role="2OqNvi">
@@ -5633,6 +5521,59 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="3swcsd1Twtt" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:3swcsd1iBEb" resolve="ExpandMacroParameterUsageReference" />
+      <node concept="1Koe21" id="3swcsd1Twtu" role="1lVwrX">
+        <node concept="312cEu" id="3swcsd1Twtv" role="1Koe22">
+          <property role="TrG5h" value="Token" />
+          <node concept="3clFb_" id="3swcsd1Twtw" role="jymVt">
+            <property role="TrG5h" value="method" />
+            <node concept="3uibUv" id="3swcsd1Twtx" role="3clF45">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+            <node concept="3Tm6S6" id="3swcsd1Twty" role="1B3o_S" />
+            <node concept="3clFbS" id="3swcsd1Twtz" role="3clF47">
+              <node concept="3clFbF" id="3swcsd1Twt$" role="3cqZAp">
+                <node concept="37vLTw" id="3swcsd1Twt_" role="3clFbG">
+                  <ref role="3cqZAo" node="3swcsd1TwtL" resolve="param" />
+                  <node concept="raruj" id="3swcsd1TwtA" role="lGtFl" />
+                  <node concept="1ZhdrF" id="3swcsd1TwtB" role="lGtFl">
+                    <property role="2qtEX8" value="variableDeclaration" />
+                    <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                    <node concept="3$xsQk" id="3swcsd1TwtC" role="3$ytzL">
+                      <node concept="3clFbS" id="3swcsd1TwtD" role="2VODD2">
+                        <node concept="3clFbF" id="3swcsd1TwtE" role="3cqZAp">
+                          <node concept="2OqwBi" id="3swcsd1TwtF" role="3clFbG">
+                            <node concept="1iwH7S" id="3swcsd1TwtG" role="2Oq$k0" />
+                            <node concept="1iwH70" id="3swcsd1TwtH" role="2OqNvi">
+                              <ref role="1iwH77" node="3swcsd17R96" resolve="expandMacroParam_field" />
+                              <node concept="2OqwBi" id="3swcsd1TxtW" role="1iwH7V">
+                                <node concept="30H73N" id="3swcsd1TwtJ" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="3swcsd1TxNL" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:3swcsd1iBFV" resolve="parameterUsage" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="312cEg" id="3swcsd1TwtL" role="jymVt">
+            <property role="TrG5h" value="param" />
+            <node concept="3Tm6S6" id="3swcsd1TwtM" role="1B3o_S" />
+            <node concept="3uibUv" id="3swcsd1TwtN" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+          <node concept="3Tm6S6" id="3swcsd1TwtO" role="1B3o_S" />
+        </node>
+      </node>
+    </node>
     <node concept="3aamgX" id="5itBwM9omeA" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:5itBwM5kgmv" resolve="CallMacroParameterReference" />
       <node concept="1Koe21" id="5itBwM9ooba" role="1lVwrX">
@@ -14638,23 +14579,23 @@
             </node>
             <node concept="3Tm1VV" id="4qGA5WD0usv" role="1B3o_S" />
             <node concept="3clFbS" id="4qGA5WD0usw" role="3clF47">
-              <node concept="3clFbF" id="4qGA5WD0usx" role="3cqZAp">
-                <node concept="37vLTI" id="4qGA5WD0usy" role="3clFbG">
-                  <node concept="2OqwBi" id="4qGA5WD0usz" role="37vLTJ">
-                    <node concept="Xjq3P" id="4qGA5WD0us$" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="4qGA5WD0us_" role="2OqNvi">
-                      <ref role="2Oxat5" node="5itBwM6XBIc" resolve="logical" />
-                      <node concept="1ZhdrF" id="4qGA5WD0usA" role="lGtFl">
+              <node concept="3clFbF" id="3swcsd1cTF5" role="3cqZAp">
+                <node concept="37vLTI" id="3swcsd1cTF6" role="3clFbG">
+                  <node concept="2OqwBi" id="3swcsd1cTF7" role="37vLTJ">
+                    <node concept="Xjq3P" id="3swcsd1cTF8" role="2Oq$k0" />
+                    <node concept="2OwXpG" id="3swcsd1cTF9" role="2OqNvi">
+                      <ref role="2Oxat5" node="3swcsd18dlE" resolve="parameter" />
+                      <node concept="1ZhdrF" id="3swcsd1cTFa" role="lGtFl">
                         <property role="2qtEX8" value="fieldDeclaration" />
                         <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
-                        <node concept="3$xsQk" id="4qGA5WD0usB" role="3$ytzL">
-                          <node concept="3clFbS" id="4qGA5WD0usC" role="2VODD2">
-                            <node concept="3clFbF" id="4qGA5WD0usD" role="3cqZAp">
-                              <node concept="2OqwBi" id="4qGA5WD0usE" role="3clFbG">
-                                <node concept="1iwH7S" id="4qGA5WD0usF" role="2Oq$k0" />
-                                <node concept="1iwH70" id="4qGA5WD0usG" role="2OqNvi">
-                                  <ref role="1iwH77" node="4qGA5WD10sU" resolve="expandMacroParam_field" />
-                                  <node concept="30H73N" id="4qGA5WD0usH" role="1iwH7V" />
+                        <node concept="3$xsQk" id="3swcsd1cTFb" role="3$ytzL">
+                          <node concept="3clFbS" id="3swcsd1cTFc" role="2VODD2">
+                            <node concept="3clFbF" id="3swcsd1cTFd" role="3cqZAp">
+                              <node concept="2OqwBi" id="3swcsd1cTFe" role="3clFbG">
+                                <node concept="1iwH7S" id="3swcsd1cTFf" role="2Oq$k0" />
+                                <node concept="1iwH70" id="3swcsd1cTFg" role="2OqNvi">
+                                  <ref role="1iwH77" node="4qGA5WD10sU" resolve="expandMacroParamDecl_field" />
+                                  <node concept="30H73N" id="3swcsd1cTFh" role="1iwH7V" />
                                 </node>
                               </node>
                             </node>
@@ -14663,18 +14604,18 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="1eOMI4" id="4qGA5WD0usI" role="37vLTx">
-                    <node concept="10QFUN" id="4qGA5WD0usJ" role="1eOMHV">
-                      <node concept="AH0OO" id="4qGA5WD0usM" role="10QFUP">
-                        <node concept="3cmrfG" id="4qGA5WD0usN" role="AHEQo">
+                  <node concept="1eOMI4" id="3swcsd1cTFi" role="37vLTx">
+                    <node concept="10QFUN" id="3swcsd1cTFj" role="1eOMHV">
+                      <node concept="AH0OO" id="3swcsd1cTFk" role="10QFUP">
+                        <node concept="3cmrfG" id="3swcsd1cTFl" role="AHEQo">
                           <property role="3cmrfH" value="0" />
-                          <node concept="17Uvod" id="4qGA5WD0usO" role="lGtFl">
+                          <node concept="17Uvod" id="3swcsd1cTFm" role="lGtFl">
                             <property role="2qtEX9" value="value" />
                             <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
-                            <node concept="3zFVjK" id="4qGA5WD0usP" role="3zH0cK">
-                              <node concept="3clFbS" id="4qGA5WD0usQ" role="2VODD2">
-                                <node concept="3clFbF" id="4qGA5WD0usR" role="3cqZAp">
-                                  <node concept="$GB7w" id="4qGA5WD0usS" role="3clFbG">
+                            <node concept="3zFVjK" id="3swcsd1cTFn" role="3zH0cK">
+                              <node concept="3clFbS" id="3swcsd1cTFo" role="2VODD2">
+                                <node concept="3clFbF" id="3swcsd1cTFp" role="3cqZAp">
+                                  <node concept="$GB7w" id="3swcsd1cTFq" role="3clFbG">
                                     <property role="26SvY3" value="1jlY2aid0uu/index" />
                                   </node>
                                 </node>
@@ -14682,19 +14623,19 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="37vLTw" id="4qGA5WD0usT" role="AHHXb">
+                        <node concept="37vLTw" id="3swcsd1cTFr" role="AHHXb">
                           <ref role="3cqZAo" node="4qGA5WD0usr" resolve="params" />
                         </node>
                       </node>
-                      <node concept="3uibUv" id="4qGA5WD17wG" role="10QFUM">
+                      <node concept="3uibUv" id="3swcsd1cTFs" role="10QFUM">
                         <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                        <node concept="29HgVG" id="4qGA5WD19aL" role="lGtFl">
-                          <node concept="3NFfHV" id="4qGA5WD1a0b" role="3NFExx">
-                            <node concept="3clFbS" id="4qGA5WD1a0c" role="2VODD2">
-                              <node concept="3clFbF" id="4qGA5WD1b$P" role="3cqZAp">
-                                <node concept="2OqwBi" id="4qGA5WD1cB1" role="3clFbG">
-                                  <node concept="30H73N" id="4qGA5WD1b$O" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="4qGA5WD1eXX" role="2OqNvi">
+                        <node concept="29HgVG" id="3swcsd1cTFt" role="lGtFl">
+                          <node concept="3NFfHV" id="3swcsd1cTFu" role="3NFExx">
+                            <node concept="3clFbS" id="3swcsd1cTFv" role="2VODD2">
+                              <node concept="3clFbF" id="3swcsd1cTFw" role="3cqZAp">
+                                <node concept="2OqwBi" id="3swcsd1cTFx" role="3clFbG">
+                                  <node concept="30H73N" id="3swcsd1cTFz" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="3swcsd1cTF_" role="2OqNvi">
                                     <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
                                   </node>
                                 </node>
@@ -14706,19 +14647,51 @@
                     </node>
                   </node>
                 </node>
-                <node concept="1WS0z7" id="4qGA5WD0usU" role="lGtFl">
-                  <property role="1qytDF" value="" />
-                  <node concept="3JmXsc" id="4qGA5WD0usV" role="3Jn$fo">
-                    <node concept="3clFbS" id="4qGA5WD0usW" role="2VODD2">
-                      <node concept="3clFbF" id="4qGA5WD0Soi" role="3cqZAp">
-                        <node concept="2OqwBi" id="4qGA5WD0VNi" role="3clFbG">
-                          <node concept="2OqwBi" id="4qGA5WD0TsS" role="2Oq$k0">
-                            <node concept="30H73N" id="4qGA5WD0Soh" role="2Oq$k0" />
-                            <node concept="3TrEf2" id="4qGA5WD0UvB" role="2OqNvi">
+                <node concept="1W57fq" id="3swcsd1cTFA" role="lGtFl">
+                  <node concept="3IZrLx" id="3swcsd1cTFB" role="3IZSJc">
+                    <node concept="3clFbS" id="3swcsd1cTFC" role="2VODD2">
+                      <node concept="3clFbF" id="3swcsd1cTFD" role="3cqZAp">
+                        <node concept="1Wc70l" id="3swcsd1cTFE" role="3clFbG">
+                          <node concept="2OqwBi" id="3swcsd1cTFF" role="3uHU7w">
+                            <node concept="2OqwBi" id="3swcsd1cTFG" role="2Oq$k0">
+                              <node concept="2OqwBi" id="3swcsd1cTFH" role="2Oq$k0">
+                                <node concept="30H73N" id="3swcsd1cTFI" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="3swcsd1cTFJ" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:5itBwM6gb4P" resolve="prototype" />
+                                </node>
+                              </node>
+                              <node concept="3Tsc0h" id="3swcsd1cTFK" role="2OqNvi">
+                                <ref role="3TtcxE" to="wq2x:5itBwM6wU6s" resolve="parameter" />
+                              </node>
+                            </node>
+                            <node concept="3GX2aA" id="3swcsd1cTFL" role="2OqNvi" />
+                          </node>
+                          <node concept="2OqwBi" id="3swcsd1cTFM" role="3uHU7B">
+                            <node concept="2OqwBi" id="3swcsd1cTFN" role="2Oq$k0">
+                              <node concept="30H73N" id="3swcsd1cTFO" role="2Oq$k0" />
+                              <node concept="3Tsc0h" id="3swcsd1cTFP" role="2OqNvi">
+                                <ref role="3TtcxE" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+                              </node>
+                            </node>
+                            <node concept="1v1jN8" id="3swcsd1d2A1" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1WS0z7" id="3swcsd1cTFR" role="lGtFl">
+                  <node concept="3JmXsc" id="3swcsd1cTFS" role="3Jn$fo">
+                    <node concept="3clFbS" id="3swcsd1cTFT" role="2VODD2">
+                      <node concept="3clFbF" id="3swcsd1cTFU" role="3cqZAp">
+                        <node concept="2OqwBi" id="3swcsd1cTFV" role="3clFbG">
+                          <node concept="2OqwBi" id="3swcsd1daaf" role="2Oq$k0">
+                            <node concept="30H73N" id="3swcsd1cTFW" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="3swcsd1di3P" role="2OqNvi">
                               <ref role="3Tt5mk" to="wq2x:5itBwM6gb4P" resolve="prototype" />
                             </node>
                           </node>
-                          <node concept="3Tsc0h" id="4qGA5WD0Xzu" role="2OqNvi">
+                          <node concept="3Tsc0h" id="3swcsd1cTFX" role="2OqNvi">
                             <ref role="3TtcxE" to="wq2x:5itBwM6wU6s" resolve="parameter" />
                           </node>
                         </node>
@@ -14727,6 +14700,111 @@
                   </node>
                 </node>
               </node>
+              <node concept="3clFbF" id="3swcsd18thA" role="3cqZAp">
+                <node concept="37vLTI" id="3swcsd18Egm" role="3clFbG">
+                  <node concept="2OqwBi" id="3swcsd18$Qg" role="37vLTJ">
+                    <node concept="Xjq3P" id="3swcsd18BeB" role="2Oq$k0" />
+                    <node concept="2OwXpG" id="3swcsd18$Qj" role="2OqNvi">
+                      <ref role="2Oxat5" node="3swcsd18dlE" resolve="parameter" />
+                      <node concept="1ZhdrF" id="3swcsd1baYa" role="lGtFl">
+                        <property role="2qtEX8" value="fieldDeclaration" />
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
+                        <node concept="3$xsQk" id="3swcsd1baYb" role="3$ytzL">
+                          <node concept="3clFbS" id="3swcsd1baYc" role="2VODD2">
+                            <node concept="3clFbF" id="3swcsd1beGI" role="3cqZAp">
+                              <node concept="2OqwBi" id="3swcsd1beGJ" role="3clFbG">
+                                <node concept="1iwH7S" id="3swcsd1beGK" role="2Oq$k0" />
+                                <node concept="1iwH70" id="3swcsd1beGL" role="2OqNvi">
+                                  <ref role="1iwH77" node="3swcsd17R96" resolve="expandMacroParam_field" />
+                                  <node concept="30H73N" id="3swcsd1beGM" role="1iwH7V" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1eOMI4" id="3swcsd1bjf0" role="37vLTx">
+                    <node concept="10QFUN" id="3swcsd1bjf1" role="1eOMHV">
+                      <node concept="AH0OO" id="3swcsd1bjf2" role="10QFUP">
+                        <node concept="3cmrfG" id="3swcsd1bjf3" role="AHEQo">
+                          <property role="3cmrfH" value="0" />
+                          <node concept="17Uvod" id="3swcsd1bjf4" role="lGtFl">
+                            <property role="2qtEX9" value="value" />
+                            <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580320020/1068580320021" />
+                            <node concept="3zFVjK" id="3swcsd1bjf5" role="3zH0cK">
+                              <node concept="3clFbS" id="3swcsd1bjf6" role="2VODD2">
+                                <node concept="3clFbF" id="3swcsd1bjf7" role="3cqZAp">
+                                  <node concept="$GB7w" id="3swcsd1bjf8" role="3clFbG">
+                                    <property role="26SvY3" value="1jlY2aid0uu/index" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="3swcsd1bjf9" role="AHHXb">
+                          <ref role="3cqZAo" node="4qGA5WD0usr" resolve="params" />
+                        </node>
+                      </node>
+                      <node concept="3uibUv" id="3swcsd1bjfa" role="10QFUM">
+                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                        <node concept="29HgVG" id="3swcsd1bjfb" role="lGtFl">
+                          <node concept="3NFfHV" id="3swcsd1bjfc" role="3NFExx">
+                            <node concept="3clFbS" id="3swcsd1bjfd" role="2VODD2">
+                              <node concept="3clFbF" id="3swcsd1bjfe" role="3cqZAp">
+                                <node concept="2OqwBi" id="3swcsd1bjff" role="3clFbG">
+                                  <node concept="2OqwBi" id="3swcsd1bpk1" role="2Oq$k0">
+                                    <node concept="30H73N" id="3swcsd1bjfg" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="3swcsd1bx0e" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="wq2x:3swcsd17JEn" resolve="declaration" />
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="3swcsd1bjfh" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1W57fq" id="3swcsd1bCRc" role="lGtFl">
+                  <node concept="3IZrLx" id="3swcsd1bCRd" role="3IZSJc">
+                    <node concept="3clFbS" id="3swcsd1bCRe" role="2VODD2">
+                      <node concept="3clFbF" id="3swcsd1bFwh" role="3cqZAp">
+                        <node concept="2OqwBi" id="3swcsd1bTVP" role="3clFbG">
+                          <node concept="2OqwBi" id="3swcsd1bIGT" role="2Oq$k0">
+                            <node concept="30H73N" id="3swcsd1bFwg" role="2Oq$k0" />
+                            <node concept="3Tsc0h" id="3swcsd1bOeW" role="2OqNvi">
+                              <ref role="3TtcxE" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+                            </node>
+                          </node>
+                          <node concept="3GX2aA" id="3swcsd1c1wm" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1WS0z7" id="3swcsd18KgX" role="lGtFl">
+                  <node concept="3JmXsc" id="3swcsd18KgY" role="3Jn$fo">
+                    <node concept="3clFbS" id="3swcsd18KgZ" role="2VODD2">
+                      <node concept="3clFbF" id="3swcsd18Mb0" role="3cqZAp">
+                        <node concept="2OqwBi" id="3swcsd18OKD" role="3clFbG">
+                          <node concept="30H73N" id="3swcsd18MaZ" role="2Oq$k0" />
+                          <node concept="3Tsc0h" id="3swcsd1b7uq" role="2OqNvi">
+                            <ref role="3TtcxE" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
               <node concept="3clFbF" id="4qGA5WD0utb" role="3cqZAp">
                 <node concept="Xjq3P" id="4qGA5WD0utc" role="3clFbG" />
               </node>
@@ -14919,7 +14997,7 @@
             </node>
           </node>
           <node concept="312cEg" id="4qGA5WD0_eV" role="jymVt">
-            <property role="TrG5h" value="parameter" />
+            <property role="TrG5h" value="parameterDecl" />
             <node concept="3Tmbuc" id="4qGA5WD0_eW" role="1B3o_S" />
             <node concept="3uibUv" id="4qGA5WD0_eX" role="1tU5fm">
               <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
@@ -14938,8 +15016,25 @@
                 </node>
               </node>
             </node>
+            <node concept="1W57fq" id="3swcsd1Zvg9" role="lGtFl">
+              <node concept="3IZrLx" id="3swcsd1Zvga" role="3IZSJc">
+                <node concept="3clFbS" id="3swcsd1Zvgb" role="2VODD2">
+                  <node concept="3clFbF" id="3swcsd1ZvTT" role="3cqZAp">
+                    <node concept="2OqwBi" id="3swcsd1ZA9P" role="3clFbG">
+                      <node concept="2OqwBi" id="3swcsd1ZvTV" role="2Oq$k0">
+                        <node concept="30H73N" id="3swcsd1ZvTW" role="2Oq$k0" />
+                        <node concept="3Tsc0h" id="3swcsd1ZvTX" role="2OqNvi">
+                          <ref role="3TtcxE" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+                        </node>
+                      </node>
+                      <node concept="1v1jN8" id="3swcsd1ZFqw" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="1WS0z7" id="4qGA5WD0_eY" role="lGtFl">
-              <ref role="2rW$FS" node="4qGA5WD10sU" resolve="expandMacroParam_field" />
+              <ref role="2rW$FS" node="4qGA5WD10sU" resolve="expandMacroParamDecl_field" />
               <node concept="3JmXsc" id="4qGA5WD0_eZ" role="3Jn$fo">
                 <node concept="3clFbS" id="4qGA5WD0_f0" role="2VODD2">
                   <node concept="3clFbF" id="4qGA5WD0But" role="3cqZAp">
@@ -14975,6 +15070,63 @@
               </node>
             </node>
           </node>
+          <node concept="312cEg" id="3swcsd18dlE" role="jymVt">
+            <property role="TrG5h" value="parameter" />
+            <node concept="3Tmbuc" id="3swcsd18dlF" role="1B3o_S" />
+            <node concept="3uibUv" id="3swcsd18dlG" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              <node concept="29HgVG" id="3swcsd18dlH" role="lGtFl">
+                <node concept="3NFfHV" id="3swcsd18dlI" role="3NFExx">
+                  <node concept="3clFbS" id="3swcsd18dlJ" role="2VODD2">
+                    <node concept="3clFbF" id="3swcsd18dlK" role="3cqZAp">
+                      <node concept="2OqwBi" id="3swcsd18dlL" role="3clFbG">
+                        <node concept="2OqwBi" id="3swcsd1C2bo" role="2Oq$k0">
+                          <node concept="30H73N" id="3swcsd18dlM" role="2Oq$k0" />
+                          <node concept="3TrEf2" id="3swcsd1C87H" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:3swcsd17JEn" resolve="declaration" />
+                          </node>
+                        </node>
+                        <node concept="3TrEf2" id="3swcsd18dlN" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1WS0z7" id="3swcsd18dlO" role="lGtFl">
+              <ref role="2rW$FS" node="3swcsd17R96" resolve="expandMacroParam_field" />
+              <node concept="3JmXsc" id="3swcsd18dlP" role="3Jn$fo">
+                <node concept="3clFbS" id="3swcsd18dlQ" role="2VODD2">
+                  <node concept="3clFbF" id="3swcsd18dlR" role="3cqZAp">
+                    <node concept="2OqwBi" id="3swcsd1BSFa" role="3clFbG">
+                      <node concept="30H73N" id="3swcsd1BPs3" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="3swcsd1C03O" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="17Uvod" id="3swcsd18dlX" role="lGtFl">
+              <property role="2qtEX9" value="name" />
+              <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+              <node concept="3zFVjK" id="3swcsd18dlY" role="3zH0cK">
+                <node concept="3clFbS" id="3swcsd18dlZ" role="2VODD2">
+                  <node concept="3clFbF" id="3swcsd18dm0" role="3cqZAp">
+                    <node concept="2OqwBi" id="3swcsd18dm1" role="3clFbG">
+                      <node concept="30H73N" id="3swcsd18dm2" role="2Oq$k0" />
+                      <node concept="3TrcHB" id="3swcsd18dm3" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="312cEg" id="5itBwM6XBIn" role="jymVt">
             <property role="TrG5h" value="macroInput" />
             <node concept="3Tmbuc" id="5itBwM6XBIo" role="1B3o_S" />
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 d6b82de3..ae93bd54 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
@@ -96,6 +96,7 @@
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)</dependency>
     <dependency reexport="false">528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)</dependency>
+    <dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -154,11 +155,15 @@
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
     <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index ed380843..75b234e2 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -62,6 +62,7 @@
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <property id="2523873803623706117" name="isMultiline" index="hSjvv" />
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
@@ -130,7 +131,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -139,7 +140,7 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -229,7 +230,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -1510,6 +1511,7 @@
       <node concept="3clFbS" id="5itBwM6yGqQ" role="3clF47">
         <node concept="3clFbF" id="5itBwM6yJrk" role="3cqZAp">
           <node concept="2OqwBi" id="5itBwM6yRt9" role="3clFbG">
+            <property role="hSjvv" value="true" />
             <node concept="2OqwBi" id="5itBwM6yNDi" role="2Oq$k0">
               <node concept="2OqwBi" id="5itBwM6yKVw" role="2Oq$k0">
                 <node concept="13iPFW" id="5itBwM6yJrj" role="2Oq$k0" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 9498dfd7..59ecf68d 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -48,7 +48,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
@@ -84,6 +84,9 @@
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" 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>
@@ -128,10 +131,11 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
@@ -146,7 +150,7 @@
       </concept>
       <concept id="7024111702304501416" name="jetbrains.mps.baseLanguage.structure.OrAssignmentExpression" flags="nn" index="3vZ8r8" />
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
@@ -261,7 +265,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -1147,77 +1151,11 @@
       <ref role="1N5Vy1" to="wq2x:5itBwM6_hXY" resolve="declaration" />
       <node concept="3dgokm" id="5itBwM6BjFH" role="1N6uqs">
         <node concept="3clFbS" id="5itBwM6BjFI" role="2VODD2">
-          <node concept="3cpWs8" id="5itBwM6BnN1" role="3cqZAp">
-            <node concept="3cpWsn" id="5itBwM6BnN2" role="3cpWs9">
-              <property role="TrG5h" value="parameter" />
-              <node concept="2I9FWS" id="5itBwM6BmQZ" role="1tU5fm">
-                <ref role="2I9WkF" to="wq2x:5itBwM6wvc4" resolve="ExpandMacroParameterDeclaration" />
-              </node>
-              <node concept="2OqwBi" id="5itBwM6BnN3" role="33vP2m">
-                <node concept="2OqwBi" id="5itBwM6BnN4" role="2Oq$k0">
-                  <node concept="2OqwBi" id="5itBwM6BnN5" role="2Oq$k0">
-                    <node concept="2rP1CM" id="5itBwM6CvJv" role="2Oq$k0" />
-                    <node concept="2Xjw5R" id="5itBwM6BnN7" role="2OqNvi">
-                      <node concept="1xMEDy" id="5itBwM6BnN8" role="1xVPHs">
-                        <node concept="chp4Y" id="5itBwM6BnN9" role="ri$Ld">
-                          <ref role="cht4Q" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
-                        </node>
-                      </node>
-                      <node concept="1xIGOp" id="5itBwM6BnNa" role="1xVPHs" />
-                    </node>
-                  </node>
-                  <node concept="3TrEf2" id="5itBwM6BnNb" role="2OqNvi">
-                    <ref role="3Tt5mk" to="wq2x:5itBwM6gb4P" resolve="prototype" />
-                  </node>
-                </node>
-                <node concept="3Tsc0h" id="5itBwM6BnNc" role="2OqNvi">
-                  <ref role="3TtcxE" to="wq2x:5itBwM6wU6s" resolve="parameter" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="5itBwM6BoLz" role="3cqZAp">
-            <node concept="2ShNRf" id="5itBwM6BoLv" role="3clFbG">
-              <node concept="YeOm9" id="5itBwM6BqXP" role="2ShVmc">
-                <node concept="1Y3b0j" id="5itBwM6BqXS" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
-                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
-                  <node concept="3Tm1VV" id="5itBwM6BqXT" role="1B3o_S" />
-                  <node concept="37vLTw" id="5itBwM6Bqko" role="37wK5m">
-                    <ref role="3cqZAo" node="5itBwM6BnN2" resolve="parameter" />
-                  </node>
-                  <node concept="3clFb_" id="5itBwM6Brqv" role="jymVt">
-                    <property role="TrG5h" value="getName" />
-                    <node concept="17QB3L" id="5itBwM6Brqw" role="3clF45" />
-                    <node concept="3Tm1VV" id="5itBwM6Brqx" role="1B3o_S" />
-                    <node concept="37vLTG" id="5itBwM6Brqz" role="3clF46">
-                      <property role="TrG5h" value="child" />
-                      <node concept="3Tqbb2" id="5itBwM6Brq$" role="1tU5fm" />
-                    </node>
-                    <node concept="3clFbS" id="5itBwM6BrqA" role="3clF47">
-                      <node concept="3clFbF" id="5itBwM6BsFX" role="3cqZAp">
-                        <node concept="2OqwBi" id="5itBwM6Bw7l" role="3clFbG">
-                          <node concept="1PxgMI" id="5itBwM6BuJ_" role="2Oq$k0">
-                            <property role="1BlNFB" value="true" />
-                            <node concept="chp4Y" id="5itBwM6BvYm" role="3oSUPX">
-                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                            </node>
-                            <node concept="37vLTw" id="5itBwM6BsFW" role="1m5AlR">
-                              <ref role="3cqZAo" node="5itBwM6Brqz" resolve="child" />
-                            </node>
-                          </node>
-                          <node concept="3TrcHB" id="5itBwM6BwEd" role="2OqNvi">
-                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2AHcQZ" id="5itBwM6BrqB" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                    </node>
-                  </node>
-                </node>
+          <node concept="3clFbF" id="3swcsd22TOU" role="3cqZAp">
+            <node concept="2ShNRf" id="3swcsd22TOS" role="3clFbG">
+              <node concept="1pGfFk" id="3swcsd22UCe" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="o8zo:7ipADkTfAzT" resolve="EmptyScope" />
               </node>
             </node>
           </node>
@@ -2377,5 +2315,75 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="3swcsd1iBGn">
+    <property role="3GE5qa" value="macro.decl" />
+    <ref role="1M2myG" to="wq2x:3swcsd1iBEb" resolve="ExpandMacroParameterUsageReference" />
+    <node concept="1N5Pfh" id="3swcsd1iC09" role="1Mr941">
+      <ref role="1N5Vy1" to="wq2x:3swcsd1iBFV" resolve="parameterUsage" />
+      <node concept="3dgokm" id="3swcsd1iC3p" role="1N6uqs">
+        <node concept="3clFbS" id="3swcsd1iC3q" role="2VODD2">
+          <node concept="3clFbF" id="3swcsd1iC8C" role="3cqZAp">
+            <node concept="2ShNRf" id="3swcsd1iC8A" role="3clFbG">
+              <node concept="YeOm9" id="3swcsd1iDMO" role="2ShVmc">
+                <node concept="1Y3b0j" id="3swcsd1iDMR" role="YeSDq">
+                  <property role="2bfB8j" value="true" />
+                  <property role="373rjd" value="true" />
+                  <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
+                  <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
+                  <node concept="2OqwBi" id="3swcsd1iKoL" role="37wK5m">
+                    <node concept="2OqwBi" id="3swcsd1iKoM" role="2Oq$k0">
+                      <node concept="2rP1CM" id="3swcsd1iKoN" role="2Oq$k0" />
+                      <node concept="2Xjw5R" id="3swcsd1iKoO" role="2OqNvi">
+                        <node concept="1xMEDy" id="3swcsd1iKoP" role="1xVPHs">
+                          <node concept="chp4Y" id="3swcsd1iKoQ" role="ri$Ld">
+                            <ref role="cht4Q" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
+                          </node>
+                        </node>
+                        <node concept="1xIGOp" id="3swcsd1iKoR" role="1xVPHs" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="3swcsd1iKoS" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+                    </node>
+                  </node>
+                  <node concept="3Tm1VV" id="3swcsd1iDMS" role="1B3o_S" />
+                  <node concept="3clFb_" id="3swcsd1iDUg" role="jymVt">
+                    <property role="TrG5h" value="getName" />
+                    <node concept="17QB3L" id="3swcsd1iDUh" role="3clF45" />
+                    <node concept="3Tm1VV" id="3swcsd1iDUi" role="1B3o_S" />
+                    <node concept="37vLTG" id="3swcsd1iDUk" role="3clF46">
+                      <property role="TrG5h" value="child" />
+                      <node concept="3Tqbb2" id="3swcsd1iDUl" role="1tU5fm">
+                        <ref role="ehGHo" to="wq2x:3swcsd17JEl" resolve="ExpandMacroParameterUsage" />
+                      </node>
+                    </node>
+                    <node concept="3clFbS" id="3swcsd1iDUn" role="3clF47">
+                      <node concept="3clFbF" id="3swcsd1iFmK" role="3cqZAp">
+                        <node concept="2OqwBi" id="3swcsd1iFCr" role="3clFbG">
+                          <node concept="37vLTw" id="3swcsd1iFmH" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3swcsd1iDUk" resolve="child" />
+                          </node>
+                          <node concept="3TrcHB" id="3swcsd1iIeS" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="3swcsd1iDUo" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="1M2fIO" id="3swcsd1zSET">
+    <property role="3GE5qa" value="macro.decl" />
+    <ref role="1M2myG" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
+  </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 b39cb176..17e76609 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -28,8 +28,13 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="tp2c" ref="r:00000000-0000-4000-0000-011c89590338(jetbrains.mps.baseLanguage.closures.structure)" />
+    <import index="7a0s" ref="r:2af017c2-293f-4ebb-99f3-81e353b3d6e6(jetbrains.mps.editor.runtime)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
+    <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" implicit="true" />
+    <import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" implicit="true" />
+    <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -37,7 +42,7 @@
       <concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
       <concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
       <concept id="5991739802479784073" name="jetbrains.mps.lang.editor.structure.MenuTypeDefault" flags="ng" index="22hDWj" />
-      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ng" index="22mbnS">
+      <concept id="2000375450116454183" name="jetbrains.mps.lang.editor.structure.ISubstituteMenu" flags="ngI" index="22mbnS">
         <child id="414384289274416996" name="parts" index="3ft7WO" />
       </concept>
       <concept id="2000375450116423800" name="jetbrains.mps.lang.editor.structure.SubstituteMenu" flags="ng" index="22mcaB" />
@@ -83,7 +88,7 @@
       <concept id="7671875129586001610" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_IncludeSubstituteMenu" flags="ng" index="ulPW2">
         <child id="6089045305656903122" name="menuReference" index="2ks2uz" />
       </concept>
-      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ng" index="upBLQ">
+      <concept id="8478191136883534237" name="jetbrains.mps.lang.editor.structure.IExtensibleSubstituteMenuPart" flags="ngI" index="upBLQ">
         <child id="8478191136883534238" name="features" index="upBLP" />
       </concept>
       <concept id="8478191136883534207" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_Selection" flags="ng" index="upBMk">
@@ -95,6 +100,7 @@
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
       </concept>
+      <concept id="795210086017940429" name="jetbrains.mps.lang.editor.structure.ReadOnlyStyleClassItem" flags="lg" index="xShMh" />
       <concept id="562388756446465666" name="jetbrains.mps.lang.editor.structure.MigratedSideTransformMenuAttribute" flags="ng" index="yp4Wq">
         <property id="562388756446465811" name="transformTag" index="yp4Ub" />
       </concept>
@@ -166,15 +172,15 @@
       <concept id="1186414999511" name="jetbrains.mps.lang.editor.structure.UnderlinedStyleClassItem" flags="ln" index="VQ3r3">
         <property id="1214316229833" name="underlined" index="2USNnj" />
       </concept>
-      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
+      <concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
         <reference id="1630016958698373342" name="concept" index="2ZyFGn" />
       </concept>
-      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
+      <concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
         <reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
         <child id="5991739802479788259" name="type" index="22hAXT" />
       </concept>
       <concept id="1630016958697286851" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_parameterObject" flags="ng" index="2ZBlsa" />
-      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
+      <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ngI" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
       <concept id="1214406454886" name="jetbrains.mps.lang.editor.structure.TextBackgroundColorStyleClassItem" flags="ln" index="30gYXW" />
@@ -241,11 +247,11 @@
         <property id="1225456424731" name="value" index="1iTho6" />
       </concept>
       <concept id="3622263992595020491" name="jetbrains.mps.lang.editor.structure.SubstituteMenuItem_OutputConcept_Operation" flags="ng" index="3j5asz" />
-      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ng" index="1joUw2">
+      <concept id="7291101478617127464" name="jetbrains.mps.lang.editor.structure.IExtensibleTransformationMenuPart" flags="ngI" index="1joUw2">
         <child id="8954657570916349207" name="features" index="2jZA2a" />
       </concept>
       <concept id="3622263992592371436" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_WrappedItem" flags="ng" index="3jrdc4" />
-      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ngI" index="1k5N5V">
         <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
       </concept>
       <concept id="1223386653097" name="jetbrains.mps.lang.editor.structure.StrikeOutStyleSheet" flags="ln" index="3nxI2P" />
@@ -276,7 +282,7 @@
       </concept>
       <concept id="7667708318090725848" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentAnchorStyleClassItem" flags="ln" index="1Bsynf" />
       <concept id="7667708318090877006" name="jetbrains.mps.lang.editor.structure.IndentLayoutWrapAnchorStyleClassItem" flags="ln" index="1Bt7hp" />
-      <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ng" index="3EoQpk">
+      <concept id="7991336459489871999" name="jetbrains.mps.lang.editor.structure.IOutputConceptSubstituteMenuPart" flags="ngI" index="3EoQpk">
         <reference id="7991336459489872009" name="outputConcept" index="3EoQqy" />
       </concept>
       <concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
@@ -297,15 +303,17 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
         <property id="16410578721444372" name="customizeEmptyCell" index="2ru_X1" />
         <child id="16410578721629643" name="emptyCellModel" index="2ruayu" />
       </concept>
-      <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
-      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ng" index="1FNN41">
+      <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR">
+        <reference id="1173177718857" name="elementActionMap" index="APP_o" />
+      </concept>
+      <concept id="843003353410421268" name="jetbrains.mps.lang.editor.structure.IOutputConceptTransformationMenuPart" flags="ngI" index="1FNN41">
         <child id="843003353410424960" name="outputConceptReference" index="1FNMel" />
       </concept>
       <concept id="843003353410421233" name="jetbrains.mps.lang.editor.structure.OptionalConceptReference" flags="ng" index="1FNNb$">
@@ -326,7 +334,7 @@
         <child id="1225900141900" name="modelAccessor" index="1HlULh" />
       </concept>
       <concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
-      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
+      <concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ngI" index="3INCJE">
         <child id="1638911550608572412" name="sections" index="IW6Ez" />
       </concept>
       <concept id="5624877018228264944" name="jetbrains.mps.lang.editor.structure.TransformationMenuContribution" flags="ng" index="3INDKC">
@@ -402,6 +410,9 @@
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" 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>
@@ -451,10 +462,11 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
@@ -462,7 +474,14 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="8276990574909231788" name="jetbrains.mps.baseLanguage.structure.FinallyClause" flags="ng" index="1wplmZ">
+        <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
+      </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+      <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
+        <child id="8276990574886367509" name="finallyClause" index="1zxBo6" />
+        <child id="8276990574886367508" name="body" index="1zxBo7" />
+      </concept>
       <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
         <child id="1163668914799" name="condition" index="3K4Cdx" />
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
@@ -521,6 +540,9 @@
       </concept>
       <concept id="7835263205327057228" name="jetbrains.mps.lang.smodel.structure.Node_GetChildrenAndChildAttributesOperation" flags="ng" index="Bykcj" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
       <concept id="1966870290088668520" name="jetbrains.mps.lang.smodel.structure.Enum_MembersOperation" flags="ng" index="2ViDtN" />
       <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
@@ -598,7 +620,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -1398,6 +1420,21 @@
         <property role="VOm3f" value="true" />
       </node>
     </node>
+    <node concept="14StLt" id="4bWqD4C9OIl" role="V601i">
+      <property role="TrG5h" value="BindingName" />
+      <node concept="VechU" id="4bWqD4C9OIm" role="3F10Kt">
+        <node concept="mot77" id="4bWqD4C9OIn" role="VblUZ">
+          <node concept="3clFbS" id="4bWqD4C9OIo" role="2VODD2">
+            <node concept="3clFbF" id="4bWqD4C9OIp" role="3cqZAp">
+              <node concept="10M0yZ" id="5yqFHXovg0i" role="3clFbG">
+                <ref role="3cqZAo" to="qgy9:4aJUH_hWVXm" resolve="FG_OPTIONAL" />
+                <ref role="1PxDUh" to="qgy9:7ksQUDZtHks" resolve="CustomColors" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="24kQdi" id="6p0DfM0ibrF">
     <property role="3GE5qa" value="rule.input" />
@@ -3434,11 +3471,9 @@
     <property role="3GE5qa" value="macro.decl" />
     <ref role="1XX52x" to="wq2x:5itBwM66cNU" resolve="ExpandMacroInputSpecification" />
     <node concept="3EZMnI" id="5itBwM6707d" role="2wV5jI">
-      <node concept="3F1sOY" id="5itBwM6707i" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:5itBwM66hzH" resolve="input" />
-      </node>
       <node concept="3F0ifn" id="5itBwMadWuT" role="3EZMnx">
         <property role="3F0ifm" value="matching" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
       </node>
       <node concept="1iCGBv" id="5itBwM6707f" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:5itBwM66ULm" resolve="applicableConcept" />
@@ -3520,6 +3555,13 @@
           </node>
         </node>
       </node>
+      <node concept="3F0ifn" id="vp2bUKySCm" role="3EZMnx">
+        <property role="3F0ifm" value="as" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+      </node>
+      <node concept="3F1sOY" id="5itBwM6707i" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:5itBwM66hzH" resolve="input" />
+      </node>
     </node>
   </node>
   <node concept="1h_SRR" id="5itBwM67a4R">
@@ -3561,16 +3603,16 @@
     <property role="3GE5qa" value="macro.decl" />
     <ref role="1XX52x" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
     <node concept="3EZMnI" id="5itBwM67$AH" role="2wV5jI">
+      <node concept="3F0ifn" id="vp2bUKxe7Y" role="3EZMnx">
+        <property role="3F0ifm" value="override macro" />
+      </node>
       <node concept="1iCGBv" id="5itBwM6grn2" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:5itBwM6gb4P" resolve="prototype" />
         <node concept="1sVBvm" id="5itBwM6grn4" role="1sWHZn">
           <node concept="3F0A7n" id="5itBwM6grMo" role="2wV5jI">
             <property role="1Intyy" value="true" />
-            <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
+            <ref role="1k5W1q" to="tpen:hshUnm6" resolve="StaticMethod" />
             <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-            <node concept="Vb9p2" id="5itBwM6nGXD" role="3F10Kt">
-              <property role="Vbekb" value="g1_tSyq/BOLD_ITALIC" />
-            </node>
             <node concept="A1WHu" id="5itBwM9G_Fy" role="3vIgyS">
               <ref role="A1WHt" node="5itBwM9Gwen" resolve="ExpandMacroTemplate_AddLogical" />
             </node>
@@ -3620,8 +3662,35 @@
           </node>
         </node>
       </node>
+      <node concept="3F0ifn" id="vp2bUKxmrt" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" node="hY9fg1G" resolve="ConstraintLeftParenAfterName" />
+      </node>
+      <node concept="3F2HdR" id="3swcsd197g7" role="3EZMnx">
+        <property role="2czwfO" value="," />
+        <ref role="1NtTu8" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+        <ref role="APP_o" node="vp2bUKDeb3" resolve="ExpandMacroTemplate_readonly" />
+        <ref role="1ERwB7" node="vp2bUKDeb3" resolve="ExpandMacroTemplate_readonly" />
+        <node concept="l2Vlx" id="3swcsd197g9" role="2czzBx" />
+        <node concept="3F0ifn" id="3swcsd197x1" role="2czzBI">
+          <property role="3F0ifm" value="" />
+        </node>
+        <node concept="xShMh" id="3swcsd1LDsI" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="vp2bUKxmry" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" node="hFCSUmN" resolve="ConstraintRightParen" />
+      </node>
       <node concept="3F1sOY" id="5itBwM67$AL" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:5itBwM67n1U" resolve="inputSpec" />
+        <node concept="pVoyu" id="vp2bUKxndw" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="lj46D" id="vp2bUKySGI" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="3F0ifn" id="5itBwM67ZpX" role="3EZMnx">
         <property role="3F0ifm" value="produce" />
@@ -3759,6 +3828,10 @@
     <property role="3GE5qa" value="macro.decl" />
     <ref role="1XX52x" to="wq2x:5itBwM6cWQh" resolve="ExpandMacroPrototype" />
     <node concept="3EZMnI" id="5itBwM6d7yl" role="2wV5jI">
+      <node concept="3F0ifn" id="vp2bUKqPdB" role="3EZMnx">
+        <property role="3F0ifm" value="virtual macro" />
+        <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+      </node>
       <node concept="3F0A7n" id="5itBwM6db6q" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         <ref role="1k5W1q" node="7ksQUDZpyGq" resolve="Constraint" />
@@ -3812,45 +3885,49 @@
           </node>
         </node>
       </node>
-      <node concept="3F0ifn" id="5itBwM6iMJx" role="3EZMnx">
-        <property role="3F0ifm" value="concept" />
-        <ref role="1k5W1q" to="tpen:hgVS8CF" resolve="KeyWord" />
-      </node>
-      <node concept="3F0ifn" id="5itBwM7NNWU" role="3EZMnx">
-        <property role="3F0ifm" value="/" />
-        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-      </node>
-      <node concept="1iCGBv" id="5itBwM6dGOD" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
-        <node concept="1sVBvm" id="5itBwM6dGOE" role="1sWHZn">
-          <node concept="3F0A7n" id="5itBwM6dGOF" role="2wV5jI">
-            <property role="1Intyy" value="true" />
-            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-            <ref role="1k5W1q" node="7ksQUDZqcLh" resolve="ConceptName" />
-          </node>
-        </node>
-      </node>
-      <node concept="3F0ifn" id="5itBwM7NOem" role="3EZMnx">
-        <property role="3F0ifm" value="/" />
-        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      <node concept="3F0ifn" id="vp2bUKsjUt" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" node="hY9fg1G" resolve="ConstraintLeftParenAfterName" />
       </node>
       <node concept="3F2HdR" id="5itBwM6x16d" role="3EZMnx">
-        <property role="2czwfO" value=" " />
+        <property role="2czwfO" value="," />
         <ref role="1NtTu8" to="wq2x:5itBwM6wU6s" resolve="parameter" />
         <node concept="l2Vlx" id="5itBwM6x16f" role="2czzBx" />
         <node concept="3F0ifn" id="5itBwM6x1xb" role="2czzBI">
           <property role="3F0ifm" value="" />
           <property role="ilYzB" value="&lt;no parameter&gt;" />
         </node>
-        <node concept="lj46D" id="5itBwM6x5ul" role="3F10Kt">
+        <node concept="tppnM" id="5itBwM76LYm" role="sWeuL" />
+      </node>
+      <node concept="3F0ifn" id="vp2bUKskML" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" node="hFCSUmN" resolve="ConstraintRightParen" />
+      </node>
+      <node concept="3EZMnI" id="vp2bUKqPWA" role="3EZMnx">
+        <node concept="3F0ifn" id="5itBwM6iMJx" role="3EZMnx">
+          <property role="3F0ifm" value="matching" />
+          <ref role="1k5W1q" to="qgy9:4aJUH_hW38r" resolve="RuleKeyword" />
+        </node>
+        <node concept="1iCGBv" id="5itBwM6dGOD" role="3EZMnx">
+          <ref role="1NtTu8" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
+          <node concept="1sVBvm" id="5itBwM6dGOE" role="1sWHZn">
+            <node concept="3F0A7n" id="5itBwM6dGOF" role="2wV5jI">
+              <property role="1Intyy" value="true" />
+              <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+              <ref role="1k5W1q" node="7ksQUDZqcLh" resolve="ConceptName" />
+            </node>
+          </node>
+        </node>
+        <node concept="VPM3Z" id="vp2bUKqPWC" role="3F10Kt" />
+        <node concept="pVoyu" id="vp2bUKsjD3" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
-        <node concept="pVoyu" id="5itBwM6x6Em" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-        <node concept="tppnM" id="5itBwM76LYm" role="sWeuL">
-          <node concept="ljvvj" id="5itBwM76Nak" role="3F10Kt">
-            <property role="VOm3f" value="true" />
+        <node concept="l2Vlx" id="vp2bUKqPWF" role="2iSdaV" />
+        <node concept="pkWqt" id="vp2bUKtZz8" role="pqm2j">
+          <node concept="3clFbS" id="vp2bUKtZz9" role="2VODD2">
+            <node concept="3clFbF" id="vp2bUKu01z" role="3cqZAp">
+              <node concept="3clFbT" id="vp2bUKu01y" role="3clFbG" />
+            </node>
           </node>
         </node>
       </node>
@@ -3925,7 +4002,7 @@
           <node concept="3F0A7n" id="5itBwM7GBLK" role="2wV5jI">
             <property role="1Intyy" value="true" />
             <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-            <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
+            <ref role="1k5W1q" node="7ksQUDZpyGq" resolve="Constraint" />
             <node concept="A1WHu" id="5itBwM7IonQ" role="3vIgyS">
               <ref role="A1WHt" node="5itBwM7Hz63" resolve="ExpandMacroConstraint_AddLogical" />
             </node>
@@ -3936,6 +4013,7 @@
         <node concept="VPM3Z" id="5itBwM7GBLU" role="3F10Kt" />
         <node concept="3F0ifn" id="5itBwM7GBM6" role="3EZMnx">
           <property role="3F0ifm" value="&lt;" />
+          <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
           <node concept="11L4FC" id="5itBwMaayLi" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -3958,6 +4036,7 @@
         </node>
         <node concept="3F0ifn" id="5itBwM7GBMc" role="3EZMnx">
           <property role="3F0ifm" value="&gt;" />
+          <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
           <node concept="11L4FC" id="5itBwM7GBU9" role="3F10Kt">
             <property role="VOm3f" value="true" />
           </node>
@@ -3979,17 +4058,35 @@
           </node>
         </node>
       </node>
-      <node concept="3F1sOY" id="5itBwM7GC2I" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:5itBwM7GBKT" resolve="input" />
-      </node>
       <node concept="3EZMnI" id="5itBwM7QPJi" role="3EZMnx">
         <node concept="VPM3Z" id="5itBwM7QPJk" role="3F10Kt" />
+        <node concept="3F0ifn" id="5itBwM7QPvN" role="3EZMnx">
+          <property role="3F0ifm" value="(" />
+          <ref role="1k5W1q" node="hY9fg1G" resolve="ConstraintLeftParenAfterName" />
+          <node concept="11LMrY" id="5itBwM7QPvX" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
         <node concept="3F1sOY" id="5itBwM7QQHL" role="3EZMnx">
-          <property role="1$x2rV" value="default" />
+          <property role="1$x2rV" value="&lt;default&gt;" />
           <ref role="1NtTu8" to="wq2x:5itBwM7QPB1" resolve="arglist" />
         </node>
+        <node concept="3F0ifn" id="5itBwM7QPvT" role="3EZMnx">
+          <property role="3F0ifm" value=")" />
+          <ref role="1k5W1q" node="hFCSUmN" resolve="ConstraintRightParen" />
+          <node concept="11L4FC" id="5itBwM7QPvZ" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
         <node concept="l2Vlx" id="5itBwM7QPJn" role="2iSdaV" />
       </node>
+      <node concept="3F0ifn" id="3swcsd2droO" role="3EZMnx">
+        <property role="3F0ifm" value=":" />
+        <ref role="1k5W1q" node="7ksQUDZpd8b" resolve="ConstraintKeyword" />
+      </node>
+      <node concept="3F1sOY" id="5itBwM7GC2I" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:5itBwM7GBKT" resolve="input" />
+      </node>
       <node concept="l2Vlx" id="5itBwM7GBLw" role="2iSdaV" />
     </node>
   </node>
@@ -4113,6 +4210,7 @@
           <node concept="3F0A7n" id="5itBwM7QPuG" role="2wV5jI">
             <property role="1Intyy" value="true" />
             <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+            <ref role="1k5W1q" node="4bWqD4C9OIl" resolve="BindingName" />
           </node>
         </node>
       </node>
@@ -4135,12 +4233,6 @@
     <property role="3GE5qa" value="constraint" />
     <ref role="1XX52x" to="wq2x:5itBwM7QPtM" resolve="ExpandMacroConstraintArglist" />
     <node concept="3EZMnI" id="5itBwM7QPvG" role="2wV5jI">
-      <node concept="3F0ifn" id="5itBwM7QPvN" role="3EZMnx">
-        <property role="3F0ifm" value="[" />
-        <node concept="11LMrY" id="5itBwM7QPvX" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
       <node concept="3F2HdR" id="5itBwM7QPw9" role="3EZMnx">
         <property role="2czwfO" value="," />
         <ref role="1NtTu8" to="wq2x:5itBwM7QPw7" resolve="binding" />
@@ -4154,12 +4246,6 @@
           <property role="3F0ifm" value="" />
         </node>
       </node>
-      <node concept="3F0ifn" id="5itBwM7QPvT" role="3EZMnx">
-        <property role="3F0ifm" value="]" />
-        <node concept="11L4FC" id="5itBwM7QPvZ" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
       <node concept="l2Vlx" id="5itBwM7QPvJ" role="2iSdaV" />
     </node>
   </node>
@@ -7234,6 +7320,75 @@
                 <property role="TrG5h" value="proDecl" />
               </node>
             </node>
+            <node concept="2Gpval" id="3swcsd1xXIe" role="3cqZAp">
+              <node concept="2GrKxI" id="3swcsd1xXIg" role="2Gsz3X">
+                <property role="TrG5h" value="paramDecl" />
+              </node>
+              <node concept="2OqwBi" id="3swcsd1xZVZ" role="2GsD0m">
+                <node concept="37vLTw" id="3swcsd1xZzb" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5itBwM9VuiY" resolve="pro" />
+                </node>
+                <node concept="3Tsc0h" id="3swcsd1y0mM" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:5itBwM6wU6s" resolve="parameter" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="3swcsd1xXIk" role="2LFqv$">
+                <node concept="3cpWs8" id="3swcsd1ybou" role="3cqZAp">
+                  <node concept="3cpWsn" id="3swcsd1ybov" role="3cpWs9">
+                    <property role="TrG5h" value="usage" />
+                    <node concept="3Tqbb2" id="3swcsd1ybmH" role="1tU5fm">
+                      <ref role="ehGHo" to="wq2x:3swcsd17JEl" resolve="ExpandMacroParameterUsage" />
+                    </node>
+                    <node concept="2OqwBi" id="3swcsd1ybow" role="33vP2m">
+                      <node concept="2OqwBi" id="3swcsd1ybox" role="2Oq$k0">
+                        <node concept="37vLTw" id="3swcsd1yboy" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5itBwM9UDp5" resolve="emt" />
+                        </node>
+                        <node concept="3Tsc0h" id="3swcsd1yboz" role="2OqNvi">
+                          <ref role="3TtcxE" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+                        </node>
+                      </node>
+                      <node concept="WFELt" id="3swcsd1ybo$" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3swcsd1y0MW" role="3cqZAp">
+                  <node concept="37vLTI" id="3swcsd1ydp8" role="3clFbG">
+                    <node concept="2GrUjf" id="3swcsd1ydA5" role="37vLTx">
+                      <ref role="2Gs0qQ" node="3swcsd1xXIg" resolve="paramDecl" />
+                    </node>
+                    <node concept="2OqwBi" id="3swcsd1ycgm" role="37vLTJ">
+                      <node concept="37vLTw" id="3swcsd1ybo_" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3swcsd1ybov" resolve="usage" />
+                      </node>
+                      <node concept="3TrEf2" id="3swcsd1ycYZ" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:3swcsd17JEn" resolve="declaration" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3swcsd1yeoX" role="3cqZAp">
+                  <node concept="37vLTI" id="3swcsd1ygh8" role="3clFbG">
+                    <node concept="2OqwBi" id="3swcsd1yhBI" role="37vLTx">
+                      <node concept="2GrUjf" id="3swcsd1ygFB" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="3swcsd1xXIg" resolve="paramDecl" />
+                      </node>
+                      <node concept="3TrcHB" id="3swcsd1yiB5" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="3swcsd1yezJ" role="37vLTJ">
+                      <node concept="37vLTw" id="3swcsd1yeoV" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3swcsd1ybov" resolve="usage" />
+                      </node>
+                      <node concept="3TrcHB" id="3swcsd1yeKP" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3clFbF" id="5itBwM9XlnZ" role="3cqZAp">
               <node concept="2OqwBi" id="5itBwM9XmO4" role="3clFbG">
                 <node concept="2OqwBi" id="5itBwM9XlFh" role="2Oq$k0">
@@ -9184,5 +9339,176 @@
       </node>
     </node>
   </node>
+  <node concept="1h_SRR" id="vp2bUKDeb3">
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="ExpandMacroTemplate_readonly" />
+    <ref role="1h_SK9" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
+    <node concept="1hA7zw" id="vp2bUKGgQ6" role="1h_SK8">
+      <property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
+      <node concept="1hAIg9" id="vp2bUKGgQ7" role="1hA7z_">
+        <node concept="3clFbS" id="vp2bUKGgQ8" role="2VODD2" />
+      </node>
+    </node>
+    <node concept="1hA7zw" id="vp2bUKDeb4" role="1h_SK8">
+      <property role="1hAc7j" value="g_hAxAO/delete_action_id" />
+      <node concept="1hAIg9" id="vp2bUKDeb5" role="1hA7z_">
+        <node concept="3clFbS" id="vp2bUKDeb6" role="2VODD2">
+          <node concept="3clFbH" id="vp2bUKDebq" role="3cqZAp" />
+        </node>
+      </node>
+    </node>
+    <node concept="1hA7zw" id="vp2bUKDebG" role="1h_SK8">
+      <property role="1hAc7j" value="13S4mXuSN7V/insert_action_id" />
+      <node concept="1hAIg9" id="vp2bUKDebH" role="1hA7z_">
+        <node concept="3clFbS" id="vp2bUKDebI" role="2VODD2" />
+      </node>
+    </node>
+    <node concept="1hA7zw" id="vp2bUKGgNV" role="1h_SK8">
+      <property role="1hAc7j" value="13S4mXuSN7W/insert_before_action_id" />
+      <node concept="1hAIg9" id="vp2bUKGgNW" role="1hA7z_">
+        <node concept="3clFbS" id="vp2bUKGgNX" role="2VODD2" />
+      </node>
+    </node>
+    <node concept="1hA7zw" id="vp2bUKGgOX" role="1h_SK8">
+      <property role="1hAc7j" value="3xhyJYa3zm9/insert_placeholder_action_id" />
+      <node concept="1hAIg9" id="vp2bUKGgOY" role="1hA7z_">
+        <node concept="3clFbS" id="vp2bUKGgOZ" role="2VODD2" />
+      </node>
+    </node>
+    <node concept="1hA7zw" id="vp2bUKGgPw" role="1h_SK8">
+      <property role="1hAc7j" value="qmyvdpNLIC/insert_placeholder_before_action_id" />
+      <node concept="1hAIg9" id="vp2bUKGgPx" role="1hA7z_">
+        <node concept="3clFbS" id="vp2bUKGgPy" role="2VODD2" />
+      </node>
+    </node>
+  </node>
+  <node concept="24kQdi" id="3swcsd197_7">
+    <property role="3GE5qa" value="macro.decl" />
+    <ref role="1XX52x" to="wq2x:3swcsd17JEl" resolve="ExpandMacroParameterUsage" />
+    <node concept="3EZMnI" id="3swcsd197_9" role="2wV5jI">
+      <node concept="1HlG4h" id="3swcsd1einM" role="3EZMnx">
+        <ref role="1k5W1q" to="tpen:1zA_DOMARqB" resolve="BlockComment" />
+        <node concept="1HfYo3" id="3swcsd1einO" role="1HlULh">
+          <node concept="3TQlhw" id="3swcsd1einQ" role="1Hhtcw">
+            <node concept="3clFbS" id="3swcsd1einS" role="2VODD2">
+              <node concept="3cpWs8" id="3swcsd1eqwk" role="3cqZAp">
+                <node concept="3cpWsn" id="3swcsd1eqwl" role="3cpWs9">
+                  <property role="TrG5h" value="hec" />
+                  <node concept="3uibUv" id="3swcsd1eq9L" role="1tU5fm">
+                    <ref role="3uigEE" to="7a0s:6qGpHl7IHpK" resolve="HeadlessEditorComponent" />
+                  </node>
+                  <node concept="2ShNRf" id="3swcsd1eqwm" role="33vP2m">
+                    <node concept="1pGfFk" id="3swcsd1eqwn" role="2ShVmc">
+                      <property role="373rjd" value="true" />
+                      <ref role="37wK5l" to="7a0s:2iNJDZP2RE6" resolve="HeadlessEditorComponent" />
+                      <node concept="2OqwBi" id="3swcsd1eqwo" role="37wK5m">
+                        <node concept="2JrnkZ" id="3swcsd1eqwp" role="2Oq$k0">
+                          <node concept="2OqwBi" id="3swcsd1eqwq" role="2JrQYb">
+                            <node concept="pncrf" id="3swcsd1eqwr" role="2Oq$k0" />
+                            <node concept="I4A8Y" id="3swcsd1eqws" role="2OqNvi" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="3swcsd1eqwt" role="2OqNvi">
+                          <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3J1_TO" id="3swcsd1eqzO" role="3cqZAp">
+                <node concept="3clFbS" id="3swcsd1eqzP" role="1zxBo7">
+                  <node concept="3clFbF" id="3swcsd1eukE" role="3cqZAp">
+                    <node concept="2OqwBi" id="3swcsd1eum3" role="3clFbG">
+                      <node concept="37vLTw" id="3swcsd1eukD" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3swcsd1eqwl" resolve="hec" />
+                      </node>
+                      <node concept="liA8E" id="3swcsd1euSb" role="2OqNvi">
+                        <ref role="37wK5l" to="exr9:~EditorComponent.editNode(org.jetbrains.mps.openapi.model.SNode)" resolve="editNode" />
+                        <node concept="2OqwBi" id="3swcsd1euXT" role="37wK5m">
+                          <node concept="2OqwBi" id="3swcsd1g8O5" role="2Oq$k0">
+                            <node concept="pncrf" id="3swcsd1euU7" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="3swcsd1g97l" role="2OqNvi">
+                              <ref role="3Tt5mk" to="wq2x:3swcsd17JEn" resolve="declaration" />
+                            </node>
+                          </node>
+                          <node concept="3TrEf2" id="3swcsd1ev0F" role="2OqNvi">
+                            <ref role="3Tt5mk" to="wq2x:5itBwM6wB6D" resolve="type" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs6" id="3swcsd1ey1G" role="3cqZAp">
+                    <node concept="2OqwBi" id="3swcsd1ewRQ" role="3cqZAk">
+                      <node concept="2OqwBi" id="3swcsd1ewg7" role="2Oq$k0">
+                        <node concept="2OqwBi" id="3swcsd1evos" role="2Oq$k0">
+                          <node concept="37vLTw" id="3swcsd1evlS" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3swcsd1eqwl" resolve="hec" />
+                          </node>
+                          <node concept="liA8E" id="3swcsd1evV1" role="2OqNvi">
+                            <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="3swcsd1ewIt" role="2OqNvi">
+                          <ref role="37wK5l" to="f4zo:~EditorCell.renderText()" resolve="renderText" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="3swcsd1exCw" role="2OqNvi">
+                        <ref role="37wK5l" to="cj4x:~TextBuilder.getText()" resolve="getText" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="1wplmZ" id="3swcsd1eqzQ" role="1zxBo6">
+                  <node concept="3clFbS" id="3swcsd1eqzR" role="1wplMD">
+                    <node concept="3clFbF" id="3swcsd1ej04" role="3cqZAp">
+                      <node concept="2OqwBi" id="3swcsd1erZ0" role="3clFbG">
+                        <node concept="37vLTw" id="3swcsd1eqwu" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3swcsd1eqwl" resolve="hec" />
+                        </node>
+                        <node concept="liA8E" id="3swcsd1eu0W" role="2OqNvi">
+                          <ref role="37wK5l" to="exr9:~EditorComponent.dispose()" resolve="dispose" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3F0A7n" id="3swcsd1eimH" role="3EZMnx">
+        <property role="1Intyy" value="true" />
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        <ref role="1k5W1q" to="tpen:1zA_DOMARqB" resolve="BlockComment" />
+        <node concept="VPxyj" id="3swcsd1la8D" role="3F10Kt" />
+      </node>
+      <node concept="l2Vlx" id="3swcsd197_c" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="3swcsd1iBFY">
+    <property role="3GE5qa" value="macro.decl" />
+    <ref role="1XX52x" to="wq2x:3swcsd1iBEb" resolve="ExpandMacroParameterUsageReference" />
+    <node concept="3EZMnI" id="3swcsd1iBG0" role="2wV5jI">
+      <node concept="1iCGBv" id="3swcsd1iBG7" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:3swcsd1iBFV" resolve="parameterUsage" />
+        <node concept="1sVBvm" id="3swcsd1iBG9" role="1sWHZn">
+          <node concept="3F0A7n" id="3swcsd1iBGg" role="2wV5jI">
+            <property role="1Intyy" value="true" />
+            <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+            <node concept="VPxyj" id="3swcsd1iBGk" role="3F10Kt" />
+          </node>
+        </node>
+      </node>
+      <node concept="l2Vlx" id="3swcsd1iBG3" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="22mcaB" id="3swcsd1pSAU">
+    <property role="3GE5qa" value="macro.decl" />
+    <ref role="aqKnT" to="wq2x:3swcsd17JEl" resolve="ExpandMacroParameterUsage" />
+    <node concept="22hDWj" id="3swcsd1rzJT" role="22hAXT" />
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
index ae5842dc..2155e8eb 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
@@ -18,6 +18,7 @@
     <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.coderules.util)" />
     <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -27,6 +28,9 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
+        <child id="1154032183016" name="body" index="2LFqv$" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -101,6 +105,7 @@
       <concept id="1192796902958" name="jetbrains.mps.lang.intentions.structure.ConceptFunctionParameter_node" flags="nn" index="2Sf5sV" />
       <concept id="2522969319638091381" name="jetbrains.mps.lang.intentions.structure.BaseIntentionDeclaration" flags="ig" index="2ZfUlf">
         <property id="2522969319638091386" name="isAvailableInChildNodes" index="2ZfUl0" />
+        <property id="2522969319638091385" name="isErrorIntention" index="2ZfUl3" />
         <reference id="2522969319638198290" name="forConcept" index="2ZfgGC" />
         <child id="2522969319638198291" name="executeFunction" index="2ZfgGD" />
         <child id="2522969319638093995" name="isApplicableFunction" index="2ZfVeh" />
@@ -138,6 +143,10 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
+        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
+      </concept>
+      <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
@@ -151,6 +160,7 @@
       <concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
         <child id="1180636770616" name="createdType" index="3zrR0E" />
       </concept>
+      <concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
       <concept id="6407023681583036853" name="jetbrains.mps.lang.smodel.structure.NodeAttributeQualifier" flags="ng" index="3CFYIy">
         <reference id="6407023681583036854" name="attributeConcept" index="3CFYIx" />
       </concept>
@@ -166,6 +176,9 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
       </concept>
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
       <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
         <reference id="1138056516764" name="link" index="3Tt5mk" />
       </concept>
@@ -178,7 +191,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -198,11 +211,25 @@
         <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="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
+        <child id="1153944400369" name="variable" index="2Gsz3X" />
+        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
+      </concept>
+      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
+      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
+        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
+      </concept>
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+      <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
+      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
   <node concept="2S6QgY" id="1CgWc1TyAgc">
@@ -870,5 +897,337 @@
       </node>
     </node>
   </node>
+  <node concept="2S6QgY" id="3swcsd1$HaE">
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="InitializeParameter" />
+    <property role="2ZfUl3" value="true" />
+    <ref role="2ZfgGC" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
+    <node concept="2S6ZIM" id="3swcsd1$HaF" role="2ZfVej">
+      <node concept="3clFbS" id="3swcsd1$HaG" role="2VODD2">
+        <node concept="3clFbF" id="3swcsd1$Hrv" role="3cqZAp">
+          <node concept="Xl_RD" id="3swcsd1$Hru" role="3clFbG">
+            <property role="Xl_RC" value="Add Parameters Matching Prototype" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2Sbjvc" id="3swcsd1$HaH" role="2ZfgGD">
+      <node concept="3clFbS" id="3swcsd1$HaI" role="2VODD2">
+        <node concept="2Gpval" id="3swcsd1$Y7Y" role="3cqZAp">
+          <node concept="2GrKxI" id="3swcsd1$Y80" role="2Gsz3X">
+            <property role="TrG5h" value="decl" />
+          </node>
+          <node concept="3clFbS" id="3swcsd1$Y84" role="2LFqv$">
+            <node concept="3cpWs8" id="3swcsd1_n9D" role="3cqZAp">
+              <node concept="3cpWsn" id="3swcsd1_n9E" role="3cpWs9">
+                <property role="TrG5h" value="usage" />
+                <node concept="3Tqbb2" id="3swcsd1_n9h" role="1tU5fm">
+                  <ref role="ehGHo" to="wq2x:3swcsd17JEl" resolve="ExpandMacroParameterUsage" />
+                </node>
+                <node concept="2OqwBi" id="3swcsd1_n9F" role="33vP2m">
+                  <node concept="2OqwBi" id="3swcsd1_n9G" role="2Oq$k0">
+                    <node concept="2Sf5sV" id="3swcsd1_n9H" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="3swcsd1_n9I" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+                    </node>
+                  </node>
+                  <node concept="WFELt" id="3swcsd1_n9J" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3swcsd1$Yfk" role="3cqZAp">
+              <node concept="37vLTI" id="3swcsd1_nTu" role="3clFbG">
+                <node concept="2GrUjf" id="3swcsd1_nWZ" role="37vLTx">
+                  <ref role="2Gs0qQ" node="3swcsd1$Y80" resolve="decl" />
+                </node>
+                <node concept="2OqwBi" id="3swcsd1_npM" role="37vLTJ">
+                  <node concept="37vLTw" id="3swcsd1_n9K" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3swcsd1_n9E" resolve="usage" />
+                  </node>
+                  <node concept="3TrEf2" id="3swcsd1_nFF" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:3swcsd17JEn" resolve="declaration" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3swcsd1_o01" role="3cqZAp">
+              <node concept="37vLTI" id="3swcsd1_plW" role="3clFbG">
+                <node concept="2OqwBi" id="3swcsd1_ppw" role="37vLTx">
+                  <node concept="2GrUjf" id="3swcsd1_pmJ" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="3swcsd1$Y80" resolve="decl" />
+                  </node>
+                  <node concept="3TrcHB" id="3swcsd1_qfe" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="3swcsd1_o2k" role="37vLTJ">
+                  <node concept="37vLTw" id="3swcsd1_nZZ" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3swcsd1_n9E" resolve="usage" />
+                  </node>
+                  <node concept="3TrcHB" id="3swcsd1_o5w" role="2OqNvi">
+                    <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="3swcsd1$Y9N" role="2GsD0m">
+            <node concept="2OqwBi" id="3swcsd1$Y9O" role="2Oq$k0">
+              <node concept="2Sf5sV" id="3swcsd1$Y9P" role="2Oq$k0" />
+              <node concept="3TrEf2" id="3swcsd1$Y9Q" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:5itBwM6gb4P" resolve="prototype" />
+              </node>
+            </node>
+            <node concept="3Tsc0h" id="3swcsd1$Y9R" role="2OqNvi">
+              <ref role="3TtcxE" to="wq2x:5itBwM6wU6s" resolve="parameter" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2SaL7w" id="3swcsd1$H$6" role="2ZfVeh">
+      <node concept="3clFbS" id="3swcsd1$H$7" role="2VODD2">
+        <node concept="3cpWs8" id="3swcsd1zTOD" role="3cqZAp">
+          <node concept="3cpWsn" id="3swcsd1zTOE" role="3cpWs9">
+            <property role="TrG5h" value="decls" />
+            <node concept="2I9FWS" id="3swcsd1zTM2" role="1tU5fm">
+              <ref role="2I9WkF" to="wq2x:5itBwM6wvc4" resolve="ExpandMacroParameterDeclaration" />
+            </node>
+            <node concept="2OqwBi" id="3swcsd1zTOF" role="33vP2m">
+              <node concept="2OqwBi" id="3swcsd1zTOG" role="2Oq$k0">
+                <node concept="3TrEf2" id="3swcsd1zTOI" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:5itBwM6gb4P" resolve="prototype" />
+                </node>
+                <node concept="2Sf5sV" id="3swcsd1$Lrk" role="2Oq$k0" />
+              </node>
+              <node concept="3Tsc0h" id="3swcsd1zTOJ" role="2OqNvi">
+                <ref role="3TtcxE" to="wq2x:5itBwM6wU6s" resolve="parameter" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3swcsd1$5vb" role="3cqZAp">
+          <node concept="3cpWsn" id="3swcsd1$5vc" role="3cpWs9">
+            <property role="TrG5h" value="usages" />
+            <node concept="_YKpA" id="3swcsd1$5u0" role="1tU5fm">
+              <node concept="3Tqbb2" id="3swcsd1$5u3" role="_ZDj9">
+                <ref role="ehGHo" to="wq2x:3swcsd17JEl" resolve="ExpandMacroParameterUsage" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="3swcsd1$5vd" role="33vP2m">
+              <node concept="2OqwBi" id="3swcsd1$5vf" role="2Oq$k0">
+                <node concept="3Tsc0h" id="3swcsd1$5vh" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+                </node>
+                <node concept="2Sf5sV" id="3swcsd1$LA$" role="2Oq$k0" />
+              </node>
+              <node concept="ANE8D" id="3swcsd1$5vr" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3swcsd1$LJQ" role="3cqZAp">
+          <node concept="1Wc70l" id="3swcsd1_2Fb" role="3clFbG">
+            <node concept="2OqwBi" id="3swcsd1_6SC" role="3uHU7B">
+              <node concept="37vLTw" id="3swcsd1_33w" role="2Oq$k0">
+                <ref role="3cqZAo" node="3swcsd1$5vc" resolve="usages" />
+              </node>
+              <node concept="1v1jN8" id="3swcsd1_aUK" role="2OqNvi" />
+            </node>
+            <node concept="2OqwBi" id="3swcsd1_exI" role="3uHU7w">
+              <node concept="37vLTw" id="3swcsd1_b07" role="2Oq$k0">
+                <ref role="3cqZAo" node="3swcsd1zTOE" resolve="decls" />
+              </node>
+              <node concept="3GX2aA" id="3swcsd1_jts" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="2S6QgY" id="3swcsd1NhIB">
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="InitializeLogical" />
+    <property role="2ZfUl3" value="true" />
+    <ref role="2ZfgGC" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
+    <node concept="2S6ZIM" id="3swcsd1NhIC" role="2ZfVej">
+      <node concept="3clFbS" id="3swcsd1NhID" role="2VODD2">
+        <node concept="3clFbF" id="3swcsd1NhZv" role="3cqZAp">
+          <node concept="Xl_RD" id="3swcsd1NhZu" role="3clFbG">
+            <property role="Xl_RC" value="Add Logical Matching Prototype" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2Sbjvc" id="3swcsd1NhIE" role="2ZfgGD">
+      <node concept="3clFbS" id="3swcsd1NhIF" role="2VODD2">
+        <node concept="2Gpval" id="3swcsd1NNAf" role="3cqZAp">
+          <node concept="2GrKxI" id="3swcsd1NNAg" role="2Gsz3X">
+            <property role="TrG5h" value="protoLogDecl" />
+          </node>
+          <node concept="3clFbS" id="3swcsd1NNAh" role="2LFqv$">
+            <node concept="3cpWs8" id="3swcsd1NYhc" role="3cqZAp">
+              <node concept="3cpWsn" id="3swcsd1NYhd" role="3cpWs9">
+                <property role="TrG5h" value="logDecl" />
+                <node concept="3Tqbb2" id="3swcsd1NYgO" role="1tU5fm">
+                  <ref role="ehGHo" to="wq2x:7IysFe_ZPXH" resolve="MacroBodyLogicalDeclaration" />
+                </node>
+                <node concept="2OqwBi" id="3swcsd1NYhe" role="33vP2m">
+                  <node concept="2OqwBi" id="3swcsd1NYhf" role="2Oq$k0">
+                    <node concept="2Sf5sV" id="3swcsd1NYhg" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="3swcsd1NYhh" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:5itBwM9Gou_" resolve="logical" />
+                    </node>
+                  </node>
+                  <node concept="WFELt" id="3swcsd1NYhi" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3swcsd1O7VD" role="3cqZAp">
+              <node concept="37vLTI" id="3swcsd1O8R9" role="3clFbG">
+                <node concept="2OqwBi" id="3swcsd1O92c" role="37vLTx">
+                  <node concept="2OqwBi" id="3swcsd1O8WZ" role="2Oq$k0">
+                    <node concept="2GrUjf" id="3swcsd1QcmW" role="2Oq$k0">
+                      <ref role="2Gs0qQ" node="3swcsd1NNAg" resolve="protoLogDecl" />
+                    </node>
+                    <node concept="3TrEf2" id="3swcsd1O90A" role="2OqNvi">
+                      <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
+                    </node>
+                  </node>
+                  <node concept="1$rogu" id="3swcsd1O960" role="2OqNvi" />
+                </node>
+                <node concept="2OqwBi" id="3swcsd1O84c" role="37vLTJ">
+                  <node concept="37vLTw" id="3swcsd1O7VB" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3swcsd1NYhd" resolve="logDecl" />
+                  </node>
+                  <node concept="3TrEf2" id="3swcsd1O8gz" role="2OqNvi">
+                    <ref role="3Tt5mk" to="5j4j:5zfvpQ72gqq" resolve="dataType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2Gpval" id="3swcsd1O5at" role="3cqZAp">
+              <node concept="2GrKxI" id="3swcsd1O5av" role="2Gsz3X">
+                <property role="TrG5h" value="protoLogVar" />
+              </node>
+              <node concept="2OqwBi" id="3swcsd1O7b5" role="2GsD0m">
+                <node concept="2GrUjf" id="3swcsd1O5Kx" role="2Oq$k0">
+                  <ref role="2Gs0qQ" node="3swcsd1NNAg" resolve="protoLogDecl" />
+                </node>
+                <node concept="3Tsc0h" id="3swcsd1O7wg" role="2OqNvi">
+                  <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="3swcsd1O5az" role="2LFqv$">
+                <node concept="3cpWs8" id="3swcsd1OeTj" role="3cqZAp">
+                  <node concept="3cpWsn" id="3swcsd1OeTk" role="3cpWs9">
+                    <property role="TrG5h" value="logVar" />
+                    <node concept="3Tqbb2" id="3swcsd1OeSY" role="1tU5fm">
+                      <ref role="ehGHo" to="5j4j:7E86$tKtfM3" resolve="LogicalVariableDeclaration" />
+                    </node>
+                    <node concept="2OqwBi" id="3swcsd1OeTl" role="33vP2m">
+                      <node concept="2OqwBi" id="3swcsd1OeTm" role="2Oq$k0">
+                        <node concept="37vLTw" id="3swcsd1OeTn" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3swcsd1NYhd" resolve="logDecl" />
+                        </node>
+                        <node concept="3Tsc0h" id="3swcsd1OeTo" role="2OqNvi">
+                          <ref role="3TtcxE" to="5j4j:2E5lcNn8k3O" resolve="declaration" />
+                        </node>
+                      </node>
+                      <node concept="WFELt" id="3swcsd1OeTp" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3swcsd1O97Z" role="3cqZAp">
+                  <node concept="37vLTI" id="3swcsd1Oki2" role="3clFbG">
+                    <node concept="2OqwBi" id="3swcsd1Ok_i" role="37vLTx">
+                      <node concept="2GrUjf" id="3swcsd1Oky$" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="3swcsd1O5av" resolve="protoLogVar" />
+                      </node>
+                      <node concept="3TrcHB" id="3swcsd1OkWL" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="3swcsd1OiLc" role="37vLTJ">
+                      <node concept="37vLTw" id="3swcsd1OeTq" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3swcsd1OeTk" resolve="logVar" />
+                      </node>
+                      <node concept="3TrcHB" id="3swcsd1OiY8" role="2OqNvi">
+                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3swcsd1OlGj" role="3cqZAp">
+                  <node concept="37vLTI" id="3swcsd1Omrg" role="3clFbG">
+                    <node concept="2OqwBi" id="3swcsd1OpsU" role="37vLTx">
+                      <node concept="2OqwBi" id="3swcsd1OmwI" role="2Oq$k0">
+                        <node concept="2GrUjf" id="3swcsd1OmtY" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="3swcsd1O5av" resolve="protoLogVar" />
+                        </node>
+                        <node concept="3TrEf2" id="3swcsd1Op4P" role="2OqNvi">
+                          <ref role="3Tt5mk" to="5j4j:5f6wxQ3ychO" resolve="cardinalityExpr" />
+                        </node>
+                      </node>
+                      <node concept="1$rogu" id="3swcsd1OpM9" role="2OqNvi" />
+                    </node>
+                    <node concept="2OqwBi" id="3swcsd1OlR7" role="37vLTJ">
+                      <node concept="37vLTw" id="3swcsd1OlGh" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3swcsd1OeTk" resolve="logVar" />
+                      </node>
+                      <node concept="3TrEf2" id="3swcsd1Om4k" role="2OqNvi">
+                        <ref role="3Tt5mk" to="5j4j:5f6wxQ3ychO" resolve="cardinalityExpr" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="3swcsd1NNAC" role="2GsD0m">
+            <node concept="2OqwBi" id="3swcsd1NNAD" role="2Oq$k0">
+              <node concept="2Sf5sV" id="3swcsd1NNAE" role="2Oq$k0" />
+              <node concept="3TrEf2" id="3swcsd1NNAF" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:5itBwM6gb4P" resolve="prototype" />
+              </node>
+            </node>
+            <node concept="3Tsc0h" id="3swcsd1NNAG" role="2OqNvi">
+              <ref role="3TtcxE" to="wq2x:5itBwM6iJYb" resolve="logical" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2SaL7w" id="3swcsd1Nkhx" role="2ZfVeh">
+      <node concept="3clFbS" id="3swcsd1Nkhy" role="2VODD2">
+        <node concept="3clFbF" id="3swcsd1Nolz" role="3cqZAp">
+          <node concept="1Wc70l" id="3swcsd1N$uH" role="3clFbG">
+            <node concept="2OqwBi" id="3swcsd1NClt" role="3uHU7w">
+              <node concept="2OqwBi" id="3swcsd1N$yI" role="2Oq$k0">
+                <node concept="2Sf5sV" id="3swcsd1N$wJ" role="2Oq$k0" />
+                <node concept="3Tsc0h" id="3swcsd1N_be" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:5itBwM9Gou_" resolve="logical" />
+                </node>
+              </node>
+              <node concept="1v1jN8" id="3swcsd1NG8$" role="2OqNvi" />
+            </node>
+            <node concept="2OqwBi" id="3swcsd1NtjT" role="3uHU7B">
+              <node concept="2OqwBi" id="3swcsd1Nppf" role="2Oq$k0">
+                <node concept="2OqwBi" id="3swcsd1NoMy" role="2Oq$k0">
+                  <node concept="2Sf5sV" id="3swcsd1Noly" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3swcsd1Np6g" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:5itBwM6gb4P" resolve="prototype" />
+                  </node>
+                </node>
+                <node concept="3Tsc0h" id="3swcsd1NpH1" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:5itBwM6iJYb" resolve="logical" />
+                </node>
+              </node>
+              <node concept="3GX2aA" id="3swcsd1NyMP" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </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 7d4a387a..cfe47c04 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -107,7 +107,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -1138,6 +1138,13 @@
       <property role="20lbJX" value="fLJekj5/_0__n" />
       <ref role="20lvS9" node="7IysFe_ZPXH" resolve="MacroBodyLogicalDeclaration" />
     </node>
+    <node concept="1TJgyj" id="3swcsd18ZGX" role="1TKVEi">
+      <property role="IQ2ns" value="3972229586022038333" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="parameter" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="3swcsd17JEl" resolve="ExpandMacroParameterUsage" />
+    </node>
     <node concept="1TJgyj" id="5itBwM67n1U" role="1TKVEi">
       <property role="IQ2ns" value="6097203247156392058" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />
@@ -1229,6 +1236,7 @@
       <property role="20kJfa" value="applicableConcept" />
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" to="tpce:h0PkWnZ" resolve="AbstractConceptDeclaration" />
+      <node concept="asaX9" id="vp2bUKvt3$" role="lGtFl" />
     </node>
     <node concept="PrWs8" id="5itBwM6ur5y" role="PzmwI">
       <ref role="PrY4T" node="5itBwM6ugMI" resolve="MacroPrototype" />
@@ -1772,5 +1780,38 @@
     <property role="3GE5qa" value="constraint" />
     <property role="TrG5h" value="Queryable" />
   </node>
+  <node concept="1TIwiD" id="3swcsd17JEl">
+    <property role="EcuMT" value="3972229586021710485" />
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="ExpandMacroParameterUsage" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <node concept="1TJgyj" id="3swcsd17JEn" role="1TKVEi">
+      <property role="IQ2ns" value="3972229586021710487" />
+      <property role="20kJfa" value="declaration" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" node="5itBwM6wvc4" resolve="ExpandMacroParameterDeclaration" />
+    </node>
+    <node concept="PrWs8" id="3swcsd1eimr" role="PzmwI">
+      <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />
+    </node>
+    <node concept="PrWs8" id="3swcsd1eimt" role="PzmwI">
+      <ref role="PrY4T" to="tpee:4H$HgYMZ7sw" resolve="IVariableDeclaration" />
+    </node>
+    <node concept="PrWs8" id="3swcsd1eimw" role="PzmwI">
+      <ref role="PrY4T" to="tpck:hqLv6T6" resolve="IResolveInfo" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="3swcsd1iBEb">
+    <property role="EcuMT" value="3972229586024561291" />
+    <property role="3GE5qa" value="macro.decl" />
+    <property role="TrG5h" value="ExpandMacroParameterUsageReference" />
+    <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="1TJgyj" id="3swcsd1iBFV" role="1TKVEi">
+      <property role="IQ2ns" value="3972229586024561403" />
+      <property role="20kJfa" value="parameterUsage" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" node="3swcsd17JEl" resolve="ExpandMacroParameterUsage" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index f29e044a..0321edad 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -57,6 +57,7 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271221393" name="jetbrains.mps.baseLanguage.structure.NPENotEqualsExpression" flags="nn" index="17QLQc" />
       <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -89,7 +90,7 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -111,7 +112,7 @@
       </concept>
     </language>
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
-      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ng" index="2c44t0">
+      <concept id="1196350785110" name="jetbrains.mps.lang.quotation.structure.AbstractAntiquotation" flags="ngI" index="2c44t0">
         <property id="6489343236075007666" name="label" index="3hQQBS" />
         <child id="1196350785111" name="expression" index="2c44t1" />
       </concept>
@@ -162,6 +163,9 @@
       <concept id="1175517767210" name="jetbrains.mps.lang.typesystem.structure.ReportErrorStatement" flags="nn" index="2MkqsV">
         <child id="1175517851849" name="errorString" index="2MkJ7o" />
       </concept>
+      <concept id="1227096620180" name="jetbrains.mps.lang.typesystem.structure.ReferenceMessageTarget" flags="ng" index="2OE7Q9">
+        <reference id="1227096645744" name="linkDeclaration" index="2OEe5H" />
+      </concept>
       <concept id="1205762105978" name="jetbrains.mps.lang.typesystem.structure.WhenConcreteVariableDeclaration" flags="ng" index="2X1qdy" />
       <concept id="1205762656241" name="jetbrains.mps.lang.typesystem.structure.WhenConcreteVariableReference" flags="nn" index="2X3wrD">
         <reference id="1205762683928" name="whenConcreteVar" index="2X3Bk0" />
@@ -171,6 +175,7 @@
       </concept>
       <concept id="1195214364922" name="jetbrains.mps.lang.typesystem.structure.NonTypesystemRule" flags="ig" index="18kY7G" />
       <concept id="3937244445246642777" name="jetbrains.mps.lang.typesystem.structure.AbstractReportStatement" flags="ng" index="1urrMJ">
+        <child id="3937244445246643443" name="messageTarget" index="1urrC5" />
         <child id="3937244445246642781" name="nodeToReport" index="1urrMF" />
       </concept>
       <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
@@ -210,6 +215,9 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
+        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
+      </concept>
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
@@ -250,7 +258,7 @@
         <property id="1757699476691236116" name="role_DebugInfo" index="2qtEX8" />
         <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -258,11 +266,16 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
       <concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
+      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
+      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="9042586985346099698" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachStatement" flags="nn" index="1_o_46">
         <child id="9042586985346099734" name="forEach" index="1_o_by" />
       </concept>
@@ -1478,5 +1491,164 @@
       <ref role="1YaFvo" to="wq2x:5EDW3XEaQl5" resolve="QueryParameter" />
     </node>
   </node>
+  <node concept="18kY7G" id="3swcsd1zSI8">
+    <property role="TrG5h" value="check_ExpandMacroTemplate" />
+    <property role="3GE5qa" value="macro.decl" />
+    <node concept="3clFbS" id="3swcsd1zSI9" role="18ibNy">
+      <node concept="3cpWs8" id="3swcsd1zTOD" role="3cqZAp">
+        <node concept="3cpWsn" id="3swcsd1zTOE" role="3cpWs9">
+          <property role="TrG5h" value="decls" />
+          <node concept="2I9FWS" id="3swcsd1zTM2" role="1tU5fm">
+            <ref role="2I9WkF" to="wq2x:5itBwM6wvc4" resolve="ExpandMacroParameterDeclaration" />
+          </node>
+          <node concept="2OqwBi" id="3swcsd1zTOF" role="33vP2m">
+            <node concept="2OqwBi" id="3swcsd1zTOG" role="2Oq$k0">
+              <node concept="1YBJjd" id="3swcsd1zTOH" role="2Oq$k0">
+                <ref role="1YBMHb" node="3swcsd1zSIb" resolve="expandMacroTemplate" />
+              </node>
+              <node concept="3TrEf2" id="3swcsd1zTOI" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:5itBwM6gb4P" resolve="prototype" />
+              </node>
+            </node>
+            <node concept="3Tsc0h" id="3swcsd1zTOJ" role="2OqNvi">
+              <ref role="3TtcxE" to="wq2x:5itBwM6wU6s" resolve="parameter" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cpWs8" id="3swcsd1$5vb" role="3cqZAp">
+        <node concept="3cpWsn" id="3swcsd1$5vc" role="3cpWs9">
+          <property role="TrG5h" value="usages" />
+          <node concept="_YKpA" id="3swcsd1$5u0" role="1tU5fm">
+            <node concept="3Tqbb2" id="3swcsd1$5u3" role="_ZDj9">
+              <ref role="ehGHo" to="wq2x:5itBwM6wvc4" resolve="ExpandMacroParameterDeclaration" />
+            </node>
+          </node>
+          <node concept="2OqwBi" id="3swcsd1$5vd" role="33vP2m">
+            <node concept="2OqwBi" id="3swcsd1$5ve" role="2Oq$k0">
+              <node concept="2OqwBi" id="3swcsd1$5vf" role="2Oq$k0">
+                <node concept="1YBJjd" id="3swcsd1$5vg" role="2Oq$k0">
+                  <ref role="1YBMHb" node="3swcsd1zSIb" resolve="expandMacroTemplate" />
+                </node>
+                <node concept="3Tsc0h" id="3swcsd1$5vh" role="2OqNvi">
+                  <ref role="3TtcxE" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+                </node>
+              </node>
+              <node concept="3$u5V9" id="3swcsd1$5vi" role="2OqNvi">
+                <node concept="1bVj0M" id="3swcsd1$5vj" role="23t8la">
+                  <node concept="3clFbS" id="3swcsd1$5vk" role="1bW5cS">
+                    <node concept="3clFbF" id="3swcsd1$5vl" role="3cqZAp">
+                      <node concept="2OqwBi" id="3swcsd1$5vm" role="3clFbG">
+                        <node concept="37vLTw" id="3swcsd1$5vn" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3swcsd1$5vp" resolve="it" />
+                        </node>
+                        <node concept="3TrEf2" id="3swcsd1$5vo" role="2OqNvi">
+                          <ref role="3Tt5mk" to="wq2x:3swcsd17JEn" resolve="declaration" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="gl6BB" id="3swcsd1$5vp" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="3swcsd1$5vq" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="ANE8D" id="3swcsd1$5vr" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbJ" id="3swcsd1$6xt" role="3cqZAp">
+        <node concept="3clFbS" id="3swcsd1$6xv" role="3clFbx">
+          <node concept="2MkqsV" id="3swcsd1$dGD" role="3cqZAp">
+            <node concept="Xl_RD" id="3swcsd1$e85" role="2MkJ7o">
+              <property role="Xl_RC" value="parameters inconsistent with prototype" />
+            </node>
+            <node concept="1YBJjd" id="3swcsd1$dJr" role="1urrMF">
+              <ref role="1YBMHb" node="3swcsd1zSIb" resolve="expandMacroTemplate" />
+            </node>
+            <node concept="2OE7Q9" id="3swcsd1$dON" role="1urrC5">
+              <ref role="2OEe5H" to="wq2x:3swcsd18ZGX" resolve="parameter" />
+            </node>
+          </node>
+        </node>
+        <node concept="17QLQc" id="3swcsd1$dE_" role="3clFbw">
+          <node concept="37vLTw" id="3swcsd1$dEQ" role="3uHU7w">
+            <ref role="3cqZAo" node="3swcsd1$5vc" resolve="usages" />
+          </node>
+          <node concept="37vLTw" id="3swcsd1$7aP" role="3uHU7B">
+            <ref role="3cqZAo" node="3swcsd1zTOE" resolve="decls" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="3swcsd1zSIb" role="1YuTPh">
+      <property role="TrG5h" value="expandMacroTemplate" />
+      <ref role="1YaFvo" to="wq2x:5itBwM65AQ4" resolve="ExpandMacroTemplate" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="3swcsd27qN5">
+    <property role="TrG5h" value="typeof_ExpandMacroParameterUsage" />
+    <property role="3GE5qa" value="macro.decl" />
+    <node concept="3clFbS" id="3swcsd27qN6" role="18ibNy">
+      <node concept="1Z5TYs" id="3swcsd27r48" role="3cqZAp">
+        <node concept="mw_s8" id="3swcsd27r4q" role="1ZfhK$">
+          <node concept="1Z2H0r" id="3swcsd27r4m" role="mwGJk">
+            <node concept="1YBJjd" id="3swcsd27r4F" role="1Z2MuG">
+              <ref role="1YBMHb" node="3swcsd27qN8" resolve="empu" />
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="3swcsd27rYS" role="1ZfhKB">
+          <node concept="1Z2H0r" id="3swcsd27rYO" role="mwGJk">
+            <node concept="2OqwBi" id="3swcsd27s9$" role="1Z2MuG">
+              <node concept="1YBJjd" id="3swcsd27rZ9" role="2Oq$k0">
+                <ref role="1YBMHb" node="3swcsd27qN8" resolve="empu" />
+              </node>
+              <node concept="3TrEf2" id="3swcsd27srH" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:3swcsd17JEn" resolve="declaration" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="3swcsd27qN8" role="1YuTPh">
+      <property role="TrG5h" value="empu" />
+      <ref role="1YaFvo" to="wq2x:3swcsd17JEl" resolve="ExpandMacroParameterUsage" />
+    </node>
+  </node>
+  <node concept="1YbPZF" id="3swcsd27ttC">
+    <property role="TrG5h" value="typeof_ExpandMacroParameterUsageReference" />
+    <property role="3GE5qa" value="macro.decl" />
+    <node concept="3clFbS" id="3swcsd27ttD" role="18ibNy">
+      <node concept="1Z5TYs" id="3swcsd27ttP" role="3cqZAp">
+        <node concept="mw_s8" id="3swcsd27ttQ" role="1ZfhK$">
+          <node concept="1Z2H0r" id="3swcsd27ttR" role="mwGJk">
+            <node concept="1YBJjd" id="3swcsd27ttS" role="1Z2MuG">
+              <ref role="1YBMHb" node="3swcsd27ttF" resolve="empur" />
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="3swcsd27ttT" role="1ZfhKB">
+          <node concept="1Z2H0r" id="3swcsd27ttU" role="mwGJk">
+            <node concept="2OqwBi" id="3swcsd27ttV" role="1Z2MuG">
+              <node concept="1YBJjd" id="3swcsd27ttW" role="2Oq$k0">
+                <ref role="1YBMHb" node="3swcsd27ttF" resolve="empur" />
+              </node>
+              <node concept="3TrEf2" id="3swcsd27ttX" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:3swcsd1iBFV" resolve="parameterUsage" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="3swcsd27ttF" role="1YuTPh">
+      <property role="TrG5h" value="empur" />
+      <ref role="1YaFvo" to="wq2x:3swcsd1iBEb" resolve="ExpandMacroParameterUsageReference" />
+    </node>
+  </node>
 </model>