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

Decorators normative changes (#52582)

Browse Source
This commit is contained in:
Ron Buckton
2023-02-09 14:48:45 -05:00
committed by GitHub
parent 0ef9e8eac9
commit 6c9792aa87
114 changed files with 1890 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/compiler/program.ts
View File

@@ -3,6 +3,7 @@ import {
__String,
addInternalEmitFlags,
addRange,
addRelatedInfo,
append,
arrayFrom,
arrayIsEqualTo,
@@ -2957,14 +2958,21 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
}
else if (isClassDeclaration(parent)) {
const exportIndex = findIndex(parent.modifiers, isExportModifier);
const defaultIndex = findIndex(parent.modifiers, isDefaultModifier);
if (exportIndex >= 0 && decoratorIndex < exportIndex) {
// report illegal decorator before `export default`
diagnostics.push(createDiagnosticForNode(parent.modifiers[decoratorIndex], Diagnostics.Decorators_must_come_after_export_or_export_default_in_JavaScript_files));
}
else if (defaultIndex >= 0 && decoratorIndex < defaultIndex) {
// report illegal decorator before `export default`
diagnostics.push(createDiagnosticForNode(parent.modifiers[decoratorIndex], Diagnostics.Decorators_are_not_valid_here));
if (exportIndex >= 0) {
const defaultIndex = findIndex(parent.modifiers, isDefaultModifier);
if (decoratorIndex > exportIndex && defaultIndex >= 0 && decoratorIndex < defaultIndex) {
// report illegal decorator between `export` and `default`
diagnostics.push(createDiagnosticForNode(parent.modifiers[decoratorIndex], Diagnostics.Decorators_are_not_valid_here));
}
else if (exportIndex >= 0 && decoratorIndex < exportIndex) {
const trailingDecoratorIndex = findIndex(parent.modifiers, isDecorator, exportIndex);
if (trailingDecoratorIndex >= 0) {
diagnostics.push(addRelatedInfo(
createDiagnosticForNode(parent.modifiers[trailingDecoratorIndex], Diagnostics.Decorators_may_not_appear_after_export_or_export_default_if_they_also_appear_before_export),
createDiagnosticForNode(parent.modifiers[decoratorIndex], Diagnostics.Decorator_used_before_export_here),
));
}
}
}
}
}