1 files changed, 19 insertions, 8 deletions

diff --git a/runtime/inspector_server.rs b/runtime/inspector_server.rs
index 6ba4d088d..99aff0644 100644
--- a/runtime/inspector_server.rs
+++ b/runtime/inspector_server.rs
@@ -65,13 +65,18 @@ impl InspectorServer {
     &self,
     module_url: String,
     js_runtime: &mut JsRuntime,
+    should_break_on_first_statement: bool,
   ) {
     let inspector = js_runtime.inspector();
     let session_sender = inspector.get_session_sender();
     let deregister_rx = inspector.add_deregister_handler();
-    // TODO(bartlomieju): simplify
-    let info =
-      InspectorInfo::new(self.host, session_sender, deregister_rx, module_url);
+    let info = InspectorInfo::new(
+      self.host,
+      session_sender,
+      deregister_rx,
+      module_url,
+      should_break_on_first_statement,
+    );
     self.register_inspector_tx.unbounded_send(info).unwrap();
   }
 }
@@ -229,6 +234,10 @@ async fn server(
         "Debugger listening on {}",
         info.get_websocket_debugger_url()
       );
+      eprintln!("Visit chrome://inspect to connect to the debugger.");
+      if info.should_break_on_first_statement {
+        eprintln!("Deno is waiting for debugger to connect.");
+      }
       if inspector_map.borrow_mut().insert(info.uuid, info).is_some() {
         panic!("Inspector UUID already in map");
       }
@@ -336,7 +345,7 @@ async fn pump_websocket_messages(
     .map_err(|_| ());
 
   let inbound_pump = async move {
-    let result = websocket_rx
+    let _result = websocket_rx
       .map_ok(|msg| msg.into_data())
       .map_err(AnyError::from)
       .map_ok(|msg| {
@@ -345,10 +354,9 @@ async fn pump_websocket_messages(
       .try_collect::<()>()
       .await;
 
-    match result {
-      Ok(_) => eprintln!("Debugger session ended"),
-      Err(err) => eprintln!("Debugger session ended: {}.", err),
-    };
+    // Users don't care if there was an error coming from debugger,
+    // just about the fact that debugger did disconnect.
+    eprintln!("Debugger session ended");
 
     Ok(())
   };
@@ -364,6 +372,7 @@ pub struct InspectorInfo {
   pub new_session_tx: UnboundedSender<InspectorSessionProxy>,
   pub deregister_rx: oneshot::Receiver<()>,
   pub url: String,
+  pub should_break_on_first_statement: bool,
 }
 
 impl InspectorInfo {
@@ -372,6 +381,7 @@ impl InspectorInfo {
     new_session_tx: mpsc::UnboundedSender<InspectorSessionProxy>,
     deregister_rx: oneshot::Receiver<()>,
     url: String,
+    should_break_on_first_statement: bool,
   ) -> Self {
     Self {
       host,
@@ -380,6 +390,7 @@ impl InspectorInfo {
       new_session_tx,
       deregister_rx,
       url,
+      should_break_on_first_statement,
     }
   }