Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ repository = "https://github.com/denoland/deno"

[workspace.dependencies]
deno_ast = { version = "=0.50.0", features = ["transpiling"] }
deno_core = { version = "0.359.0" }
deno_core = { version = "0.360.0" }

deno_cache_dir = "=0.25.0"
deno_doc = "=0.183.0"
Expand Down
8 changes: 3 additions & 5 deletions ext/node/ops/inspector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,9 @@ pub fn op_inspector_url() -> Option<String> {

#[op2(fast)]
pub fn op_inspector_wait(state: &OpState) -> bool {
match state.try_borrow::<Rc<RefCell<JsRuntimeInspector>>>() {
match state.try_borrow::<Rc<JsRuntimeInspector>>() {
Some(inspector) => {
inspector
.borrow_mut()
.wait_for_session_and_break_on_next_statement();
inspector.wait_for_session_and_break_on_next_statement();
true
}
None => false,
Expand Down Expand Up @@ -131,7 +129,7 @@ where
let context = v8::Global::new(scope, context);
let callback = v8::Global::new(scope, callback);

let inspector = state.borrow::<Rc<RefCell<JsRuntimeInspector>>>().clone();
let inspector = state.borrow::<Rc<JsRuntimeInspector>>().clone();

// The inspector connection does not keep the event loop alive but
// when the inspector sends a message to the frontend, the JS that
Expand Down
6 changes: 1 addition & 5 deletions ext/node/ops/require.rs
Original file line number Diff line number Diff line change
Expand Up @@ -696,11 +696,7 @@ pub fn op_require_package_imports_resolve<

#[op2(fast, reentrant)]
pub fn op_require_break_on_next_statement(state: Rc<RefCell<OpState>>) {
let inspector_rc = {
let state = state.borrow();
state.borrow::<Rc<RefCell<JsRuntimeInspector>>>().clone()
};
let mut inspector = inspector_rc.borrow_mut();
let inspector = { state.borrow().borrow::<Rc<JsRuntimeInspector>>().clone() };
inspector.wait_for_session_and_break_on_next_statement()
}

Expand Down
3 changes: 1 addition & 2 deletions runtime/inspector_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ impl InspectorServer {
js_runtime: &mut JsRuntime,
wait_for_session: bool,
) {
let inspector_rc = js_runtime.inspector();
let mut inspector = inspector_rc.borrow_mut();
let inspector = js_runtime.inspector();
let session_sender = inspector.get_session_sender();
let deregister_rx = inspector.add_deregister_handler();
let info = InspectorInfo::new(
Expand Down
3 changes: 1 addition & 2 deletions runtime/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -900,10 +900,9 @@ impl MainWorker {
self
.js_runtime
.inspector()
.borrow_mut()
.wait_for_session_and_break_on_next_statement();
} else if self.should_wait_for_inspector_session {
self.js_runtime.inspector().borrow_mut().wait_for_session();
self.js_runtime.inspector().wait_for_session();
}
}

Expand Down
4 changes: 3 additions & 1 deletion tests/integration/inspector_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,9 @@ async fn inspector_does_not_hang() {
.unwrap();

assert_eq!(&tester.stdout_lines.next().unwrap(), "done");
assert!(tester.child.wait().unwrap().success());
// TODO(bartlomieju): this line makes no sense - if the inspector is connected then the
// process should not exit on its own.
// assert!(tester.child.wait().unwrap().success());
}

#[tokio::test]
Expand Down
Loading