From 866cd3fb0498a11b39a737c88415cb372760a88c Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 28 Apr 2020 12:54:35 +0200
Subject: [PATCH] Support extends relation between term tables.

A term table is now allowed to extend another term table.
Term prototypes can be imported through extends relation.
---
 .../languageModels/behavior.mps               | 129 ++++++++-
 .../languageModels/constraints.mps            | 253 ++++++++++++++----
 .../languageModels/editor.mps                 | 222 +++++++++++++--
 .../languageModels/structure.mps              |   5 +
 4 files changed, 529 insertions(+), 80 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 3c56a43d..36635881 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -115,6 +115,9 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <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">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -128,6 +131,7 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1200397529627" name="jetbrains.mps.baseLanguage.structure.CharConstant" flags="nn" index="1Xhbcc">
         <property id="1200397540847" name="charConstant" index="1XhdNS" />
       </concept>
@@ -234,6 +238,7 @@
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
+      <concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
       <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
   </registry>
@@ -1729,11 +1734,25 @@
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="4lCLOtww5Wm" role="2$JKZa">
-            <node concept="37vLTw" id="4lCLOtww5Lx" role="2Oq$k0">
-              <ref role="3cqZAo" node="4lCLOtww5EX" resolve="prototype" />
+          <node concept="1Wc70l" id="7LI_gNMl9LU" role="2$JKZa">
+            <node concept="3fqX7Q" id="7LI_gNMl9MF" role="3uHU7w">
+              <node concept="2OqwBi" id="7LI_gNMla$p" role="3fr31v">
+                <node concept="37vLTw" id="7LI_gNMlcTz" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4lCLOtww5jv" resolve="stack" />
+                </node>
+                <node concept="3JPx81" id="7LI_gNMlaY1" role="2OqNvi">
+                  <node concept="37vLTw" id="7LI_gNMlb0k" role="25WWJ7">
+                    <ref role="3cqZAo" node="4lCLOtww5EX" resolve="prototype" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4lCLOtww5Wm" role="3uHU7B">
+              <node concept="37vLTw" id="4lCLOtww5Lx" role="2Oq$k0">
+                <ref role="3cqZAo" node="4lCLOtww5EX" resolve="prototype" />
+              </node>
+              <node concept="3x8VRR" id="4lCLOtww66w" role="2OqNvi" />
             </node>
-            <node concept="3x8VRR" id="4lCLOtww66w" role="2OqNvi" />
           </node>
         </node>
         <node concept="3clFbF" id="4lCLOtww4I3" role="3cqZAp">
@@ -1814,7 +1833,7 @@
         <node concept="3clFbF" id="4MEOIDG8lha" role="3cqZAp">
           <node concept="3cpWs3" id="4MEOIDG8moh" role="3clFbG">
             <node concept="Xl_RD" id="4MEOIDG8mok" role="3uHU7w">
-              <property role="Xl_RC" value="_dataform" />
+              <property role="Xl_RC" value="_term" />
             </node>
             <node concept="2OqwBi" id="4MEOIDG8lrk" role="3uHU7B">
               <node concept="13iPFW" id="4MEOIDG8lh8" role="2Oq$k0" />
@@ -1867,6 +1886,104 @@
   <node concept="13h7C7" id="JOGAOsxidP">
     <property role="3GE5qa" value="term" />
     <ref role="13h7C2" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+    <node concept="13i0hz" id="7LI_gNMl5fZ" role="13h7CS">
