Skip to content

Small refactors #546

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

Merged
ko1 merged 3 commits into from
Mar 15, 2022
Merged

Small refactors #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eda7fe5
Remove obsolete condition
st0012 Feb 21, 2022
82b65ab
Refactor ThreadClient#to_s
st0012 Feb 21, 2022
a97b55c
Use ThreadClient#current_frame when possible
st0012 Feb 21, 2022
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
6 changes: 1 addition & 5 deletions lib/debug/session.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,7 @@ def activate on_fork: false
@tp_thread_begin&.disable
@tp_thread_begin = nil

if on_fork
@ui.activate self, on_fork: true
else
@ui.activate self, on_fork: false
end
@ui.activate self, on_fork: on_fork

q = Queue.new
@session_server = Thread.new do
Expand Down
13 changes: 3 additions & 10 deletions lib/debug/thread_client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,7 @@ def inspect
end

def to_s
loc = current_frame&.location

if loc
str = "(#{@thread.name || @thread.status})@#{loc}"
else
str = "(#{@thread.name || @thread.status})@#{@thread.to_s}"
end

str = "(#{@thread.name || @thread.status})@#{current_frame&.location || @thread.to_s}"
str += " (not under control)" unless self.waiting?
str
end
Expand Down Expand Up @@ -557,8 +550,8 @@ def truncate(string, width:)

def show_by_editor path = nil
unless path
if @target_frames && frame = @target_frames[@current_frame_index]
path = frame.path
if current_frame
path = current_frame.path
else
return # can't get path
end
Expand Down