From 4afc3303632c19b13b41376d25dbcd3287c2228a Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Wed, 10 Jan 2018 17:29:48 -0500
Subject: [PATCH] Fix: various lint fixes

---
 .../eval-code/direct/var-env-lower-lex-catch-non-strict.js     | 2 +-
 test/annexB/language/literals/regexp/class-escape.js           | 2 +-
 test/annexB/language/literals/regexp/extended-pattern-char.js  | 2 +-
 test/annexB/language/literals/regexp/identity-escape.js        | 2 +-
 test/annexB/language/literals/regexp/legacy-octal-escape.js    | 2 +-
 .../language/literals/regexp/non-empty-class-ranges-no-dash.js | 2 +-
 test/annexB/language/literals/regexp/non-empty-class-ranges.js | 2 +-
 .../literals/regexp/quantifiable-assertion-followed-by.js      | 2 +-
 .../literals/regexp/quantifiable-assertion-not-followed-by.js  | 2 +-
 .../language/literals/string/legacy-octal-escape-sequence.js   | 2 +-
 .../language/statements/try/catch-redeclared-for-in-var.js     | 2 +-
 .../annexB/language/statements/try/catch-redeclared-for-var.js | 2 +-
 test/built-ins/Array/prototype/flatMap/length.js               | 2 +-
 test/built-ins/Array/prototype/flatMap/name.js                 | 2 +-
 test/built-ins/Array/prototype/flatten/length.js               | 2 +-
 .../ArrayIteratorPrototype/next/property-descriptor.js         | 1 -
 test/built-ins/Symbol/species/subclassing.js                   | 3 +--
 ...y-errors-expression-await-as-function-binding-identifier.js | 2 +-
 ...y-errors-expression-yield-as-function-binding-identifier.js | 2 +-
 .../early-errors-expression-yield-star-after-newline.js        | 3 ++-
 .../async-generator/expression-await-as-yield-operand.js       | 3 ++-
 .../expression-await-promise-as-yield-operand.js               | 3 ++-
 .../expression-await-thenable-as-yield-operand.js              | 3 ++-
 .../expressions/async-generator/expression-yield-as-operand.js | 3 ++-
 .../async-generator/expression-yield-as-statement.js           | 3 ++-
 .../expressions/async-generator/expression-yield-newline.js    | 3 ++-
 .../async-generator/expression-yield-star-before-newline.js    | 3 ++-
 .../literals/regexp/u-invalid-quantifiable-assertion.js        | 2 +-
 .../literals/string/legacy-non-octal-escape-sequence-strict.js | 2 +-
 .../literals/string/legacy-octal-escape-sequence-strict.js     | 2 +-
 30 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/test/annexB/language/eval-code/direct/var-env-lower-lex-catch-non-strict.js b/test/annexB/language/eval-code/direct/var-env-lower-lex-catch-non-strict.js
index f4aec2affc..ff82e2c9ad 100644
--- a/test/annexB/language/eval-code/direct/var-env-lower-lex-catch-non-strict.js
+++ b/test/annexB/language/eval-code/direct/var-env-lower-lex-catch-non-strict.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-variablestatements-in-catch-blocks
-es6id: B3.5
+es6id: B.3.5
 description: Re-declaration of catch parameter
 info: |
     [...]
diff --git a/test/annexB/language/literals/regexp/class-escape.js b/test/annexB/language/literals/regexp/class-escape.js
index bbc0ada785..14224531a1 100644
--- a/test/annexB/language/literals/regexp/class-escape.js
+++ b/test/annexB/language/literals/regexp/class-escape.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-regular-expressions-patterns
-es6id: B1.4
+es6id: B.1.4
 description: Extensions to ClassEscape
 info: |
     ClassEscape[U] ::
diff --git a/test/annexB/language/literals/regexp/extended-pattern-char.js b/test/annexB/language/literals/regexp/extended-pattern-char.js
index ec173f2d21..7ba8a948d9 100644
--- a/test/annexB/language/literals/regexp/extended-pattern-char.js
+++ b/test/annexB/language/literals/regexp/extended-pattern-char.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-regular-expressions-patterns
-es6id: B1.4
+es6id: B.1.4
 description: Extended Pattern Characters (as distinct from Pattern Characters)
 info: |
     ExtendedPatternCharacter ::
