From fd300e3e076fd8eb895ca5d9bb5dc76e25e71948 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 21 Jan 2020 15:32:46 +0100
Subject: [PATCH] Add null guard before invoking pattern match, avoid NPE.

---
 ...ains.mps.coderules.typechecking.plugin.mps | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index 74457746..6746654c 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -2090,16 +2090,24 @@
                 <ref role="3cqZAo" node="4lCLOtwpu_0" resolve="result" />
               </node>
               <node concept="10Nm6u" id="4lCLOtwpAYm" role="3K4GZi" />
-              <node concept="2OqwBi" id="4lCLOtwpAYn" role="3K4Cdx">
-                <node concept="37vLTw" id="4lCLOtwpAYo" role="2Oq$k0">
-                  <ref role="3cqZAo" node="hEDrw1P5M4" resolve="pattern" />
-                </node>
-                <node concept="liA8E" id="4lCLOtwpAYp" role="2OqNvi">
-                  <ref role="37wK5l" to="7jhi:~IMatchingPattern.match(org.jetbrains.mps.openapi.model.SNode)" resolve="match" />
-                  <node concept="37vLTw" id="4lCLOtwpAYq" role="37wK5m">
+              <node concept="1Wc70l" id="22KCgTW0QSe" role="3K4Cdx">
+                <node concept="3y3z36" id="22KCgTW0V53" role="3uHU7B">
+                  <node concept="10Nm6u" id="22KCgTW0Vmn" role="3uHU7w" />
+                  <node concept="37vLTw" id="22KCgTW0U_5" role="3uHU7B">
                     <ref role="3cqZAo" node="4lCLOtwpu_0" resolve="result" />
                   </node>
                 </node>
+                <node concept="2OqwBi" id="4lCLOtwpAYn" role="3uHU7w">
+                  <node concept="37vLTw" id="4lCLOtwpAYo" role="2Oq$k0">
+                    <ref role="3cqZAo" node="hEDrw1P5M4" resolve="pattern" />
+                  </node>
+                  <node concept="liA8E" id="4lCLOtwpAYp" role="2OqNvi">
+                    <ref role="37wK5l" to="7jhi:~IMatchingPattern.match(org.jetbrains.mps.openapi.model.SNode)" resolve="match" />
+                    <node concept="37vLTw" id="4lCLOtwpAYq" role="37wK5m">
+                      <ref role="3cqZAo" node="4lCLOtwpu_0" resolve="result" />
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>