Upgrade to https://github.com/acornjs/acorn.git commit 84eda6bf

[jst.git] / src / locutil.js

diff --git a/src/locutil.js b/src/locutil.js
index 5a9465e..b6dc773 100644 (file)
--- a/src/locutil.js
+++ b/src/locutil.js
@@ -1,4 +1,4 @@
-import {lineBreakG} from "./whitespace"
+import {nextLineBreak} from "./whitespace.js"
 
 // These are used when `options.locations` is on, for the
 // `startLoc` and `endLoc` properties.
@@ -30,13 +30,9 @@ export class SourceLocation {
 
 export function getLineInfo(input, offset) {
   for (let line = 1, cur = 0;;) {
-    lineBreakG.lastIndex = cur
-    let match = lineBreakG.exec(input)
-    if (match && match.index < offset) {
-      ++line
-      cur = match.index + match[0].length
-    } else {
-      return new Position(line, offset - cur)
-    }
+    let nextBreak = nextLineBreak(input, cur, offset)
+    if (nextBreak < 0) return new Position(line, offset - cur)
+    ++line
+    cur = nextBreak
   }
 }