Skip to content

Preserve diagnostics at newlines and unconsumed input #14

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

Open
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve diagnostics at newlines and unconsumed input #14

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
12 changes: 7 additions & 5 deletions lib/raabro.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,9 @@ def extract_error
#Raabro.pp(self, colors: true)
err_tree, stack = lookup_error || lookup_all_error

line, column = line_and_column(err_tree.offset)
matched = @parter == :all ? c0 : self
offset = err_tree ? err_tree.offset : matched.offset + matched.length
line, column = line_and_column(offset)

err_message =
if stack
Expand All @@ -190,7 +192,7 @@ def extract_error
visual =
visual(line, column)

[ line, column, err_tree.offset, err_message, visual ]
[ line, column, offset, err_message, visual ]
end

def lookup_error(stack=[])
Expand Down Expand Up @@ -221,7 +223,7 @@ def line_and_column(offset)
line = 1
column = 0

(0..offset).each do |off|
(0...offset).each do |off|

column += 1
next unless @input.at(off) == "\n"
Expand All @@ -230,12 +232,12 @@ def line_and_column(offset)
column = 0
end

[ line, column ]
[ line, column + 1 ]
end

def visual(line, column)

@input.string.split("\n")[line - 1] + "\n" +
@input.string.split("\n", -1)[line - 1].to_s + "\n" +
' ' * (column - 1) + '^---'
end
end
Expand Down