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

Allow references to const variables with literal types in constant expressions

Browse Source
This commit is contained in:
Anders Hejlsberg
2024-07-30 09:30:01 -07:00
parent e0036e65e8
commit 2e0d0fcb6c
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/compiler/checker.ts
View File

@@ -46726,17 +46726,19 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
if (isConstantVariable(symbol)) {
const declaration = symbol.valueDeclaration;
if (declaration && isVariableDeclaration(declaration) && !declaration.type && declaration.initializer && (!location || declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location))) {
const result = evaluate(declaration.initializer, declaration);
if (location && getSourceFileOfNode(location) !== getSourceFileOfNode(declaration)) {
return evaluatorResult(
result.value,
/*isSyntacticallyString*/ false,
/*resolvedOtherFiles*/ true,
/*hasExternalReferences*/ true,
);
if (declaration && isVariableDeclaration(declaration)) {
if (!declaration.type && declaration.initializer && (!location || declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location))) {
const result = evaluate(declaration.initializer, declaration);
return location && getSourceFileOfNode(location) !== getSourceFileOfNode(declaration) ?
evaluatorResult(result.value, /*isSyntacticallyString*/ false, /*resolvedOtherFiles*/ true, /*hasExternalReferences*/ true) :
evaluatorResult(result.value, result.isSyntacticallyString, result.resolvedOtherFiles, /*hasExternalReferences*/ true);
}
if (declaration.type && declaration.type.kind === SyntaxKind.LiteralType) {
const type = getTypeOfSymbol(symbol);
if (type.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral)) {
return evaluatorResult((type as LiteralType).value as string | number);
}
}
return evaluatorResult(result.value, result.isSyntacticallyString, result.resolvedOtherFiles, /*hasExternalReferences*/ true);
}
}
return evaluatorResult(/*value*/ undefined);