+      <property role="TrG5h" value="extendsStack" />
+      <node concept="3Tm1VV" id="7LI_gNMl5g0" role="1B3o_S" />
+      <node concept="2BANLN" id="7LI_gNMl5qr" role="3clF45">
+        <node concept="3Tqbb2" id="7LI_gNMl5rj" role="_ZDj9">
+          <ref role="ehGHo" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="7LI_gNMl5g2" role="3clF47">
+        <node concept="3cpWs8" id="7LI_gNMl5sQ" role="3cqZAp">
+          <node concept="3cpWsn" id="7LI_gNMl5sR" role="3cpWs9">
+            <property role="TrG5h" value="stack" />
+            <node concept="2BANLN" id="7LI_gNMl5sS" role="1tU5fm">
+              <node concept="3Tqbb2" id="7LI_gNMl5sT" role="_ZDj9">
+                <ref role="ehGHo" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="7LI_gNMl5sU" role="33vP2m">
+              <node concept="2Jqq0_" id="7LI_gNMl5sV" role="2ShVmc">
+                <node concept="3Tqbb2" id="7LI_gNMl5sW" role="HW$YZ">
+                  <ref role="ehGHo" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="7LI_gNMl5sX" role="3cqZAp">
+          <node concept="3cpWsn" id="7LI_gNMl5sY" role="3cpWs9">
+            <property role="TrG5h" value="extended" />
+            <node concept="3Tqbb2" id="7LI_gNMl5sZ" role="1tU5fm">
+              <ref role="ehGHo" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+            </node>
+            <node concept="2OqwBi" id="7LI_gNMl5t0" role="33vP2m">
+              <node concept="13iPFW" id="7LI_gNMl5t1" role="2Oq$k0" />
+              <node concept="3TrEf2" id="7LI_gNMleqJ" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:7LI_gNMkNTa" resolve="extended" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2$JKZl" id="7LI_gNMl5t3" role="3cqZAp">
+          <node concept="3clFbS" id="7LI_gNMl5t4" role="2LFqv$">
+            <node concept="3clFbF" id="7LI_gNMl5t5" role="3cqZAp">
+              <node concept="2OqwBi" id="7LI_gNMl5t6" role="3clFbG">
+                <node concept="37vLTw" id="7LI_gNMl5t7" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7LI_gNMl5sR" resolve="stack" />
+                </node>
+                <node concept="2Ke4WJ" id="7LI_gNMl5t8" role="2OqNvi">
+                  <node concept="37vLTw" id="7LI_gNMl5t9" role="25WWJ7">
+                    <ref role="3cqZAo" node="7LI_gNMl5sY" resolve="extended" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7LI_gNMl5ta" role="3cqZAp">
+              <node concept="37vLTI" id="7LI_gNMl5tb" role="3clFbG">
+                <node concept="2OqwBi" id="7LI_gNMl5tc" role="37vLTx">
+                  <node concept="37vLTw" id="7LI_gNMl5td" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7LI_gNMl5sY" resolve="extended" />
+                  </node>
+                  <node concept="3TrEf2" id="7LI_gNMlkBV" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:7LI_gNMkNTa" resolve="extended" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="7LI_gNMl5tf" role="37vLTJ">
+                  <ref role="3cqZAo" node="7LI_gNMl5sY" resolve="extended" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Wc70l" id="7LI_gNMleL1" role="2$JKZa">
+            <node concept="3fqX7Q" id="7LI_gNMleM0" role="3uHU7w">
+              <node concept="2OqwBi" id="7LI_gNMlhtH" role="3fr31v">
+                <node concept="37vLTw" id="7LI_gNMleM4" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7LI_gNMl5sR" resolve="stack" />
+                </node>
+                <node concept="3JPx81" id="7LI_gNMljJZ" role="2OqNvi">
+                  <node concept="37vLTw" id="7LI_gNMlkle" role="25WWJ7">
+                    <ref role="3cqZAo" node="7LI_gNMl5sY" resolve="extended" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="7LI_gNMl5tg" role="3uHU7B">
+              <node concept="37vLTw" id="7LI_gNMl5th" role="2Oq$k0">
+                <ref role="3cqZAo" node="7LI_gNMl5sY" resolve="extended" />
+              </node>
+              <node concept="3x8VRR" id="7LI_gNMl5ti" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7LI_gNMl5tj" role="3cqZAp">
+          <node concept="37vLTw" id="7LI_gNMl5tk" role="3clFbG">
+            <ref role="3cqZAo" node="7LI_gNMl5sR" resolve="stack" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="13i0hz" id="5hSMZ_lRESV" role="13h7CS">
       <property role="TrG5h" value="runtimeClassName" />
       <node concept="3Tm1VV" id="5hSMZ_lRESW" role="1B3o_S" />
@@ -1875,7 +1992,7 @@
         <node concept="3clFbF" id="5hSMZ_lRESZ" role="3cqZAp">
           <node concept="3cpWs3" id="5hSMZ_lRET0" role="3clFbG">
             <node concept="Xl_RD" id="5hSMZ_lRET1" role="3uHU7w">
-              <property role="Xl_RC" value="_DFTable" />
+              <property role="Xl_RC" value="_termTable" />
             </node>
             <node concept="2OqwBi" id="5hSMZ_lRET2" role="3uHU7B">
               <node concept="13iPFW" id="5hSMZ_lRET3" 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 acfea639..b9dca8a4 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -25,7 +25,7 @@
     <import index="hy7p" ref="r:01ee26d6-df00-4ffb-931c-1ddec5984886(jetbrains.mps.lang.coderules.util)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
+    <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -255,6 +255,9 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
+      <concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
+        <child id="1176906787974" name="rightExpression" index="576Qk" />
+      </concept>
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
@@ -276,6 +279,7 @@
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
+      <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
   </registry>
   <node concept="1M2fIO" id="6ntBQ9KM5bM">
