From abed4bd3e1990f67d73b009d21f4387675f29253 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 27 Apr 2021 08:06:34 +0200
Subject: [PATCH] Avoid failing on an error in template application, allow
 recover

---
 .../jetbrains.mps.lang.coderules.program.mps  | 98 +++++++++----------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 9f348d34..cd644465 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -7666,34 +7666,34 @@
             <node concept="3clFbS" id="7Oc59RSA9rp" role="1zc67A">
               <node concept="3cpWs6" id="5MHpiylA5DD" role="3cqZAp">
                 <node concept="1Ls8ON" id="6i42QSsqS_w" role="3cqZAk">
-                  <node concept="2YIFZM" id="7TC1Xcd$6oS" role="1Lso8e">
-                    <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
+                  <node concept="2YIFZM" id="51h1DIGuKJm" role="1Lso8e">
+                    <ref role="37wK5l" to="psoy:5X1yxJHYTYX" resolve="RECOVER" />
                     <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
-                    <node concept="2ShNRf" id="5X1yxJI9byg" role="37wK5m">
-                      <node concept="1pGfFk" id="5X1yxJI9byh" role="2ShVmc">
+                    <node concept="2ShNRf" id="51h1DIGuKJn" role="37wK5m">
+                      <node concept="1pGfFk" id="51h1DIGuKJo" role="2ShVmc">
                         <ref role="37wK5l" to="i348:5X1yxJHUoaR" resolve="TemplateApplicationException" />
-                        <node concept="3cpWs3" id="5X1yxJI9byi" role="37wK5m">
-                          <node concept="1rXfSq" id="5X1yxJI9byj" role="3uHU7w">
+                        <node concept="3cpWs3" id="51h1DIGuKJp" role="37wK5m">
+                          <node concept="1rXfSq" id="51h1DIGuKJq" role="3uHU7w">
                             <ref role="37wK5l" node="5X1yxJI81iu" resolve="details" />
-                            <node concept="37vLTw" id="5X1yxJI9byk" role="37wK5m">
+                            <node concept="37vLTw" id="51h1DIGuKJr" role="37wK5m">
                               <ref role="3cqZAo" node="5ntLU8GlSnL" resolve="node" />
                             </node>
                           </node>
-                          <node concept="3cpWs3" id="5X1yxJI9byl" role="3uHU7B">
-                            <node concept="3cpWs3" id="5X1yxJI9bym" role="3uHU7B">
-                              <node concept="Xl_RD" id="5X1yxJI9byn" role="3uHU7B">
+                          <node concept="3cpWs3" id="51h1DIGuKJs" role="3uHU7B">
+                            <node concept="3cpWs3" id="51h1DIGuKJt" role="3uHU7B">
+                              <node concept="Xl_RD" id="51h1DIGuKJu" role="3uHU7B">
                                 <property role="Xl_RC" value="Error applying template (" />
                               </node>
-                              <node concept="37vLTw" id="5X1yxJI9byo" role="3uHU7w">
+                              <node concept="37vLTw" id="51h1DIGuKJv" role="3uHU7w">
                                 <ref role="3cqZAo" node="5ntLU8GlSnJ" resolve="tpl" />
                               </node>
                             </node>
-                            <node concept="Xl_RD" id="5X1yxJI9byp" role="3uHU7w">
+                            <node concept="Xl_RD" id="51h1DIGuKJw" role="3uHU7w">
                               <property role="Xl_RC" value=")" />
                             </node>
                           </node>
                         </node>
-                        <node concept="37vLTw" id="5X1yxJI9byq" role="37wK5m">
+                        <node concept="37vLTw" id="51h1DIGuKJx" role="37wK5m">
                           <ref role="3cqZAo" node="7Oc59RSA9rl" resolve="ex" />
                         </node>
                       </node>
@@ -8171,46 +8171,46 @@
                         </node>
                         <node concept="liA8E" id="47oVduOAAdp" role="2OqNvi">
                           <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
-                          <node concept="2YIFZM" id="47oVduOAAdq" role="37wK5m">
-                            <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
+                          <node concept="2YIFZM" id="51h1DIGuTeM" role="37wK5m">
+                            <ref role="37wK5l" to="psoy:5X1yxJHYTYX" resolve="RECOVER" />
                             <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
