From e4b927e6e64553aa61f925c4a9f8bab8cb69f5e2 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Wed, 25 Dec 2019 12:54:40 +0300
Subject: [PATCH] stringType: make it a sub-dataform of classifierType, don't
 add new rules. Add tests for conversion to/from classifierType and binstr
 promote. (MPSCR-3)

Everywhere where we don't care whether it's <String> or <string> it will be handled just as String.
Where we need to discern between the cases (as in Recover), 'stringType()' dataform can be matched first.
---
 .../jetbrains.mps.baseLanguageExt.types.mps   | 240 +++++++++---------
 ...mps.baseLanguageExt.test.code.features.mps | 221 ++++++++++++++++
 ...ps.baseLanguageExt.test.features@tests.mps |  29 +++
 3 files changed, 367 insertions(+), 123 deletions(-)

diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 279ac72b..050513a2 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -11313,20 +11313,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3Aq9E8" id="4peSo3CwOLs" role="1nLNMd">
-              <node concept="3I6sU6" id="4nIWweBxPAy" role="3Ip0Jz">
-                <node concept="3I6s7M" id="4nIWweBxPAz" role="3I6sU7">
-                  <node concept="3A8Hvi" id="44o2wihh9$O" role="3I6s78">
-                    <node concept="a7P8L" id="44o2wihh9$P" role="3A8w4Q">
-                      <ref role="a7OzE" node="5crgrygExs3" resolve="T" />
-                    </node>
-                    <node concept="a7P8L" id="44o2wihh9$Q" role="3A8wtg">
-                      <ref role="a7OzE" node="5crgrygExrU" resolve="S" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
           </node>
         </node>
       </node>
@@ -25897,6 +25883,65 @@
         <property role="TrG5h" value="terms" />
       </node>
     </node>
+    <node concept="1nLNMY" id="27bTNFf8LqB" role="1nK1Vg">
+      <property role="TrG5h" value="recover_stringType" />
+      <node concept="3clFbS" id="27bTNFf8LqC" role="1nLNMH">
+        <node concept="1nLNNL" id="27bTNFf8LqD" role="3cqZAp">
+          <node concept="1nLNMm" id="27bTNFf8LqE" role="1nLNNK">
+            <node concept="0eUR_" id="27bTNFf8LqF" role="0UC6o">
+              <node concept="3NuqgR" id="27bTNFf8LqG" role="0eVf_">
+                <node concept="aZer4" id="27bTNFf8LqH" role="3XD1gS">
+                  <property role="TrG5h" value="Node" />
+                </node>
+                <node concept="3Tqbb2" id="27bTNFf8LqI" role="3vLBG7" />
+              </node>
+              <node concept="3NuqgR" id="27bTNFf8LqJ" role="0eVf_">
+                <node concept="aZer4" id="27bTNFf8LqK" role="3XD1gS">
+                  <property role="TrG5h" value="Type" />
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="27bTNFf8LqL" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="27bTNFf8LqM" role="3Ip0Jz">
+                <node concept="3I6s7M" id="27bTNFf8LqN" role="3I6sU7">
+                  <node concept="3Aqt3T" id="27bTNFf8LqO" role="3I6s78">
+                    <ref role="3AqCNq" node="6Qzc0KyJGJT" resolve="recover" />
+                    <node concept="a7P8L" id="27bTNFf8LqP" role="3AunhB">
+                      <ref role="a7OzE" node="27bTNFf8LqH" resolve="Node" />
+                    </node>
+                    <node concept="1HFMs5" id="27bTNFf8LqQ" role="3AunhB">
+                      <node concept="ns1u0" id="27bTNFf8LNm" role="1uarlW">
+                        <ref role="ns1xF" node="2HYHa0WV2R$" resolve="stringType" />
+                      </node>
+                      <node concept="a7P8L" id="27bTNFf8LqS" role="1uarlU">
+                        <ref role="a7OzE" node="27bTNFf8LqK" resolve="Type" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9E8" id="27bTNFf8LqT" role="1nLNMd">
+              <node concept="3I6sU6" id="27bTNFf8LqU" role="3Ip0Jz">
+                <node concept="3I6s7M" id="27bTNFf8LqV" role="3I6sU7">
+                  <node concept="3A8Hvi" id="5TfjU0xvr7f" role="3I6s78">
+                    <node concept="a7P8L" id="27bTNFf8LqX" role="3A8wtg">
+                      <ref role="a7OzE" node="27bTNFf8LqH" resolve="Node" />
+                    </node>
+                    <node concept="HKQnh" id="27bTNFf8LqY" role="3A8w4Q">
+                      <node concept="2c44tf" id="27bTNFf8LqZ" role="HKQng">
+                        <node concept="17QB3L" id="27bTNFf8LQA" role="2c44tc" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="2J$kxDHq_5O" role="1nK1Vg">
       <property role="TrG5h" value="recover_rawClsType" />
       <node concept="3clFbS" id="2J$kxDHq_5P" role="1nLNMH">