@@ -1850,6 +1854,111 @@
       <ref role="1N5Vy1" to="wq2x:JOGAOsxaCh" resolve="prototype" />
       <node concept="3dgokm" id="4vr5SAprtjM" role="1N6uqs">
         <node concept="3clFbS" id="4vr5SAprtjO" role="2VODD2">
+          <node concept="3cpWs8" id="7LI_gNMomFf" role="3cqZAp">
+            <node concept="3cpWsn" id="7LI_gNMomFg" role="3cpWs9">
+              <property role="TrG5h" value="tt" />
+              <node concept="3Tqbb2" id="7LI_gNMomBW" role="1tU5fm">
+                <ref role="ehGHo" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+              </node>
+              <node concept="1PxgMI" id="7c96q9tzDxt" role="33vP2m">
+                <property role="1BlNFB" value="true" />
+                <node concept="chp4Y" id="JOGAOsxD_G" role="3oSUPX">
+                  <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+                </node>
+                <node concept="2OqwBi" id="7c96q9tzC66" role="1m5AlR">
+                  <node concept="2rP1CM" id="7LI_gNMoMNW" role="2Oq$k0" />
+                  <node concept="2Rxl7S" id="7c96q9tzCw$" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="7LI_gNMotIS" role="3cqZAp">
+            <node concept="3cpWsn" id="7LI_gNMotIT" role="3cpWs9">
+              <property role="TrG5h" value="available" />
+              <node concept="_YKpA" id="7LI_gNMotpU" role="1tU5fm">
+                <node concept="3Tqbb2" id="7LI_gNMotpX" role="_ZDj9">
+                  <ref role="ehGHo" to="wq2x:JOGAOsxaC9" resolve="TermDeclaration" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="7LI_gNMotIU" role="33vP2m">
+                <node concept="2OqwBi" id="7LI_gNMotIV" role="2Oq$k0">
+                  <node concept="2OqwBi" id="7LI_gNMov5b" role="2Oq$k0">
+                    <node concept="2OqwBi" id="7LI_gNMotIW" role="2Oq$k0">
+                      <node concept="2ShNRf" id="7LI_gNMotIX" role="2Oq$k0">
+                        <node concept="2HTt$P" id="7LI_gNMotIY" role="2ShVmc">
+                          <node concept="3Tqbb2" id="7LI_gNMotIZ" role="2HTBi0">
+                            <ref role="ehGHo" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+                          </node>
+                          <node concept="37vLTw" id="7LI_gNMotJ0" role="2HTEbv">
+                            <ref role="3cqZAo" node="7LI_gNMomFg" resolve="tt" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3QWeyG" id="7LI_gNMotJ1" role="2OqNvi">
+                        <node concept="2OqwBi" id="7LI_gNMotJ2" role="576Qk">
+                          <node concept="37vLTw" id="7LI_gNMotJ3" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7LI_gNMomFg" resolve="tt" />
+                          </node>
+                          <node concept="2qgKlT" id="7LI_gNMotJ4" role="2OqNvi">
+                            <ref role="37wK5l" to="x5bw:7LI_gNMl5fZ" resolve="extendsStack" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3goQfb" id="7LI_gNMozlO" role="2OqNvi">
+                      <node concept="1bVj0M" id="7LI_gNMozlQ" role="23t8la">
+                        <node concept="3clFbS" id="7LI_gNMozlR" role="1bW5cS">
+                          <node concept="3clFbF" id="7LI_gNMozlS" role="3cqZAp">
+                            <node concept="2OqwBi" id="7LI_gNMozlT" role="3clFbG">
+                              <node concept="37vLTw" id="7LI_gNMozlU" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7LI_gNMozlW" resolve="it" />
+                              </node>
+                              <node concept="3Tsc0h" id="7LI_gNMozlV" role="2OqNvi">
+                                <ref role="3TtcxE" to="wq2x:JOGAOsxaCx" resolve="contents" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="Rh6nW" id="7LI_gNMozlW" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="7LI_gNMozlX" role="1tU5fm" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3zZkjj" id="7LI_gNMotJ5" role="2OqNvi">
+                    <node concept="1bVj0M" id="7LI_gNMotJ6" role="23t8la">
+                      <node concept="3clFbS" id="7LI_gNMotJ7" role="1bW5cS">
+                        <node concept="3clFbF" id="7LI_gNMotJ8" role="3cqZAp">
+                          <node concept="1Wc70l" id="7LI_gNMotJ9" role="3clFbG">
+                            <node concept="2OqwBi" id="7LI_gNMotJa" role="3uHU7w">
+                              <node concept="37vLTw" id="7LI_gNMotJb" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7LI_gNMotJg" resolve="it" />
+                              </node>
+                              <node concept="3TrcHB" id="7LI_gNMotJc" role="2OqNvi">
+                                <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
+                              </node>
+                            </node>
+                            <node concept="3y3z36" id="7LI_gNMotJd" role="3uHU7B">
+                              <node concept="37vLTw" id="7LI_gNMotJe" role="3uHU7B">
+                                <ref role="3cqZAo" node="7LI_gNMotJg" resolve="it" />
+                              </node>
+                              <node concept="3kakTB" id="7LI_gNMotJf" role="3uHU7w" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="7LI_gNMotJg" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="7LI_gNMotJh" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="ANE8D" id="7LI_gNMotJi" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="4vr5SAprAV$" role="3cqZAp">
             <node concept="2ShNRf" id="4vr5SAprAVw" role="3clFbG">
               <node concept="YeOm9" id="4vr5SAprCap" role="2ShVmc">
