Preserve separators in numeric literals with target=ES2021+ (#57144)

danvk · web-flow · commit f41a5f59868e · 2024-02-15T14:26:42.000-08:00
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -5657,7 +5657,7 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
         const flags = (neverAsciiEscape ? GetLiteralTextFlags.NeverAsciiEscape : 0)
             | (jsxAttributeEscape ? GetLiteralTextFlags.JsxAttributeEscape : 0)
             | (printerOptions.terminateUnterminatedLiterals ? GetLiteralTextFlags.TerminateUnterminatedLiterals : 0)
-            | (printerOptions.target && printerOptions.target === ScriptTarget.ESNext ? GetLiteralTextFlags.AllowNumericSeparator : 0);
+            | (printerOptions.target && printerOptions.target >= ScriptTarget.ES2021 ? GetLiteralTextFlags.AllowNumericSeparator : 0);
 
         return getLiteralText(node, currentSourceFile, flags);
     }
diff --git a/tests/baselines/reference/parser.numericSeparators.decimal(target=es2020).js b/tests/baselines/reference/parser.numericSeparators.decimal(target=es2020).js
diff --git a/tests/baselines/reference/parser.numericSeparators.decimal(target=es2020).symbols b/tests/baselines/reference/parser.numericSeparators.decimal(target=es2020).symbols
diff --git a/tests/baselines/reference/parser.numericSeparators.decimal(target=es2020).types b/tests/baselines/reference/parser.numericSeparators.decimal(target=es2020).types
diff --git a/tests/baselines/reference/parser.numericSeparators.decimal(target=es2021).js b/tests/baselines/reference/parser.numericSeparators.decimal(target=es2021).js
@@ -0,0 +1,34 @@
+//// [tests/cases/conformance/parser/ecmascript2021/numericSeparators/parser.numericSeparators.decimal.ts] ////
+
+//// [parser.numericSeparators.decimal.ts]
+1_000_000_000
+1.1_00_01
+1e1_0
+1e+1_0
+1e-1_0
+1.1e10_0
+1.1e+10_0
+1.1e-10_0
+12_34_56
+1_22_333
+1_2.3_4
+1_2.3_4e5_6
+1_2.3_4e+5_6
+1_2.3_4e-5_6
+
+
+//// [parser.numericSeparators.decimal.js]
+1_000_000_000;
+1.1_00_01;
+1e1_0;
+1e+1_0;
+1e-1_0;
+1.1e10_0;
+1.1e+10_0;
+1.1e-10_0;
+12_34_56;
+1_22_333;
+1_2.3_4;
+1_2.3_4e5_6;
+1_2.3_4e+5_6;
+1_2.3_4e-5_6;
diff --git a/tests/baselines/reference/parser.numericSeparators.decimal(target=es2021).symbols b/tests/baselines/reference/parser.numericSeparators.decimal(target=es2021).symbols
@@ -0,0 +1,19 @@
+//// [tests/cases/conformance/parser/ecmascript2021/numericSeparators/parser.numericSeparators.decimal.ts] ////
+
+=== parser.numericSeparators.decimal.ts ===
+
+1_000_000_000
+1.1_00_01
+1e1_0
+1e+1_0
+1e-1_0
+1.1e10_0
+1.1e+10_0
+1.1e-10_0
+12_34_56
+1_22_333
+1_2.3_4
+1_2.3_4e5_6
+1_2.3_4e+5_6
+1_2.3_4e-5_6
+
diff --git a/tests/baselines/reference/parser.numericSeparators.decimal(target=es2021).types b/tests/baselines/reference/parser.numericSeparators.decimal(target=es2021).types
@@ -0,0 +1,45 @@
+//// [tests/cases/conformance/parser/ecmascript2021/numericSeparators/parser.numericSeparators.decimal.ts] ////
+
+=== parser.numericSeparators.decimal.ts ===
+1_000_000_000
+>1_000_000_000 : 1000000000
+
+1.1_00_01
+>1.1_00_01 : 1.10001
+
+1e1_0
+>1e1_0 : 10000000000
+
+1e+1_0
+>1e+1_0 : 10000000000
+
+1e-1_0
+>1e-1_0 : 1e-10
+
+1.1e10_0
+>1.1e10_0 : 1.1e+100
+
+1.1e+10_0
+>1.1e+10_0 : 1.1e+100
+
+1.1e-10_0
+>1.1e-10_0 : 1.1e-100
+
+12_34_56
+>12_34_56 : 123456
+
+1_22_333
+>1_22_333 : 122333
+
+1_2.3_4
+>1_2.3_4 : 12.34
+
+1_2.3_4e5_6
+>1_2.3_4e5_6 : 1.234e+57
+
+1_2.3_4e+5_6
+>1_2.3_4e+5_6 : 1.234e+57
+
+1_2.3_4e-5_6
+>1_2.3_4e-5_6 : 1.234e-55
+
diff --git a/tests/baselines/reference/parser.numericSeparators.decimal(target=es5).js b/tests/baselines/reference/parser.numericSeparators.decimal(target=es5).js
@@ -0,0 +1,34 @@
+//// [tests/cases/conformance/parser/ecmascript2021/numericSeparators/parser.numericSeparators.decimal.ts] ////
+
+//// [parser.numericSeparators.decimal.ts]
+1_000_000_000
+1.1_00_01
+1e1_0
+1e+1_0
+1e-1_0
+1.1e10_0
+1.1e+10_0
+1.1e-10_0
+12_34_56
+1_22_333
+1_2.3_4
+1_2.3_4e5_6
+1_2.3_4e+5_6
+1_2.3_4e-5_6
+
+
+//// [parser.numericSeparators.decimal.js]
+1000000000;
+1.10001;
+10000000000;
+10000000000;
+1e-10;
+1.1e+100;
+1.1e+100;
+1.1e-100;
+123456;
+122333;
+12.34;
+1.234e+57;
+1.234e+57;
+1.234e-55;
diff --git a/tests/baselines/reference/parser.numericSeparators.decimal(target=es5).symbols b/tests/baselines/reference/parser.numericSeparators.decimal(target=es5).symbols
@@ -0,0 +1,19 @@
+//// [tests/cases/conformance/parser/ecmascript2021/numericSeparators/parser.numericSeparators.decimal.ts] ////
+
+=== parser.numericSeparators.decimal.ts ===
+
+1_000_000_000
+1.1_00_01
+1e1_0
+1e+1_0
+1e-1_0
+1.1e10_0
+1.1e+10_0
+1.1e-10_0
+12_34_56
+1_22_333
+1_2.3_4
+1_2.3_4e5_6
+1_2.3_4e+5_6
+1_2.3_4e-5_6
+
diff --git a/tests/baselines/reference/parser.numericSeparators.decimal(target=es5).types b/tests/baselines/reference/parser.numericSeparators.decimal(target=es5).types
@@ -0,0 +1,45 @@
+//// [tests/cases/conformance/parser/ecmascript2021/numericSeparators/parser.numericSeparators.decimal.ts] ////
+
+=== parser.numericSeparators.decimal.ts ===
+1_000_000_000
+>1_000_000_000 : 1000000000
+
+1.1_00_01
+>1.1_00_01 : 1.10001
+
+1e1_0
+>1e1_0 : 10000000000
+
+1e+1_0
+>1e+1_0 : 10000000000
+
+1e-1_0
+>1e-1_0 : 1e-10
+
+1.1e10_0
+>1.1e10_0 : 1.1e+100
+
+1.1e+10_0
+>1.1e+10_0 : 1.1e+100
+
+1.1e-10_0
+>1.1e-10_0 : 1.1e-100
+
+12_34_56
+>12_34_56 : 123456
+
+1_22_333
+>1_22_333 : 122333
+
+1_2.3_4
+>1_2.3_4 : 12.34
+
+1_2.3_4e5_6
+>1_2.3_4e5_6 : 1.234e+57
+
+1_2.3_4e+5_6
+>1_2.3_4e+5_6 : 1.234e+57
+
+1_2.3_4e-5_6
+>1_2.3_4e-5_6 : 1.234e-55
+
diff --git a/tests/cases/conformance/parser/ecmascript2021/numericSeparators/parser.numericSeparators.decimal.ts b/tests/cases/conformance/parser/ecmascript2021/numericSeparators/parser.numericSeparators.decimal.ts
@@ -1,3 +1,4 @@
+// @target: es5, es2020, es2021
 1_000_000_000
 1.1_00_01
 1e1_0

Original file line number	Diff line number	Diff line change
`@@ -5657,7 +5657,7 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri`
`5657`	`5657`	`const flags = (neverAsciiEscape ? GetLiteralTextFlags.NeverAsciiEscape : 0)`
`5658`	`5658`	`\| (jsxAttributeEscape ? GetLiteralTextFlags.JsxAttributeEscape : 0)`
`5659`	`5659`	`\| (printerOptions.terminateUnterminatedLiterals ? GetLiteralTextFlags.TerminateUnterminatedLiterals : 0)`
`5660`		`- \| (printerOptions.target && printerOptions.target === ScriptTarget.ESNext ? GetLiteralTextFlags.AllowNumericSeparator : 0);`
	`5660`	`+ \| (printerOptions.target && printerOptions.target >= ScriptTarget.ES2021 ? GetLiteralTextFlags.AllowNumericSeparator : 0);`
`5661`	`5661`
`5662`	`5662`	`return getLiteralText(node, currentSourceFile, flags);`
`5663`	`5663`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// @target: es5, es2020, es2021`
`1`	`2`	`1_000_000_000`
`2`	`3`	`1.1_00_01`
`3`	`4`	`1e1_0`