Skip to content

Improve syntax error error message #251

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 4 commits into from
Oct 13, 2019
Merged

Improve syntax error error message #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c38d57d
fix: PR#249 depends on ruby2.6 infinite rage syntax
zheng-yongping Sep 16, 2019
6a50153
feat: improve SyntaxError error message
zheng-yongping Sep 17, 2019
76b3dff
refacotr: not depending on the implementation of method_source comple…
zheng-yongping Sep 17, 2019
2a03542
refactor: use if elsif
zheng-yongping Sep 18, 2019
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
16 changes: 13 additions & 3 deletions lib/iruby/backend.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class PryBackend

def initialize
require 'pry'
Pry.memory_size = 3
Pry.memory_size = 3
Pry.pager = false # Don't use the pager
Pry.print = proc {|output, value|} # No result printing
Pry.exception_handler = proc {|output, exception, _| }
Expand All @@ -72,11 +72,21 @@ def eval(code, store_history)
reset
raise SystemExit
end
unless @pry.eval_string.empty?

# Pry::Code.complete_expression? return false
if !@pry.eval_string.empty?
syntax_error = @pry.eval_string
@pry.reset_eval_string
@pry.evaluate_ruby syntax_error
@pry.evaluate_ruby(syntax_error)

# Pry::Code.complete_expression? raise SyntaxError
# evaluate again for current line number
elsif @pry.last_result_is_exception? &&
@pry.last_exception.is_a?(SyntaxError) &&
@pry.last_exception.is_a?(Pry::UserError)
@pry.evaluate_ruby(code)
end

raise @pry.last_exception if @pry.last_result_is_exception?
@pry.push_initial_binding unless @pry.current_binding # ensure that we have a binding
@pry.last_result
Expand Down
3 changes: 2 additions & 1 deletion lib/iruby/kernel.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ def execute_request(msg)
end

def error_content(e)
backtrace = e.backtrace[0..e.backtrace.rindex{|line| line.start_with?(@backend.eval_path)}]
rindex = e.backtrace.rindex{|line| line.start_with?(@backend.eval_path)} || -1
backtrace = SyntaxError === e && rindex == -1 ? [] : e.backtrace[0..rindex]
{ ename: e.class.to_s,
evalue: e.message,
traceback: ["#{RED}#{e.class}#{RESET}: #{e.message}", *backtrace] }
Expand Down