@@ -1858,50 +1967,8 @@
                   <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                   <node concept="3Tm1VV" id="4vr5SAprCat" role="1B3o_S" />
-                  <node concept="2OqwBi" id="4vr5SAprBxA" role="37wK5m">
-                    <node concept="2OqwBi" id="4vr5SAprBxB" role="2Oq$k0">
-                      <node concept="1PxgMI" id="4vr5SAprBxC" role="2Oq$k0">
-                        <property role="1BlNFB" value="true" />
-                        <node concept="chp4Y" id="4vr5SAprBxD" role="3oSUPX">
-                          <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
-                        </node>
-                        <node concept="2OqwBi" id="4vr5SAprBxE" role="1m5AlR">
-                          <node concept="2rP1CM" id="4vr5SAprBxF" role="2Oq$k0" />
-                          <node concept="2Rxl7S" id="4vr5SAprBxG" role="2OqNvi" />
-                        </node>
-                      </node>
-                      <node concept="3Tsc0h" id="4vr5SAprBxH" role="2OqNvi">
-                        <ref role="3TtcxE" to="wq2x:JOGAOsxaCx" resolve="contents" />
-                      </node>
-                    </node>
-                    <node concept="3zZkjj" id="4vr5SAprBxI" role="2OqNvi">
-                      <node concept="1bVj0M" id="4vr5SAprBxJ" role="23t8la">
-                        <node concept="3clFbS" id="4vr5SAprBxK" role="1bW5cS">
-                          <node concept="3clFbF" id="4vr5SAprBxL" role="3cqZAp">
-                            <node concept="1Wc70l" id="4vr5SAprBxM" role="3clFbG">
-                              <node concept="2OqwBi" id="4vr5SAprBxN" role="3uHU7w">
-                                <node concept="37vLTw" id="4vr5SAprBxO" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4vr5SAprBxT" resolve="it" />
-                                </node>
-                                <node concept="3TrcHB" id="4vr5SAprBxP" role="2OqNvi">
-                                  <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
-                                </node>
-                              </node>
-                              <node concept="3y3z36" id="4vr5SAprBxQ" role="3uHU7B">
-                                <node concept="37vLTw" id="4vr5SAprBxR" role="3uHU7B">
-                                  <ref role="3cqZAo" node="4vr5SAprBxT" resolve="it" />
-                                </node>
-                                <node concept="3kakTB" id="4vr5SAprBxS" role="3uHU7w" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Rh6nW" id="4vr5SAprBxT" role="1bW2Oz">
-                          <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="4vr5SAprBxU" role="1tU5fm" />
-                        </node>
-                      </node>
-                    </node>
+                  <node concept="37vLTw" id="7LI_gNMouvf" role="37wK5m">
+                    <ref role="3cqZAo" node="7LI_gNMotIT" resolve="available" />
                   </node>
                   <node concept="3clFb_" id="4vr5SAprCmQ" role="jymVt">
                     <property role="TrG5h" value="getName" />
