From 2f34591b0b8696d14bce7c28aba5304f2310f532 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 8 Feb 2022 09:52:16 +0100
Subject: [PATCH] Support list feature in recovery

---
 .../generator/template/main@generator.mps     |   4 +-
 .../languageModels/behavior.mps               | 146 +++-
 .../generator/template/main@generator.mps     | 624 +++++++++++++++++-
 .../models/constraints.mps                    |   2 +-
 4 files changed, 728 insertions(+), 48 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 3b195e8b..2f8c4873 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
@@ -16248,7 +16248,7 @@
                               <node concept="2OqwBi" id="6P1UyJpnUAU" role="3clFbG">
                                 <node concept="30H73N" id="6P1UyJpnUAV" role="2Oq$k0" />
                                 <node concept="2qgKlT" id="6P1UyJpnUAW" role="2OqNvi">
-                                  <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
+                                  <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="allChildFeatures" />
                                 </node>
                               </node>
                             </node>
@@ -16426,7 +16426,7 @@
                               <node concept="2OqwBi" id="4lCLOtwwaUg" role="3clFbG">
                                 <node concept="30H73N" id="4lCLOtwwaUh" role="2Oq$k0" />
                                 <node concept="2qgKlT" id="4lCLOtwwaUi" role="2OqNvi">
-                                  <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
+                                  <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="allChildFeatures" />
                                 </node>
                               </node>
                             </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index be495a5e..fb618ced 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -2010,8 +2010,56 @@
         </node>
       </node>
     </node>
-    <node concept="13i0hz" id="7c96q9tCSX_" role="13h7CS">
+    <node concept="13i0hz" id="3Co8b0rO8iu" role="13h7CS">
       <property role="TrG5h" value="childFeatures" />
+      <node concept="3Tm1VV" id="3Co8b0rO8iv" role="1B3o_S" />
+      <node concept="A3Dl8" id="3Co8b0rO8iw" role="3clF45">
+        <node concept="3Tqbb2" id="3Co8b0rO8ix" role="A3Ik2">
+          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3Co8b0rO8iy" role="3clF47">
+        <node concept="3clFbF" id="3Co8b0rO8iz" role="3cqZAp">
+          <node concept="2OqwBi" id="3Co8b0rO8i$" role="3clFbG">
+            <node concept="2OqwBi" id="3Co8b0rO8i_" role="2Oq$k0">
+              <node concept="13iPFW" id="3Co8b0rO8iA" role="2Oq$k0" />
+              <node concept="3TrEf2" id="3Co8b0rO8iB" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
+              </node>
+            </node>
+            <node concept="2qgKlT" id="3Co8b0rO8iC" role="2OqNvi">
+              <ref role="37wK5l" node="5UYwY$H7TrL" resolve="childFeatures" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="3Co8b0rO986" role="13h7CS">
+      <property role="TrG5h" value="listFeatures" />
+      <node concept="3Tm1VV" id="3Co8b0rO987" role="1B3o_S" />
+      <node concept="A3Dl8" id="3Co8b0rO988" role="3clF45">
+        <node concept="3Tqbb2" id="3Co8b0rO989" role="A3Ik2">
+          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3Co8b0rO98a" role="3clF47">
+        <node concept="3clFbF" id="3Co8b0rO98b" role="3cqZAp">
+          <node concept="2OqwBi" id="3Co8b0rO98c" role="3clFbG">
+            <node concept="2OqwBi" id="3Co8b0rO98d" role="2Oq$k0">
+              <node concept="13iPFW" id="3Co8b0rO98e" role="2Oq$k0" />
+              <node concept="3TrEf2" id="3Co8b0rO98f" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
+              </node>
+            </node>
+            <node concept="2qgKlT" id="3Co8b0rO98g" role="2OqNvi">
+              <ref role="37wK5l" node="3Co8b0rNyy5" resolve="listFeatures" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="7c96q9tCSX_" role="13h7CS">
+      <property role="TrG5h" value="allChildFeatures" />
       <node concept="3Tm1VV" id="7c96q9tCSXA" role="1B3o_S" />
       <node concept="A3Dl8" id="7c96q9tCSXB" role="3clF45">
         <node concept="3Tqbb2" id="7c96q9tCSXC" role="A3Ik2">
@@ -2020,15 +2068,30 @@
       </node>
       <node concept="3clFbS" id="7c96q9tCSXD" role="3clF47">
         <node concept="3clFbF" id="7c96q9tIynM" role="3cqZAp">
-          <node concept="2OqwBi" id="7c96q9tIynN" role="3clFbG">
-            <node concept="2OqwBi" id="7c96q9tIynO" role="2Oq$k0">
-              <node concept="13iPFW" id="7c96q9tIynP" role="2Oq$k0" />
-              <node concept="3TrEf2" id="7c96q9tIynQ" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
+          <node concept="2OqwBi" id="3Co8b0rO6sG" role="3clFbG">
+            <node concept="2OqwBi" id="7c96q9tIynN" role="2Oq$k0">
+              <node concept="2OqwBi" id="7c96q9tIynO" role="2Oq$k0">
+                <node concept="13iPFW" id="7c96q9tIynP" role="2Oq$k0" />
+                <node concept="3TrEf2" id="7c96q9tIynQ" role="2OqNvi">
+                  <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
+                </node>
+              </node>
+              <node concept="2qgKlT" id="7c96q9tLmeG" role="2OqNvi">
+                <ref role="37wK5l" node="5UYwY$H7TrL" resolve="childFeatures" />
               </node>
             </node>
-            <node concept="2qgKlT" id="7c96q9tLmeG" role="2OqNvi">
-              <ref role="37wK5l" node="5UYwY$H7TrL" resolve="childFeatures" />
+            <node concept="3QWeyG" id="3Co8b0rO70N" role="2OqNvi">
+              <node concept="2OqwBi" id="3Co8b0rO82R" role="576Qk">
+                <node concept="2OqwBi" id="3Co8b0rO7ez" role="2Oq$k0">
+                  <node concept="13iPFW" id="3Co8b0rO72E" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="3Co8b0rO7RE" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:JOGAOsxaCc" resolve="template" />
+                  </node>
+                </node>
+                <node concept="2qgKlT" id="3Co8b0rO8gg" role="2OqNvi">
+                  <ref role="37wK5l" node="3Co8b0rNyy5" resolve="listFeatures" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -2313,25 +2376,13 @@
               <node concept="1bVj0M" id="1GNw78$s22F" role="23t8la">
                 <node concept="3clFbS" id="1GNw78$s22G" role="1bW5cS">
                   <node concept="3clFbF" id="1GNw78$s22H" role="3cqZAp">
