mirror of
https://github.com/pry/pry.git
synced 2022-11-09 12:35:05 -05:00
Fixed failing test related to exception expressions not being
suppressable. Changed rescue Exception to rescue EOFError in Pry#readline.
This commit is contained in:
parent
b5e9428dd1
commit
080d19e2fe
1 changed files with 6 additions and 13 deletions
|
@ -144,7 +144,7 @@ class Pry
|
||||||
target = Pry.binding_for(target)
|
target = Pry.binding_for(target)
|
||||||
result = re(target)
|
result = re(target)
|
||||||
|
|
||||||
show_result(result) if should_print?(result)
|
show_result(result) if should_print?
|
||||||
end
|
end
|
||||||
|
|
||||||
# Perform a read-eval
|
# Perform a read-eval
|
||||||
|
@ -301,27 +301,20 @@ class Pry
|
||||||
else
|
else
|
||||||
input.readline
|
input.readline
|
||||||
end
|
end
|
||||||
rescue Exception => ex
|
|
||||||
|
rescue EOFError
|
||||||
self.input = Readline
|
self.input = Readline
|
||||||
""
|
""
|
||||||
|
|
||||||
# FIX ME!!!
|
|
||||||
# failing test is due to null_input?() being true for a
|
|
||||||
# command that doesn't return a value. This causes a EOFError
|
|
||||||
# exception for a 'rep' (as in test) as it makes the read loop
|
|
||||||
# redo and so it tries to read from a non-existent string
|
|
||||||
# binding.pry
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Whether the print proc should be invoked.
|
# Whether the print proc should be invoked.
|
||||||
# Currently only invoked if the output is not suppressed OR the output
|
# Currently only invoked if the output is not suppressed OR the last result
|
||||||
# is an exception regardless of suppression.
|
# is an exception regardless of suppression.
|
||||||
# @param [Object] result The result of evaluation stage of the REPL
|
|
||||||
# @return [Boolean] Whether the print proc should be invoked.
|
# @return [Boolean] Whether the print proc should be invoked.
|
||||||
def should_print?(result)
|
def should_print?
|
||||||
!@suppress_output || result.is_a?(Exception)
|
!@suppress_output || last_result_is_exception?
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns the appropriate prompt to use.
|
# Returns the appropriate prompt to use.
|
||||||
|
|
Loading…
Add table
Reference in a new issue