Incorrect line calculation after invalid escape sequence in tagged template

[fasttime]

For example, in the following source, bar; is located on line 5:

foo`
\x

`;
bar;

But the parser seems to ignore the line breaks after the invalid escape sequence inside the template and makes it a 3:

// test.mjs
import { parse } from 'acorn';

const ast = parse(
    "foo`\n\\x\n\n`;\nbar;",
    { ecmaVersion: "latest", locations: true }
);

console.log(ast.body[1].loc);

The output is:

SourceLocation {
  start: Position { line: 3, column: 0 },
  end: Position { line: 3, column: 4 }
}

[marijnh]

This patch should help here.

[fasttime]

Thanks @marijnh, that was quick! But won't this patch still produce wrong line numbers for "\r\n" terminator sequences? E.g. "foo`\r\n\\x\r\n\r\n`;\r\nbar;".

[marijnh]

You are entirely right. Attached patch should make that better.