From 0e17f086ce3795dc958e2bb8dad2bf3525d2b55f Mon Sep 17 00:00:00 2001
From: Kitson Kelly <me@kitsonkelly.com>
Date: Wed, 12 May 2021 13:10:06 +1000
Subject: fix(#10603): revert minimal changes to resolve deadlock bug (#10605)

---
 cli/bench/lsp.rs | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

(limited to 'cli/bench')

diff --git a/cli/bench/lsp.rs b/cli/bench/lsp.rs
index 173c52774..ed474b9ea 100644
--- a/cli/bench/lsp.rs
+++ b/cli/bench/lsp.rs
@@ -184,6 +184,7 @@ impl LspClient {
     }
   }
 
+  #[allow(unused)]
   fn read_request<R>(&mut self) -> Result<(u64, String, Option<R>), AnyError>
   where
     R: de::DeserializeOwned,
@@ -238,6 +239,7 @@ impl LspClient {
     }
   }
 
+  #[allow(unused)]
   fn write_response<V>(&mut self, id: u64, result: V) -> Result<(), AnyError>
   where
     V: Serialize,
@@ -294,15 +296,16 @@ fn bench_big_file_edits(deno_exe: &Path) -> Result<Duration, AnyError> {
     }),
   )?;
 
-  let (id, method, _): (u64, String, Option<Value>) = client.read_request()?;
-  assert_eq!(method, "workspace/configuration");
+  // TODO(@kitsonk) work around https://github.com/denoland/deno/issues/10603
+  // let (id, method, _): (u64, String, Option<Value>) = client.read_request()?;
+  // assert_eq!(method, "workspace/configuration");
 
-  client.write_response(
-    id,
-    json!({
-      "enable": true
-    }),
-  )?;
+  // client.write_response(
+  //   id,
+  //   json!({
+  //     "enable": true
+  //   }),
+  // )?;
 
   let (method, _): (String, Option<Value>) = client.read_notification()?;
   assert_eq!(method, "textDocument/publishDiagnostics");
@@ -366,15 +369,16 @@ fn bench_startup_shutdown(deno_exe: &Path) -> Result<Duration, AnyError> {
     }),
   )?;
 
-  let (id, method, _): (u64, String, Option<Value>) = client.read_request()?;
-  assert_eq!(method, "workspace/configuration");
+  // TODO(@kitsonk) work around https://github.com/denoland/deno/issues/10603
+  // let (id, method, _): (u64, String, Option<Value>) = client.read_request()?;
+  // assert_eq!(method, "workspace/configuration");
 
-  client.write_response(
-    id,
-    json!({
-      "enable": true
-    }),
-  )?;
+  // client.write_response(
+  //   id,
+  //   json!({
+  //     "enable": true
+  //   }),
+  // )?;
 
   let (method, _): (String, Option<Value>) = client.read_notification()?;
   assert_eq!(method, "textDocument/publishDiagnostics");
-- 
cgit v1.2.3