-                    <node concept="22lmx$" id="5YVpdhev4y1" role="3clFbG">
-                      <node concept="2OqwBi" id="1GNw78$s22I" role="3uHU7B">
-                        <node concept="37vLTw" id="1GNw78$s22J" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1GNw78$s22M" resolve="it" />
-                        </node>
-                        <node concept="1mIQ4w" id="1GNw78$s22K" role="2OqNvi">
-                          <node concept="chp4Y" id="JOGAOsxSP6" role="cj9EA">
-                            <ref role="cht4Q" to="wq2x:JOGAOsxpXw" resolve="ListFeature" />
-                          </node>
-                        </node>
+                    <node concept="2OqwBi" id="5YVpdhev4Hh" role="3clFbG">
+                      <node concept="37vLTw" id="5YVpdhev4Hi" role="2Oq$k0">
+                        <ref role="3cqZAo" node="1GNw78$s22M" resolve="it" />
                       </node>
-                      <node concept="2OqwBi" id="5YVpdhev4Hh" role="3uHU7w">
-                        <node concept="37vLTw" id="5YVpdhev4Hi" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1GNw78$s22M" resolve="it" />
-                        </node>
-                        <node concept="1mIQ4w" id="5YVpdhev4Hj" role="2OqNvi">
-                          <node concept="chp4Y" id="JOGAOsxT7n" role="cj9EA">
-                            <ref role="cht4Q" to="wq2x:JOGAOsxm2z" resolve="ChildFeature" />
-                          </node>
+                      <node concept="1mIQ4w" id="5YVpdhev4Hj" role="2OqNvi">
+                        <node concept="chp4Y" id="JOGAOsxT7n" role="cj9EA">
+                          <ref role="cht4Q" to="wq2x:JOGAOsxm2z" resolve="ChildFeature" />
                         </node>
                       </node>
                     </node>
@@ -2347,6 +2398,49 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="3Co8b0rNyy5" role="13h7CS">
+      <property role="TrG5h" value="listFeatures" />
+      <node concept="3Tm1VV" id="3Co8b0rNyy6" role="1B3o_S" />
+      <node concept="A3Dl8" id="3Co8b0rNyy7" role="3clF45">
+        <node concept="3Tqbb2" id="3Co8b0rNyy8" role="A3Ik2">
+          <ref role="ehGHo" to="wq2x:JOGAOsxiL_" resolve="TermFeature" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3Co8b0rNyy9" role="3clF47">
+        <node concept="3cpWs6" id="3Co8b0rNyya" role="3cqZAp">
+          <node concept="2OqwBi" id="3Co8b0rNyyb" role="3cqZAk">
+            <node concept="2OqwBi" id="3Co8b0rNyyc" role="2Oq$k0">
+              <node concept="13iPFW" id="3Co8b0rNyyd" role="2Oq$k0" />
+              <node concept="3Tsc0h" id="3Co8b0rNyye" role="2OqNvi">
+                <ref role="3TtcxE" to="wq2x:JOGAOsxiLz" resolve="feature" />
+              </node>
+            </node>
+            <node concept="3zZkjj" id="3Co8b0rNyyf" role="2OqNvi">
+              <node concept="1bVj0M" id="3Co8b0rNyyg" role="23t8la">
+                <node concept="3clFbS" id="3Co8b0rNyyh" role="1bW5cS">
+                  <node concept="3clFbF" id="3Co8b0rNyyi" role="3cqZAp">
+                    <node concept="2OqwBi" id="3Co8b0rNyyk" role="3clFbG">
+                      <node concept="37vLTw" id="3Co8b0rNyyl" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3Co8b0rNyys" resolve="it" />
+                      </node>
+                      <node concept="1mIQ4w" id="3Co8b0rNyym" role="2OqNvi">
+                        <node concept="chp4Y" id="3Co8b0rNyyn" role="cj9EA">
+                          <ref role="cht4Q" to="wq2x:JOGAOsxpXw" resolve="ListFeature" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="3Co8b0rNyys" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="3Co8b0rNyyt" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="13hLZK" id="JOGAOsxlgY" role="13h7CW">
       <node concept="3clFbS" id="JOGAOsxlgZ" role="2VODD2" />
     </node>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
index 6963d1e5..fd957ec7 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
@@ -79,6 +79,9 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
@@ -128,9 +131,6 @@
         <child id="1177093586806" name="templateNode" index="gfFT$" />
       </concept>
       <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
-      <concept id="1168559512253" name="jetbrains.mps.lang.generator.structure.DismissTopMappingRule" flags="lg" index="j$LIH">
-        <child id="1169669152123" name="generatorMessage" index="1lHHLF" />
-      </concept>
       <concept id="1168619357332" name="jetbrains.mps.lang.generator.structure.RootTemplateAnnotation" flags="lg" index="n94m4">
         <reference id="1168619429071" name="applicableConcept" index="n9lRv" />
       </concept>
@@ -181,10 +181,6 @@
       <concept id="1167514355419" name="jetbrains.mps.lang.generator.structure.Root_MappingRule" flags="lg" index="3lhOvk">
         <reference id="1167514355421" name="template" index="3lhOvi" />
       </concept>
-      <concept id="1169670156577" name="jetbrains.mps.lang.generator.structure.GeneratorMessage" flags="lg" index="1lLz0L">
-        <property id="1169670173015" name="messageText" index="1lLB17" />
-        <property id="1169670356567" name="messageType" index="1lMjX7" />
-      </concept>
       <concept id="1131073187192" name="jetbrains.mps.lang.generator.structure.MapSrcNodeMacro" flags="ln" index="1pdMLZ">
         <child id="1225229330048" name="postMapperFunction" index="15mYut" />
       </concept>
@@ -252,9 +248,20 @@
         <reference id="8829335963593822893" name="declaration" index="a7OzE" />
       </concept>
       <concept id="8829335963591572611" name="jetbrains.mps.logic.structure.LogicalVariableDeclaration" flags="ng" index="aZer4" />
