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

Improve error messages when it evaluates expressions in Console #386

Merged
merged 1 commit into from
Nov 11, 2021
+24 −9
Merged

Improve error messages when it evaluates expressions in Console #386

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
33 changes: 24 additions & 9 deletions lib/debug/server_cdp.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,13 +331,13 @@ def cdp_event args
result[:reason] = 'other'
@ui.fire_event 'Debugger.paused', **result
when :evaluate
res = result[:result]
[res].each {|e|
if oid = e.dig(:objectId)
rs = result.dig(:response, :result)
[rs].each {|r|
if oid = r.dig(:objectId)
@scope_map[oid] = 'eval'
end
}
@ui.respond req, result: res
@ui.respond req, **result[:response]

out = result[:output]
if out && !out.empty?
Expand Down Expand Up @@ -420,18 +420,29 @@ def process_cdp args
}
}
when :evaluate
res = {}
expr = args.shift
begin
orig_stdout = $stdout
$stdout = StringIO.new
result = current_frame.binding.eval(expr.to_s, '(DEBUG CONSOLE)')
rescue Exception => e
result = e
b = result.backtrace.map{|e| " #{e}\n"}
line = b.first.match('.*:(\d+):in .*')[1].to_i
res[:exceptionDetails] = {
exceptionId: 1,
text: 'Uncaught',
lineNumber: line - 1,
columnNumber: 0,
exception: evaluate_result(result),
}
ensure
output = $stdout.string
$stdout = orig_stdout
end
event! :cdp_result, :evaluate, req, result: evaluate_result(result), output: output
res[:result] = evaluate_result(result)
event! :cdp_result, :evaluate, req, response: res, output: output
when :properties
oid = args.shift
if fid = @frame_id_map[oid]
Expand Down Expand Up @@ -476,7 +487,7 @@ def parse_object objs
end
end

def variable_ name, obj, type, description: nil, use_short: true
def variable_ name, obj, type, description: nil, subtype: nil, use_short: true
prop = {
name: name,
value: {
Expand All @@ -487,9 +498,11 @@ def variable_ name, obj, type, description: nil, use_short: true
configurable: true, # TODO: Change these parts because
enumerable: true # they are not necessarily `true`.
}
if description
if description && subtype
v = prop[:value]
v.delete :value
v[:description] = description
v[:subtype] = subtype
v[:objectId] = oid = rand.to_s
v[:className] = obj.class
@obj_map[oid] = obj
Expand All @@ -500,9 +513,9 @@ def variable_ name, obj, type, description: nil, use_short: true
def variable name, obj
case obj
when Array
variable_ name, obj, 'object', description: "Array(#{obj.size})"
variable_ name, obj, 'object', description: "Array(#{obj.size})", subtype: 'array'
when Hash
variable_ name, obj, 'object', description: 'Object'
variable_ name, obj, 'object', description: 'Object', subtype: 'map'
when Range, NilClass, Time
variable_ name, obj, 'object'
when String
Expand All @@ -517,6 +530,8 @@ def variable name, obj
variable_ name, obj, 'number'
when Integer
variable_ name, obj, 'number'
when Exception
variable_ name, obj, 'object', description: "#{obj.inspect}\n#{obj.backtrace.map{|e| " #{e}\n"}.join}", subtype: 'error'
else
variable_ name, obj, 'undefined'
end
Expand Down