Respect syntax error offset location

michaelficarra · May 25, 2015 · 597bf15 · 597bf15
1 parent 10b3340
commit 597bf15
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 11 deletions.
diff --git a/lib/compiler.js b/lib/compiler.js
diff --git a/lib/helpers.js b/lib/helpers.js
diff --git a/lib/optimiser.js b/lib/optimiser.js
diff --git a/src/helpers.coffee b/src/helpers.coffee
@@ -32,15 +32,27 @@ cleanMarkers = (str) -> str.replace /[\uEFEF\uEFFE\uEFFF]/g, ''
   ((str.replace /\uEFEF/g, '(INDENT)').replace /\uEFFE/g, '(DEDENT)').replace /\uEFFF/g, '(TERM)'
 
 @formatParserError = (input, e) ->
-  realColumn = (cleanMarkers "#{(input.split '\n')[e.line - 1]}\n"[...e.column]).length
+  lines = input.split('\n')
+  line = e.line - 1 # switch to zero-indexed
+  column = e.column
+  offset = e.offset
+  while offset > 0
+    if offset > lines[line].length
+      offset -= lines[line].length
+      line += 1
+    else
+      column += offset
+      offset = 0
+  realColumn = (cleanMarkers "#{lines[line]}\n"[...column]).length
+  line += 1 # switch back to one-indexed
   unless e.found?
-    return "Syntax error on line #{e.line}, column #{realColumn}: unexpected end of input"
+    return "Syntax error on line #{line}, column #{realColumn}: unexpected end of input"
   found = JSON.stringify humanReadable e.found
   found = ((found.replace /^"|"$/g, '').replace /'/g, '\\\'').replace /\\"/g, '"'
   unicode = ((e.found.charCodeAt 0).toString 16).toUpperCase()
   unicode = "\\u#{"0000"[unicode.length..]}#{unicode}"
-  message = "Syntax error on line #{e.line}, column #{realColumn}: unexpected '#{found}' (#{unicode})"
-  "#{message}\n#{pointToErrorLocation input, e.line, realColumn}"
+  message = "Syntax error on line #{line}, column #{realColumn}: unexpected '#{found}' (#{unicode})"
+  "#{message}\n#{pointToErrorLocation input, line, realColumn}"
 
 @pointToErrorLocation = pointToErrorLocation = (source, line, column, numLinesOfContext = 3) ->
   lines = source.split '\n'