Skip to content

Commit 97bf5a0

Browse files
st0012ko1
authored andcommitted
skip_internal_path should be included in skip_path
1 parent 079405d commit 97bf5a0

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

lib/debug/breakpoint.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ def setup
288288
@tp = TracePoint.new(:raise){|tp|
289289
exc = tp.raised_exception
290290
next if SystemExit === exc
291-
next if skip_internal_path?(tp.path)
292291
next if skip_path?(tp.path)
293292

294293
next if !safe_eval(tp.binding, @cond) if @cond
@@ -326,7 +325,6 @@ def initialize expr, path
326325
def setup
327326
@tp = TracePoint.new(:line){|tp|
328327
next if ThreadClient.current.management?
329-
next if skip_internal_path?(tp.path)
330328
next if skip_path?(tp.path)
331329

332330
if safe_eval tp.binding, @expr
@@ -374,7 +372,6 @@ def watch_eval(tp)
374372

375373
def setup
376374
@tp = TracePoint.new(:line, :return, :b_return){|tp|
377-
next if skip_internal_path?(tp.path)
378375

379376
watch_eval(tp)
380377
}
@@ -418,7 +415,6 @@ def setup
418415
next if @cond_class && !tp.self.kind_of?(@cond_class)
419416

420417
caller_location = caller_locations(2, 1).first.to_s
421-
next if skip_internal_path?(caller_location)
422418
next if skip_path?(caller_location)
423419

424420
suspend

lib/debug/thread_client.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
module DEBUGGER__
99
module SkipPathHelper
1010
def skip_path?(path)
11-
(skip_paths = CONFIG[:skip_path]) && skip_paths.any?{|skip_path| path.match?(skip_path)}
11+
skip_internal_path?(path) || (skip_paths = CONFIG[:skip_path]) && skip_paths.any?{|skip_path| path.match?(skip_path)}
1212
end
1313

1414
def skip_internal_path?(path)
@@ -1005,6 +1005,7 @@ def initialize
10051005

10061006
@tp_recorder ||= TracePoint.new(:line){|tp|
10071007
next unless Thread.current == thread
1008+
# can't be replaced by skip_location
10081009
next if skip_internal_path?(tp.path)
10091010
loc = caller_locations(1, 1).first
10101011
next if skip_location?(loc)

lib/debug/tracer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def to_s
6666
end
6767

6868
def skip? tp
69-
ThreadClient.current.management? || skip_internal_path?(tp.path) || skip_path?(tp.path) || skip_with_pattern?(tp)
69+
ThreadClient.current.management? || skip_path?(tp.path) || skip_with_pattern?(tp)
7070
end
7171

7272
def skip_with_pattern?(tp)

0 commit comments

Comments
 (0)