Skip to content

fix(41240): Support emitting numerics with separators as-is in target: esnext #41435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2020
Merged

fix(41240): Support emitting numerics with separators as-is in target: esnext #41435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/compiler/emitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4600,7 +4600,8 @@ namespace ts {

const flags = (neverAsciiEscape ? GetLiteralTextFlags.NeverAsciiEscape : 0)
| (jsxAttributeEscape ? GetLiteralTextFlags.JsxAttributeEscape : 0)
| (printerOptions.terminateUnterminatedLiterals ? GetLiteralTextFlags.TerminateUnterminatedLiterals : 0);
| (printerOptions.terminateUnterminatedLiterals ? GetLiteralTextFlags.TerminateUnterminatedLiterals : 0)
| (printerOptions.target && printerOptions.target === ScriptTarget.ESNext ? GetLiteralTextFlags.AllowNumericSeparator : 0);

return getLiteralText(node, currentSourceFile!, flags);
}
Expand Down
18 changes: 14 additions & 4 deletions src/compiler/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,15 +616,13 @@ namespace ts {
NeverAsciiEscape = 1 << 0,
JsxAttributeEscape = 1 << 1,
TerminateUnterminatedLiterals = 1 << 2,
AllowNumericSeparator = 1 << 3
}

export function getLiteralText(node: LiteralLikeNode, sourceFile: SourceFile, flags: GetLiteralTextFlags) {
// If we don't need to downlevel and we can reach the original source text using
// the node's parent reference, then simply get the text as it was originally written.
if (!nodeIsSynthesized(node) && node.parent && !(flags & GetLiteralTextFlags.TerminateUnterminatedLiterals && node.isUnterminated) && !(
(isNumericLiteral(node) && node.numericLiteralFlags & TokenFlags.ContainsSeparator) ||
isBigIntLiteral(node)
)) {
if (canUseOriginalText(node, flags)) {
return getSourceTextOfNodeFromSourceFile(sourceFile, node);
}

Expand Down Expand Up @@ -677,6 +675,18 @@ namespace ts {
return Debug.fail(`Literal kind '${node.kind}' not accounted for.`);
}

function canUseOriginalText(node: LiteralLikeNode, flags: GetLiteralTextFlags): boolean {
if (nodeIsSynthesized(node) || !node.parent || (flags & GetLiteralTextFlags.TerminateUnterminatedLiterals && node.isUnterminated)) {
return false;
}

if (isNumericLiteral(node) && node.numericLiteralFlags & TokenFlags.ContainsSeparator) {
return !!(flags & GetLiteralTextFlags.AllowNumericSeparator);
}

return !isBigIntLiteral(node);
}

export function getTextOfConstantValue(value: string | number) {
return isString(value) ? '"' + escapeNonAsciiString(value) + '"' : "" + value;
}
Expand Down
12 changes: 12 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2015).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//// [numericUnderscoredSeparator.ts]
1_000_000_000_000
0b1010_0001_1000_0101
0b1010_0001_1000_0101
0xA0_B0_C0


//// [numericUnderscoredSeparator.js]
1000000000000;
41349;
41349;
10531008;
7 changes: 7 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2015).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0xA0_B0_C0
No type information for this code.
No type information for this code.
13 changes: 13 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2015).types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
>1_000_000_000_000 : 1000000000000

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0xA0_B0_C0
>0xA0_B0_C0 : 10531008

12 changes: 12 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2016).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//// [numericUnderscoredSeparator.ts]
1_000_000_000_000
0b1010_0001_1000_0101
0b1010_0001_1000_0101
0xA0_B0_C0


//// [numericUnderscoredSeparator.js]
1000000000000;
41349;
41349;
10531008;
7 changes: 7 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2016).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0xA0_B0_C0
No type information for this code.
No type information for this code.
13 changes: 13 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2016).types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
>1_000_000_000_000 : 1000000000000

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0xA0_B0_C0
>0xA0_B0_C0 : 10531008