@@ -27884,65 +27929,6 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="27bTNFf8LqB" role="1nK1Vg">
-      <property role="TrG5h" value="recover_stringType" />
-      <node concept="3clFbS" id="27bTNFf8LqC" role="1nLNMH">
-        <node concept="1nLNNL" id="27bTNFf8LqD" role="3cqZAp">
-          <node concept="1nLNMm" id="27bTNFf8LqE" role="1nLNNK">
-            <node concept="0eUR_" id="27bTNFf8LqF" role="0UC6o">
-              <node concept="3NuqgR" id="27bTNFf8LqG" role="0eVf_">
-                <node concept="aZer4" id="27bTNFf8LqH" role="3XD1gS">
-                  <property role="TrG5h" value="Node" />
-                </node>
-                <node concept="3Tqbb2" id="27bTNFf8LqI" role="3vLBG7" />
-              </node>
-              <node concept="3NuqgR" id="27bTNFf8LqJ" role="0eVf_">
-                <node concept="aZer4" id="27bTNFf8LqK" role="3XD1gS">
-                  <property role="TrG5h" value="Type" />
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq93q" id="27bTNFf8LqL" role="1nLNMb">
-              <property role="3ArMco" value="false" />
-              <node concept="3I6sU6" id="27bTNFf8LqM" role="3Ip0Jz">
-                <node concept="3I6s7M" id="27bTNFf8LqN" role="3I6sU7">
-                  <node concept="3Aqt3T" id="27bTNFf8LqO" role="3I6s78">
-                    <ref role="3AqCNq" node="6Qzc0KyJGJT" resolve="recover" />
-                    <node concept="a7P8L" id="27bTNFf8LqP" role="3AunhB">
-                      <ref role="a7OzE" node="27bTNFf8LqH" resolve="Node" />
-                    </node>
-                    <node concept="1HFMs5" id="27bTNFf8LqQ" role="3AunhB">
-                      <node concept="ns1u0" id="27bTNFf8LNm" role="1uarlW">
-                        <ref role="ns1xF" node="2HYHa0WV2R$" resolve="stringType" />
-                      </node>
-                      <node concept="a7P8L" id="27bTNFf8LqS" role="1uarlU">
-                        <ref role="a7OzE" node="27bTNFf8LqK" resolve="Type" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9E8" id="27bTNFf8LqT" role="1nLNMd">
-              <node concept="3I6sU6" id="27bTNFf8LqU" role="3Ip0Jz">
-                <node concept="3I6s7M" id="27bTNFf8LqV" role="3I6sU7">
-                  <node concept="3A8Hvi" id="5TfjU0xvr7f" role="3I6s78">
-                    <node concept="a7P8L" id="27bTNFf8LqX" role="3A8wtg">
-                      <ref role="a7OzE" node="27bTNFf8LqH" resolve="Node" />
-                    </node>
-                    <node concept="HKQnh" id="27bTNFf8LqY" role="3A8w4Q">
-                      <node concept="2c44tf" id="27bTNFf8LqZ" role="HKQng">
-                        <node concept="17QB3L" id="27bTNFf8LQA" role="2c44tc" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="1nLNMY" id="6N2bvv_l1A5" role="1nK1Vg">
       <property role="TrG5h" value="recover_intersectionType" />
       <node concept="3clFbS" id="6N2bvv_l1A6" role="1nLNMH">