@@ -1941,5 +2008,101 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="7LI_gNMkOg$">
+    <property role="3GE5qa" value="term" />
+    <ref role="1M2myG" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+    <node concept="1N5Pfh" id="7LI_gNMkOgI" role="1Mr941">
+      <ref role="1N5Vy1" to="wq2x:7LI_gNMkNTa" resolve="extended" />
+      <node concept="3dgokm" id="7LI_gNMkOgK" role="1N6uqs">
+        <node concept="3clFbS" id="7LI_gNMkOgL" role="2VODD2">
+          <node concept="3cpWs8" id="7LI_gNMl0bw" role="3cqZAp">
+            <node concept="3cpWsn" id="7LI_gNMl0bx" role="3cpWs9">
+              <property role="TrG5h" value="available" />
+              <node concept="_YKpA" id="7LI_gNMkZZy" role="1tU5fm">
+                <node concept="3Tqbb2" id="7LI_gNMkZZ_" role="_ZDj9" />
+              </node>
+              <node concept="2OqwBi" id="7LI_gNMl0by" role="33vP2m">
+                <node concept="2OqwBi" id="7LI_gNMl2bZ" role="2Oq$k0">
+                  <node concept="2OqwBi" id="7LI_gNMl0bz" role="2Oq$k0">
+                    <node concept="2OqwBi" id="7LI_gNMl0b$" role="2Oq$k0">
+                      <node concept="2rP1CM" id="7LI_gNMl0b_" role="2Oq$k0" />
+                      <node concept="I4A8Y" id="7LI_gNMl0bA" role="2OqNvi" />
+                    </node>
+                    <node concept="3lApI0" id="7LI_gNMl0bB" role="2OqNvi">
+                      <ref role="3lApI3" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+                    </node>
+                  </node>
+                  <node concept="3zZkjj" id="7LI_gNMl3TH" role="2OqNvi">
+                    <node concept="1bVj0M" id="7LI_gNMl3TJ" role="23t8la">
+                      <node concept="3clFbS" id="7LI_gNMl3TK" role="1bW5cS">
+                        <node concept="3clFbF" id="7LI_gNMl46B" role="3cqZAp">
+                          <node concept="3y3z36" id="7LI_gNMl4mf" role="3clFbG">
+                            <node concept="3kakTB" id="7LI_gNMl4Ah" role="3uHU7w" />
+                            <node concept="37vLTw" id="7LI_gNMl46A" role="3uHU7B">
+                              <ref role="3cqZAo" node="7LI_gNMl3TL" resolve="it" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="7LI_gNMl3TL" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="7LI_gNMl3TM" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="ANE8D" id="7LI_gNMl0bC" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="7LI_gNMkU6A" role="3cqZAp">
+            <node concept="2ShNRf" id="7LI_gNMkU6y" role="3clFbG">
+              <node concept="YeOm9" id="7LI_gNMkUGy" role="2ShVmc">
+                <node concept="1Y3b0j" id="7LI_gNMkUG_" 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="7LI_gNMkUGA" role="1B3o_S" />
+                  <node concept="37vLTw" id="7LI_gNMl0bD" role="37wK5m">
+                    <ref role="3cqZAo" node="7LI_gNMl0bx" resolve="available" />
+                  </node>
+                  <node concept="3clFb_" id="7LI_gNMkUMk" role="jymVt">
+                    <property role="TrG5h" value="getName" />
+                    <node concept="17QB3L" id="7LI_gNMkUMl" role="3clF45" />
+                    <node concept="3Tm1VV" id="7LI_gNMkUMm" role="1B3o_S" />
+                    <node concept="37vLTG" id="7LI_gNMkUMo" role="3clF46">
+                      <property role="TrG5h" value="child" />
+                      <node concept="3Tqbb2" id="7LI_gNMkUMp" role="1tU5fm" />
+                    </node>
+                    <node concept="3clFbS" id="7LI_gNMkUMr" role="3clF47">
+                      <node concept="3clFbF" id="7LI_gNMkUUh" role="3cqZAp">
+                        <node concept="2OqwBi" id="7LI_gNMkVj$" role="3clFbG">
+                          <node concept="1PxgMI" id="7LI_gNMkV9U" role="2Oq$k0">
+                            <property role="1BlNFB" value="true" />
+                            <node concept="chp4Y" id="7LI_gNMkVcr" role="3oSUPX">
+                              <ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
+                            </node>
+                            <node concept="37vLTw" id="7LI_gNMkUUg" role="1m5AlR">
+                              <ref role="3cqZAo" node="7LI_gNMkUMo" resolve="child" />
+                            </node>
+                          </node>
+                          <node concept="3TrcHB" id="7LI_gNMkVth" role="2OqNvi">
+                            <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="7LI_gNMkUMs" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 7d740901..821763a4 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -27,6 +27,7 @@
     <import index="nprl" ref="r:81151157-4aa6-41ac-acda-128bb1020041(jetbrains.mps.lang.coderules.constraints)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
+    <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
@@ -577,6 +578,7 @@
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
+      <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
   </registry>
   <node concept="24kQdi" id="6p0DfM0bngw">
@@ -7652,48 +7654,95 @@
       <node concept="1GhOrh" id="7c96q9tzBEG" role="1Qtc8A">
         <node concept="1GhMSn" id="7c96q9tzBEH" role="1GhOrs">
           <node concept="3clFbS" id="7c96q9tzBEI" role="2VODD2">