12 changes: 12 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2017).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//// [numericUnderscoredSeparator.ts]
1_000_000_000_000
0b1010_0001_1000_0101
0b1010_0001_1000_0101
0xA0_B0_C0


//// [numericUnderscoredSeparator.js]
1000000000000;
41349;
41349;
10531008;
7 changes: 7 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2017).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0xA0_B0_C0
No type information for this code.
No type information for this code.
13 changes: 13 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2017).types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
>1_000_000_000_000 : 1000000000000

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0xA0_B0_C0
>0xA0_B0_C0 : 10531008

12 changes: 12 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2018).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//// [numericUnderscoredSeparator.ts]
1_000_000_000_000
0b1010_0001_1000_0101
0b1010_0001_1000_0101
0xA0_B0_C0


//// [numericUnderscoredSeparator.js]
1000000000000;
41349;
41349;
10531008;
7 changes: 7 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2018).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0xA0_B0_C0
No type information for this code.
No type information for this code.
13 changes: 13 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2018).types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
>1_000_000_000_000 : 1000000000000

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0xA0_B0_C0
>0xA0_B0_C0 : 10531008

12 changes: 12 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2019).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//// [numericUnderscoredSeparator.ts]
1_000_000_000_000
0b1010_0001_1000_0101
0b1010_0001_1000_0101
0xA0_B0_C0


//// [numericUnderscoredSeparator.js]
1000000000000;
41349;
41349;
10531008;
7 changes: 7 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2019).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0xA0_B0_C0
No type information for this code.
No type information for this code.
13 changes: 13 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es2019).types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
>1_000_000_000_000 : 1000000000000

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0xA0_B0_C0
>0xA0_B0_C0 : 10531008

12 changes: 12 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es3).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//// [numericUnderscoredSeparator.ts]
1_000_000_000_000
0b1010_0001_1000_0101
0b1010_0001_1000_0101
0xA0_B0_C0


//// [numericUnderscoredSeparator.js]
1000000000000;
41349;
41349;
10531008;
7 changes: 7 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es3).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0xA0_B0_C0
No type information for this code.
No type information for this code.
13 changes: 13 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es3).types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
>1_000_000_000_000 : 1000000000000

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0xA0_B0_C0
>0xA0_B0_C0 : 10531008

12 changes: 12 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es5).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//// [numericUnderscoredSeparator.ts]
1_000_000_000_000
0b1010_0001_1000_0101
0b1010_0001_1000_0101
0xA0_B0_C0


//// [numericUnderscoredSeparator.js]
1000000000000;
41349;
41349;
10531008;
7 changes: 7 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es5).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0xA0_B0_C0
No type information for this code.
No type information for this code.
13 changes: 13 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=es5).types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
>1_000_000_000_000 : 1000000000000

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0xA0_B0_C0
>0xA0_B0_C0 : 10531008

12 changes: 12 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=esnext).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//// [numericUnderscoredSeparator.ts]
1_000_000_000_000
0b1010_0001_1000_0101
0b1010_0001_1000_0101
0xA0_B0_C0


//// [numericUnderscoredSeparator.js]
1_000_000_000_000;
0b1010_0001_1000_0101;
0b1010_0001_1000_0101;
0xA0_B0_C0;
7 changes: 7 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=esnext).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0b1010_0001_1000_0101
No type information for this code.0xA0_B0_C0
No type information for this code.
No type information for this code.
13 changes: 13 additions & 0 deletions tests/baselines/reference/numericUnderscoredSeparator(target=esnext).types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=== tests/cases/compiler/numericUnderscoredSeparator.ts ===
1_000_000_000_000
>1_000_000_000_000 : 1000000000000

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0b1010_0001_1000_0101
>0b1010_0001_1000_0101 : 41349

0xA0_B0_C0
>0xA0_B0_C0 : 10531008

6 changes: 6 additions & 0 deletions tests/cases/compiler/numericUnderscoredSeparator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// @target: es3,es5,es2015,es2016,es2017,es2018,es2019,esnext

1_000_000_000_000
0b1010_0001_1000_0101
0b1010_0001_1000_0101
0xA0_B0_C0