@@ -33593,7 +33579,34 @@
     </node>
     <node concept="ns1x$" id="2HYHa0WV2R$" role="ns1xc">
       <property role="TrG5h" value="stringType" />
-      <node concept="nspSf" id="2HYHa0WV2R_" role="ns1xx" />
+      <ref role="ns1xW" node="JOGAOsVt2a" resolve="classifierType" />
+      <node concept="nspSf" id="2HYHa0WV2R_" role="ns1xx">
+        <node concept="nssqF" id="2i6cuYQdAne" role="nspSe">
+          <property role="nspS5" value="true" />
+          <property role="TrG5h" value="classifier" />
+          <node concept="2tJFMh" id="2i6cuYQdB4U" role="nstic">
+            <node concept="ZC_QK" id="2i6cuYQdBcC" role="2tJFKM">
+              <ref role="2aWVGs" to="wyt6:~String" resolve="String" />
+            </node>
+          </node>
+        </node>
+        <node concept="nssqF" id="2i6cuYQfyjG" role="nspSe">
+          <property role="TrG5h" value="kind" />
+          <property role="nspS5" value="true" />
+          <node concept="Xl_RD" id="2i6cuYQj56W" role="nstic">
+            <property role="Xl_RC" value="str" />
+          </node>
+        </node>
+        <node concept="nsiOd" id="2i6cuYQdBIj" role="nspSe">
+          <property role="nspS5" value="true" />
+          <property role="TrG5h" value="parameter" />
+          <node concept="1nq8_$" id="2i6cuYQdCzI" role="nstic">
+            <node concept="Hz6ka" id="2i6cuYQdCzH" role="1nq8_t">
+              <node concept="KCUsM" id="2i6cuYQdCFr" role="Hz6kd" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="ns1x$" id="JOGAOsVt2o" role="ns1xc">
       <property role="TrG5h" value="arrayType" />
@@ -33854,8 +33867,21 @@
                     <node concept="a7P8L" id="2HYHa0WD7LG" role="3AunhB">
                       <ref role="a7OzE" node="2HYHa0WD7Lp" resolve="Out" />
                     </node>
-                    <node concept="a7P8L" id="2HYHa0WD7LL" role="3AunhB">
-                      <ref role="a7OzE" node="2HYHa0WD7Ls" resolve="InS" />
+                    <node concept="1HFMs5" id="2i6cuYQdoWn" role="3AunhB">
+                      <node concept="a7P8L" id="2HYHa0WD7LL" role="1uarlU">
+                        <ref role="a7OzE" node="2HYHa0WD7Ls" resolve="InS" />
+                      </node>
+                      <node concept="ns1u0" id="2HYHa0WD9Ya" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
+                        <node concept="nsMwS" id="2HYHa0WD9Yc" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                          <node concept="2tJFMh" id="2HYHa0WD9Yg" role="nsMwV">
+                            <node concept="ZC_QK" id="2HYHa0WD9Yl" role="2tJFKM">
+                              <ref role="2aWVGs" to="wyt6:~String" resolve="String" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                     <node concept="a7P8L" id="2HYHa0WD7LQ" role="3AunhB">
                       <ref role="a7OzE" node="2HYHa0WD7Lv" resolve="InT" />
@@ -33902,28 +33928,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3Aq9_M" id="2HYHa0WD9XV" role="1nLNMa">
-              <node concept="3I6sU6" id="2HYHa0WD9XW" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2HYHa0WD9Y2" role="3I6sU7">
-                  <node concept="3A8Hvi" id="2HYHa0WD9XZ" role="3I6s78">
-                    <node concept="a7P8L" id="2HYHa0WD9Y7" role="3A8wtg">
-                      <ref role="a7OzE" node="2HYHa0WD7Ls" resolve="InS" />
-                    </node>
-                    <node concept="ns1u0" id="2HYHa0WD9Ya" role="3A8w4Q">
-                      <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
-                      <node concept="nsMwS" id="2HYHa0WD9Yc" role="ns1xD">
-                        <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                        <node concept="2tJFMh" id="2HYHa0WD9Yg" role="nsMwV">
-                          <node concept="ZC_QK" id="2HYHa0WD9Yl" role="2tJFKM">
-                            <ref role="2aWVGs" to="wyt6:~String" resolve="String" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
           </node>
         </node>
         <node concept="3clFbH" id="2HYHa0WD9WC" role="3cqZAp" />
