From d5a259bbdec75958da57d22c5c54ea59b3ecec85 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Sat, 11 Jul 2020 15:59:51 +0200
Subject: [PATCH] Re-apply all re-runnable migrations (one fix).

---
 build.xml                                     |   2 +
 .../languageModels/editor.mps                 |   2 -
 .../models/jetbrains.mps.coderules.build.mps  |  18 +++
 samples/mpscore/build.xml                     |  10 ++
 .../jetbrains.mps.lang.smodelExt.types.mps    |  11 +-
 ...nguage.collectionsExt.test.collections.mps |   2 +-
 ...ns.mps.lang.smodelExt.test.types@tests.mps |  35 ++--
 .../models/samples.mpscore.build.mps          | 150 ++++++++++++++++++
 8 files changed, 197 insertions(+), 33 deletions(-)

diff --git a/build.xml b/build.xml
index 586cb4dc..4621b487 100644
--- a/build.xml
+++ b/build.xml
@@ -727,6 +727,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.coderules.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.runtime.jar" />
     </jar>
@@ -2726,6 +2727,7 @@
     </echoxml>
     <jar destfile="${build.tmp}/default/coderules-0.5.zip/coderules/languages/jetbrains.mps.coderules.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.runtime" />
+      <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.runtime.jar1" />
     </jar>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index ee07dca8..da89f638 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -193,7 +193,6 @@
       <concept id="8998492695583129991" name="jetbrains.mps.lang.editor.structure.SubstituteFeature_CanSubstitute" flags="ng" index="16NL3D">
         <child id="8998492695583129992" name="query" index="16NL3A" />
       </concept>
-      <concept id="2115302367868116903" name="jetbrains.mps.lang.editor.structure.GeneratedSubstituteMenuAttribute" flags="ng" index="382kZG" />
       <concept id="1154465273778" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_ParentNode" flags="nn" index="3bvxqY" />
       <concept id="1838685759388685703" name="jetbrains.mps.lang.editor.structure.TransformationFeature_DescriptionText" flags="ng" index="3cqGtN">
         <child id="1838685759388685704" name="query" index="3cqGtW" />
@@ -6756,7 +6755,6 @@
     <node concept="3XHNnq" id="7L5omgeruEh" role="3ft7WO">
       <ref role="3XGfJA" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
     </node>
-    <node concept="382kZG" id="7L5omgeruEj" role="lGtFl" />
   </node>
   <node concept="22mcaB" id="4hPXq9Jmem8">
     <ref role="aqKnT" to="wq2x:4EfgX2EvF4i" resolve="ExpressionConstraint" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
index c8d88cef..7b2b5e5d 100644
--- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
@@ -2676,6 +2676,24 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
           </node>
         </node>
+        <node concept="3rtmxn" id="4XonyipwPR3" role="3bR31x">
+          <node concept="3LXTmp" id="4XonyipwPR4" role="3rtmxm">
+            <node concept="3qWCbU" id="4XonyipwPR5" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="4XonyipwPR6" role="3LXTmr">
+              <node concept="2Ry0Ak" id="4XonyipwPR7" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="4XonyipwPR8" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="4XonyipwPR9" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules.runtime" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="NKt6yn9_8p" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index 6a6bbf04..67baff5a 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -100,6 +100,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguage.blTypesExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.blTypesExt" />
+      <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguage.blTypesExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.blTypesExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.blTypesExt.jar" />
     </jar>
@@ -563,6 +564,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguage.sequence.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.sequence" />
+      <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguage.sequence" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.sequence/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.sequence.jar" />
     </jar>
@@ -701,6 +703,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguage.function.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.function" />
+      <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguage.function" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.function/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.function.jar" />
     </jar>
@@ -839,6 +842,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguage.collectionsExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.collectionsExt" />
+      <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguage.collectionsExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.collectionsExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.collectionsExt.jar" />
     </jar>
@@ -978,6 +982,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguage.closuresExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.closuresExt" />
+      <fileset dir="${basedir}/languages/jetbrains.mps.baseLanguage.closuresExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.baseLanguage.closuresExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.closuresExt.jar" />
     </jar>
@@ -1240,6 +1245,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguage.collectionsExt.test.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.collectionsExt.test" />
+      <fileset dir="${basedir}/solutions/jetbrains.mps.baseLanguage.collectionsExt.test" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.collectionsExt.test.jar" />
     </jar>
