microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-04 21:53:42 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Wrap inline negative const enum with parens (#55065)

Browse Source 
Co-authored-by: Oleksandr T <oleksandr.tarasiuk@outlook.com>
This commit is contained in:
Mateusz Burzyński 2023-08-01 01:33:51 +02:00 committed by GitHub
parent cd23992100
commit 6c942fa2c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 279 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/emitter.ts
View File

@ -3061,11 +3061,11 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
&& !stringContains(text, String.fromCharCode(CharacterCodes.e));
}
else if (isAccessExpression(expression)) {
// check if constant enum value is integer
// check if constant enum value is a non-negative integer
const constantValue = getConstantValue(expression);
// isFinite handles cases when constantValue is undefined
return typeof constantValue === "number" && isFinite(constantValue)
&& Math.floor(constantValue) === constantValue;
&& constantValue >= 0 && Math.floor(constantValue) === constantValue;
}
}

11
src/compiler/transformers/ts.ts
View File

@ -123,7 +123,6 @@ import {
isTryStatement,
JsxOpeningElement,
JsxSelfClosingElement,
LeftHandSideExpression,
map,
mapDefined,
MethodDeclaration,
@ -2666,21 +2665,21 @@ export function transformTypeScript(context: TransformationContext) {
return value.replace(/\*\//g, "*_/");
}
function substituteConstantValue(node: PropertyAccessExpression | ElementAccessExpression): LeftHandSideExpression {
function substituteConstantValue(node: PropertyAccessExpression | ElementAccessExpression) {
const constantValue = tryGetConstEnumValue(node);
if (constantValue !== undefined) {
// track the constant value on the node for the printer in needsDotDotForPropertyAccess
// track the constant value on the node for the printer in mayNeedDotDotForPropertyAccess
setConstantValue(node, constantValue);
const substitute = typeof constantValue === "string" ? factory.createStringLiteral(constantValue) :
constantValue < 0 ? factory.createPrefixUnaryExpression(SyntaxKind.MinusToken, factory.createNumericLiteral(Math.abs(constantValue))) :
factory.createNumericLiteral(constantValue);
const substitute = typeof constantValue === "string" ? factory.createStringLiteral(constantValue) : factory.createNumericLiteral(constantValue);
if (!compilerOptions.removeComments) {
const originalNode = getOriginalNode(node, isAccessExpression);
addSyntheticTrailingComment(substitute, SyntaxKind.MultiLineCommentTrivia, ` ${safeMultiLineComment(getTextOfNode(originalNode))} `);
}
return substitute;
}
return node;
}

1
src/testRunner/tests.ts
View File

@ -34,6 +34,7 @@ import "./unittests/evaluation/asyncArrow";
import "./unittests/evaluation/asyncGenerator";
import "./unittests/evaluation/autoAccessors";
import "./unittests/evaluation/awaiter";
import "./unittests/evaluation/constEnum";
import "./unittests/evaluation/destructuring";
import "./unittests/evaluation/externalModules";
import "./unittests/evaluation/esDecorators";

17
src/testRunner/unittests/evaluation/constEnum.ts Normal file
View File

@ -0,0 +1,17 @@
import * as evaluator from "../../_namespaces/evaluator";
describe("unittests:: evaluation:: constEnum", () => {
it("correct order of operations for inlined negative numbers", async () => {
const result = evaluator.evaluateTypeScript(`
const enum TestEnum {
A = 1,
B = -1
}
export const a = typeof TestEnum.A.toString();
export const b = typeof TestEnum.B.toString();
`);
assert.equal(result.a, "string");
assert.equal(result.b, "string");
});
});

33
tests/baselines/reference/constEnumPropertyAccess3.js Normal file
View File

@ -0,0 +1,33 @@
//// [tests/cases/conformance/constEnums/constEnumPropertyAccess3.ts] ////
//// [constEnumPropertyAccess3.ts]
const enum E {
A = ~1,
B = -1,
C = ~(1 + 1),
D = -(1 + 2),
E = 1 - 10,
}
E.A.toString();
E.B.toString();
E.C.toString();
E.D.toString();
E["A"].toString();
E["B"].toString();
E["C"].toString();
E["D"].toString();
E["E"].toString();
//// [constEnumPropertyAccess3.js]
(-2 /* E.A */).toString();
(-1 /* E.B */).toString();
(-3 /* E.C */).toString();
(-3 /* E.D */).toString();
(-2 /* E["A"] */).toString();
(-1 /* E["B"] */).toString();
(-3 /* E["C"] */).toString();
(-3 /* E["D"] */).toString();
(-9 /* E["E"] */).toString();

80
tests/baselines/reference/constEnumPropertyAccess3.symbols Normal file
View File

@ -0,0 +1,80 @@
//// [tests/cases/conformance/constEnums/constEnumPropertyAccess3.ts] ////
=== constEnumPropertyAccess3.ts ===
const enum E {
>E : Symbol(E, Decl(constEnumPropertyAccess3.ts, 0, 0))
A = ~1,
>A : Symbol(E.A, Decl(constEnumPropertyAccess3.ts, 0, 14))
B = -1,
>B : Symbol(E.B, Decl(constEnumPropertyAccess3.ts, 1, 11))
C = ~(1 + 1),
>C : Symbol(E.C, Decl(constEnumPropertyAccess3.ts, 2, 11))
D = -(1 + 2),
>D : Symbol(E.D, Decl(constEnumPropertyAccess3.ts, 3, 17))
E = 1 - 10,
>E : Symbol(E.E, Decl(constEnumPropertyAccess3.ts, 4, 17))
}
E.A.toString();
>E.A.toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
>E.A : Symbol(E.A, Decl(constEnumPropertyAccess3.ts, 0, 14))
>E : Symbol(E, Decl(constEnumPropertyAccess3.ts, 0, 0))
>A : Symbol(E.A, Decl(constEnumPropertyAccess3.ts, 0, 14))
>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
E.B.toString();
>E.B.toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
>E.B : Symbol(E.B, Decl(constEnumPropertyAccess3.ts, 1, 11))
>E : Symbol(E, Decl(constEnumPropertyAccess3.ts, 0, 0))
>B : Symbol(E.B, Decl(constEnumPropertyAccess3.ts, 1, 11))
>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
E.C.toString();
>E.C.toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
>E.C : Symbol(E.C, Decl(constEnumPropertyAccess3.ts, 2, 11))
>E : Symbol(E, Decl(constEnumPropertyAccess3.ts, 0, 0))
>C : Symbol(E.C, Decl(constEnumPropertyAccess3.ts, 2, 11))
>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
E.D.toString();
>E.D.toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
>E.D : Symbol(E.D, Decl(constEnumPropertyAccess3.ts, 3, 17))
>E : Symbol(E, Decl(constEnumPropertyAccess3.ts, 0, 0))
>D : Symbol(E.D, Decl(constEnumPropertyAccess3.ts, 3, 17))
>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
E["A"].toString();
>E["A"].toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
>E : Symbol(E, Decl(constEnumPropertyAccess3.ts, 0, 0))
>"A" : Symbol(E.A, Decl(constEnumPropertyAccess3.ts, 0, 14))
>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
E["B"].toString();
>E["B"].toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
>E : Symbol(E, Decl(constEnumPropertyAccess3.ts, 0, 0))
>"B" : Symbol(E.B, Decl(constEnumPropertyAccess3.ts, 1, 11))
>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
E["C"].toString();
>E["C"].toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
>E : Symbol(E, Decl(constEnumPropertyAccess3.ts, 0, 0))
>"C" : Symbol(E.C, Decl(constEnumPropertyAccess3.ts, 2, 11))
>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
E["D"].toString();
>E["D"].toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
>E : Symbol(E, Decl(constEnumPropertyAccess3.ts, 0, 0))
>"D" : Symbol(E.D, Decl(constEnumPropertyAccess3.ts, 3, 17))
>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
E["E"].toString();
>E["E"].toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))
>E : Symbol(E, Decl(constEnumPropertyAccess3.ts, 0, 0))
>"E" : Symbol(E.E, Decl(constEnumPropertyAccess3.ts, 4, 17))
>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --))

