fix: fix ending loc of empty comment

closes #126
meriyah · Oct 27, 2020 · d62d0b8 · d62d0b8
1 parent 38aed7d
commit d62d0b8
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 0 deletions.
diff --git a/src/lexer/comments.ts b/src/lexer/comments.ts
@@ -67,6 +67,9 @@ export function skipSingleLineComment(
   column: number
 ): LexerState {
   const { index } = parser;
+  parser.tokenPos = parser.index;
+  parser.linePos = parser.line;
+  parser.colPos = parser.column;
   while (parser.index < parser.end) {
     if (CharTypes[parser.currentChar] & CharFlags.LineTerminator) {
       const isCR = parser.currentChar === Chars.CarriageReturn;

diff --git a/test/parser/miscellaneous/onComment.ts b/test/parser/miscellaneous/onComment.ts
@@ -37,6 +37,40 @@ describe('Miscellaneous - onComment', () => {
     t.equal(onCommentCount, 1);
   });
 
+  it('should extract single line empty comment', () => {
+    let onCommentCount = 0;
+    t.deepEqual(
+      parseScript('//\n', {
+        ranges: true,
+        loc: true,
+        onComment: (type: string, value: string, start: number, end: number, loc: SourceLocation) => {
+          t.deepEqual(type, 'SingleLine');
+          t.deepEqual(value, '');
+          t.equal(start, 0);
+          t.equal(end, 2);
+          t.deepEqual(loc, {
+            start: { line: 1, column: 0 },
+            end: { line: 1, column: 2 }
+          });
+          onCommentCount++;
+        }
+      }),
+      {
+        body: [],
+        sourceType: 'script',
+        type: 'Program',
+        start: 0,
+        end: 3,
+        range: [0, 3],
+        loc: {
+          start: { line: 1, column: 0 },
+          end: { line: 2, column: 0 }
+        }
+      }
+    );
+    t.equal(onCommentCount, 1);
+  });
+
   it('should extract single line comment with trailing new line', () => {
     let onCommentCount = 0;
     t.deepEqual(
@@ -164,6 +198,31 @@ describe('Miscellaneous - onComment', () => {
     t.equal(onCommentCount, 1);
   });
 
+  it('should extract empty multiline line comment', () => {
+    let onCommentCount = 0;
+    t.deepEqual(
+      parseScript('/**/', {
+        onComment: (type: string, value: string, start: number, end: number, loc: SourceLocation) => {
+          t.deepEqual(type, 'MultiLine');
+          t.deepEqual(value, '');
+          t.equal(start, 0);
+          t.equal(end, 4);
+          t.deepEqual(loc, {
+            start: { line: 1, column: 0 },
+            end: { line: 1, column: 4 }
+          });
+          onCommentCount++;
+        }
+      }),
+      {
+        body: [],
+        sourceType: 'script',
+        type: 'Program'
+      }
+    );
+    t.equal(onCommentCount, 1);
+  });
+
   it('should extract multiline line comment', () => {
     let onCommentCount = 0;
     t.deepEqual(