From a2f939b99c43c6344f109144d7b01c95294a6f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Mon, 21 Jun 2021 19:37:51 +0200
Subject: refactor(core): always attach inspector to isolate (#11042)

This commit changes "deno_core::JsRuntime" to always create
"deno_core::JsRuntimeInspector" instance.
---
 runtime/examples/hello_runtime.rs |  1 -
 runtime/web_worker.rs             | 14 +++++---------
 runtime/worker.rs                 | 22 +++++++---------------
 3 files changed, 12 insertions(+), 25 deletions(-)

(limited to 'runtime')

diff --git a/runtime/examples/hello_runtime.rs b/runtime/examples/hello_runtime.rs
index 28ea64043..af2f64892 100644
--- a/runtime/examples/hello_runtime.rs
+++ b/runtime/examples/hello_runtime.rs
@@ -32,7 +32,6 @@ async fn main() -> Result<(), AnyError> {
     seed: None,
     js_error_create_fn: None,
     create_web_worker_cb,
-    attach_inspector: false,
     maybe_inspector_server: None,
     should_break_on_first_statement: false,
     module_loader,
diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs
index 7a58314a9..9fe90ee1d 100644
--- a/runtime/web_worker.rs
+++ b/runtime/web_worker.rs
@@ -218,7 +218,6 @@ pub struct WebWorkerOptions {
   pub create_web_worker_cb: Arc<ops::worker_host::CreateWebWorkerCb>,
   pub js_error_create_fn: Option<Rc<JsErrorCreateFn>>,
   pub use_deno_namespace: bool,
-  pub attach_inspector: bool,
   pub maybe_inspector_server: Option<Arc<InspectorServer>>,
   pub apply_source_maps: bool,
   /// Sets `Deno.version.deno` in JS runtime.
@@ -314,17 +313,15 @@ impl WebWorker {
       startup_snapshot: Some(js::deno_isolate_init()),
       js_error_create_fn: options.js_error_create_fn.clone(),
       get_error_class_fn: options.get_error_class_fn,
-      attach_inspector: options.attach_inspector,
       extensions,
       ..Default::default()
     });
 
-    if let Some(inspector) = js_runtime.inspector() {
-      if let Some(server) = options.maybe_inspector_server.clone() {
-        let session_sender = inspector.get_session_sender();
-        let deregister_rx = inspector.add_deregister_handler();
-        server.register_inspector(session_sender, deregister_rx);
-      }
+    if let Some(server) = options.maybe_inspector_server.clone() {
+      let inspector = js_runtime.inspector();
+      let session_sender = inspector.get_session_sender();
+      let deregister_rx = inspector.add_deregister_handler();
+      server.register_inspector(session_sender, deregister_rx);
     }
 
     let (internal_handle, external_handle) = {
@@ -550,7 +547,6 @@ mod tests {
       create_web_worker_cb,
       js_error_create_fn: None,
       use_deno_namespace: false,
-      attach_inspector: false,
       maybe_inspector_server: None,
       runtime_version: "x".to_string(),
       ts_version: "x".to_string(),
diff --git a/runtime/worker.rs b/runtime/worker.rs
index 3d7640404..58a2e8a9a 100644
--- a/runtime/worker.rs
+++ b/runtime/worker.rs
@@ -58,7 +58,6 @@ pub struct WorkerOptions {
   // of WebWorker
   pub create_web_worker_cb: Arc<ops::worker_host::CreateWebWorkerCb>,
   pub js_error_create_fn: Option<Rc<JsErrorCreateFn>>,
-  pub attach_inspector: bool,
   pub maybe_inspector_server: Option<Arc<InspectorServer>>,
   pub should_break_on_first_statement: bool,
   /// Sets `Deno.version.deno` in JS runtime.
@@ -141,24 +140,19 @@ impl MainWorker {
       js_error_create_fn: options.js_error_create_fn.clone(),
       get_error_class_fn: options.get_error_class_fn,
       extensions,
-      attach_inspector: options.attach_inspector,
       ..Default::default()
     });
 
-    let mut should_break_on_first_statement = false;
-
-    if let Some(inspector) = js_runtime.inspector() {
-      if let Some(server) = options.maybe_inspector_server.clone() {
-        let session_sender = inspector.get_session_sender();
-        let deregister_rx = inspector.add_deregister_handler();
-        server.register_inspector(session_sender, deregister_rx);
-      }
-      should_break_on_first_statement = options.should_break_on_first_statement;
+    if let Some(server) = options.maybe_inspector_server.clone() {
+      let inspector = js_runtime.inspector();
+      let session_sender = inspector.get_session_sender();
+      let deregister_rx = inspector.add_deregister_handler();
+      server.register_inspector(session_sender, deregister_rx);
     }
 
     Self {
       js_runtime,
-      should_break_on_first_statement,
+      should_break_on_first_statement: options.should_break_on_first_statement,
     }
   }
 
@@ -231,7 +225,6 @@ impl MainWorker {
       self
         .js_runtime
         .inspector()
-        .unwrap()
         .wait_for_session_and_break_on_next_statement()
     }
   }
@@ -239,7 +232,7 @@ impl MainWorker {
   /// Create new inspector session. This function panics if Worker
   /// was not configured to create inspector.
   pub async fn create_inspector_session(&mut self) -> LocalInspectorSession {
-    let inspector = self.js_runtime.inspector().unwrap();
+    let inspector = self.js_runtime.inspector();
     inspector.create_local_session()
   }
 
@@ -295,7 +288,6 @@ mod tests {
       seed: None,
       js_error_create_fn: None,
       create_web_worker_cb: Arc::new(|_| unreachable!()),
-      attach_inspector: false,
       maybe_inspector_server: None,
       should_break_on_first_statement: false,
       module_loader: Rc::new(deno_core::FsModuleLoader),
-- 
cgit v1.2.3