-                            <node concept="2ShNRf" id="47oVduOAAdr" role="37wK5m">
-                              <node concept="1pGfFk" id="47oVduOAAds" role="2ShVmc">
+                            <node concept="2ShNRf" id="51h1DIGuTeN" role="37wK5m">
+                              <node concept="1pGfFk" id="51h1DIGuTeO" role="2ShVmc">
                                 <ref role="37wK5l" to="i348:5X1yxJHUoaR" resolve="TemplateApplicationException" />
-                                <node concept="3cpWs3" id="47oVduOAAdt" role="37wK5m">
-                                  <node concept="37vLTw" id="47oVduOAAdu" role="3uHU7w">
+                                <node concept="3cpWs3" id="51h1DIGuTeP" role="37wK5m">
+                                  <node concept="37vLTw" id="51h1DIGuTeQ" role="3uHU7w">
                                     <ref role="3cqZAo" node="47oVduOAAd2" resolve="details" />
                                   </node>
-                                  <node concept="3cpWs3" id="47oVduOAAdv" role="3uHU7B">
-                                    <node concept="3cpWs3" id="47oVduOAAdw" role="3uHU7B">
-                                      <node concept="3cpWs3" id="47oVduOAAdx" role="3uHU7B">
-                                        <node concept="2OqwBi" id="47oVduOAAdy" role="3uHU7B">
-                                          <node concept="37vLTw" id="47oVduOADmj" role="2Oq$k0">
+                                  <node concept="3cpWs3" id="51h1DIGuTeR" role="3uHU7B">
+                                    <node concept="3cpWs3" id="51h1DIGuTeS" role="3uHU7B">
+                                      <node concept="3cpWs3" id="51h1DIGuTeT" role="3uHU7B">
+                                        <node concept="2OqwBi" id="51h1DIGuTeU" role="3uHU7B">
+                                          <node concept="37vLTw" id="51h1DIGuTeV" role="2Oq$k0">
                                             <ref role="3cqZAo" node="47oVduO$23x" resolve="ex" />
                                           </node>
-                                          <node concept="liA8E" id="47oVduOAAd$" role="2OqNvi">
+                                          <node concept="liA8E" id="51h1DIGuTeW" role="2OqNvi">
                                             <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                                           </node>
                                         </node>
-                                        <node concept="Xl_RD" id="47oVduOAAd_" role="3uHU7w">
+                                        <node concept="Xl_RD" id="51h1DIGuTeX" role="3uHU7w">
                                           <property role="Xl_RC" value="(" />
                                         </node>
                                       </node>
-                                      <node concept="2OqwBi" id="47oVduOAAdA" role="3uHU7w">
-                                        <node concept="37vLTw" id="47oVduOAAdB" role="2Oq$k0">
+                                      <node concept="2OqwBi" id="51h1DIGuTeY" role="3uHU7w">
+                                        <node concept="37vLTw" id="51h1DIGuTeZ" role="2Oq$k0">
                                           <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
                                         </node>
-                                        <node concept="liA8E" id="47oVduOAAdC" role="2OqNvi">
+                                        <node concept="liA8E" id="51h1DIGuTf0" role="2OqNvi">
                                           <ref role="37wK5l" to="i348:1ffsG7bUgP4" resolve="toString" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="Xl_RD" id="47oVduOAAdD" role="3uHU7w">
+                                    <node concept="Xl_RD" id="51h1DIGuTf1" role="3uHU7w">
                                       <property role="Xl_RC" value=")" />
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="37vLTw" id="47oVduOADKV" role="37wK5m">
+                                <node concept="37vLTw" id="51h1DIGuTf2" role="37wK5m">
                                   <ref role="3cqZAo" node="47oVduO$23x" resolve="ex" />
                                 </node>
                               </node>
@@ -8509,46 +8509,46 @@
                           </node>
                           <node concept="liA8E" id="3rrtTcS7pRb" role="2OqNvi">
                             <ref role="37wK5l" to="psoy:7nkyKX7v7xb" resolve="and" />