diff --git a/test/annexB/language/literals/regexp/identity-escape.js b/test/annexB/language/literals/regexp/identity-escape.js
index 8cc4ea2149..12c27f29e0 100644
--- a/test/annexB/language/literals/regexp/identity-escape.js
+++ b/test/annexB/language/literals/regexp/identity-escape.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-regular-expressions-patterns
-es6id: B1.4
+es6id: B.1.4
 description: Support for UnicodeIDContinue in IdentityEscape
 info: |
     IdentityEscape[U] ::
diff --git a/test/annexB/language/literals/regexp/legacy-octal-escape.js b/test/annexB/language/literals/regexp/legacy-octal-escape.js
index 01eef78535..b2fd48f29e 100644
--- a/test/annexB/language/literals/regexp/legacy-octal-escape.js
+++ b/test/annexB/language/literals/regexp/legacy-octal-escape.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-regular-expressions-patterns
-es6id: B1.4
+es6id: B.1.4
 description: Legacy Octal Escape Sequence
 info: |
     CharacterEscape[U]::
diff --git a/test/annexB/language/literals/regexp/non-empty-class-ranges-no-dash.js b/test/annexB/language/literals/regexp/non-empty-class-ranges-no-dash.js
index a91ec290b6..bb7906fc35 100644
--- a/test/annexB/language/literals/regexp/non-empty-class-ranges-no-dash.js
+++ b/test/annexB/language/literals/regexp/non-empty-class-ranges-no-dash.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-regular-expressions-patterns
-es6id: B1.4
+es6id: B.1.4
 description: Extensions to NonemptyClassRangesNoDash production
 info: |
     The production
diff --git a/test/annexB/language/literals/regexp/non-empty-class-ranges.js b/test/annexB/language/literals/regexp/non-empty-class-ranges.js
index 932d87a8e3..95af75d738 100644
--- a/test/annexB/language/literals/regexp/non-empty-class-ranges.js
+++ b/test/annexB/language/literals/regexp/non-empty-class-ranges.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-regular-expressions-patterns
-es6id: B1.4
+es6id: B.1.4
 description: Extensions to NonemptyClassRanges production
 info: |
     The production NonemptyClassRanges :: ClassAtom-ClassAtom ClassRanges
diff --git a/test/annexB/language/literals/regexp/quantifiable-assertion-followed-by.js b/test/annexB/language/literals/regexp/quantifiable-assertion-followed-by.js
index a92b9018d8..40bd38d8f6 100644
--- a/test/annexB/language/literals/regexp/quantifiable-assertion-followed-by.js
+++ b/test/annexB/language/literals/regexp/quantifiable-assertion-followed-by.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-regular-expressions-patterns
-es6id: B1.4
+es6id: B.1.4
 description: Quantifiable assertions `?=` ("followed by")
 info: |
     Term[U] ::
diff --git a/test/annexB/language/literals/regexp/quantifiable-assertion-not-followed-by.js b/test/annexB/language/literals/regexp/quantifiable-assertion-not-followed-by.js
index 2463108d52..f4c7f199e1 100644
--- a/test/annexB/language/literals/regexp/quantifiable-assertion-not-followed-by.js
+++ b/test/annexB/language/literals/regexp/quantifiable-assertion-not-followed-by.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-regular-expressions-patterns
-es6id: B1.4
+es6id: B.1.4
 description: Quantifiable assertions `?!` ("not followed by")
 info: |
     Term[U] ::
diff --git a/test/annexB/language/literals/string/legacy-octal-escape-sequence.js b/test/annexB/language/literals/string/legacy-octal-escape-sequence.js
index 45e0bf8c81..198f463073 100644
--- a/test/annexB/language/literals/string/legacy-octal-escape-sequence.js
+++ b/test/annexB/language/literals/string/legacy-octal-escape-sequence.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-additional-syntax-string-literals
-es6id: B1.2
+es6id: B.1.2
 description: String value for LegacyOctalEscapeSequence
 info: |
     EscapeSequence ::