+      <concept id="6856711987710888499" name="jetbrains.mps.logic.structure.DataNodeLiteral" flags="ng" index="Hz6ka">
+        <child id="6856711987710888500" name="root" index="Hz6kd" />
+      </concept>
+      <concept id="2105510410850132386" name="jetbrains.mps.logic.structure.ListNode" flags="ng" index="KCUsM" />
+      <concept id="960803923479540328" name="jetbrains.mps.logic.structure.LogicalVariableDataForm" flags="ng" index="3wAshV">
+        <child id="960803923479549586" name="variable" index="3wAq21" />
+      </concept>
       <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
         <child id="8713947027062064784" name="logical" index="1FtiSR" />
       </concept>
+      <concept id="1432138691741609740" name="jetbrains.mps.logic.structure.ConsListNode" flags="ng" index="1Pxxm1">
+        <child id="1432138691741609741" name="head" index="1Pxxm0" />
+        <child id="1432138691741609743" name="tail" index="1Pxxm2" />
+      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@@ -271,6 +278,7 @@
         <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" />
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
         <child id="6750920497477046361" name="conceptArgument" index="3MHsoP" />
       </concept>
@@ -316,7 +324,14 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
+      <concept id="1172650591544" name="jetbrains.mps.baseLanguage.collections.structure.SkipOperation" flags="nn" index="7r0gD">
+        <child id="1172658456740" name="elementsToSkip" index="7T0AP" />
+      </concept>
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <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" />
@@ -368,6 +383,7 @@
       <concept id="6533016889629821361" name="jetbrains.mps.lang.coderules.structure.QueryTable" flags="ng" index="KEFAe">
         <child id="6533016889629824446" name="query" index="KEEm1" />
       </concept>
+      <concept id="5042557354438383712" name="jetbrains.mps.lang.coderules.structure.TermListType" flags="ig" index="VbTHi" />
       <concept id="2381360340662937504" name="jetbrains.mps.lang.coderules.structure.TermType" flags="ig" index="32pEOW" />
       <concept id="6097203247164180547" name="jetbrains.mps.lang.coderules.structure.ExpandMacroParameterReference" flags="ng" index="3i2tpf">
         <reference id="6097203247164235646" name="declaration" index="3i285M" />
@@ -408,6 +424,9 @@
         <reference id="6097203247185614710" name="declaration" index="3jhG_U" />
         <child id="6097203247185614708" name="argument" index="3jhG_S" />
       </concept>
+      <concept id="4957570047287105024" name="jetbrains.mps.lang.coderules.structure.FailConstraint" flags="ng" index="1lpGmL">
+        <child id="4957570047287138243" name="message" index="1lp$hM" />
+      </concept>
       <concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
         <child id="4814011019633607808" name="parameter" index="0Rg$4" />
         <child id="3575255234174969659" name="guard" index="1nLNMa" />
@@ -460,6 +479,9 @@
       <concept id="2316688792938825384" name="jetbrains.mps.lang.coderules.structure.LogicalClauseList" flags="ng" index="3I6sU6">
         <child id="2316688792938825385" name="clauses" index="3I6sU7" />
       </concept>
+      <concept id="2316688792939428589" name="jetbrains.mps.lang.coderules.structure.TemplateLogicalClause" flags="ng" index="3IrJb3">
+        <child id="2316688792939428590" name="code" index="3IrJb0" />
+      </concept>
       <concept id="5092612813123973086" name="jetbrains.mps.lang.coderules.structure.CustomSessionParameter" flags="ng" index="1ItZu1">
         <child id="5092612813124334287" name="key" index="1Ij6Eg" />
       </concept>
@@ -868,12 +890,6 @@
     </node>
     <node concept="3aamgX" id="4qGA5WCJsFK" role="3acgRq">
       <ref role="30HIoZ" to="zfi7:1vAI4X$MkW8" resolve="FeatureReferenceExpression" />
-      <node concept="j$LIH" id="4qGA5WCJtmY" role="1lVwrX">
-        <node concept="1lLz0L" id="4qGA5WCJtpi" role="1lHHLF">
-          <property role="1lMjX7" value="h1lM37o/error" />
-          <property role="1lLB17" value="not supported" />
-        </node>
-      </node>
       <node concept="30G5F_" id="1PN9XOGEUvS" role="30HLyM">
         <node concept="3clFbS" id="1PN9XOGEUvT" role="2VODD2">
           <node concept="3clFbF" id="1PN9XOGEUwf" role="3cqZAp">
@@ -893,6 +909,56 @@
           </node>
         </node>
       </node>
+      <node concept="1Koe21" id="3Co8b0rRSHw" role="1lVwrX">
+        <node concept="1nLNMm" id="3Co8b0rRSHx" role="1Koe22">
+          <node concept="3NuqgR" id="3Co8b0rRSHy" role="0Rg$4">
+            <node concept="aZer4" id="3Co8b0rRSHz" role="3XD1gS">
+              <property role="TrG5h" value="Var" />
+            </node>
+            <node concept="3uibUv" id="3Co8b0rRSH$" role="3vLBG7">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
+          <node concept="3xSepi" id="3Co8b0rRSH_" role="3xSepv">
+            <node concept="3Aq9E8" id="3Co8b0rRSHA" role="3xSepj">
+              <node concept="3I6sU6" id="3Co8b0rRSHB" role="3Ip0Jz">
+                <node concept="3I6s7M" id="3Co8b0rRSHC" role="3I6sU7">
+                  <node concept="3wWvb2" id="3Co8b0rRSHD" role="3I6s78">
+                    <node concept="1Ft4W6" id="3Co8b0rRSHE" role="3wWo3s">
+                      <node concept="a7P8L" id="3Co8b0rRSHF" role="1FtiSR">
+                        <ref role="a7OzE" node="3Co8b0rRSHz" resolve="Var" />
+                        <node concept="1ZhdrF" id="3Co8b0rRSHG" role="lGtFl">
+                          <property role="2qtEX8" value="declaration" />
+                          <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
+                          <node concept="3$xsQk" id="3Co8b0rRSHH" role="3$ytzL">
+                            <node concept="3clFbS" id="3Co8b0rRSHI" role="2VODD2">
+                              <node concept="3clFbF" id="3Co8b0rRSHJ" role="3cqZAp">
+                                <node concept="2OqwBi" id="3Co8b0rRSHK" role="3clFbG">
+                                  <node concept="1iwH7S" id="3Co8b0rRSHL" role="2Oq$k0" />
+                                  <node concept="1iwH70" id="3Co8b0rRSHM" role="2OqNvi">
+                                    <ref role="1iwH77" node="1PN9XOGEAUt" resolve="feature_node" />
+                                    <node concept="2OqwBi" id="3Co8b0rRSHN" role="1iwH7V">
+                                      <node concept="30H73N" id="3Co8b0rRSHO" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="3Co8b0rRSHP" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="zfi7:1vAI4X$MlAp" resolve="feature" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="raruj" id="3Co8b0rRSHQ" role="lGtFl" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="3aamgX" id="4qGA5WCG_7q" role="3acgRq">
       <ref role="30HIoZ" to="zfi7:4qGA5WCG3z$" resolve="AssignTypePseudoConstraint" />
