Skip to content

Move block and method args to their own methods #636

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
merged 1 commit into from
Jun 24, 2022
Merged

Move block and method args to their own methods #636

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
34 changes: 15 additions & 19 deletions lib/debug/frame_info.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,10 @@ def name
# p frame_type: frame_type, self: self
case frame_type
when :block
level, block_loc, _args = block_identifier
level, block_loc = block_identifier
"block in #{block_loc}#{level}"
when :method
ci, _args = method_identifier
"#{ci}"
method_identifier
when :c
c_identifier
when :other
Expand Down Expand Up @@ -83,16 +82,13 @@ def frame_type

def block_identifier
return unless frame_type == :block
args = parameters_info
_, level, block_loc = location.label.match(BLOCK_LABL_REGEXP).to_a
[level || "", block_loc, args]
[level || "", block_loc]
end

def method_identifier
return unless frame_type == :method
args = parameters_info
ci = "#{klass_sig}#{callee}"
[ci, args]
"#{klass_sig}#{callee}"
end

def c_identifier
Expand Down Expand Up @@ -138,6 +134,17 @@ def local_variables
end
end

def parameters_info
vars = iseq.parameters_symbols
vars.map{|var|
begin
{ name: var, value: DEBUGGER__.safe_inspect(local_variable_get(var), short: true) }
rescue NameError, TypeError
nil
end
}.compact
end

private

def get_singleton_class obj
Expand All @@ -150,17 +157,6 @@ def get_singleton_class obj
local_variables[var]
end

def parameters_info
vars = iseq.parameters_symbols
vars.map{|var|
begin
{ name: var, value: DEBUGGER__.safe_inspect(local_variable_get(var), short: true) }
rescue NameError, TypeError
nil
end
}.compact
end

def klass_sig
if self.class == get_singleton_class(self.self)
"#{self.self}."
Expand Down
6 changes: 4 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 @@ -50,15 +50,17 @@ def default_frame_formatter frame
call_identifier_str =
case frame.frame_type
when :block
level, block_loc, args = frame.block_identifier
level, block_loc = frame.block_identifier
args = frame.parameters_info

if !args.empty?
args_str = " {|#{assemble_arguments(args)}|}"
end

"#{colorize_blue("block")}#{args_str} in #{colorize_blue(block_loc + level)}"
when :method
ci, args = frame.method_identifier
ci = frame.method_identifier
args = frame.parameters_info

if !args.empty?
args_str = "(#{assemble_arguments(args)})"
Expand Down