diff --git a/test/annexB/language/statements/try/catch-redeclared-for-in-var.js b/test/annexB/language/statements/try/catch-redeclared-for-in-var.js
index f4a8120316..e2a2022eb3 100644
--- a/test/annexB/language/statements/try/catch-redeclared-for-in-var.js
+++ b/test/annexB/language/statements/try/catch-redeclared-for-in-var.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-variablestatements-in-catch-blocks
-es6id: B3.5
+es6id: B.3.5
 description: Re-declaration of catch parameter (for-in statement)
 info: |
     It is a Syntax Error if any element of the BoundNames of CatchParameter
diff --git a/test/annexB/language/statements/try/catch-redeclared-for-var.js b/test/annexB/language/statements/try/catch-redeclared-for-var.js
index d4010f8bc0..ab289f26f7 100644
--- a/test/annexB/language/statements/try/catch-redeclared-for-var.js
+++ b/test/annexB/language/statements/try/catch-redeclared-for-var.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-variablestatements-in-catch-blocks
-es6id: B3.5
+es6id: B.3.5
 description: Re-declaration of catch parameter (for-in statement)
 info: |
     It is a Syntax Error if any element of the BoundNames of CatchParameter
diff --git a/test/built-ins/Array/prototype/flatMap/length.js b/test/built-ins/Array/prototype/flatMap/length.js
index 4ef59290bd..c5fc1b3a36 100644
--- a/test/built-ins/Array/prototype/flatMap/length.js
+++ b/test/built-ins/Array/prototype/flatMap/length.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Shilpi Jain and Michael Ficarra. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-es6id: sec-array.prototype.flatMap
+esid: sec-array.prototype.flatMap
 description: Array.prototype.flatMap.length value and descriptor.
 info: >
   17 ECMAScript Standard Built-in Objects
diff --git a/test/built-ins/Array/prototype/flatMap/name.js b/test/built-ins/Array/prototype/flatMap/name.js
index 53deaa1e56..98ea548a4b 100644
--- a/test/built-ins/Array/prototype/flatMap/name.js
+++ b/test/built-ins/Array/prototype/flatMap/name.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Shilpi Jain and Michael Ficarra. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-es6id: sec-array.prototype.flatmap
+esid: sec-array.prototype.flatmap
 description: Array.prototype.flatmap name value and descriptor.
 info: >
   17 ECMAScript Standard Built-in Objects
diff --git a/test/built-ins/Array/prototype/flatten/length.js b/test/built-ins/Array/prototype/flatten/length.js
index 704e81158a..0e13e5ec52 100644
--- a/test/built-ins/Array/prototype/flatten/length.js
+++ b/test/built-ins/Array/prototype/flatten/length.js
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Shilpi Jain and Michael Ficarra. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-es6id: sec-array.prototype.flatten
+esid: sec-array.prototype.flatten
 description: Array.prototype.flatten.length value and descriptor.
 info: >
   17 ECMAScript Standard Built-in Objects
diff --git a/test/built-ins/ArrayIteratorPrototype/next/property-descriptor.js b/test/built-ins/ArrayIteratorPrototype/next/property-descriptor.js
index aeadb7ddda..2d12272c18 100644
--- a/test/built-ins/ArrayIteratorPrototype/next/property-descriptor.js
+++ b/test/built-ins/ArrayIteratorPrototype/next/property-descriptor.js
@@ -7,7 +7,6 @@ description: >
     The method should exist on the ArrayIterator prototype, and it should be
     writable and configurable, but not enumerable.
 includes: [propertyHelper.js]
-es6id: 17
 features: [Symbol.iterator]
 ---*/
 
diff --git a/test/built-ins/Symbol/species/subclassing.js b/test/built-ins/Symbol/species/subclassing.js
index 4a005e5b5c..7d20d7a751 100644
--- a/test/built-ins/Symbol/species/subclassing.js
+++ b/test/built-ins/Symbol/species/subclassing.js
@@ -4,10 +4,9 @@
 /*---
 info: |
  Symbol.species is retained on subclassing
-es6id: 
 author: Sam Mikes
 description: Symbol.species is retained on subclassing
-includes: 
+includes:
   - propertyHelper.js
 features: [Symbol.species]
 ---*/