@@ -1170,6 +1236,220 @@
   </node>
   <node concept="AVZre" id="j$DTRidoLS">
     <property role="TrG5h" value="_RecoverType_Default_" />
+    <node concept="1nLNMY" id="uhKQGLhaJN" role="1nK1Vg">
+      <property role="TrG5h" value="recover_list" />
+      <node concept="3clFbS" id="uhKQGLhaJO" role="1nLNMH">
+        <node concept="1nLNNL" id="6N2bvv_l2PD" role="3cqZAp">
+          <node concept="1nLNMm" id="6N2bvv_l2PF" role="1nLNNK">
+            <node concept="3Aq93q" id="6N2bvv_l2Rd" role="1nLNMb">
+              <node concept="3I6sU6" id="6N2bvv_l2Re" role="3Ip0Jz">
+                <node concept="3I6s7M" id="6N2bvv_l2RH" role="3I6sU7">
+                  <node concept="3Aqt3T" id="6N2bvv_l2RG" role="3I6s78">
+                    <ref role="3AqCNq" node="6N2bvv_l2qf" resolve="recoverList" />
+                    <node concept="a7P8L" id="6N2bvv_l30i" role="3AunhB">
+                      <ref role="a7OzE" node="6N2bvv_l2nb" resolve="Nodes" />
+                    </node>
+                    <node concept="1HFMs5" id="6N2bvv_l35R" role="3AunhB">
+                      <node concept="a7P8L" id="6N2bvv_l35M" role="1uarlU">
+                        <ref role="a7OzE" node="6N2bvv_l2mG" resolve="Terms" />
+                      </node>
+                      <node concept="Hz6ka" id="2rIdnPwt5Wz" role="1uarlW">
+                        <node concept="KCUsM" id="2rIdnPwt5Yf" role="Hz6kd" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="6N2bvv_l2na" role="0Rg$4">
+              <node concept="aZer4" id="6N2bvv_l2nb" role="3XD1gS">
+                <property role="TrG5h" value="Nodes" />
+              </node>
+              <node concept="2I9FWS" id="6N2bvv_l2nF" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6N2bvv_l32z" role="0Rg$4">
+              <node concept="aZer4" id="6N2bvv_l2mG" role="3XD1gS">
+                <property role="TrG5h" value="Terms" />
+              </node>
+              <node concept="32pEOW" id="24ciDNzxNFd" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6N2bvv_u3u6" role="0Rg$4">
+              <node concept="aZer4" id="6N2bvv_u3u7" role="3XD1gS">
+                <property role="TrG5h" value="X" />
+              </node>
+              <node concept="32pEOW" id="24ciDNzxNFe" role="3vLBG7" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6N2bvv_l2SC" role="3cqZAp" />
+        <node concept="1nLNNL" id="6N2bvv_l2kG" role="3cqZAp">
+          <node concept="1nLNMm" id="6N2bvv_l2kI" role="1nLNNK">
+            <node concept="3Aq93q" id="6N2bvv_l2lI" role="1nLNMb">
+              <node concept="3I6sU6" id="6N2bvv_l2lJ" role="3Ip0Jz">
+                <node concept="3I6s7M" id="6N2bvv_l2z8" role="3I6sU7">
+                  <node concept="3Aqt3T" id="6N2bvv_l2z7" role="3I6s78">
+                    <ref role="3AqCNq" node="6N2bvv_l2qf" resolve="recoverList" />
+                    <node concept="a7P8L" id="6N2bvv_l2$$" role="3AunhB">
+                      <ref role="a7OzE" node="5TXeSYSHy4s" resolve="Nodes" />
+                    </node>
+                    <node concept="1HFMs5" id="2rIdnPwt61u" role="3AunhB">
+                      <node concept="a7P8L" id="2rIdnPwt61v" role="1uarlU">
+                        <ref role="a7OzE" node="5TXeSYSHy4v" resolve="Terms" />
+                      </node>
+                      <node concept="Hz6ka" id="2rIdnPwt65e" role="1uarlW">
+                        <node concept="1Pxxm1" id="7L5omgek1kU" role="Hz6kd">
+                          <node concept="3wAshV" id="3zXFZnUhsNd" role="1Pxxm0">
+                            <node concept="a7P8L" id="2rIdnPwt68A" role="3wAq21">
+                              <ref role="a7OzE" node="6N2bvv_l2E6" resolve="T" />
+                            </node>
+                          </node>
+                          <node concept="3wAshV" id="3zXFZnUhsNe" role="1Pxxm2">
+                            <node concept="a7P8L" id="2rIdnPwt6c0" role="3wAq21">
+                              <ref role="a7OzE" node="6N2bvv_l2Kl" resolve="Tail" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="6N2bvv_l2mF" role="0Rg$4">
+              <node concept="aZer4" id="6N2bvv_l2E6" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="32pEOW" id="24ciDNzxNFf" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="2J$kxDHrgzk" role="0Rg$4">
+              <node concept="aZer4" id="2J$kxDHrgzl" role="3XD1gS">
+                <property role="TrG5h" value="Node" />
+              </node>
+              <node concept="3Tqbb2" id="2J$kxDHrgzw" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="6N2bvv_l2Kk" role="0Rg$4">
+              <node concept="aZer4" id="6N2bvv_l2Kl" role="3XD1gS">
+                <property role="TrG5h" value="Tail" />
+              </node>
+              <node concept="VbTHi" id="7L5omgek2tj" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="5TXeSYSHy4r" role="0Rg$4">
+              <node concept="aZer4" id="5TXeSYSHy4s" role="3XD1gS">
+                <property role="TrG5h" value="Nodes" />
+              </node>
+              <node concept="2I9FWS" id="5TXeSYSHy4t" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="5TXeSYSHy4u" role="0Rg$4">
+              <node concept="aZer4" id="5TXeSYSHy4v" role="3XD1gS">
+                <property role="TrG5h" value="Terms" />
+              </node>
+              <node concept="32pEOW" id="24ciDNzxNFg" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="5TXeSYSHy4w" role="0Rg$4">
+              <node concept="aZer4" id="5TXeSYSHy4x" role="3XD1gS">
+                <property role="TrG5h" value="X" />
+              </node>
+              <node concept="32pEOW" id="24ciDNzxNFh" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="6E2cNicdiky" role="3xSepv">
+              <node concept="3Aq9E8" id="6N2bvv_pZTM" role="3xSepj">
+                <node concept="3I6sU6" id="6N2bvv_pZTN" role="3Ip0Jz">
+                  <node concept="3IrJb3" id="6N2bvv_pZUI" role="3I6sU7">
+                    <node concept="3clFbS" id="6N2bvv_pZUJ" role="3IrJb0">
+                      <node concept="3Aqczg" id="6N2bvv_pZWY" role="3cqZAp">
+                        <node concept="3Aqt3T" id="6N2bvv_pZWX" role="3Aqpz8">
+                          <ref role="3AqCNq" node="7lmP5gAtUEL" resolve="__recoverType__" />
+                          <node concept="a7P8L" id="2J$kxDHrgzR" role="3AunhB">
+                            <ref role="a7OzE" node="2J$kxDHrgzl" resolve="Node" />
+                          </node>
+                          <node concept="a7P8L" id="6N2bvv_l3a3" role="3AunhB">
+                            <ref role="a7OzE" node="6N2bvv_l2E6" resolve="T" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3Aqczg" id="6N2bvv_pZZZ" role="3cqZAp">
+                        <node concept="3wWvb2" id="6N2bvv_pZZX" role="3Aqpz8">
+                          <node concept="2OqwBi" id="6N2bvv_q03k" role="3wWo3s">
+                            <node concept="TSZUe" id="6N2bvv_q03o" role="2OqNvi">
+                              <node concept="1Ft4W6" id="7zIaaskbYIq" role="25WWJ7">
+                                <node concept="a7P8L" id="2J$kxDHrgG4" role="1FtiSR">
+                                  <ref role="a7OzE" node="2J$kxDHrgzl" resolve="Node" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="1Ft4W6" id="7zIaaskbYIp" role="2Oq$k0">
+                              <node concept="a7P8L" id="6N2bvv_q03n" role="1FtiSR">
+                                <ref role="a7OzE" node="5TXeSYSHy4s" resolve="Nodes" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3Aqczg" id="6N2bvv_q0$6" role="3cqZAp">
+                        <node concept="3Aqt3T" id="6N2bvv_q0$4" role="3Aqpz8">
+                          <ref role="3AqCNq" node="6N2bvv_l2qf" resolve="recoverList" />
+                          <node concept="a7P8L" id="6N2bvv_l9pS" role="3AunhB">
+                            <ref role="a7OzE" node="5TXeSYSHy4s" resolve="Nodes" />
+                          </node>
+                          <node concept="a7P8L" id="4UXp0cuMXGy" role="3AunhB">
+                            <ref role="a7OzE" node="6N2bvv_l2Kl" resolve="Tail" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="RZQG98EwC_" role="3cqZAp" />
+        <node concept="1nLNNL" id="RZQG98Ewrg" role="3cqZAp">
+          <node concept="1nLNMm" id="RZQG98Ewrh" role="1nLNNK">
+            <node concept="3Aq93q" id="RZQG98Ewri" role="1nLNMb">
+              <node concept="3I6sU6" id="RZQG98Ewrj" role="3Ip0Jz">
+                <node concept="3I6s7M" id="RZQG98Ewrk" role="3I6sU7">
+                  <node concept="3Aqt3T" id="RZQG98Ewrl" role="3I6s78">
+                    <ref role="3AqCNq" node="6N2bvv_l2qf" resolve="recoverList" />
+                    <node concept="a7P8L" id="2J$kxDHrfAi" role="3AunhB">
+                      <ref role="a7OzE" node="5TXeSYSHyqv" resolve="Nodes" />
+                    </node>
+                    <node concept="a7P8L" id="2J$kxDHrfC3" role="3AunhB">
+                      <ref role="a7OzE" node="5TXeSYSHyqy" resolve="Terms" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="5TXeSYSHyqu" role="0Rg$4">
+              <node concept="aZer4" id="5TXeSYSHyqv" role="3XD1gS">
+                <property role="TrG5h" value="Nodes" />
+              </node>
+              <node concept="2I9FWS" id="5TXeSYSHyqw" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="5TXeSYSHyqx" role="0Rg$4">
+              <node concept="aZer4" id="5TXeSYSHyqy" role="3XD1gS">
+                <property role="TrG5h" value="Terms" />
+              </node>
+              <node concept="32pEOW" id="24ciDNzxNFi" role="3vLBG7" />
+            </node>
+            <node concept="3xSepi" id="6E2cNicdikz" role="3xSepv">
+              <node concept="3Aq9E8" id="RZQG98EwF0" role="3xSepj">
+                <node concept="3I6sU6" id="RZQG98EwF1" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="RZQG98EwF6" role="3I6sU7">
+                    <node concept="1lpGmL" id="RZQG98EwF4" role="3I6s78">
+                      <node concept="Xl_RD" id="RZQG98EwFa" role="1lp$hM">
+                        <property role="Xl_RC" value="list expected" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="12QmIo_7sgp" role="1nK1Vg">
       <property role="TrG5h" value="recover_catchall" />
       <node concept="3clFbS" id="12QmIo_7sgq" role="1nLNMH">