@@ -1303,6 +1309,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.baseLanguage.closuresExt.test.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguage.closuresExt.test" />
+      <fileset dir="${basedir}/solutions/jetbrains.mps.baseLanguage.closuresExt.test" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/solutions/jetbrains.mps.baseLanguage.closuresExt.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguage.closuresExt.test.jar" />
     </jar>
@@ -1398,6 +1405,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.lang.smodelExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodelExt" />
+      <fileset dir="${basedir}/languages/jetbrains.mps.lang.smodelExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.smodelExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodelExt.jar" />
     </jar>
@@ -1611,6 +1619,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/typechecking.samples.baseLanguage.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/typechecking.samples.baseLanguage" />
+      <fileset dir="${basedir}/solutions/typechecking.samples.baseLanguage" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/solutions/typechecking.samples.baseLanguage/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/typechecking.samples.baseLanguage.jar" />
     </jar>
@@ -1697,6 +1706,7 @@
     </echoxml>
     <jar destfile="${build.layout}/deploy/jetbrains.mps.logicExt.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logicExt" />
+      <fileset dir="${basedir}/languages/jetbrains.mps.logicExt" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.logicExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logicExt.jar" />
     </jar>
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
index 187aa005..b7dc7669 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
@@ -278,7 +278,6 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
-      <concept id="8866923313515890008" name="jetbrains.mps.lang.smodel.structure.AsNodeOperation" flags="nn" index="FGMqu" />
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
@@ -300,6 +299,9 @@
       <concept id="942336824646299470" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetPointerOperation" flags="ng" index="1AR3kn">
         <child id="942336824646299471" name="linkTarget" index="1AR3km" />
       </concept>
+      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
+        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
+      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
         <property id="1238684351431" name="asCast" index="1BlNFB" />
       </concept>
@@ -4608,11 +4610,8 @@
                               <ref role="3cqZAo" node="5OjpQKwc2Os" resolve="result" />
                             </node>
                             <node concept="TSZUe" id="5OjpQKwcj5b" role="2OqNvi">
-                              <node concept="2OqwBi" id="6$6scRbVQxq" role="25WWJ7">
-                                <node concept="35c_gC" id="6$6scRbVQxr" role="2Oq$k0">
-                                  <ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                </node>
-                                <node concept="FGMqu" id="6$6scRbVQxs" role="2OqNvi" />
+                              <node concept="3B5_sB" id="6$6scRbVQxq" role="25WWJ7">
+                                <ref role="3B5MYn" to="tpck:gw2VY9q" resolve="BaseConcept" />
                               </node>
                             </node>
                           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps
index 21aba039..7e416ce6 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps
@@ -4,7 +4,7 @@
   <attribute name="doNotGenerate" value="true" />
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="9" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
     <use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
     <use id="c1f5ad88-21f4-4e0e-927c-48b1ca0c2334" name="jetbrains.mps.baseLanguage.collectionsExt" version="0" />
   </languages>
diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps
index 4b5c3ad2..576ebd2c 100644
--- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps
@@ -162,10 +162,6 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
-      <concept id="8866923313515890008" name="jetbrains.mps.lang.smodel.structure.AsNodeOperation" flags="nn" index="FGMqu" />
-      <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
-        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
-      </concept>
       <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
         <reference id="1154546997487" name="concept" index="3gnhBz" />
       </concept>
@@ -178,6 +174,9 @@
         <child id="1163670677455" name="concept" index="3Kbmr1" />
         <child id="1163670683720" name="body" index="3Kbo56" />
       </concept>
+      <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
+        <reference id="1219352800908" name="referentNode" index="3B5MYn" />
+      </concept>
       <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -241,11 +240,8 @@
               </node>
               <node concept="liA8E" id="5OjpQKvZJmy" role="2OqNvi">
                 <ref role="37wK5l" to="jxwi:5OjpQKw2l7T" resolve="buildVertex" />
-                <node concept="2OqwBi" id="6$6scRbVXKj" role="37wK5m">
-                  <node concept="35c_gC" id="6$6scRbVW0h" role="2Oq$k0">
-                    <ref role="35c_gD" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
-                  </node>
-                  <node concept="FGMqu" id="6$6scRbVYTz" role="2OqNvi" />
+                <node concept="3B5_sB" id="6$6scRbVXKj" role="37wK5m">
+                  <ref role="3B5MYn" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
                 </node>
               </node>
             </node>
