Skip to content
Snippets Groups Projects
Commit da84d5c4 authored by Kieran Trezona-le Comte's avatar Kieran Trezona-le Comte
Browse files

Better names

parent 9ae8a665
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ module SQLint ...@@ -15,7 +15,7 @@ module SQLint
[].tap do |results| [].tap do |results|
state = ParseState.new(@input, 0) state = ParseState.new(@input, 0)
while state != END_PARSE while state != END_PARSE
error, new_parse_state = foo(state) error, new_parse_state = parse_next_error(state)
results << error if error results << error if error
state = new_parse_state state = new_parse_state
end end
...@@ -24,13 +24,13 @@ module SQLint ...@@ -24,13 +24,13 @@ module SQLint
private private
def foo(parse_state) def parse_next_error(parse_state)
begin begin
PgQuery.parse(parse_state.input) PgQuery.parse(parse_state.input)
[nil, END_PARSE] [nil, END_PARSE]
rescue PgQuery::ParseError => e rescue PgQuery::ParseError => e
offset = e.location + parse_state.offset offset = e.location + parse_state.offset
line_number, column_number = find_position(offset) line_number, column_number = find_absolute_position(offset)
lint = Lint.new(@filename, line_number, column_number, :error, e.message) lint = Lint.new(@filename, line_number, column_number, :error, e.message)
input_from_error = parse_state.input[e.location..-1] input_from_error = parse_state.input[e.location..-1]
...@@ -48,7 +48,7 @@ module SQLint ...@@ -48,7 +48,7 @@ module SQLint
end end
end end
def find_position(offset) def find_absolute_position(offset)
lines_before_error = @input[0...(offset)].split("\n") lines_before_error = @input[0...(offset)].split("\n")
line_number = lines_before_error.size line_number = lines_before_error.size
column_number = lines_before_error.any? ? lines_before_error.last.size : 1 column_number = lines_before_error.any? ? lines_before_error.last.size : 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment