typescript-eslint · JamesHenry · Jan 16, 2019 · Jan 14, 2019 · Jan 14, 2019 · Jan 16, 2019
diff --git a/packages/typescript-eslint-parser/tests/lib/__snapshots__/javascript.ts.snap b/packages/typescript-eslint-parser/tests/lib/__snapshots__/javascript.ts.snap
diff --git a/...escript-eslint-shared-fixtures/fixtures/javascript/arrowFunctions/not-strict-octal.src.js b/...escript-eslint-shared-fixtures/fixtures/javascript/arrowFunctions/not-strict-octal.src.js
@@ -1 +1 @@
-(a) => 00;
+(a) => 0o0;
diff --git a/packages/typescript-eslint-shared-fixtures/fixtures/javascript/hexLiterals/invalid.src.js b/packages/typescript-eslint-shared-fixtures/fixtures/javascript/hexLiterals/invalid.src.js
@@ -0,0 +1 @@
+0x12z;
diff --git a/packages/typescript-eslint-shared-fixtures/fixtures/javascript/hexLiterals/lowercase.src.js b/packages/typescript-eslint-shared-fixtures/fixtures/javascript/hexLiterals/lowercase.src.js
@@ -0,0 +1 @@
+0x2343;
diff --git a/packages/typescript-eslint-shared-fixtures/fixtures/javascript/hexLiterals/uppercase.src.js b/packages/typescript-eslint-shared-fixtures/fixtures/javascript/hexLiterals/uppercase.src.js
@@ -0,0 +1 @@
+0X2343;
diff --git a/packages/typescript-eslint-shared-fixtures/fixtures/javascript/octalLiterals/legacy.src.js b/packages/typescript-eslint-shared-fixtures/fixtures/javascript/octalLiterals/legacy.src.js
@@ -0,0 +1 @@
+02343;
diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -1779,13 +1779,14 @@ export default function convert(config: ConvertConfig): ESTreeNode | null {
       }
       break;
 
-    case SyntaxKind.NumericLiteral:
+    case SyntaxKind.NumericLiteral: {
       Object.assign(result, {
         type: AST_NODE_TYPES.Literal,
         value: Number(node.text),
-        raw: ast.text.slice(result.range[0], result.range[1])
+        raw: node.getText()
       });
       break;
+    }
 
     case SyntaxKind.BigIntLiteral: {
       const raw = ast.text.slice(result.range[0], result.range[1]);

diff --git a/packages/typescript-estree/src/semantic-errors.ts b/packages/typescript-estree/src/semantic-errors.ts
@@ -61,6 +61,7 @@ function whitelistSupportedDiagnostics(
       case 1049: // ts 3.2 "A 'set' accessor must have exactly one parameter."
       case 1070: // ts 3.2 "'{0}' modifier cannot appear on a type member."
       case 1071: // ts 3.2 "'{0}' modifier cannot appear on an index signature."
+      case 1085: // ts 3.2 "Octal literals are not available when targeting ECMAScript 5 and higher. Use the syntax '{0}'."
       case 1090: // ts 3.2 "'{0}' modifier cannot appear on a parameter."
       case 1096: // ts 3.2 "An index signature must have exactly one parameter."
       case 1097: // ts 3.2 "'{0}' list cannot be empty."
@@ -83,6 +84,7 @@ function whitelistSupportedDiagnostics(
       case 2364: // ts 3.2 "The left-hand side of an assignment expression must be a variable or a property access."
       case 2369: // ts 3.2 "A parameter property is only allowed in a constructor implementation."
       case 2462: // ts 3.2 "A rest element must be last in a destructuring pattern."
+      case 8017: // ts 3.2 "Octal literal types must use ES2015 syntax. Use the syntax '{0}'."
       case 17012: // ts 3.2 "'{0}' is not a valid meta-property for keyword '{1}'. Did you mean '{2}'?"
       case 17013: // ts 3.2 "Meta-property '{0}' is only allowed in the body of a function declaration, function expression, or constructor."
         return true;

diff --git a/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts b/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
@@ -91,7 +91,7 @@ class FixturesTester {
   }
 
   public getFixtures(): Fixture[] {
-    const fixtures = this.fixtures
+    return this.fixtures
       .map(fixture =>
         glob
           .sync(`${fixture.directory}/${fixture.pattern}`, {})
@@ -102,8 +102,6 @@ class FixturesTester {
           }))
       )
       .reduce((acc, x) => acc.concat(x), []);
-
-    return fixtures;
   }
 }
 
@@ -225,6 +223,7 @@ tester.addFixturePatternConfig('javascript/forIn', {
 tester.addFixturePatternConfig('javascript/forOf');
 tester.addFixturePatternConfig('javascript/generators');
 tester.addFixturePatternConfig('javascript/globalReturn');
+tester.addFixturePatternConfig('javascript/hexLiterals');
 tester.addFixturePatternConfig('javascript/importMeta');
 tester.addFixturePatternConfig('javascript/labels');
 
@@ -264,7 +263,15 @@ tester.addFixturePatternConfig('javascript/objectLiteralDuplicateProperties', {
 
 tester.addFixturePatternConfig('javascript/objectLiteralShorthandMethods');
 tester.addFixturePatternConfig('javascript/objectLiteralShorthandProperties');
-tester.addFixturePatternConfig('javascript/octalLiterals');
+tester.addFixturePatternConfig('javascript/octalLiterals', {
+  ignore: [
+    /**
+     * Old-style octal literals are not supported in typescript
+     * @see https://github.com/Microsoft/TypeScript/issues/10101
+     */
+    'legacy'
+  ]
+});
 tester.addFixturePatternConfig('javascript/regex');
 tester.addFixturePatternConfig('javascript/regexUFlag');
 tester.addFixturePatternConfig('javascript/regexYFlag');