Properly tack line numbers in readInvalidTemplateToken

FIX: Fix a bug that broke line number accounting after a template literal with invalid escape sequences. Closes #1275
acornjs · Feb 7, 2024 · 6c104c4 · 6c104c4
1 parent 6770c2e
commit 6c104c4
Show file tree

Hide file tree

Showing 2 changed files with 99 additions and 0 deletions.
diff --git a/acorn/src/tokenize.js b/acorn/src/tokenize.js
@@ -679,6 +679,11 @@ pp.readInvalidTemplateToken = function() {
     case "`":
       return this.finishToken(tt.invalidTemplate, this.input.slice(this.start, this.pos))
 
+    case "\r": case "\n": case "\u2028": case "\u2029":
+      ++this.curLine
+      this.lineStart = this.pos + 1
+      break
+
     // no default
     }
   }

diff --git a/test/tests-harmony.js b/test/tests-harmony.js
@@ -1093,6 +1093,100 @@ test("`outer${{x: {y: 10}}}bar${`nested${function(){return 1;}}endnest`}end`",{
   ecmaVersion: 6
 });
 
+test("foo`\n\\x\n$\n`;", {
+  type: "Program",
+  loc: {
+    start: {
+      line: 1,
+      column: 0
+    },
+    end: {
+      line: 4,
+      column: 2
+    }
+  },
+  body: [
+    {
+      type: "ExpressionStatement",
+      loc: {
+        start: {
+          line: 1,
+          column: 0
+        },
+        end: {
+          line: 4,
+          column: 2
+        }
+      },
+      expression: {
+        type: "TaggedTemplateExpression",
+        loc: {
+          start: {
+            line: 1,
+            column: 0
+          },
+          end: {
+            line: 4,
+            column: 1
+          }
+        },
+        tag: {
+          type: "Identifier",
+          loc: {
+            start: {
+              line: 1,
+              column: 0
+            },
+            end: {
+              line: 1,
+              column: 3
+            }
+          },
+          name: "foo"
+        },
+        quasi: {
+          type: "TemplateLiteral",
+          loc: {
+            start: {
+              line: 1,
+              column: 3
+            },
+            end: {
+              line: 4,
+              column: 1
+            }
+          },
+          expressions: [],
+          quasis: [
+            {
+              type: "TemplateElement",
+              loc: {
+                start: {
+                  line: 1,
+                  column: 4
+                },
+                end: {
+                  line: 4,
+                  column: 0
+                }
+              },
+              value: {
+                raw: "\n\\x\n$\n",
+                cooked: null
+              },
+              tail: true
+            }
+          ]
+        }
+      }
+    }
+  ],
+  sourceType: "script"
+}, {
+  ecmaVersion: 10,
+  locations: true
+});
+
 
 // ES6: Switch Case Declaration