@@ -33941,8 +33945,21 @@
                     <node concept="a7P8L" id="2HYHa0WDa0W" role="3AunhB">
                       <ref role="a7OzE" node="5TXeSYSGjYA" resolve="InS" />
                     </node>
-                    <node concept="a7P8L" id="2HYHa0WDa11" role="3AunhB">
-                      <ref role="a7OzE" node="5TXeSYSGjYB" resolve="InT" />
+                    <node concept="1HFMs5" id="2i6cuYQdpnq" role="3AunhB">
+                      <node concept="a7P8L" id="2HYHa0WDa11" role="1uarlU">
+                        <ref role="a7OzE" node="5TXeSYSGjYB" resolve="InT" />
+                      </node>
+                      <node concept="ns1u0" id="2HYHa0WD9ZA" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
+                        <node concept="nsMwS" id="2HYHa0WD9ZB" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                          <node concept="2tJFMh" id="2HYHa0WD9ZC" role="nsMwV">
+                            <node concept="ZC_QK" id="2HYHa0WD9ZD" role="2tJFKM">
+                              <ref role="2aWVGs" to="wyt6:~String" resolve="String" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -33970,28 +33987,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3Aq9_M" id="2HYHa0WD9Zx" role="1nLNMa">
-              <node concept="3I6sU6" id="2HYHa0WD9Zy" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2HYHa0WD9Zz" role="3I6sU7">
-                  <node concept="3A8Hvi" id="2HYHa0WD9Z$" role="3I6s78">
-                    <node concept="a7P8L" id="2HYHa0WDa1c" role="3A8wtg">
-                      <ref role="a7OzE" node="5TXeSYSGjYB" resolve="InT" />
-                    </node>
-                    <node concept="ns1u0" id="2HYHa0WD9ZA" role="3A8w4Q">
-                      <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifierType" />
-                      <node concept="nsMwS" id="2HYHa0WD9ZB" role="ns1xD">
-                        <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                        <node concept="2tJFMh" id="2HYHa0WD9ZC" role="nsMwV">
-                          <node concept="ZC_QK" id="2HYHa0WD9ZD" role="2tJFKM">
-                            <ref role="2aWVGs" to="wyt6:~String" resolve="String" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
             <node concept="0eUR_" id="5TXeSYSGjYz" role="0UC6o">
               <node concept="3NuqgR" id="5TXeSYSGjY$" role="0eVf_">
                 <node concept="aZer4" id="5TXeSYSGjY_" role="3XD1gS">
@@ -34065,7 +34060,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="2HYHa0WDa1f" role="3cqZAp" />
       </node>
     </node>
     <node concept="1nLNMY" id="35YJGAK4DLT" role="1nK1Vg">
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
index 14513a48..6eb32763 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps
@@ -9668,5 +9668,226 @@
     <node concept="2tJIrI" id="2VOKs1Aryu1" role="jymVt" />
     <node concept="3Tm1VV" id="2VOKs1ArylW" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="2i6cuYQ8hzP">