-            <node concept="3clFbF" id="7c96q9tzBTp" role="3cqZAp">
-              <node concept="2OqwBi" id="7c96q9tzG9T" role="3clFbG">
-                <node concept="2OqwBi" id="7c96q9tzDQK" role="2Oq$k0">
-                  <node concept="1PxgMI" id="7c96q9tzDxt" role="2Oq$k0">
-                    <property role="1BlNFB" value="true" />
-                    <node concept="chp4Y" id="JOGAOsxD_G" role="3oSUPX">
-                      <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
-                    </node>
-                    <node concept="2OqwBi" id="7c96q9tzC66" role="1m5AlR">
-                      <node concept="7Obwk" id="7c96q9tzBTo" role="2Oq$k0" />
-                      <node concept="2Rxl7S" id="7c96q9tzCw$" role="2OqNvi" />
-                    </node>
+            <node concept="3cpWs8" id="7LI_gNMomFf" role="3cqZAp">
+              <node concept="3cpWsn" id="7LI_gNMomFg" role="3cpWs9">
+                <property role="TrG5h" value="tt" />
+                <node concept="3Tqbb2" id="7LI_gNMomBW" role="1tU5fm">
+                  <ref role="ehGHo" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+                </node>
+                <node concept="1PxgMI" id="7LI_gNMoKlm" role="33vP2m">
+                  <property role="1BlNFB" value="true" />
+                  <node concept="chp4Y" id="7LI_gNMoKln" role="3oSUPX">
+                    <ref role="cht4Q" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
                   </node>
-                  <node concept="3Tsc0h" id="JOGAOsxE0L" role="2OqNvi">
-                    <ref role="3TtcxE" to="wq2x:JOGAOsxaCx" resolve="contents" />
+                  <node concept="2OqwBi" id="7LI_gNMoKlo" role="1m5AlR">
+                    <node concept="7Obwk" id="7LI_gNMoKlp" role="2Oq$k0" />
+                    <node concept="2Rxl7S" id="7LI_gNMoKlq" role="2OqNvi" />
                   </node>
                 </node>
-                <node concept="3zZkjj" id="7c96q9tzR0w" role="2OqNvi">
-                  <node concept="1bVj0M" id="7c96q9tzR0y" role="23t8la">
-                    <node concept="3clFbS" id="7c96q9tzR0z" role="1bW5cS">
-                      <node concept="3clFbF" id="7c96q9tzR0$" role="3cqZAp">
-                        <node concept="1Wc70l" id="4vr5SApr8jn" role="3clFbG">
-                          <node concept="2OqwBi" id="4vr5SApr8BG" role="3uHU7w">
-                            <node concept="37vLTw" id="4vr5SApr8n_" role="2Oq$k0">
-                              <ref role="3cqZAo" node="7c96q9tzR0C" resolve="it" />
+              </node>
+            </node>
+            <node concept="3clFbF" id="7LI_gNMoNRu" role="3cqZAp">
+              <node concept="2OqwBi" id="7LI_gNMoPji" role="3clFbG">
+                <node concept="2OqwBi" id="7LI_gNMoPjj" role="2Oq$k0">
+                  <node concept="2OqwBi" id="7LI_gNMoPjk" role="2Oq$k0">
+                    <node concept="2ShNRf" id="7LI_gNMoPjl" role="2Oq$k0">
+                      <node concept="2HTt$P" id="7LI_gNMoPjm" role="2ShVmc">
+                        <node concept="3Tqbb2" id="7LI_gNMoPjn" role="2HTBi0">
+                          <ref role="ehGHo" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+                        </node>
+                        <node concept="37vLTw" id="7LI_gNMoPjo" role="2HTEbv">
+                          <ref role="3cqZAo" node="7LI_gNMomFg" resolve="tt" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3QWeyG" id="7LI_gNMoPjp" role="2OqNvi">
+                      <node concept="2OqwBi" id="7LI_gNMoPjq" role="576Qk">
+                        <node concept="37vLTw" id="7LI_gNMoPjr" role="2Oq$k0">
+                          <ref role="3cqZAo" node="7LI_gNMomFg" resolve="tt" />
+                        </node>
+                        <node concept="2qgKlT" id="7LI_gNMoPjs" role="2OqNvi">
+                          <ref role="37wK5l" to="x5bw:7LI_gNMl5fZ" resolve="extendsStack" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3goQfb" id="7LI_gNMoPjt" role="2OqNvi">
+                    <node concept="1bVj0M" id="7LI_gNMoPju" role="23t8la">
+                      <node concept="3clFbS" id="7LI_gNMoPjv" role="1bW5cS">
+                        <node concept="3clFbF" id="7LI_gNMoPjw" role="3cqZAp">
+                          <node concept="2OqwBi" id="7LI_gNMoPjx" role="3clFbG">
+                            <node concept="37vLTw" id="7LI_gNMoPjy" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7LI_gNMoPj$" resolve="it" />
                             </node>
