Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

catch up ruby 3.4.0 error related changes #1083

Merged
merged 1 commit into from
Feb 20, 2024
Merged

catch up ruby 3.4.0 error related changes #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/debug/thread_client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ def wait_next_action_
true
else
true if depth >= DEBUGGER__.frame_depth - 3 &&
caller_locations(2, 1).first.label == target_location_label
caller_locations(2, 1).first.base_label == target_location_label
# TODO: imcomplete condition
end
end
Expand All @@ -1005,7 +1005,7 @@ def wait_next_action_
true if pat === tp.callee_id.to_s
else # :return, :b_return
true if depth >= DEBUGGER__.frame_depth - 3 &&
caller_locations(2, 1).first.label == target_location_label
caller_locations(2, 1).first.base_label == target_location_label
# TODO: imcomplete condition
end
end
Expand Down
4 changes: 2 additions & 2 deletions test/protocol/boot_config_raw_dap_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def test_boot_configuration_works_correctly
threads: [
{
id: 1,
name: "#1 #{temp_file_path}:1:in `<main>'"
name: /\#1 #{temp_file_path}:1:in [`']<main>'/
}
]
}
Expand All @@ -141,7 +141,7 @@ def test_boot_configuration_works_correctly
threads: [
{
id: 1,
name: "#1 #{temp_file_path}:1:in `<main>'"
name: /\#1 #{temp_file_path}:1:in [`']<main>'/
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions test/protocol/threads_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ def test_reponse_returns_correct_threads_info

assert_threads_result(
[
/\.rb:\d:in `<main>'/,
/\.rb:\d:in `block in foo'/
/\.rb:\d:in [`']<main>'/,
/\.rb:\d:in [`']block in (Object#)?foo'/
]
)

Expand Down