From c232ba7d57d93c7d44ba5a2a8ae79c1dfcbb924d Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 21 Jul 2017 15:40:01 +0200
Subject: [PATCH] Fix the "read outside read action" issue in the cell
 renderer.

---
 .../jetbrains.mps.typechecking.plugin.mps     | 99 ++++++++++++++-----
 1 file changed, 75 insertions(+), 24 deletions(-)

diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.plugin.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.plugin.mps
index 8af01fb1..a756e2eb 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.plugin.mps
@@ -14102,7 +14102,7 @@
                       </node>
                     </node>
                     <node concept="1rXfSq" id="2tI9bOlbdfe" role="37wK5m">
-                      <ref role="37wK5l" node="2tI9bOlatsa" resolve="details" />
+                      <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
                       <node concept="2OqwBi" id="2tI9bOlbfY6" role="37wK5m">
                         <node concept="2OqwBi" id="2tI9bOlbfY7" role="2Oq$k0">
                           <node concept="liA8E" id="2tI9bOlbfY8" role="2OqNvi">
@@ -14166,7 +14166,7 @@
                         <property role="TrG5h" value="details" />
                         <node concept="17QB3L" id="2tI9bOlbpf6" role="1tU5fm" />
                         <node concept="1rXfSq" id="2tI9bOlbpf9" role="33vP2m">
-                          <ref role="37wK5l" node="2tI9bOlatsa" resolve="details" />
+                          <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
                           <node concept="37vLTw" id="2tI9bOlbpfa" role="37wK5m">
                             <ref role="3cqZAo" node="6QkkSolK_jg" resolve="arg" />
                           </node>
@@ -14310,10 +14310,10 @@
               <node concept="3clFbS" id="2tI9bOlbNYR" role="3eOfB_">
                 <node concept="3cpWs8" id="2tI9bOlbRuo" role="3cqZAp">
                   <node concept="3cpWsn" id="2tI9bOlbRup" role="3cpWs9">
-                    <property role="TrG5h" value="details" />
+                    <property role="TrG5h" value="text" />
                     <node concept="17QB3L" id="2tI9bOlbRuq" role="1tU5fm" />
                     <node concept="1rXfSq" id="2tI9bOlbRur" role="33vP2m">
-                      <ref role="37wK5l" node="2tI9bOlatsa" resolve="details" />
+                      <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
                       <node concept="37vLTw" id="2tI9bOlbRus" role="37wK5m">
                         <ref role="3cqZAo" node="6QkkSolK_jg" resolve="arg" />
                       </node>
@@ -14325,10 +14325,10 @@
                     <node concept="1pGfFk" id="2tI9bOlbPXx" role="2ShVmc">
                       <ref role="37wK5l" node="3WU9yfAaFst" resolve="TableCellInfo" />
                       <node concept="37vLTw" id="2tI9bOlbV$q" role="37wK5m">
-                        <ref role="3cqZAo" node="2tI9bOlbRup" resolve="details" />
+                        <ref role="3cqZAo" node="2tI9bOlbRup" resolve="text" />
                       </node>
                       <node concept="37vLTw" id="2tI9bOlbYqx" role="37wK5m">
-                        <ref role="3cqZAo" node="2tI9bOlbRup" resolve="details" />
+                        <ref role="3cqZAo" node="2tI9bOlbRup" resolve="text" />
                       </node>
                     </node>
                   </node>
@@ -14344,23 +14344,10 @@
                     <node concept="3uibUv" id="2tI9bOl8Bfn" role="1tU5fm">
                       <ref role="3uigEE" to="wyt6:~String" resolve="String" />
                     </node>
-                    <node concept="3K4zz7" id="2tI9bOl8Bfw" role="33vP2m">
-                      <node concept="2OqwBi" id="2tI9bOl8Bfx" role="3K4E3e">
-                        <node concept="37vLTw" id="2tI9bOl8Bfy" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6QkkSolK_jg" resolve="arg" />
-                        </node>
-                        <node concept="liA8E" id="2tI9bOl8Bfz" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
-                        </node>
-                      </node>
-                      <node concept="Xl_RD" id="2tI9bOl8Bf$" role="3K4GZi">
-                        <property role="Xl_RC" value="" />
-                      </node>
-                      <node concept="3y3z36" id="2tI9bOl8Bf_" role="3K4Cdx">
-                        <node concept="10Nm6u" id="2tI9bOl8BfA" role="3uHU7w" />
-                        <node concept="37vLTw" id="2tI9bOl8BfB" role="3uHU7B">
-                          <ref role="3cqZAo" node="6QkkSolK_jg" resolve="arg" />
-                        </node>
+                    <node concept="1rXfSq" id="6kREIVl5uTI" role="33vP2m">
+                      <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
+                      <node concept="37vLTw" id="6kREIVl5wwe" role="37wK5m">
+                        <ref role="3cqZAo" node="6QkkSolK_jg" resolve="arg" />
                       </node>
                     </node>
                   </node>