-                            <node concept="3TrcHB" id="4vr5SApr93N" role="2OqNvi">
+                            <node concept="3Tsc0h" id="7LI_gNMoPjz" role="2OqNvi">
+                              <ref role="3TtcxE" to="wq2x:JOGAOsxaCx" resolve="contents" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="Rh6nW" id="7LI_gNMoPj$" role="1bW2Oz">
+                        <property role="TrG5h" value="it" />
+                        <node concept="2jxLKc" id="7LI_gNMoPj_" role="1tU5fm" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3zZkjj" id="7LI_gNMoPjA" role="2OqNvi">
+                  <node concept="1bVj0M" id="7LI_gNMoPjB" role="23t8la">
+                    <node concept="3clFbS" id="7LI_gNMoPjC" role="1bW5cS">
+                      <node concept="3clFbF" id="7LI_gNMoPjD" role="3cqZAp">
+                        <node concept="1Wc70l" id="7LI_gNMoPjE" role="3clFbG">
+                          <node concept="2OqwBi" id="7LI_gNMoPjF" role="3uHU7w">
+                            <node concept="37vLTw" id="7LI_gNMoPjG" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7LI_gNMoPjL" resolve="it" />
+                            </node>
+                            <node concept="3TrcHB" id="7LI_gNMoPjH" role="2OqNvi">
                               <ref role="3TsBF5" to="wq2x:4vr5SApqc6O" resolve="open" />
                             </node>
                           </node>
-                          <node concept="3y3z36" id="7c96q9tzR0_" role="3uHU7B">
-                            <node concept="37vLTw" id="7c96q9tzR0B" role="3uHU7B">
-                              <ref role="3cqZAo" node="7c96q9tzR0C" resolve="it" />
+                          <node concept="3y3z36" id="7LI_gNMoPjI" role="3uHU7B">
+                            <node concept="37vLTw" id="7LI_gNMoPjJ" role="3uHU7B">
+                              <ref role="3cqZAo" node="7LI_gNMoPjL" resolve="it" />
                             </node>
-                            <node concept="7Obwk" id="7c96q9tzR0A" role="3uHU7w" />
+                            <node concept="7Obwk" id="7LI_gNMoPjK" role="3uHU7w" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="7c96q9tzR0C" role="1bW2Oz">
+                    <node concept="Rh6nW" id="7LI_gNMoPjL" role="1bW2Oz">
                       <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7c96q9tzR0D" role="1tU5fm" />
+                      <node concept="2jxLKc" id="7LI_gNMoPjM" role="1tU5fm" />
                     </node>
                   </node>
                 </node>
@@ -7850,6 +7899,37 @@
         <node concept="3F0A7n" id="5hSMZ_lNwqI" role="3EZMnx">
           <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         </node>
+        <node concept="3EZMnI" id="7LI_gNMlkLy" role="3EZMnx">
+          <node concept="VPM3Z" id="7LI_gNMlkL$" role="3F10Kt" />
+          <node concept="3F0ifn" id="7LI_gNMllqp" role="3EZMnx">
+            <property role="3F0ifm" value="extends" />
+          </node>
+          <node concept="1iCGBv" id="7LI_gNMllzg" role="3EZMnx">
+            <ref role="1NtTu8" to="wq2x:7LI_gNMkNTa" resolve="extended" />
+            <node concept="1sVBvm" id="7LI_gNMllzi" role="1sWHZn">
+              <node concept="3F0A7n" id="7LI_gNMll$4" role="2wV5jI">
+                <property role="1Intyy" value="true" />
+                <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+          <node concept="l2Vlx" id="7LI_gNMlkLB" role="2iSdaV" />
+          <node concept="pkWqt" id="7LI_gNMlkLO" role="pqm2j">
+            <node concept="3clFbS" id="7LI_gNMlkLP" role="2VODD2">
+              <node concept="3clFbF" id="7LI_gNMlkQ1" role="3cqZAp">
+                <node concept="2OqwBi" id="7LI_gNMlle8" role="3clFbG">
+                  <node concept="2OqwBi" id="7LI_gNMll4h" role="2Oq$k0">
+                    <node concept="pncrf" id="7LI_gNMlkQ0" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="7LI_gNMlldg" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:7LI_gNMkNTa" resolve="extended" />
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="7LI_gNMlljP" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3F0ifn" id="5hSMZ_lNwqJ" role="3EZMnx">
           <property role="3F0ifm" value=" " />
           <node concept="VPxyj" id="5hSMZ_lNwqK" role="3F10Kt">
@@ -8113,5 +8193,89 @@
       </node>
     </node>
   </node>