@@ -260,11 +256,8 @@
               </node>
               <node concept="liA8E" id="5OjpQKvZMfh" role="2OqNvi">
                 <ref role="37wK5l" to="jxwi:5OjpQKw2l7T" resolve="buildVertex" />
-                <node concept="2OqwBi" id="6$6scRbW1f3" role="37wK5m">
-                  <node concept="35c_gC" id="6$6scRbW03D" role="2Oq$k0">
-                    <ref role="35c_gD" to="tpee:fz12cDA" resolve="ClassConcept" />
-                  </node>
-                  <node concept="FGMqu" id="6$6scRbW2kx" role="2OqNvi" />
+                <node concept="3B5_sB" id="6$6scRbW1f3" role="37wK5m">
+                  <ref role="3B5MYn" to="tpee:fz12cDA" resolve="ClassConcept" />
                 </node>
               </node>
             </node>
@@ -345,11 +338,8 @@
             </node>
             <node concept="1uHKPH" id="6$6scRbT5HS" role="2OqNvi" />
           </node>
-          <node concept="2OqwBi" id="6$6scRbW511" role="JA92f">
-            <node concept="35c_gC" id="6$6scRbW49m" role="2Oq$k0">
-              <ref role="35c_gD" to="tpee:g96eOhU" resolve="GenericDeclaration" />
-            </node>
-            <node concept="FGMqu" id="6$6scRbW5DH" role="2OqNvi" />
+          <node concept="3B5_sB" id="6$6scRbW511" role="JA92f">
+            <ref role="3B5MYn" to="tpee:g96eOhU" resolve="GenericDeclaration" />
           </node>
         </node>
         <node concept="3clFbH" id="6$6scRbR3dN" role="3cqZAp" />
@@ -420,11 +410,8 @@
                 <node concept="2WthIp" id="5OjpQKwiyYl" role="2Oq$k0" />
                 <node concept="2XshWL" id="5OjpQKwiyYn" role="2OqNvi">
                   <ref role="2WH_rO" node="4JBuioGUNfv" resolve="nodeAsTerm" />
-                  <node concept="2OqwBi" id="6$6scRbWUpc" role="2XxRq1">
-                    <node concept="35c_gC" id="6$6scRbWUpd" role="2Oq$k0">
-                      <ref role="35c_gD" to="tpee:g96eOhU" resolve="GenericDeclaration" />
-                    </node>
-                    <node concept="FGMqu" id="6$6scRbWUpe" role="2OqNvi" />
+                  <node concept="3B5_sB" id="6$6scRbWUpc" role="2XxRq1">
+                    <ref role="3B5MYn" to="tpee:g96eOhU" resolve="GenericDeclaration" />
                   </node>
                 </node>
               </node>
diff --git a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
index 6f4f7786..77aed610 100644
--- a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
+++ b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
@@ -438,6 +438,21 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="4XonyipxefA" role="3bR31x">
+          <node concept="3LXTmp" id="4XonyipxefB" role="3rtmxm">
+            <node concept="3qWCbU" id="4XonyipxefC" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="4XonyipxefD" role="3LXTmr">
+              <node concept="2Ry0Ak" id="4XonyipxefE" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4XonyipxefF" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguage.blTypesExt" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3DveV8qz3Qm" role="2G$12L">
         <property role="TrG5h" value="jetbrains.mps.baseLanguage.javadocExt" />
@@ -750,6 +765,21 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="4Xonyipxefh" role="3bR31x">
+          <node concept="3LXTmp" id="4Xonyipxefi" role="3rtmxm">
+            <node concept="3qWCbU" id="4Xonyipxefj" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="4Xonyipxefk" role="3LXTmr">
+              <node concept="2Ry0Ak" id="4Xonyipxefl" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="4Xonyipxefm" role="2Ry0An">
+                  <property role="2Ry0Am" value="typechecking.samples.baseLanguage" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3mSr9E04JuF" role="2G$12L">
         <property role="TrG5h" value="jetbrains.mps.baseLanguage.tuplesExt" />
