From 3f4f9d35cb8e72035cd6d9379fea6e330be31806 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 16 Apr 2020 12:26:17 +0200
Subject: [PATCH] Fix macro templates in testlang.

---
 .../models/types.mps                          | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index d76c97fa..2093c1c6 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -1062,34 +1062,6 @@
         <node concept="32pEOW" id="1ALxU7reltN" role="3vLBG7" />
       </node>
     </node>
-    <node concept="3iyZe8" id="1ALxU7rfpCw" role="0oKgB">
-      <ref role="3iRiWT" node="1ALxU7re3yU" resolve="extractType" />
-      <node concept="3clFbS" id="1ALxU7rfpCx" role="3iwQuN">
-        <node concept="3Aqczg" id="1ALxU7rfsHG" role="3cqZAp">
-          <node concept="3jm4v3" id="1ALxU7rfsHE" role="3Aqpz8">
-            <ref role="3jm46O" node="1ALxU7rf6T$" resolve="typeOfString" />
-            <node concept="3j8tct" id="1ALxU7rfu1s" role="3jicU7">
-              <ref role="3j8tcu" node="1ALxU7rfpCA" resolve="strConst" />
-            </node>
-            <node concept="a7P8L" id="1ALxU7rft9B" role="3jm6SO">
-              <ref role="a7OzE" node="1ALxU7rfpC$" resolve="Type" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3uniRu" id="1ALxU7rfpCy" role="3tb1AD">
-        <node concept="32pEOW" id="1ALxU7rfpCz" role="3vLBG7" />
-        <node concept="aZer4" id="1ALxU7rfpC$" role="3XD1gS">
-          <property role="TrG5h" value="Type" />
-        </node>
-      </node>
-      <node concept="3ixlbQ" id="1ALxU7rfpC_" role="3iweTQ">
-        <ref role="3ixz9q" to="qulx:7mB3viLdltS" resolve="StrConst" />
-        <node concept="3ixQyH" id="1ALxU7rfpCA" role="3ix8rx">
-          <property role="TrG5h" value="strConst" />
-        </node>
-      </node>
-    </node>
     <node concept="3hwh0R" id="1ALxU7rf6T$" role="0oKgB">
       <property role="TrG5h" value="typeOfString" />
       <node concept="3hPv5a" id="1ALxU7rfeNs" role="3hP23H">
@@ -1166,7 +1138,7 @@
         </node>
       </node>
       <node concept="3ixlbQ" id="1ALxU7rhglw" role="3iweTQ">
-        <ref role="3ixz9q" to="qulx:7lt0LtPHOmg" resolve="Expr" />
+        <ref role="3ixz9q" to="qulx:JfcwnvuueB" resolve="Pair" />
         <node concept="3ixQyH" id="1ALxU7rhglx" role="3ix8rx">
           <property role="TrG5h" value="pairType" />
         </node>
@@ -1218,6 +1190,34 @@
         <node concept="32pEOW" id="1ALxU7rh1vq" role="3vLBG7" />
       </node>
     </node>
+    <node concept="3iyZe8" id="1ALxU7rfpCw" role="0oKgB">
+      <ref role="3iRiWT" node="1ALxU7re3yU" resolve="extractType" />
+      <node concept="3clFbS" id="1ALxU7rfpCx" role="3iwQuN">
+        <node concept="3Aqczg" id="1ALxU7rfsHG" role="3cqZAp">
+          <node concept="3jm4v3" id="1ALxU7rfsHE" role="3Aqpz8">
+            <ref role="3jm46O" node="1ALxU7rf6T$" resolve="typeOfString" />
+            <node concept="3j8tct" id="1ALxU7rfu1s" role="3jicU7">
+              <ref role="3j8tcu" node="1ALxU7rfpCA" resolve="strConst" />
+            </node>
+            <node concept="a7P8L" id="1ALxU7rft9B" role="3jm6SO">
+              <ref role="a7OzE" node="1ALxU7rfpC$" resolve="Type" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uniRu" id="1ALxU7rfpCy" role="3tb1AD">
+        <node concept="32pEOW" id="1ALxU7rfpCz" role="3vLBG7" />
+        <node concept="aZer4" id="1ALxU7rfpC$" role="3XD1gS">
+          <property role="TrG5h" value="Type" />
+        </node>
+      </node>
+      <node concept="3ixlbQ" id="1ALxU7rfpC_" role="3iweTQ">
+        <ref role="3ixz9q" to="qulx:7mB3viLdltS" resolve="StrConst" />
+        <node concept="3ixQyH" id="1ALxU7rfpCA" role="3ix8rx">
+          <property role="TrG5h" value="strConst" />
+        </node>
+      </node>
+    </node>
     <node concept="3iyZe8" id="1ALxU7rgqX9" role="0oKgB">
       <ref role="3iRiWT" node="1ALxU7rg9$e" resolve="lift" />
       <node concept="3clFbS" id="1ALxU7rgqXa" role="3iwQuN">