@@ -1330,6 +1610,16 @@
         <node concept="32pEOW" id="7lmP5gAtUF5" role="3gTf24" />
       </node>
     </node>
+    <node concept="3AqmO8" id="6N2bvv_l2qf" role="8PkJo">
+      <property role="TrG5h" value="__recoverList__" />
+      <node concept="1zAUYm" id="6N2bvv_l2sV" role="1zAUyy">
+        <property role="TrG5h" value="nlist" />
+        <node concept="2I9FWS" id="6N2bvv_l2wu" role="3gTf24" />
+      </node>
+      <node concept="1zAUYm" id="6N2bvv_l2wW" role="1zAUyy">
+        <property role="TrG5h" value="terms" />
+      </node>
+    </node>
     <node concept="n94m4" id="j$DTRidoLT" role="lGtFl" />
   </node>
   <node concept="AVZre" id="7lmP5gAu4Fv">
@@ -1567,7 +1857,7 @@
                                         </node>
                                       </node>
                                       <node concept="2qgKlT" id="1vAI4X$KUNR" role="2OqNvi">
-                                        <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
+                                        <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
                                       </node>
                                     </node>
                                   </node>
@@ -1606,6 +1896,59 @@
                               </node>
                             </node>
                           </node>
+                          <node concept="nsMwS" id="3Co8b0rOuaU" role="ns1xD">
+                            <ref role="nsMwP" node="1vAI4X$Ks9c" resolve="_children" />
+                            <node concept="1WS0z7" id="3Co8b0rOuaV" role="lGtFl">
+                              <node concept="3JmXsc" id="3Co8b0rOuaW" role="3Jn$fo">
+                                <node concept="3clFbS" id="3Co8b0rOuaX" role="2VODD2">
+                                  <node concept="3clFbF" id="3Co8b0rOuaY" role="3cqZAp">
+                                    <node concept="2OqwBi" id="3Co8b0rOuaZ" role="3clFbG">
+                                      <node concept="2OqwBi" id="3Co8b0rOub0" role="2Oq$k0">
+                                        <node concept="30H73N" id="3Co8b0rOub1" role="2Oq$k0" />
+                                        <node concept="2qgKlT" id="3Co8b0rOub2" role="2OqNvi">
+                                          <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
+                                        </node>
+                                      </node>
+                                      <node concept="2qgKlT" id="3Co8b0rOub3" role="2OqNvi">
+                                        <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="1ZhdrF" id="3Co8b0rOub4" role="lGtFl">
+                              <property role="2qtEX8" value="feature" />
+                              <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/861509610434435669/861509610434435672" />
+                              <node concept="3$xsQk" id="3Co8b0rOub5" role="3$ytzL">
+                                <node concept="3clFbS" id="3Co8b0rOub6" role="2VODD2">
+                                  <node concept="3clFbF" id="3Co8b0rOub7" role="3cqZAp">
+                                    <node concept="30H73N" id="3Co8b0rOub8" role="3clFbG" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="a7P8L" id="3Co8b0rOub9" role="iSaTp">
+                              <ref role="a7OzE" node="3Co8b0rOkRQ" resolve="Children" />
+                              <node concept="1ZhdrF" id="3Co8b0rOwpW" role="lGtFl">
+                                <property role="2qtEX8" value="declaration" />
+                                <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
+                                <node concept="3$xsQk" id="3Co8b0rOwpX" role="3$ytzL">
+                                  <node concept="3clFbS" id="3Co8b0rOwpY" role="2VODD2">
+                                    <node concept="3clFbF" id="3Co8b0rOubd" role="3cqZAp">
+                                      <node concept="2OqwBi" id="3Co8b0rOube" role="3clFbG">
+                                        <node concept="1iwH7S" id="3Co8b0rOubf" role="2Oq$k0" />
+                                        <node concept="1iwH70" id="3Co8b0rOubg" role="2OqNvi">
+                                          <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
+                                          <node concept="30H73N" id="3Co8b0rOubh" role="1iwH7V" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
                           <node concept="1ZhdrF" id="1vAI4X$KyZN" role="lGtFl">
                             <property role="2qtEX8" value="decl" />
                             <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/861509610434242029/861509610434243078" />