+    <property role="TrG5h" value="StringConversion" />
+    <node concept="2tJIrI" id="2i6cuYQ8wOD" role="jymVt" />
+    <node concept="312cEu" id="2i6cuYQ8jZ5" role="jymVt">
+      <property role="TrG5h" value="J1" />
+      <node concept="3Tm1VV" id="2i6cuYQ8jiP" role="1B3o_S" />
+      <node concept="16euLQ" id="2i6cuYQ8jZu" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+    </node>
+    <node concept="312cEu" id="2i6cuYQ8uGR" role="jymVt">
+      <property role="TrG5h" value="J2" />
+      <node concept="3Tm1VV" id="2i6cuYQ8uGS" role="1B3o_S" />
+      <node concept="16euLQ" id="2i6cuYQ8uGT" role="16eVyc">
+        <property role="TrG5h" value="T" />
+        <node concept="3uibUv" id="2i6cuYQ8wtG" role="3ztrMU">
+          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2i6cuYQ8lnD" role="jymVt" />
+    <node concept="3clFb_" id="2i6cuYQ7b2L" role="jymVt">
+      <property role="TrG5h" value="strings" />
+      <node concept="37vLTG" id="2i6cuYQ8rzj" role="3clF46">
+        <property role="TrG5h" value="j1s" />
+        <node concept="3uibUv" id="2i6cuYQ8rzJ" role="1tU5fm">
+          <ref role="3uigEE" node="2i6cuYQ8jZ5" resolve="StringConversion.J1" />
+          <node concept="17QB3L" id="2i6cuYQ8rUJ" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2i6cuYQ8B5B" role="3clF46">
+        <property role="TrG5h" value="j1S" />
+        <node concept="3uibUv" id="2i6cuYQ8C8i" role="1tU5fm">
+          <ref role="3uigEE" node="2i6cuYQ8jZ5" resolve="StringConversion.J1" />
+          <node concept="3uibUv" id="2i6cuYQ8Dya" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="2i6cuYQ8DSz" role="3clF46">
+        <property role="TrG5h" value="j2s" />
+        <node concept="3uibUv" id="2i6cuYQ8EUT" role="1tU5fm">
+          <ref role="3uigEE" node="2i6cuYQ8uGR" resolve="StringConversion.J2" />
+          <node concept="17QB3L" id="2i6cuYQ8FhX" role="11_B2D" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2i6cuYQ8FYH" role="3clF46">
+        <property role="TrG5h" value="j2S" />
+        <node concept="3uibUv" id="2i6cuYQ8Gle" role="1tU5fm">
+          <ref role="3uigEE" node="2i6cuYQ8uGR" resolve="StringConversion.J2" />
+          <node concept="3uibUv" id="2i6cuYQ8GGn" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="2i6cuYQ7b2O" role="3clF47">
+        <node concept="3cpWs8" id="2i6cuYQ7dqG" role="3cqZAp">
+          <node concept="3cpWsn" id="2i6cuYQ7dqH" role="3cpWs9">
+            <property role="TrG5h" value="s2" />
+            <node concept="3uibUv" id="2i6cuYQ7dqI" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+            </node>
+            <node concept="Xl_RD" id="2i6cuYQ7e9_" role="33vP2m">
+              <property role="Xl_RC" value="blabla" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2i6cuYQ7bQm" role="3cqZAp">
+          <node concept="3cpWsn" id="2i6cuYQ7bQp" role="3cpWs9">
+            <property role="TrG5h" value="s1" />
+            <node concept="17QB3L" id="2i6cuYQ7bQl" role="1tU5fm" />
+            <node concept="Xl_RD" id="2i6cuYQ7ccz" role="33vP2m">
+              <property role="Xl_RC" value="bla" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2i6cuYQ7eOH" role="3cqZAp" />
+        <node concept="3clFbF" id="2i6cuYQqm$P" role="3cqZAp">
+          <node concept="37vLTI" id="2i6cuYQqmIn" role="3clFbG">
+            <node concept="37vLTw" id="2i6cuYQqmJ1" role="37vLTx">
+              <ref role="3cqZAo" node="2i6cuYQ7bQp" resolve="s1" />
+            </node>
+            <node concept="37vLTw" id="2i6cuYQqm$N" role="37vLTJ">
+              <ref role="3cqZAo" node="2i6cuYQ7bQp" resolve="s1" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2i6cuYQqmOu" role="3cqZAp">
+          <node concept="37vLTI" id="2i6cuYQqmQx" role="3clFbG">
+            <node concept="37vLTw" id="2i6cuYQqmQU" role="37vLTx">
+              <ref role="3cqZAo" node="2i6cuYQ7dqH" resolve="s2" />
+            </node>
+            <node concept="37vLTw" id="2i6cuYQqmOs" role="37vLTJ">
+              <ref role="3cqZAo" node="2i6cuYQ7dqH" resolve="s2" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2i6cuYQ7ePo" role="3cqZAp">
+          <node concept="37vLTI" id="2i6cuYQ7ffj" role="3clFbG">
+            <node concept="37vLTw" id="2i6cuYQ7ffP" role="37vLTx">
+              <ref role="3cqZAo" node="2i6cuYQ7dqH" resolve="s2" />
+            </node>
+            <node concept="37vLTw" id="2i6cuYQ7ePm" role="37vLTJ">
+              <ref role="3cqZAo" node="2i6cuYQ7bQp" resolve="s1" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2i6cuYQ7fAE" role="3cqZAp">
+          <node concept="37vLTI" id="2i6cuYQ7fC7" role="3clFbG">
+            <node concept="37vLTw" id="2i6cuYQ7fCG" role="37vLTx">
+              <ref role="3cqZAo" node="2i6cuYQ7bQp" resolve="s1" />
+            </node>
+            <node concept="37vLTw" id="2i6cuYQ7fAC" role="37vLTJ">
+              <ref role="3cqZAo" node="2i6cuYQ7dqH" resolve="s2" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2i6cuYQ8qww" role="3cqZAp" />
+        <node concept="3clFbF" id="2i6cuYQqm09" role="3cqZAp">
+          <node concept="37vLTI" id="2i6cuYQqm5w" role="3clFbG">
+            <node concept="37vLTw" id="2i6cuYQqm6w" role="37vLTx">
+              <ref role="3cqZAo" node="2i6cuYQ8rzj" resolve="j1s" />
+            </node>
+            <node concept="37vLTw" id="2i6cuYQqm07" role="37vLTJ">
+              <ref role="3cqZAo" node="2i6cuYQ8rzj" resolve="j1s" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2i6cuYQqmgq" role="3cqZAp">
+          <node concept="37vLTI" id="2i6cuYQqmk2" role="3clFbG">
+            <node concept="37vLTw" id="2i6cuYQqmoP" role="37vLTx">
+              <ref role="3cqZAo" node="2i6cuYQ8B5B" resolve="j1S" />
+            </node>
+            <node concept="37vLTw" id="2i6cuYQqmgo" role="37vLTJ">
+              <ref role="3cqZAo" node="2i6cuYQ8B5B" resolve="j1S" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2i6cuYQ8HJg" role="3cqZAp">
+          <node concept="37vLTI" id="2i6cuYQ8I87" role="3clFbG">
+            <node concept="37vLTw" id="2i6cuYQ8IOR" role="37vLTx">
+              <ref role="3cqZAo" node="2i6cuYQ8B5B" resolve="j1S" />
+            </node>
+            <node concept="37vLTw" id="2i6cuYQ8HJe" role="37vLTJ">
+              <ref role="3cqZAo" node="2i6cuYQ8rzj" resolve="j1s" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2i6cuYQ8J_g" role="3cqZAp">
+          <node concept="37vLTI" id="2i6cuYQ8JYb" role="3clFbG">
+            <node concept="37vLTw" id="2i6cuYQ8KkZ" role="37vLTx">
+              <ref role="3cqZAo" node="2i6cuYQ8rzj" resolve="j1s" />
+            </node>
+            <node concept="37vLTw" id="2i6cuYQ8J_e" role="37vLTJ">
+              <ref role="3cqZAo" node="2i6cuYQ8B5B" resolve="j1S" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2i6cuYQdqQn" role="3cqZAp" />
+        <node concept="3cpWs8" id="2i6cuYQdqVp" role="3cqZAp">
+          <node concept="3cpWsn" id="2i6cuYQdqVs" role="3cpWs9">
+            <property role="TrG5h" value="sop1" />
+            <node concept="17QB3L" id="2i6cuYQdqVn" role="1tU5fm" />
+            <node concept="3cpWs3" id="2i6cuYQdrl6" role="33vP2m">
+              <node concept="3cmrfG" id="2i6cuYQdrlD" role="3uHU7w">
+                <property role="3cmrfH" value="245" />
+              </node>
+              <node concept="37vLTw" id="2i6cuYQdr8K" role="3uHU7B">
+                <ref role="3cqZAo" node="2i6cuYQ7bQp" resolve="s1" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2i6cuYQdrDA" role="3cqZAp">
+          <node concept="3cpWsn" id="2i6cuYQdrDB" role="3cpWs9">
+            <property role="TrG5h" value="sop2" />
+            <node concept="17QB3L" id="2i6cuYQdrDC" role="1tU5fm" />
+            <node concept="3cpWs3" id="2i6cuYQdswa" role="33vP2m">
+              <node concept="37vLTw" id="2i6cuYQds$v" role="3uHU7w">
+                <ref role="3cqZAo" node="2i6cuYQ7bQp" resolve="s1" />
+              </node>
+              <node concept="3cmrfG" id="2i6cuYQdrDE" role="3uHU7B">
+                <property role="3cmrfH" value="245" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2i6cuYQdsSp" role="3cqZAp">
+          <node concept="3cpWsn" id="2i6cuYQdsSq" role="3cpWs9">
+            <property role="TrG5h" value="sop3" />
+            <node concept="17QB3L" id="2i6cuYQdsSr" role="1tU5fm" />
+            <node concept="3cpWs3" id="2i6cuYQdsSs" role="33vP2m">
+              <node concept="37vLTw" id="2i6cuYQdsSt" role="3uHU7w">
+                <ref role="3cqZAo" node="2i6cuYQ7bQp" resolve="s1" />
+              </node>
+              <node concept="37vLTw" id="2i6cuYQdsXD" role="3uHU7B">
+                <ref role="3cqZAo" node="2i6cuYQ7dqH" resolve="s2" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2i6cuYQdteM" role="3cqZAp">
+          <node concept="3cpWsn" id="2i6cuYQdteN" role="3cpWs9">
+            <property role="TrG5h" value="sop3" />
+            <node concept="17QB3L" id="2i6cuYQdteO" role="1tU5fm" />
+            <node concept="3cpWs3" id="2i6cuYQdteP" role="33vP2m">
+              <node concept="37vLTw" id="2i6cuYQdtoF" role="3uHU7w">
+                <ref role="3cqZAo" node="2i6cuYQ7dqH" resolve="s2" />
+              </node>
+              <node concept="37vLTw" id="2i6cuYQdtk9" role="3uHU7B">
+                <ref role="3cqZAo" node="2i6cuYQ7bQp" resolve="s1" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2i6cuYQ7aq$" role="1B3o_S" />
+      <node concept="3cqZAl" id="2i6cuYQ7aNG" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="2i6cuYQ8hzQ" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
index b63971cf..939d8a40 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps
@@ -271,6 +271,35 @@
         </node>
       </node>
     </node>
