fix: fix TemplateElement range and loc

meriyah · Oct 16, 2020 · 2a3632c · 2a3632c
1 parent ff71744
commit 2a3632c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 21 deletions.
diff --git a/src/parser.ts b/src/parser.ts
@@ -4581,14 +4581,36 @@ export function parseTemplateElement(
   col: number,
   tail: boolean
 ): ESTree.TemplateElement {
-  return finishNode(parser, context, start, line, col, {
+  const node = finishNode(parser, context, start, line, col, {
     type: 'TemplateElement',
     value: {
       cooked,
       raw
     },
     tail
-  });
+  }) as ESTree.TemplateElement;
+
+  const tailSize = tail ? 1 : 2;
+
+  // Patch range
+  if (context & Context.OptionsRanges) {
+    // skip the front "`" or "}"
+    (node.start as number) += 1;
+    (node.range as [number, number])[0] += 1;
+    // skip the tail "`" or "${"
+    (node.end as number) -= tailSize;
+    (node.range as [number, number])[1] -= tailSize;
+  }
+
+  // Patch loc
+  if (context & Context.OptionsLoc) {
+    // skip the front "`" or "}"
+    (node.loc as ESTree.SourceLocation).start.column += 1;
+    // skip the tail "`" or "${"
+    (node.loc as ESTree.SourceLocation).end.column -= tailSize;
+  }
+
+  return node;
 }
 
 /**

diff --git a/test/parser/expressions/object.ts b/test/parser/expressions/object.ts
@@ -4505,9 +4505,9 @@ describe('Expressions - Object', () => {
                         quasis: [
                           {
                             type: 'TemplateElement',
-                            start: 20,
-                            end: 23,
-                            range: [20, 23],
+                            start: 21,
+                            end: 22,
+                            range: [21, 22],
                             value: {
                               raw: 'c',
                               cooked: 'c'
@@ -4589,9 +4589,9 @@ describe('Expressions - Object', () => {
                         quasis: [
                           {
                             type: 'TemplateElement',
-                            start: 46,
-                            end: 49,
-                            range: [46, 49],
+                            start: 47,
+                            end: 47,
+                            range: [47, 47],
                             value: {
                               raw: '',
                               cooked: ''
@@ -4600,9 +4600,9 @@ describe('Expressions - Object', () => {
                           },
                           {
                             type: 'TemplateElement',
-                            start: 50,
-                            end: 53,
-                            range: [50, 53],
+                            start: 51,
+                            end: 52,
+                            range: [51, 52],
                             value: {
                               raw: 'e',
                               cooked: 'e'

diff --git a/test/parser/expressions/template.ts b/test/parser/expressions/template.ts
@@ -3510,17 +3510,17 @@ describe('Expressions - Template', () => {
                       raw: 'a'
                     },
                     tail: true,
-                    start: 4,
-                    end: 7,
-                    range: [4, 7],
+                    start: 5,
+                    end: 6,
+                    range: [5, 6],
                     loc: {
                       start: {
                         line: 1,
-                        column: 4
+                        column: 5
                       },
                       end: {
                         line: 1,
-                        column: 7
+                        column: 6
                       }
                     }
                   }
@@ -3599,17 +3599,17 @@ describe('Expressions - Template', () => {
                       raw: 'b'
                     },
                     tail: true,
-                    start: 12,
-                    end: 15,
-                    range: [12, 15],
+                    start: 13,
+                    end: 14,
+                    range: [13, 14],
                     loc: {
                       start: {
                         line: 2,
-                        column: 4
+                        column: 5
                       },
                       end: {
                         line: 2,
-                        column: 7
+                        column: 6
                       }
                     }
                   }