@@ -1697,7 +2040,7 @@
                               </node>
                             </node>
                             <node concept="2qgKlT" id="1PN9XOGEGqX" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
+                              <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
                             </node>
                           </node>
                         </node>
@@ -1740,7 +2083,7 @@
                               </node>
                             </node>
                             <node concept="2qgKlT" id="1PN9XOGEGeE" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
+                              <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
                             </node>
                           </node>
                           <node concept="3GX2aA" id="1PN9XOGEGeF" role="2OqNvi" />
@@ -1766,7 +2109,7 @@
                               </node>
                             </node>
                             <node concept="2qgKlT" id="1vAI4X$L6dG" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
+                              <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
                             </node>
                           </node>
                         </node>
@@ -1804,7 +2147,7 @@
                               </node>
                             </node>
                             <node concept="2qgKlT" id="1vAI4X$L_Ft" role="2OqNvi">
-                              <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
+                              <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
                             </node>
                           </node>
                           <node concept="3GX2aA" id="1vAI4X$LATj" role="2OqNvi" />
@@ -1814,6 +2157,139 @@
                   </node>
                 </node>
               </node>
+              <node concept="3NuqgR" id="3Co8b0rOgiw" role="0Rg$4">
+                <node concept="aZer4" id="3Co8b0rOgix" role="3XD1gS">
+                  <property role="TrG5h" value="ChildrenTypes" />
+                  <node concept="1WS0z7" id="3Co8b0rOgiy" role="lGtFl">
+                    <ref role="2rW$FS" node="1PN9XOGEAUt" resolve="feature_node" />
+                    <node concept="3JmXsc" id="3Co8b0rOgiz" role="3Jn$fo">
+                      <node concept="3clFbS" id="3Co8b0rOgi$" role="2VODD2">
+                        <node concept="3clFbF" id="3Co8b0rOgi_" role="3cqZAp">
+                          <node concept="2OqwBi" id="3Co8b0rOgiA" role="3clFbG">
+                            <node concept="2OqwBi" id="3Co8b0rOgiB" role="2Oq$k0">
+                              <node concept="30H73N" id="3Co8b0rOgiC" role="2Oq$k0" />
+                              <node concept="2qgKlT" id="3Co8b0rOgiD" role="2OqNvi">
+                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
+                              </node>
+                            </node>
+                            <node concept="2qgKlT" id="3Co8b0rOgiE" role="2OqNvi">
+                              <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="17Uvod" id="3Co8b0rOgiF" role="lGtFl">
+                    <property role="2qtEX9" value="name" />
+                    <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                    <node concept="3zFVjK" id="3Co8b0rOgiG" role="3zH0cK">
+                      <node concept="3clFbS" id="3Co8b0rOgiH" role="2VODD2">
+                        <node concept="3clFbF" id="3Co8b0rOgiI" role="3cqZAp">
+                          <node concept="3cpWs3" id="3Co8b0rOgiJ" role="3clFbG">
+                            <node concept="Xl_RD" id="3Co8b0rOgiK" role="3uHU7w">
+                              <property role="Xl_RC" value="Types" />
+                            </node>
+                            <node concept="2OqwBi" id="3Co8b0rOgiL" role="3uHU7B">
+                              <node concept="30H73N" id="3Co8b0rOgiM" role="2Oq$k0" />
+                              <node concept="3TrcHB" id="3Co8b0rOgiN" role="2OqNvi">
+                                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2I9FWS" id="3Co8b0rOhqF" role="3vLBG7" />
+                <node concept="1W57fq" id="3Co8b0rOgiP" role="lGtFl">
+                  <node concept="3IZrLx" id="3Co8b0rOgiQ" role="3IZSJc">
+                    <node concept="3clFbS" id="3Co8b0rOgiR" role="2VODD2">
+                      <node concept="3clFbF" id="3Co8b0rOgiS" role="3cqZAp">
+                        <node concept="2OqwBi" id="3Co8b0rOgiT" role="3clFbG">
+                          <node concept="2OqwBi" id="3Co8b0rOgiU" role="2Oq$k0">
+                            <node concept="2OqwBi" id="3Co8b0rOgiV" role="2Oq$k0">
+                              <node concept="30H73N" id="3Co8b0rOgiW" role="2Oq$k0" />
+                              <node concept="2qgKlT" id="3Co8b0rOgiX" role="2OqNvi">
+                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
+                              </node>
+                            </node>
+                            <node concept="2qgKlT" id="3Co8b0rOgiY" role="2OqNvi">
+                              <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                            </node>
+                          </node>
+                          <node concept="3GX2aA" id="3Co8b0rOgiZ" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3NuqgR" id="3Co8b0rOkRP" role="0Rg$4">
+                <node concept="aZer4" id="3Co8b0rOkRQ" role="3XD1gS">
+                  <property role="TrG5h" value="Children" />
+                  <node concept="1WS0z7" id="3Co8b0rOkRR" role="lGtFl">
+                    <ref role="2rW$FS" node="1vAI4X$KXom" resolve="feature_logical" />
+                    <node concept="3JmXsc" id="3Co8b0rOkRS" role="3Jn$fo">
+                      <node concept="3clFbS" id="3Co8b0rOkRT" role="2VODD2">
+                        <node concept="3clFbF" id="3Co8b0rOkRU" role="3cqZAp">
+                          <node concept="2OqwBi" id="3Co8b0rOkRV" role="3clFbG">
+                            <node concept="2OqwBi" id="3Co8b0rOkRW" role="2Oq$k0">
+                              <node concept="30H73N" id="3Co8b0rOkRX" role="2Oq$k0" />
+                              <node concept="2qgKlT" id="3Co8b0rOkRY" role="2OqNvi">
+                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
+                              </node>
+                            </node>
+                            <node concept="2qgKlT" id="3Co8b0rOkRZ" role="2OqNvi">
+                              <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="17Uvod" id="3Co8b0rOkS0" role="lGtFl">
+                    <property role="2qtEX9" value="name" />
+                    <property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
+                    <node concept="3zFVjK" id="3Co8b0rOkS1" role="3zH0cK">
+                      <node concept="3clFbS" id="3Co8b0rOkS2" role="2VODD2">
+                        <node concept="3clFbF" id="3Co8b0rOkS3" role="3cqZAp">
+                          <node concept="2OqwBi" id="3Co8b0rOkS4" role="3clFbG">
+                            <node concept="30H73N" id="3Co8b0rOkS5" role="2Oq$k0" />
+                            <node concept="3TrcHB" id="3Co8b0rOkS6" role="2OqNvi">
+                              <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="VbTHi" id="3Co8b0rQgAp" role="3vLBG7" />
+                <node concept="1W57fq" id="3Co8b0rOkS8" role="lGtFl">
+                  <node concept="3IZrLx" id="3Co8b0rOkS9" role="3IZSJc">
+                    <node concept="3clFbS" id="3Co8b0rOkSa" role="2VODD2">
+                      <node concept="3clFbF" id="3Co8b0rOkSb" role="3cqZAp">
+                        <node concept="2OqwBi" id="3Co8b0rOkSc" role="3clFbG">
+                          <node concept="2OqwBi" id="3Co8b0rOkSd" role="2Oq$k0">
+                            <node concept="2OqwBi" id="3Co8b0rOkSe" role="2Oq$k0">
+                              <node concept="30H73N" id="3Co8b0rOkSf" role="2Oq$k0" />
+                              <node concept="2qgKlT" id="3Co8b0rOkSg" role="2OqNvi">
+                                <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
+                              </node>
+                            </node>
+                            <node concept="2qgKlT" id="3Co8b0rOkSh" role="2OqNvi">
+                              <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
+                            </node>
+                          </node>
+                          <node concept="3GX2aA" id="3Co8b0rOkSi" role="2OqNvi" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
               <node concept="3NuqgR" id="1vAI4X$VNo5" role="0Rg$4">
                 <node concept="aZer4" id="1vAI4X$VNo6" role="3XD1gS">
                   <property role="TrG5h" value="Value" />
