From c8a56558ae99665594f0daecc983b7f9e95b85b9 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Tue, 6 Nov 2018 14:39:01 +0100
Subject: [PATCH] Always use trampoline as blocking scheduler. Avoids deadlocks
 when two threads wait on read lock, and EDT requests write.

---
 .../models/service.mps                        | 31 +++----------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index f5702718..02412ba3 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -3601,33 +3601,10 @@
       </node>
       <node concept="3Tm1VV" id="3KwBCAA_erQ" role="1B3o_S" />
       <node concept="3clFbS" id="3KwBCAA_erR" role="3clF47">
-        <node concept="3clFbJ" id="3KwBCAA_Uq6" role="3cqZAp">
-          <node concept="9aQIb" id="3KwBCAA_Uq7" role="9aQIa">
-            <node concept="3clFbS" id="3KwBCAA_Uq8" role="9aQI4">
-              <node concept="3cpWs6" id="3KwBCAA_Uq9" role="3cqZAp">
-                <node concept="2YIFZM" id="19wqdqO465D" role="3cqZAk">
-                  <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
-                  <ref role="37wK5l" to="m4y7:~Schedulers.from(java.util.concurrent.Executor):io.reactivex.Scheduler" resolve="from" />
-                  <node concept="10M0yZ" id="19wqdqO465E" role="37wK5m">
-                    <ref role="3cqZAo" to="e5vs:~PooledThreadExecutor.INSTANCE" resolve="INSTANCE" />
-                    <ref role="1PxDUh" to="e5vs:~PooledThreadExecutor" resolve="PooledThreadExecutor" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2YIFZM" id="3KwBCAA_Uqb" role="3clFbw">
-            <ref role="1Pybhc" to="dxuu:~SwingUtilities" resolve="SwingUtilities" />
-            <ref role="37wK5l" to="dxuu:~SwingUtilities.isEventDispatchThread():boolean" resolve="isEventDispatchThread" />
-          </node>
-          <node concept="3clFbS" id="3KwBCAA_Uqc" role="3clFbx">
-            <node concept="3cpWs6" id="3KwBCAA_Uqd" role="3cqZAp">
-              <node concept="2YIFZM" id="3KwBCAA_Uqe" role="3cqZAk">
-                <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
-                <ref role="37wK5l" to="m4y7:~Schedulers.trampoline():io.reactivex.Scheduler" resolve="trampoline" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="3KwBCAA_Uqf" role="3cqZAp" />
+        <node concept="3cpWs6" id="3KwBCAA_Uqd" role="3cqZAp">
+          <node concept="2YIFZM" id="3KwBCAA_Uqe" role="3cqZAk">
+            <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
+            <ref role="37wK5l" to="m4y7:~Schedulers.trampoline():io.reactivex.Scheduler" resolve="trampoline" />
           </node>
         </node>
       </node>