fix(2356): omit numeric separators when targeting es2020 (#2358)

Author: a-tarasyuk

internal/compiler/emitter.go

@@ -163,6 +163,7 @@ func (e *emitter) emitJSFile(sourceFile *ast.SourceFile, jsFilePath string, sour
 		SourceMap:       options.SourceMap.IsTrue(),
 		InlineSourceMap: options.InlineSourceMap.IsTrue(),
 		InlineSources:   options.InlineSources.IsTrue(),
+		Target:          options.Target,
 		// !!!
 	}
 

internal/printer/printer.go

@@ -37,7 +37,7 @@ type PrinterOptions struct {
 	NoEmitHelpers bool
 	// Module                        core.ModuleKind
 	// ModuleResolution              core.ModuleResolutionKind
-	// Target                        core.ScriptTarget
+	Target                      core.ScriptTarget
 	SourceMap                   bool
 	InlineSourceMap             bool
 	InlineSources               bool
@@ -206,12 +206,13 @@ func (p *Printer) getLiteralTextOfNode(node *ast.LiteralLikeNode, sourceFile *as
 			}
 		}
 	}
-
 	// !!! Printer option to control whether to terminate unterminated literals
-	// !!! If necessary, printer option to control whether to preserve numeric separators
 	if p.emitContext.EmitFlags(node)&EFNoAsciiEscaping != 0 {
 		flags |= getLiteralTextFlagsNeverAsciiEscape
 	}
+	if p.Options.Target >= core.ScriptTargetES2021 {
+		flags |= getLiteralTextFlagsAllowNumericSeparator
+	}
 	return getLiteralText(node, core.Coalesce(sourceFile, p.currentSourceFile), flags)
 }
 
@@ -999,7 +1000,7 @@ func (p *Printer) emitLiteral(node *ast.LiteralLikeNode, flags getLiteralTextFla
 
 func (p *Printer) emitNumericLiteral(node *ast.NumericLiteral) {
 	state := p.enterNode(node.AsNode())
-	p.emitLiteral(node.AsNode(), getLiteralTextFlagsAllowNumericSeparator)
+	p.emitLiteral(node.AsNode(), getLiteralTextFlagsNone)
 	p.exitNode(node.AsNode(), state)
 }
 

internal/printer/printer_test.go

@@ -23,7 +23,7 @@ func TestEmit(t *testing.T) {
 		{title: "StringLiteral#1", input: `;"test"`, output: ";\n\"test\";"},
 		{title: "StringLiteral#2", input: `;'test'`, output: ";\n'test';"},
 		{title: "NumericLiteral#1", input: `0`, output: `0;`},
-		{title: "NumericLiteral#2", input: `10_000`, output: `10_000;`},
+		{title: "NumericLiteral#2", input: `10_000`, output: `10000;`},
 		{title: "BigIntLiteral#1", input: `0n`, output: `0n;`},
 		{title: "BigIntLiteral#2", input: `10_000n`, output: `10000n;`}, // TODO: Preserve numeric literal separators after Strada migration
 		{title: "BooleanLiteral#1", input: `true`, output: `true;`},

testdata/baselines/reference/submodule/compiler/numberLiteralsWithLeadingZeros.js

@@ -119,13 +119,13 @@ e5;
 850000;
 850000;
 0;
-.5_5;
+0.55;
 0;
-.5_5;
+0.55;
 1;
-.5_5;
+0.55;
 1;
-.5_5;
+0.55;
 8.55;
 8.55;
 0;
@@ -139,13 +139,13 @@ e5_5;
 8e+55;
 8e+55;
 0;
-.5_5e5_5;
+5.5e+54;
 0;
-.5_5e5_5;
+5.5e+54;
 1;
-.5_5e5_5;
+5.5e+54;
 1;
-.5_5e5_5;
+5.5e+54;
 8.55e+55;
 8.55e+55;
 0.55;

testdata/baselines/reference/submodule/compiler/numberLiteralsWithLeadingZeros.js.diff

@@ -8,7 +8,7 @@
 
 
 //// [numericUnderscoredSeparator.js]
-1_000_000_000_000;
-0b1010_0001_1000_0101;
-0b1010_0001_1000_0101;
-0xA0_B0_C0;
+1000000000000;
+41349;
+41349;
+10531008;

testdata/baselines/reference/submodule/compiler/numericUnderscoredSeparator(target=es2015).js

@@ -8,7 +8,7 @@
 
 
 //// [numericUnderscoredSeparator.js]
-1_000_000_000_000;
-0b1010_0001_1000_0101;
-0b1010_0001_1000_0101;
-0xA0_B0_C0;
+1000000000000;
+41349;
+41349;
+10531008;

testdata/baselines/reference/submodule/compiler/numericUnderscoredSeparator(target=es2015).js.diff

@@ -8,7 +8,7 @@
 
 
 //// [numericUnderscoredSeparator.js]
-1_000_000_000_000;
-0b1010_0001_1000_0101;
-0b1010_0001_1000_0101;
-0xA0_B0_C0;
+1000000000000;
+41349;
+41349;
+10531008;