From bd99befdb646e4b7eb71e057fbae891de0e480e3 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 5 Jun 2018 15:09:33 +0200
Subject: [PATCH] Fix a couple of bugs in template application logic.

---
 ...brains.mps.lang.typesystem2.evaluation.mps | 72 +++++++++++++++----
 1 file changed, 57 insertions(+), 15 deletions(-)

diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
index b3bb27bc..2ca44ae2 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
@@ -6829,22 +6829,41 @@
                 <node concept="3Tqbb2" id="2Qe6u2cmC60" role="3O5elw" />
               </node>
               <node concept="2OqwBi" id="2Qe6u2cmBeY" role="33vP2m">
-                <node concept="2OqwBi" id="2Qe6u2cmBeZ" role="2Oq$k0">
-                  <node concept="2OqwBi" id="2Qe6u2cmBf0" role="2Oq$k0">
-                    <node concept="37vLTw" id="2Qe6u2cmBf1" role="2Oq$k0">
+                <node concept="2OqwBi" id="2Qe6u2cmBf0" role="2Oq$k0">
+                  <node concept="37vLTw" id="2Qe6u2cmBf1" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4QPCta1aZL_" resolve="applyingResult" />
+                  </node>
+                  <node concept="2OwXpG" id="2Qe6u2cmBf2" role="2OqNvi">
+                    <ref role="2Oxat5" node="4MqhgXU_1wg" resolve="visited" />
+                  </node>
+                </node>
+                <node concept="ANE8D" id="2Qe6u2cmBf5" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="3rCAg5k6tYT" role="3cqZAp">
+            <node concept="3cpWsn" id="3rCAg5k6tYU" role="3cpWs9">
+              <property role="TrG5h" value="reqd" />
+              <node concept="3vKaQO" id="3rCAg5k6uK4" role="1tU5fm">
+                <node concept="3Tqbb2" id="3rCAg5k6uK6" role="3O5elw" />
+              </node>
+              <node concept="2OqwBi" id="3rCAg5k6tYV" role="33vP2m">
+                <node concept="2OqwBi" id="3rCAg5k6tYW" role="2Oq$k0">
+                  <node concept="2OqwBi" id="3rCAg5k6tYX" role="2Oq$k0">
+                    <node concept="37vLTw" id="3rCAg5k6tYY" role="2Oq$k0">
                       <ref role="3cqZAo" node="4QPCta1aZL_" resolve="applyingResult" />
                     </node>
-                    <node concept="2OwXpG" id="2Qe6u2cmBf2" role="2OqNvi">
-                      <ref role="2Oxat5" node="4MqhgXU_1wg" resolve="visited" />
+                    <node concept="2OwXpG" id="3rCAg5k6tYZ" role="2OqNvi">
+                      <ref role="2Oxat5" node="4MqhgXU_1ti" resolve="required" />
                     </node>
                   </node>
-                  <node concept="3QWeyG" id="2Qe6u2cmBf3" role="2OqNvi">
-                    <node concept="37vLTw" id="2Qe6u2cmBf4" role="576Qk">
+                  <node concept="3QWeyG" id="3rCAg5k6tZ0" role="2OqNvi">
+                    <node concept="37vLTw" id="3rCAg5k6tZ1" role="576Qk">
                       <ref role="3cqZAo" node="2Qe6u2ckhfY" resolve="required" />
                     </node>
                   </node>
                 </node>
-                <node concept="ANE8D" id="2Qe6u2cmBf5" role="2OqNvi" />
+                <node concept="ANE8D" id="3rCAg5k6tZ2" role="2OqNvi" />
               </node>
             </node>
           </node>
@@ -6858,13 +6877,8 @@
                 <node concept="1rXfSq" id="4QPCta1aZLR" role="37wK5m">
                   <ref role="37wK5l" node="tIwzd1MM22" resolve="processRequired" />
                   <node concept="1Ls8ON" id="4QPCta1aZLS" role="37wK5m">
-                    <node concept="2OqwBi" id="4QPCta1aZLT" role="1Lso8e">
-                      <node concept="37vLTw" id="4QPCta1aZLU" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4QPCta1aZL_" resolve="applyingResult" />
-                      </node>
-                      <node concept="2OwXpG" id="4QPCta1aZLV" role="2OqNvi">
-                        <ref role="2Oxat5" node="4MqhgXU_1ti" resolve="required" />
-                      </node>
+                    <node concept="37vLTw" id="3rCAg5k6tZ3" role="1Lso8e">
+                      <ref role="3cqZAo" node="3rCAg5k6tYU" resolve="reqd" />
                     </node>
                     <node concept="37vLTw" id="2Qe6u2cmBf6" role="1Lso8e">
                       <ref role="3cqZAo" node="2Qe6u2cmBeX" resolve="visited" />
@@ -8807,6 +8821,7 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="3clFbH" id="2BZXJed1UUQ" role="3cqZAp" />
                     </node>
                     <node concept="2OqwBi" id="6OXbTDye0r$" role="3clFbw">
                       <node concept="1LFfDK" id="6OXbTDydZtr" role="2Oq$k0">
@@ -8821,6 +8836,33 @@
                         <ref role="37wK5l" node="7Oc59RS_hsj" resolve="isSuccessful" />
                       </node>
                     </node>
+                    <node concept="9aQIb" id="2BZXJed1UiI" role="9aQIa">
+                      <node concept="3clFbS" id="2BZXJed1UiJ" role="9aQI4">
+                        <node concept="3clFbF" id="2BZXJed1VFt" role="3cqZAp">
+                          <node concept="37vLTI" id="2BZXJed1VPh" role="3clFbG">
+                            <node concept="2OqwBi" id="2BZXJed1W6q" role="37vLTx">
+                              <node concept="37vLTw" id="2BZXJed1W0J" role="2Oq$k0">
+                                <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
+                              </node>
+                              <node concept="liA8E" id="2BZXJed1We4" role="2OqNvi">
+                                <ref role="37wK5l" node="7nkyKX7v7xb" resolve="and" />
+                                <node concept="1LFfDK" id="2BZXJed1X2p" role="37wK5m">
+                                  <node concept="3cmrfG" id="2BZXJed1Xfp" role="1LF_Uc">
+                                    <property role="3cmrfH" value="0" />
+                                  </node>
+                                  <node concept="37vLTw" id="2BZXJed1W$4" role="1LFl5Q">
+                                    <ref role="3cqZAo" node="6OXbTDydyNS" resolve="result_builders" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="2BZXJed1VFs" role="37vLTJ">
+                              <ref role="3cqZAo" node="6OXbTDyef8r" resolve="result" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
                 <node concept="37vLTw" id="6OXbTDydn2q" role="2GsD0m">