diff --git a/test/language/expressions/async-generator/early-errors-expression-await-as-function-binding-identifier.js b/test/language/expressions/async-generator/early-errors-expression-await-as-function-binding-identifier.js
index 1a7ba39fa4..112881b822 100644
--- a/test/language/expressions/async-generator/early-errors-expression-await-as-function-binding-identifier.js
+++ b/test/language/expressions/async-generator/early-errors-expression-await-as-function-binding-identifier.js
@@ -3,7 +3,7 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: 12.1.1
+esid: pending
 description: >
   `await` is not a valid BindingIdentifier for AsyncGeneratorExpressions.
 negative:
diff --git a/test/language/expressions/async-generator/early-errors-expression-yield-as-function-binding-identifier.js b/test/language/expressions/async-generator/early-errors-expression-yield-as-function-binding-identifier.js
index 0dd5be0390..7f0b95f4c0 100644
--- a/test/language/expressions/async-generator/early-errors-expression-yield-as-function-binding-identifier.js
+++ b/test/language/expressions/async-generator/early-errors-expression-yield-as-function-binding-identifier.js
@@ -3,7 +3,7 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: 12.1.1
+esid: pending
 description: >
   `yield` is not a valid BindingIdentifier for AsyncGeneratorExpressions.
 negative:
diff --git a/test/language/expressions/async-generator/early-errors-expression-yield-star-after-newline.js b/test/language/expressions/async-generator/early-errors-expression-yield-star-after-newline.js
index 046ed00ac8..8e4701d994 100644
--- a/test/language/expressions/async-generator/early-errors-expression-yield-star-after-newline.js
+++ b/test/language/expressions/async-generator/early-errors-expression-yield-star-after-newline.js
@@ -3,7 +3,8 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: sec-generator-function-definitionsdescription: >
+esid: sec-generator-function-definitions
+description: >
   A newline may not precede the `*` token in a `yield` expression.
 negative:
   phase: parse
diff --git a/test/language/expressions/async-generator/expression-await-as-yield-operand.js b/test/language/expressions/async-generator/expression-await-as-yield-operand.js
index a59bd9298d..5f691ae92f 100644
--- a/test/language/expressions/async-generator/expression-await-as-yield-operand.js
+++ b/test/language/expressions/async-generator/expression-await-as-yield-operand.js
@@ -3,7 +3,8 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: sec-generator-function-definitionsdescription: >
+esid: sec-generator-function-definitions
+description: >
   AwaitExpressions are valid operands to yield expressions.
 flags: [async]
 features: [async-iteration]
diff --git a/test/language/expressions/async-generator/expression-await-promise-as-yield-operand.js b/test/language/expressions/async-generator/expression-await-promise-as-yield-operand.js
index 91f1ad8ffc..b2d0c21603 100644
--- a/test/language/expressions/async-generator/expression-await-promise-as-yield-operand.js
+++ b/test/language/expressions/async-generator/expression-await-promise-as-yield-operand.js
@@ -3,7 +3,8 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: sec-generator-function-definitionsdescription: >
+esid: sec-generator-function-definitions
+description: >
   AwaitExpressions are valid operands to yield expressions.
 flags: [async]
 features: [async-iteration]
diff --git a/test/language/expressions/async-generator/expression-await-thenable-as-yield-operand.js b/test/language/expressions/async-generator/expression-await-thenable-as-yield-operand.js
index ba0874c165..2b94f9beca 100644
--- a/test/language/expressions/async-generator/expression-await-thenable-as-yield-operand.js
+++ b/test/language/expressions/async-generator/expression-await-thenable-as-yield-operand.js
@@ -3,7 +3,8 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: sec-generator-function-definitionsdescription: >
+esid: sec-generator-function-definitions
+description: >
   AwaitExpressions are valid operands to yield expressions.
 flags: [async]
 features: [async-iteration]