@@ -999,6 +1029,21 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="4XonyipxefH" role="3bR31x">
+          <node concept="3LXTmp" id="4XonyipxefI" role="3rtmxm">
+            <node concept="3qWCbU" id="4XonyipxefJ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="4XonyipxefK" role="3LXTmr">
+              <node concept="2Ry0Ak" id="4XonyipxefL" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4XonyipxefM" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguage.sequence" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6BFOg89KVoY" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1076,6 +1121,21 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="4XonyipxefO" role="3bR31x">
+          <node concept="3LXTmp" id="4XonyipxefP" role="3rtmxm">
+            <node concept="3qWCbU" id="4XonyipxefQ" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="4XonyipxefR" role="3LXTmr">
+              <node concept="2Ry0Ak" id="4XonyipxefS" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4XonyipxefT" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguage.function" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="4NtT$ZxGTIW" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1168,6 +1228,21 @@
             <ref role="1Busuk" node="6BFOg89KVoY" resolve="jetbrains.mps.baseLanguage.function" />
           </node>
         </node>
+        <node concept="3rtmxn" id="4XonyipxefV" role="3bR31x">
+          <node concept="3LXTmp" id="4XonyipxefW" role="3rtmxm">
+            <node concept="3qWCbU" id="4XonyipxefX" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="4XonyipxefY" role="3LXTmr">
+              <node concept="2Ry0Ak" id="4XonyipxefZ" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4Xonyipxeg0" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguage.collectionsExt" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="4NtT$ZxGTTL" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1251,6 +1326,21 @@
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KZG" resolve="jetbrains.mps.baseLanguage.closures" />
           </node>
         </node>
+        <node concept="3rtmxn" id="4Xonyipxefo" role="3bR31x">
+          <node concept="3LXTmp" id="4Xonyipxefp" role="3rtmxm">
+            <node concept="3qWCbU" id="4Xonyipxefq" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="4Xonyipxefr" role="3LXTmr">
+              <node concept="2Ry0Ak" id="4Xonyipxefs" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="4Xonyipxeft" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguage.collectionsExt.test" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6$MmqWflyOZ" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1343,6 +1433,21 @@
             <ref role="1Busuk" node="6BFOg89KVoY" resolve="jetbrains.mps.baseLanguage.function" />
           </node>
         </node>
+        <node concept="3rtmxn" id="4Xonyipxeg2" role="3bR31x">
+          <node concept="3LXTmp" id="4Xonyipxeg3" role="3rtmxm">
+            <node concept="3qWCbU" id="4Xonyipxeg4" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="4Xonyipxeg5" role="3LXTmr">
+              <node concept="2Ry0Ak" id="4Xonyipxeg6" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4Xonyipxeg7" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguage.closuresExt" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6$MmqWflz4E" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1416,6 +1521,21 @@
             <ref role="3bR37D" node="4NtT$ZxGTIW" resolve="jetbrains.mps.baseLanguage.collectionsExt" />
           </node>
         </node>
+        <node concept="3rtmxn" id="4Xonyipxefv" role="3bR31x">
+          <node concept="3LXTmp" id="4Xonyipxefw" role="3rtmxm">
+            <node concept="3qWCbU" id="4Xonyipxefx" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="4Xonyipxefy" role="3LXTmr">
+              <node concept="2Ry0Ak" id="4Xonyipxefz" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="4Xonyipxef$" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.baseLanguage.closuresExt.test" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6Dg__VJQ3B2" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1575,6 +1695,21 @@
             <ref role="1Busuk" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
           </node>
         </node>
+        <node concept="3rtmxn" id="4Xonyipxeg9" role="3bR31x">
+          <node concept="3LXTmp" id="4Xonyipxega" role="3rtmxm">
+            <node concept="3qWCbU" id="4Xonyipxegb" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="4Xonyipxegc" role="3LXTmr">
+              <node concept="2Ry0Ak" id="4Xonyipxegd" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4Xonyipxege" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.lang.smodelExt" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6Dg__VJQ2NZ" role="2G$12L">
         <property role="TrG5h" value="jetbrains.mps.lang.smodelExt.test" />
@@ -1793,6 +1928,21 @@
             <ref role="1Busuk" to="zqd8:7BVjoXzUxkQ" resolve="jetbrains.mps.logic" />
           </node>
         </node>
+        <node concept="3rtmxn" id="4Xonyipxegg" role="3bR31x">
+          <node concept="3LXTmp" id="4Xonyipxegh" role="3rtmxm">
+            <node concept="3qWCbU" id="4Xonyipxegi" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="55IIr" id="4Xonyipxegj" role="3LXTmr">
+              <node concept="2Ry0Ak" id="4Xonyipxegk" role="iGT6I">
+                <property role="2Ry0Am" value="languages" />
+                <node concept="2Ry0Ak" id="4Xonyipxegl" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.logicExt" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
   </node>