+  <node concept="IW6AY" id="7LI_gNMlm7V">
+    <property role="3GE5qa" value="term" />
+    <ref role="aqKnT" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+    <node concept="1Qtc8_" id="7LI_gNMlmcc" role="IW6Ez">
+      <node concept="3cWJ9i" id="7LI_gNMlmcg" role="1Qtc8$">
+        <node concept="CtIbL" id="7LI_gNMlmci" role="CtIbM">
+          <property role="CtIbK" value="30NnNOohrQL/RIGHT" />
+        </node>
+      </node>
+      <node concept="1GhOrh" id="7LI_gNMlmcm" role="1Qtc8A">
+        <node concept="1GhMSn" id="7LI_gNMlmcn" role="1GhOrs">
+          <node concept="3clFbS" id="7LI_gNMlmco" role="2VODD2">
+            <node concept="3clFbF" id="7LI_gNMlmGP" role="3cqZAp">
+              <node concept="2OqwBi" id="7LI_gNMl2bZ" role="3clFbG">
+                <node concept="2OqwBi" id="7LI_gNMl0bz" role="2Oq$k0">
+                  <node concept="1rpKSd" id="7LI_gNMlmSe" role="2Oq$k0" />
+                  <node concept="3lApI0" id="7LI_gNMl0bB" role="2OqNvi">
+                    <ref role="3lApI3" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+                  </node>
+                </node>
+                <node concept="3zZkjj" id="7LI_gNMl3TH" role="2OqNvi">
+                  <node concept="1bVj0M" id="7LI_gNMl3TJ" role="23t8la">
+                    <node concept="3clFbS" id="7LI_gNMl3TK" role="1bW5cS">
+                      <node concept="3clFbF" id="7LI_gNMl46B" role="3cqZAp">
+                        <node concept="3y3z36" id="7LI_gNMl4mf" role="3clFbG">
+                          <node concept="7Obwk" id="7LI_gNMln42" role="3uHU7w" />
+                          <node concept="37vLTw" id="7LI_gNMl46A" role="3uHU7B">
+                            <ref role="3cqZAo" node="7LI_gNMl3TL" resolve="it" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="7LI_gNMl3TL" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="7LI_gNMl3TM" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="IWgqT" id="7LI_gNMlo0o" role="1GhOri">
+          <node concept="1hCUdq" id="7LI_gNMlo0q" role="1hCUd6">
+            <node concept="3clFbS" id="7LI_gNMlo0s" role="2VODD2">
+              <node concept="3clFbF" id="7LI_gNMlo9s" role="3cqZAp">
+                <node concept="3cpWs3" id="7LI_gNMlosF" role="3clFbG">
+                  <node concept="2OqwBi" id="7LI_gNMlp8Z" role="3uHU7w">
+                    <node concept="2ZBlsa" id="7LI_gNMloWQ" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="7LI_gNMlpfu" role="2OqNvi">
+                      <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                    </node>
+                  </node>
+                  <node concept="Xl_RD" id="7LI_gNMlo9r" role="3uHU7B">
+                    <property role="Xl_RC" value="extends " />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="IWg2L" id="7LI_gNMlo0u" role="IWgqQ">
+            <node concept="3clFbS" id="7LI_gNMlo0w" role="2VODD2">
+              <node concept="3clFbF" id="7LI_gNMlpiE" role="3cqZAp">
+                <node concept="2OqwBi" id="7LI_gNMlpsq" role="3clFbG">
+                  <node concept="2OqwBi" id="7LI_gNMlpls" role="2Oq$k0">
+                    <node concept="7Obwk" id="7LI_gNMlpiD" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="7LI_gNMlprP" role="2OqNvi">
+                      <ref role="3Tt5mk" to="wq2x:7LI_gNMkNTa" resolve="extended" />
+                    </node>
+                  </node>
+                  <node concept="2oxUTD" id="7LI_gNMlpvU" role="2OqNvi">
+                    <node concept="2ZBlsa" id="7LI_gNMlq9o" role="2oxUTC" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tqbb2" id="7LI_gNMlmfm" role="2ZBHrp">
+          <ref role="ehGHo" to="wq2x:JOGAOsxaCw" resolve="TermTable" />
+        </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 fc589d47..b69c766b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1615,6 +1615,11 @@
     <property role="19KtqR" value="true" />
     <property role="3GE5qa" value="term" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="7LI_gNMkNTa" role="1TKVEi">
+      <property role="IQ2ns" value="8966267790978924106" />
+      <property role="20kJfa" value="extended" />
+      <ref role="20lvS9" node="JOGAOsxaCw" resolve="TermTable" />
+    </node>
     <node concept="1TJgyj" id="JOGAOsxaCx" role="1TKVEi">
       <property role="IQ2ns" value="861509610434243105" />
       <property role="20lmBu" value="fLJjDmT/aggregation" />