diff --git a/test/language/expressions/async-generator/expression-yield-as-operand.js b/test/language/expressions/async-generator/expression-yield-as-operand.js
index 3c6dcc8c80..fbd852c134 100644
--- a/test/language/expressions/async-generator/expression-yield-as-operand.js
+++ b/test/language/expressions/async-generator/expression-yield-as-operand.js
@@ -3,7 +3,8 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: sec-generator-function-definitionsdescription: >
+esid: sec-generator-function-definitions
+description: >
   `yield` expressions may be used as the right-hand-side of other `yield`
   expressions.
 flags: [async]
diff --git a/test/language/expressions/async-generator/expression-yield-as-statement.js b/test/language/expressions/async-generator/expression-yield-as-statement.js
index ea993b98ac..b11b04cbe8 100644
--- a/test/language/expressions/async-generator/expression-yield-as-statement.js
+++ b/test/language/expressions/async-generator/expression-yield-as-statement.js
@@ -3,7 +3,8 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: sec-generator-function-definitionsdescription: >
+esid: sec-generator-function-definitions
+description: >
   `yield` is a valid statement within async generator function bodies.
 flags: [async]
 features: [async-iteration]
diff --git a/test/language/expressions/async-generator/expression-yield-newline.js b/test/language/expressions/async-generator/expression-yield-newline.js
index 6e354045c0..bd122822df 100644
--- a/test/language/expressions/async-generator/expression-yield-newline.js
+++ b/test/language/expressions/async-generator/expression-yield-newline.js
@@ -3,7 +3,8 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: sec-generator-function-definitionsdescription: >
+esid: sec-generator-function-definitions
+description: >
   Newlines terminate `yield` expressions.
 flags: [async]
 features: [async-iteration]
diff --git a/test/language/expressions/async-generator/expression-yield-star-before-newline.js b/test/language/expressions/async-generator/expression-yield-star-before-newline.js
index 6a8fdfd667..567b71ad8a 100644
--- a/test/language/expressions/async-generator/expression-yield-star-before-newline.js
+++ b/test/language/expressions/async-generator/expression-yield-star-before-newline.js
@@ -3,7 +3,8 @@
 
 /*---
 author: Caitlin Potter <caitp@igalia.com>
-esid: sec-generator-function-definitionsdescription: >
+esid: sec-generator-function-definitions
+description: >
   The right-hand side of a `yield *` expression may appear on a new line.
 flags: [async]
 features: [async-iteration]
diff --git a/test/language/literals/regexp/u-invalid-quantifiable-assertion.js b/test/language/literals/regexp/u-invalid-quantifiable-assertion.js
index 65de933012..c1d64c2c70 100644
--- a/test/language/literals/regexp/u-invalid-quantifiable-assertion.js
+++ b/test/language/literals/regexp/u-invalid-quantifiable-assertion.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-regular-expressions-patterns
-es6id: B1.4
+es6id: B.1.4
 description: Quantifiable assertions disallowed with `u` flag
 info: |
     The `u` flag precludes quantifiable assertions (even when Annex B is
diff --git a/test/language/literals/string/legacy-non-octal-escape-sequence-strict.js b/test/language/literals/string/legacy-non-octal-escape-sequence-strict.js
index baef3c5c58..e555c94f51 100644
--- a/test/language/literals/string/legacy-non-octal-escape-sequence-strict.js
+++ b/test/language/literals/string/legacy-non-octal-escape-sequence-strict.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-additional-syntax-string-literals
-es6id: B1.2
+es6id: B.1.2
 description: >
     LegacyOctalEscapeSequence is not enabled in strict mode code (regardless of
     the presence of Annex B)
diff --git a/test/language/literals/string/legacy-octal-escape-sequence-strict.js b/test/language/literals/string/legacy-octal-escape-sequence-strict.js
index 2d102f7658..a0abf565cd 100644
--- a/test/language/literals/string/legacy-octal-escape-sequence-strict.js
+++ b/test/language/literals/string/legacy-octal-escape-sequence-strict.js
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
 esid: sec-additional-syntax-string-literals
-es6id: B1.2
+es6id: B.1.2
 description: >
     LegacyOctalEscapeSequence is not enabled in strict mode code (regardless of
     the presence of Annex B)
-- 
GitLab