@@ -14415,7 +14402,7 @@
       </node>
       <node concept="2tJIrI" id="4_RQpN_cS33" role="jymVt" />
       <node concept="3clFb_" id="2tI9bOlatsa" role="jymVt">
-        <property role="TrG5h" value="details" />
+        <property role="TrG5h" value="presentation" />
         <node concept="37vLTG" id="2tI9bOlayJK" role="3clF46">
           <property role="TrG5h" value="value" />
           <node concept="3uibUv" id="2tI9bOlazT8" role="1tU5fm">
@@ -14624,6 +14611,70 @@
                 </node>
               </node>
             </node>
+            <node concept="3eNFk2" id="6kREIVl5gaw" role="3eNLev">
+              <node concept="2ZW3vV" id="6kREIVl5iak" role="3eO9$A">
+                <node concept="3uibUv" id="6kREIVl5ipD" role="2ZW6by">
+                  <ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
+                </node>
+                <node concept="37vLTw" id="6kREIVl5hIJ" role="2ZW6bz">
+                  <ref role="3cqZAo" node="2tI9bOlayJK" resolve="value" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="6kREIVl5gay" role="3eOfB_">
+                <node concept="3cpWs6" id="6kREIVl5jCB" role="3cqZAp">
+                  <node concept="3cpWs3" id="6kREIVl5BSp" role="3cqZAk">
+                    <node concept="Xl_RD" id="6kREIVl5BSq" role="3uHU7w">
+                      <property role="Xl_RC" value="]" />
+                    </node>
+                    <node concept="3cpWs3" id="6kREIVl5BSr" role="3uHU7B">
+                      <node concept="Xl_RD" id="6kREIVl5BSs" role="3uHU7B">
+                        <property role="Xl_RC" value="[" />
+                      </node>
+                      <node concept="2OqwBi" id="6kREIVl5BSt" role="3uHU7w">
+                        <node concept="2OqwBi" id="6kREIVl5BSu" role="2Oq$k0">
+                          <node concept="1eOMI4" id="6kREIVl5BSv" role="2Oq$k0">
+                            <node concept="10QFUN" id="6kREIVl5BSw" role="1eOMHV">
+                              <node concept="A3Dl8" id="6kREIVl5BSx" role="10QFUM">
+                                <node concept="3uibUv" id="6kREIVl5BSy" role="A3Ik2">
+                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                                </node>
+                              </node>
+                              <node concept="37vLTw" id="6kREIVl5BSz" role="10QFUP">
+                                <ref role="3cqZAo" node="2tI9bOlayJK" resolve="value" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3$u5V9" id="6kREIVl5BS$" role="2OqNvi">
+                            <node concept="1bVj0M" id="6kREIVl5BS_" role="23t8la">
+                              <node concept="3clFbS" id="6kREIVl5BSA" role="1bW5cS">
+                                <node concept="3clFbF" id="6kREIVl5BSB" role="3cqZAp">
+                                  <node concept="1rXfSq" id="6kREIVl5BSC" role="3clFbG">
+                                    <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
+                                    <node concept="37vLTw" id="6kREIVl5BSD" role="37wK5m">
+                                      <ref role="3cqZAo" node="6kREIVl5BSE" resolve="it" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="Rh6nW" id="6kREIVl5BSE" role="1bW2Oz">
+                                <property role="TrG5h" value="it" />
+                                <node concept="2jxLKc" id="6kREIVl5BSF" role="1tU5fm" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3uJxvA" id="6kREIVl5BSG" role="2OqNvi">
+                          <node concept="Xl_RD" id="6kREIVl5BSH" role="3uJOhx">
+                            <property role="Xl_RC" value="," />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="6kREIVl5iuQ" role="3cqZAp" />
+              </node>
+            </node>
             <node concept="3eNFk2" id="2tI9bOlaQ5H" role="3eNLev">
               <node concept="3y3z36" id="2tI9bOlaRJu" role="3eO9$A">
                 <node concept="10Nm6u" id="2tI9bOlaRYY" role="3uHU7w" />