+    <node concept="1LZb2c" id="2i6cuYQbqIS" role="1SL9yI">
+      <property role="TrG5h" value="stringConversion" />
+      <node concept="3cqZAl" id="2i6cuYQbqIT" role="3clF45" />
+      <node concept="3clFbS" id="2i6cuYQbqIU" role="3clF47">
+        <node concept="2Hmddi" id="2i6cuYQbqIV" role="3cqZAp">
+          <node concept="2OqwBi" id="2i6cuYQbqIW" role="2Hmdds">
+            <node concept="2YIFZM" id="2i6cuYQbqIX" role="2Oq$k0">
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <node concept="2OqwBi" id="2i6cuYQbqIY" role="37wK5m">
+                <node concept="2WthIp" id="2i6cuYQbqIZ" role="2Oq$k0" />
+                <node concept="2XshWL" id="2i6cuYQbqJ0" role="2OqNvi">
+                  <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                  <node concept="2tJFMh" id="2i6cuYQbqJ1" role="2XxRq1">
+                    <node concept="ZC_QK" id="2i6cuYQbsm4" role="2tJFKM">
+                      <ref role="2aWVGs" to="yg5v:2i6cuYQ8hzP" resolve="StringConversion" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1jxXqW" id="2i6cuYQbqJ3" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="2i6cuYQbqJ4" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1LZb2c" id="6EY0p2ym72p" role="1SL9yI">
       <property role="TrG5h" value="shortConversion" />
       <node concept="3cqZAl" id="6EY0p2ym72q" role="3clF45" />