Skip to content

Commit 9c389d9

Browse files
committed
catch up ruby 3.4.0 error related changes
* should use `base_label` instead of `label`. * should accept both backtick or single quote * shoudl accept with class name
1 parent 69909a3 commit 9c389d9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

lib/debug/thread_client.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ def wait_next_action_
989989
true
990990
else
991991
true if depth >= DEBUGGER__.frame_depth - 3 &&
992-
caller_locations(2, 1).first.label == target_location_label
992+
caller_locations(2, 1).first.base_label == target_location_label
993993
# TODO: imcomplete condition
994994
end
995995
end
@@ -1005,7 +1005,7 @@ def wait_next_action_
10051005
true if pat === tp.callee_id.to_s
10061006
else # :return, :b_return
10071007
true if depth >= DEBUGGER__.frame_depth - 3 &&
1008-
caller_locations(2, 1).first.label == target_location_label
1008+
caller_locations(2, 1).first.base_label == target_location_label
10091009
# TODO: imcomplete condition
10101010
end
10111011
end

test/protocol/boot_config_raw_dap_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def test_boot_configuration_works_correctly
120120
threads: [
121121
{
122122
id: 1,
123-
name: "#1 #{temp_file_path}:1:in `<main>'"
123+
name: /\#1 #{temp_file_path}:1:in [`']<main>'/
124124
}
125125
]
126126
}
@@ -141,7 +141,7 @@ def test_boot_configuration_works_correctly
141141
threads: [
142142
{
143143
id: 1,
144-
name: "#1 #{temp_file_path}:1:in `<main>'"
144+
name: /\#1 #{temp_file_path}:1:in [`']<main>'/
145145
}
146146
]
147147
}

test/protocol/threads_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ def test_reponse_returns_correct_threads_info
2020

2121
assert_threads_result(
2222
[
23-
/\.rb:\d:in `<main>'/,
24-
/\.rb:\d:in `block in foo'/
23+
/\.rb:\d:in [`']<main>'/,
24+
/\.rb:\d:in [`']block in (Object#)?foo'/
2525
]
2626
)
2727

0 commit comments

Comments
 (0)