111
tests/baselines/reference/constEnumPropertyAccess3.types Normal file
View File

@ -0,0 +1,111 @@
//// [tests/cases/conformance/constEnums/constEnumPropertyAccess3.ts] ////
=== constEnumPropertyAccess3.ts ===
const enum E {
>E : E
A = ~1,
>A : E.A
>~1 : number
>1 : 1
B = -1,
>B : E.B
>-1 : -1
>1 : 1
C = ~(1 + 1),
>C : E.C
>~(1 + 1) : number
>(1 + 1) : number
>1 + 1 : number
>1 : 1
>1 : 1
D = -(1 + 2),
>D : E.C
>-(1 + 2) : number
>(1 + 2) : number
>1 + 2 : number
>1 : 1
>2 : 2
E = 1 - 10,
>E : E.E
>1 - 10 : number
>1 : 1
>10 : 10
}
E.A.toString();
>E.A.toString() : string
>E.A.toString : (radix?: number) => string
>E.A : E.A
>E : typeof E
>A : E.A
>toString : (radix?: number) => string
E.B.toString();
>E.B.toString() : string
>E.B.toString : (radix?: number) => string
>E.B : E.B
>E : typeof E
>B : E.B
>toString : (radix?: number) => string
E.C.toString();
>E.C.toString() : string
>E.C.toString : (radix?: number) => string
>E.C : E.C
>E : typeof E
>C : E.C
>toString : (radix?: number) => string
E.D.toString();
>E.D.toString() : string
>E.D.toString : (radix?: number) => string
>E.D : E.C
>E : typeof E
>D : E.C
>toString : (radix?: number) => string
E["A"].toString();
>E["A"].toString() : string
>E["A"].toString : (radix?: number) => string
>E["A"] : E.A
>E : typeof E
>"A" : "A"
>toString : (radix?: number) => string
E["B"].toString();
>E["B"].toString() : string
>E["B"].toString : (radix?: number) => string
>E["B"] : E.B
>E : typeof E
>"B" : "B"
>toString : (radix?: number) => string
E["C"].toString();
>E["C"].toString() : string
>E["C"].toString : (radix?: number) => string
>E["C"] : E.C
>E : typeof E
>"C" : "C"
>toString : (radix?: number) => string
E["D"].toString();
>E["D"].toString() : string
>E["D"].toString : (radix?: number) => string
>E["D"] : E.C
>E : typeof E
>"D" : "D"
>toString : (radix?: number) => string
E["E"].toString();
>E["E"].toString() : string
>E["E"].toString : (radix?: number) => string
>E["E"] : E.E
>E : typeof E
>"E" : "E"
>toString : (radix?: number) => string

