fix(parser): improved error reporting for duplicate bindings

meriyah · Jul 29, 2019 · 0483d25 · 0483d25
1 parent 5e41577
commit 0483d25
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/common.ts b/src/common.ts
@@ -182,6 +182,7 @@ export interface ScopeState {
 /** Scope error interface */
 export interface ScopeError {
   type: Errors;
+  params: string[];
   index: number;
   line: number;
   column: number;
@@ -527,10 +528,11 @@ export function createArrowHeadParsingScope(parser: ParserState, context: Contex
  * @param parser Parser state
  * @param type Errors type
  */
-export function recordScopeError(parser: ParserState, type: Errors): ScopeError {
+export function recordScopeError(parser: ParserState, type: Errors, ...params: string[]): ScopeError {
   const { index, line, column } = parser;
   return {
     type,
+    params,
     index,
     line,
     column
@@ -612,7 +614,7 @@ export function addBlockName(
 
   if (value && (value & BindingKind.Empty) === 0) {
     if (kind & BindingKind.ArgumentList) {
-      scope.scopeError = recordScopeError(parser, Errors.Unexpected);
+      scope.scopeError = recordScopeError(parser, Errors.DuplicateBinding, name);
     } else if (
       context & Context.OptionsWebCompat &&
       value & BindingKind.FunctionLexical &&
@@ -632,7 +634,7 @@ export function addBlockName(
 
   if (scope.type & ScopeKind.ArrowParams && value && (value & BindingKind.Empty) === 0) {
     if (kind & BindingKind.ArgumentList) {
-      scope.scopeError = recordScopeError(parser, Errors.Unexpected);
+      scope.scopeError = recordScopeError(parser, Errors.DuplicateBinding, name);
     }
   }
 
@@ -678,7 +680,7 @@ export function addVarName(
     }
     if (currentScope === scope) {
       if (value & BindingKind.ArgumentList && kind & BindingKind.ArgumentList) {
-        currentScope.scopeError = recordScopeError(parser, Errors.Unexpected);
+        currentScope.scopeError = recordScopeError(parser, Errors.DuplicateBinding, name);
       }
     }
     if (value & (BindingKind.CatchIdentifier | BindingKind.CatchPattern)) {

diff --git a/src/errors.ts b/src/errors.ts
@@ -383,7 +383,7 @@ export function report(parser: ParserState, type: Errors, ...params: string[]):
 }
 
 export function reportScopeError(scope: any): never {
-  throw new ParseError(scope.index, scope.line, scope.column, scope.type);
+  throw new ParseError(scope.index, scope.line, scope.column, scope.type, scope.params);
 }
 
 /**