From 899d6b52081858ff78fdb303c01bfa9b5df0bbc2 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 26 Aug 2019 17:14:39 +0200
Subject: [PATCH] Avoid producing NPE on missing template.

---
 .../jetbrains.mps.lang.coderules.eval.mps     | 84 ++++++++++++++++++-
 .../jetbrains.mps.lang.coderules.macro.mps    |  9 ++
 2 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 9b5bfdbc..6d8aa9e5 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -6451,6 +6451,28 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFb_" id="2Y70AYExTDC" role="jymVt">
+                    <property role="TrG5h" value="defaultValue" />
+                    <node concept="3uibUv" id="2Y70AYExTDD" role="3clF45">
+                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                    </node>
+                    <node concept="3Tm1VV" id="2Y70AYExTDE" role="1B3o_S" />
+                    <node concept="3clFbS" id="2Y70AYExTDF" role="3clF47">
+                      <node concept="3clFbF" id="2Y70AYExTDG" role="3cqZAp">
+                        <node concept="2ShNRf" id="2Y70AYExTDH" role="3clFbG">
+                          <node concept="1pGfFk" id="2Y70AYExTDI" role="2ShVmc">
+                            <ref role="37wK5l" to="i348:6lpwCiZjdph" resolve="RuleBuilder" />
+                            <node concept="Xl_RD" id="2Y70AYExTDJ" role="37wK5m">
+                              <property role="Xl_RC" value="empty" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="2Y70AYExTDK" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
                   <node concept="3uibUv" id="7DvO2M9IiL_" role="2Ghqu4">
                     <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
                   </node>
@@ -6602,6 +6624,28 @@
                   <node concept="3uibUv" id="5DUvKnrzek1" role="2Ghqu4">
                     <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
                   </node>
+                  <node concept="3clFb_" id="2Y70AYExGTY" role="jymVt">
+                    <property role="TrG5h" value="defaultValue" />
+                    <node concept="3uibUv" id="2Y70AYExGU4" role="3clF45">
+                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                    </node>
+                    <node concept="3Tm1VV" id="2Y70AYExGU0" role="1B3o_S" />
+                    <node concept="3clFbS" id="2Y70AYExGU5" role="3clF47">
+                      <node concept="3clFbF" id="2Y70AYExHfP" role="3cqZAp">
+                        <node concept="2ShNRf" id="2Y70AYExHfN" role="3clFbG">
+                          <node concept="1pGfFk" id="2Y70AYExHG$" role="2ShVmc">
+                            <ref role="37wK5l" to="i348:6lpwCiZjdph" resolve="RuleBuilder" />
+                            <node concept="Xl_RD" id="2Y70AYExHIS" role="37wK5m">
+                              <property role="Xl_RC" value="empty" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="2Y70AYExGU6" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
                 </node>
               </node>
             </node>
@@ -6710,6 +6754,28 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFb_" id="2Y70AYExHLb" role="jymVt">
+                    <property role="TrG5h" value="defaultValue" />
+                    <node concept="3uibUv" id="2Y70AYExHLc" role="3clF45">
+                      <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
+                    </node>
+                    <node concept="3Tm1VV" id="2Y70AYExHLd" role="1B3o_S" />
+                    <node concept="3clFbS" id="2Y70AYExHLe" role="3clF47">
+                      <node concept="3clFbF" id="2Y70AYExHLf" role="3cqZAp">
+                        <node concept="2ShNRf" id="2Y70AYExHLg" role="3clFbG">
+                          <node concept="1pGfFk" id="2Y70AYExHLh" role="2ShVmc">
+                            <ref role="37wK5l" to="i348:6lpwCiZjdph" resolve="RuleBuilder" />
+                            <node concept="Xl_RD" id="2Y70AYExHLi" role="37wK5m">
+                              <property role="Xl_RC" value="empty" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2AHcQZ" id="2Y70AYExHLj" role="2AJF6D">
+                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                    </node>
+                  </node>
                   <node concept="3uibUv" id="7DvO2M9IiMe" role="2Ghqu4">
                     <ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
                   </node>
@@ -6756,7 +6822,14 @@
         </node>
         <node concept="3cpWs6" id="6UWSvq4Qx$K" role="3cqZAp">
           <node concept="3K4zz7" id="6UWSvq4Q$Bf" role="3cqZAk">
-            <node concept="10Nm6u" id="6UWSvq4Q_NS" role="3K4GZi" />
+            <node concept="2OqwBi" id="2Y70AYExJ3V" role="3K4GZi">
+              <node concept="37vLTw" id="2Y70AYExIek" role="2Oq$k0">
+                <ref role="3cqZAo" node="7DvO2M9IiNS" resolve="action" />
+              </node>
+              <node concept="liA8E" id="2Y70AYExJU8" role="2OqNvi">
+                <ref role="37wK5l" to="psr6:2Y70AYExG1D" resolve="defaultValue" />
+              </node>
+            </node>
             <node concept="3y3z36" id="6UWSvq4Qzuq" role="3K4Cdx">
               <node concept="10Nm6u" id="6UWSvq4Q$6Z" role="3uHU7w" />
               <node concept="37vLTw" id="6UWSvq4QyJ3" role="3uHU7B">
@@ -6854,7 +6927,14 @@
         </node>
         <node concept="3cpWs6" id="6UWSvq4QCub" role="3cqZAp">
           <node concept="3K4zz7" id="6UWSvq4QF6R" role="3cqZAk">
-            <node concept="10Nm6u" id="6UWSvq4QI_P" role="3K4GZi" />
+            <node concept="2OqwBi" id="2Y70AYExKWm" role="3K4GZi">
+              <node concept="37vLTw" id="2Y70AYExK6g" role="2Oq$k0">
+                <ref role="3cqZAo" node="7DvO2M9IiO4" resolve="action" />
+              </node>
+              <node concept="liA8E" id="2Y70AYExLwn" role="2OqNvi">
+                <ref role="37wK5l" to="psr6:2Y70AYExG1D" resolve="defaultValue" />
+              </node>
+            </node>
             <node concept="3y3z36" id="6UWSvq4QDQy" role="3K4Cdx">
               <node concept="10Nm6u" id="6UWSvq4QEu_" role="3uHU7w" />
               <node concept="37vLTw" id="6UWSvq4QCZK" role="3uHU7B">
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
index 0062bcd0..3ae923cb 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
@@ -282,6 +282,15 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="2Y70AYExG0f" role="jymVt" />
+      <node concept="3clFb_" id="2Y70AYExG1D" role="jymVt">
+        <property role="TrG5h" value="defaultValue" />
+        <node concept="16syzq" id="2Y70AYExG4Q" role="3clF45">
+          <ref role="16sUi3" node="1eKXYsjws1d" resolve="R" />
+        </node>
+        <node concept="3Tm1VV" id="2Y70AYExG1G" role="1B3o_S" />
+        <node concept="3clFbS" id="2Y70AYExG1H" role="3clF47" />
+      </node>
       <node concept="3Tm1VV" id="1eKXYsjxjKN" role="1B3o_S" />
       <node concept="16euLQ" id="1eKXYsjws1d" role="16eVyc">
         <property role="TrG5h" value="R" />