12
tests/baselines/reference/constEnumToStringNoComments.js
View File

@ -31,9 +31,9 @@ var y0 = 0.5.toString();
var y1 = 0.5.toString();
var z0 = 2..toString();
var z1 = 2..toString();
var a0 = -1..toString();
var a1 = -1..toString();
var b0 = -1.5.toString();
var b1 = -1.5.toString();
var c0 = -1..toString();
var c1 = -1..toString();
var a0 = (-1).toString();
var a1 = (-1).toString();
var b0 = (-1.5).toString();
var b1 = (-1.5).toString();
var c0 = (-1).toString();
var c1 = (-1).toString();

12
tests/baselines/reference/constEnumToStringWithComments.js
View File

@ -31,9 +31,9 @@ var y0 = 0.5 /* Foo.Y */.toString();
var y1 = 0.5 /* Foo["Y"] */.toString();
var z0 = 2 /* Foo.Z */.toString();
var z1 = 2 /* Foo["Z"] */.toString();
var a0 = -1 /* Foo.A */.toString();
var a1 = -1 /* Foo["A"] */.toString();
var b0 = -1.5 /* Foo.B */.toString();
var b1 = -1.5 /* Foo["B"] */.toString();
var c0 = -1 /* Foo.C */.toString();
var c1 = -1 /* Foo["C"] */.toString();
var a0 = (-1 /* Foo.A */).toString();
var a1 = (-1 /* Foo["A"] */).toString();
var b0 = (-1.5 /* Foo.B */).toString();
var b1 = (-1.5 /* Foo["B"] */).toString();
var c0 = (-1 /* Foo.C */).toString();
var c1 = (-1 /* Foo["C"] */).toString();

18
tests/cases/conformance/constEnums/constEnumPropertyAccess3.ts Normal file
View File

@ -0,0 +1,18 @@
const enum E {
A = ~1,
B = -1,
C = ~(1 + 1),
D = -(1 + 2),
E = 1 - 10,
}
E.A.toString();
E.B.toString();
E.C.toString();
E.D.toString();
E["A"].toString();
E["B"].toString();
E["C"].toString();
E["D"].toString();
E["E"].toString();