@@ -2024,7 +2500,117 @@
                                   </node>
                                 </node>
                                 <node concept="2qgKlT" id="1PN9XOGEJkE" role="2OqNvi">
-                                  <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
+                                  <ref role="37wK5l" to="x5bw:3Co8b0rO8iu" resolve="childFeatures" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3Aq9E8" id="3Co8b0rOTSn" role="3xSepj">
+                  <node concept="3I6sU6" id="3Co8b0rOTSo" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="3Co8b0rOTSp" role="3I6sU7">
+                      <node concept="3Aqt3T" id="3Co8b0rOTSq" role="3I6s78">
+                        <ref role="3AqCNq" node="6N2bvv_l2qf" resolve="__recoverList__" />
+                        <node concept="a7P8L" id="3Co8b0rOTSr" role="3AunhB">
+                          <ref role="a7OzE" node="3Co8b0rOgix" resolve="ChildrenTypes" />
+                          <node concept="1ZhdrF" id="3Co8b0rOTSs" role="lGtFl">
+                            <property role="2qtEX8" value="declaration" />
+                            <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
+                            <node concept="3$xsQk" id="3Co8b0rOTSt" role="3$ytzL">
+                              <node concept="3clFbS" id="3Co8b0rOTSu" role="2VODD2">
+                                <node concept="3clFbF" id="3Co8b0rOTSv" role="3cqZAp">
+                                  <node concept="2OqwBi" id="3Co8b0rOTSw" role="3clFbG">
+                                    <node concept="1iwH7S" id="3Co8b0rOTSx" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="3Co8b0rOTSy" role="2OqNvi">
+                                      <ref role="1iwH77" node="1PN9XOGEAUt" resolve="feature_node" />
+                                      <node concept="30H73N" id="3Co8b0rOTSz" role="1iwH7V" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="a7P8L" id="3Co8b0rOTS$" role="3AunhB">
+                          <ref role="a7OzE" node="3Co8b0rOkRQ" resolve="Children" />
+                          <node concept="1ZhdrF" id="3Co8b0rOTS_" role="lGtFl">
+                            <property role="2qtEX8" value="declaration" />
+                            <property role="P3scX" value="35320f26-77cb-4c55-be9f-a97a27770af1/8829335963593820278/8829335963593822893" />
+                            <node concept="3$xsQk" id="3Co8b0rOTSA" role="3$ytzL">
+                              <node concept="3clFbS" id="3Co8b0rOTSB" role="2VODD2">
+                                <node concept="3clFbF" id="3Co8b0rOTSC" role="3cqZAp">
+                                  <node concept="2OqwBi" id="3Co8b0rOTSD" role="3clFbG">
+                                    <node concept="1iwH7S" id="3Co8b0rOTSE" role="2Oq$k0" />
+                                    <node concept="1iwH70" id="3Co8b0rOTSF" role="2OqNvi">
+                                      <ref role="1iwH77" node="1vAI4X$KXom" resolve="feature_logical" />
+                                      <node concept="30H73N" id="3Co8b0rOTSG" role="1iwH7V" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1ZhdrF" id="3Co8b0rOTSH" role="lGtFl">
+                          <property role="2qtEX8" value="template" />
+                          <property role="P3scX" value="c4803b19-6d89-4a3b-bf82-390769514add/7368070394767045637/7368070394767091750" />
+                          <node concept="3$xsQk" id="3Co8b0rOTSI" role="3$ytzL">
+                            <node concept="3clFbS" id="3Co8b0rOTSJ" role="2VODD2">
+                              <node concept="3cpWs8" id="3Co8b0rOTSK" role="3cqZAp">
+                                <node concept="3cpWsn" id="3Co8b0rOTSL" role="3cpWs9">
+                                  <property role="TrG5h" value="rlist" />
+                                  <node concept="3Tqbb2" id="3Co8b0rOTSM" role="1tU5fm">
+                                    <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
+                                  </node>
+                                  <node concept="2OqwBi" id="3Co8b0rOTSN" role="33vP2m">
+                                    <node concept="1iwH7S" id="3Co8b0rOTSO" role="2Oq$k0" />
+                                    <node concept="1iwH7d" id="3Co8b0rOTSP" role="2OqNvi">
+                                      <ref role="1iwH7c" node="4LE1vMPhNy4" resolve="recoverTypeDefault" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3clFbF" id="3Co8b0rOTSQ" role="3cqZAp">
+                                <node concept="2OqwBi" id="3Co8b0rOTSR" role="3clFbG">
+                                  <node concept="2OqwBi" id="3Co8b0rRvoZ" role="2Oq$k0">
+                                    <node concept="2OqwBi" id="3Co8b0rOTSS" role="2Oq$k0">
+                                      <node concept="37vLTw" id="3Co8b0rOTST" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="3Co8b0rOTSL" resolve="rlist" />
+                                      </node>
+                                      <node concept="3Tsc0h" id="3Co8b0rOTSU" role="2OqNvi">
+                                        <ref role="3TtcxE" to="wq2x:1HWyn8jEsaE" resolve="constraint" />
+                                      </node>
+                                    </node>
+                                    <node concept="7r0gD" id="3Co8b0rRy_P" role="2OqNvi">
+                                      <node concept="3cmrfG" id="3Co8b0rRy_Y" role="7T0AP">
+                                        <property role="3cmrfH" value="1" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="1uHKPH" id="3Co8b0rOTSV" role="2OqNvi" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="1WS0z7" id="3Co8b0rOTSW" role="lGtFl">
+                        <node concept="3JmXsc" id="3Co8b0rOTSX" role="3Jn$fo">
+                          <node concept="3clFbS" id="3Co8b0rOTSY" role="2VODD2">
+                            <node concept="3clFbF" id="3Co8b0rOTSZ" role="3cqZAp">
+                              <node concept="2OqwBi" id="3Co8b0rOTT0" role="3clFbG">
+                                <node concept="2OqwBi" id="3Co8b0rOTT1" role="2Oq$k0">
+                                  <node concept="30H73N" id="3Co8b0rOTT2" role="2Oq$k0" />
+                                  <node concept="2qgKlT" id="3Co8b0rOTT3" role="2OqNvi">
+                                    <ref role="37wK5l" to="h103:1vAI4X$KvKn" resolve="getTypeTermDeclaration" />
+                                  </node>
+                                </node>
+                                <node concept="2qgKlT" id="3Co8b0rOTT4" role="2OqNvi">
+                                  <ref role="37wK5l" to="x5bw:3Co8b0rO986" resolve="listFeatures" />
                                 </node>
                               </node>
                             </node>
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
index c851efb8..4a37b203 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
@@ -268,7 +268,7 @@
                                   <ref role="3cqZAo" node="1vAI4X$N8Tq" resolve="it" />
                                 </node>
                                 <node concept="2qgKlT" id="1vAI4X$N8Tp" role="2OqNvi">
-                                  <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="childFeatures" />
+                                  <ref role="37wK5l" to="x5bw:7c96q9tCSX_" resolve="allChildFeatures" />
                                 </node>
                               </node>
                             </node>