-                            <node concept="2YIFZM" id="3rrtTcS7pRc" role="37wK5m">
+                            <node concept="2YIFZM" id="51h1DIGv0Lu" role="37wK5m">
+                              <ref role="37wK5l" to="psoy:5X1yxJHYTYX" resolve="RECOVER" />
                               <ref role="1Pybhc" to="psoy:7Oc59RSEjdb" resolve="Result" />
-                              <ref role="37wK5l" to="psoy:5X1yxJHYPm2" resolve="FAIL" />
-                              <node concept="2ShNRf" id="3rrtTcS7pRd" role="37wK5m">
-                                <node concept="1pGfFk" id="3rrtTcS7pRe" role="2ShVmc">
+                              <node concept="2ShNRf" id="51h1DIGv0Lv" role="37wK5m">
+                                <node concept="1pGfFk" id="51h1DIGv0Lw" role="2ShVmc">
                                   <ref role="37wK5l" to="i348:5X1yxJHUoaR" resolve="TemplateApplicationException" />
-                                  <node concept="3cpWs3" id="3rrtTcS7pRf" role="37wK5m">
-                                    <node concept="37vLTw" id="3rrtTcS7pRg" role="3uHU7w">
+                                  <node concept="3cpWs3" id="51h1DIGv0Lx" role="37wK5m">
+                                    <node concept="37vLTw" id="51h1DIGv0Ly" role="3uHU7w">
                                       <ref role="3cqZAo" node="3rrtTcS7pQO" resolve="details" />
                                     </node>
-                                    <node concept="3cpWs3" id="3rrtTcS7pRh" role="3uHU7B">
-                                      <node concept="3cpWs3" id="3rrtTcS7pRi" role="3uHU7B">
-                                        <node concept="3cpWs3" id="3rrtTcSd5Rt" role="3uHU7B">
-                                          <node concept="2OqwBi" id="3rrtTcSd6nL" role="3uHU7B">
-                                            <node concept="37vLTw" id="3rrtTcSd62g" role="2Oq$k0">
+                                    <node concept="3cpWs3" id="51h1DIGv0Lz" role="3uHU7B">
+                                      <node concept="3cpWs3" id="51h1DIGv0L$" role="3uHU7B">
+                                        <node concept="3cpWs3" id="51h1DIGv0L_" role="3uHU7B">
+                                          <node concept="2OqwBi" id="51h1DIGv0LA" role="3uHU7B">
+                                            <node concept="37vLTw" id="51h1DIGv0LB" role="2Oq$k0">
                                               <ref role="3cqZAo" node="3rrtTcScZYu" resolve="cause" />
                                             </node>
-                                            <node concept="liA8E" id="3rrtTcSd6K1" role="2OqNvi">
+                                            <node concept="liA8E" id="51h1DIGv0LC" role="2OqNvi">
                                               <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                                             </node>
                                           </node>
-                                          <node concept="Xl_RD" id="3rrtTcS7pRn" role="3uHU7w">
+                                          <node concept="Xl_RD" id="51h1DIGv0LD" role="3uHU7w">
                                             <property role="Xl_RC" value=" (" />
                                           </node>
                                         </node>
-                                        <node concept="2OqwBi" id="3rrtTcS7pRo" role="3uHU7w">
-                                          <node concept="37vLTw" id="3rrtTcS7pRp" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="51h1DIGv0LE" role="3uHU7w">
+                                          <node concept="37vLTw" id="51h1DIGv0LF" role="2Oq$k0">
                                             <ref role="3cqZAo" node="4MqhgXUBzFo" resolve="template" />
                                           </node>
-                                          <node concept="liA8E" id="3rrtTcS7pRq" role="2OqNvi">
+                                          <node concept="liA8E" id="51h1DIGv0LG" role="2OqNvi">
                                             <ref role="37wK5l" to="i348:1ffsG7bUgP4" resolve="toString" />
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="Xl_RD" id="3rrtTcS7pRr" role="3uHU7w">
+                                      <node concept="Xl_RD" id="51h1DIGv0LH" role="3uHU7w">
                                         <property role="Xl_RC" value=")" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="37vLTw" id="3rrtTcSd7qe" role="37wK5m">
+                                  <node concept="37vLTw" id="51h1DIGv0LI" role="37wK5m">
                                     <ref role="3cqZAo" node="3rrtTcScZYu" resolve="cause" />
                                   </node>
                                 </node>