Skip to content

Commit 3eb9a57

Browse files
rbucktontypescript-bot
rbuckton
authored and
typescript-bot
committed
Cherry-pick PR microsoft#50343 into release-4.8
Component commits: da3e304 Change type of deprecated 'decorators' property a63f47c fix 'Invalid Arguments' error for create/update constructor in factory a2588b8 Update deprecation comments aebe225 Make 'decorators' optional and 'undefined' 46c30f3 Rename '_decorators' to 'illegalDecorators'
1 parent 99b7928 commit 3eb9a57

File tree

11 files changed

+301
-440
lines changed

11 files changed

+301
-440
lines changed

‎src/compiler/checker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43956,7 +43956,7 @@ namespace ts {
4395643956
}
4395743957

4395843958
function checkGrammarDecorators(node: Node): boolean {
43959-
if (canHaveIllegalDecorators(node) && some(node.decorators)) {
43959+
if (canHaveIllegalDecorators(node) && some(node.illegalDecorators)) {
4396043960
return grammarErrorOnFirstToken(node, Diagnostics.Decorators_are_not_valid_here);
4396143961
}
4396243962
if (!canHaveDecorators(node) || !hasDecorators(node)) {

‎src/compiler/debug.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ namespace ts {
3030
export let currentLogLevel = LogLevel.Warning;
3131
export let isDebugging = false;
3232
export let loggingHost: LoggingHost | undefined;
33+
export let enableDeprecationWarnings = true;
3334
/* eslint-enable prefer-const */
3435

3536
type AssertionKeys = MatchingKeys<typeof Debug, AnyFunction>;
@@ -732,7 +733,7 @@ namespace ts {
732733
function createWarningDeprecation(name: string, errorAfter: Version | undefined, since: Version | undefined, message: string | undefined) {
733734
let hasWrittenDeprecation = false;
734735
return () => {
735-
if (!hasWrittenDeprecation) {
736+
if (enableDeprecationWarnings && !hasWrittenDeprecation) {
736737
log.warn(formatDeprecationMessage(name, /*error*/ false, errorAfter, since, message));
737738
hasWrittenDeprecation = true;
738739
}

‎src/compiler/factory/nodeFactory.ts‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,7 @@ namespace ts {
14351435
node.transformFlags = propagateChildFlags(body) | TransformFlags.ContainsClassFields;
14361436

14371437
// The following properties are used only to report grammar errors
1438-
node.decorators = undefined;
1438+
node.illegalDecorators = undefined;
14391439
node.modifiers = undefined;
14401440
return node;
14411441
}
@@ -1452,7 +1452,7 @@ namespace ts {
14521452

14531453
function finishUpdateClassStaticBlockDeclaration(updated: Mutable<ClassStaticBlockDeclaration>, original: ClassStaticBlockDeclaration) {
14541454
if (updated !== original) {
1455-
updated.decorators = original.decorators;
1455+
updated.illegalDecorators = original.illegalDecorators;
14561456
updated.modifiers = original.modifiers;
14571457
}
14581458
return update(updated, original);
@@ -1476,7 +1476,7 @@ namespace ts {
14761476
node.transformFlags |= TransformFlags.ContainsES2015;
14771477

14781478
// The following properties are used only to report grammar errors
1479-
node.decorators = undefined;
1479+
node.illegalDecorators = undefined;
14801480
node.typeParameters = undefined;
14811481
node.type = undefined;
14821482
return node;
@@ -1498,7 +1498,7 @@ namespace ts {
14981498

14991499
function finishUpdateConstructorDeclaration(updated: Mutable<ConstructorDeclaration>, original: ConstructorDeclaration) {
15001500
if (updated !== original) {
1501-
updated.decorators = original.decorators;
1501+
updated.illegalDecorators = original.illegalDecorators;
15021502
updated.typeParameters = original.typeParameters;
15031503
updated.type = original.type;
15041504
}
@@ -3657,7 +3657,7 @@ namespace ts {
36573657
}
36583658

36593659
// The following properties are used only to report grammar errors
3660-
node.decorators = undefined;
3660+
node.illegalDecorators = undefined;
36613661
return node;
36623662
}
36633663

@@ -3686,7 +3686,7 @@ namespace ts {
36863686
function finishUpdateFunctionDeclaration(updated: Mutable<FunctionDeclaration>, original: FunctionDeclaration) {
36873687
if (updated !== original) {
36883688
// copy children used only for error reporting
3689-
updated.decorators = original.decorators;
3689+
updated.illegalDecorators = original.illegalDecorators;
36903690
}
36913691
return finishUpdateBaseSignatureDeclaration(updated, original);
36923692
}
@@ -3756,7 +3756,7 @@ namespace ts {
37563756
node.transformFlags = TransformFlags.ContainsTypeScript;
37573757

37583758
// The following properties are used only to report grammar errors
3759-
node.decorators = undefined;
3759+
node.illegalDecorators = undefined;
37603760
return node;
37613761
}
37623762

@@ -3780,7 +3780,7 @@ namespace ts {
37803780

37813781
function finishUpdateInterfaceDeclaration(updated: Mutable<InterfaceDeclaration>, original: InterfaceDeclaration) {
37823782
if (updated !== original) {
3783-
updated.decorators = original.decorators;
3783+
updated.illegalDecorators = original.illegalDecorators;
37843784
}
37853785
return update(updated, original);
37863786
}
@@ -3802,7 +3802,7 @@ namespace ts {
38023802
node.transformFlags = TransformFlags.ContainsTypeScript;
38033803

38043804
// The following properties are used only to report grammar errors
3805-
node.decorators = undefined;
3805+
node.illegalDecorators = undefined;
38063806
return node;
38073807
}
38083808

@@ -3824,7 +3824,7 @@ namespace ts {
38243824

38253825
function finishUpdateTypeAliasDeclaration(updated: Mutable<TypeAliasDeclaration>, original: TypeAliasDeclaration) {
38263826
if (updated !== original) {
3827-
updated.decorators = original.decorators;
3827+
updated.illegalDecorators = original.illegalDecorators;
38283828
}
38293829
return update(updated, original);
38303830
}
@@ -3847,7 +3847,7 @@ namespace ts {
38473847
node.transformFlags &= ~TransformFlags.ContainsPossibleTopLevelAwait; // Enum declarations cannot contain `await`
38483848

38493849
// The following properties are used only to report grammar errors
3850-
node.decorators = undefined;
3850+
node.illegalDecorators = undefined;
38513851
return node;
38523852
}
38533853

@@ -3866,7 +3866,7 @@ namespace ts {
38663866

38673867
function finishUpdateEnumDeclaration(updated: Mutable<EnumDeclaration>, original: EnumDeclaration) {
38683868
if (updated !== original) {
3869-
updated.decorators = original.decorators;
3869+
updated.illegalDecorators = original.illegalDecorators;
38703870
}
38713871
return update(updated, original);
38723872
}
@@ -3896,7 +3896,7 @@ namespace ts {
38963896
node.transformFlags &= ~TransformFlags.ContainsPossibleTopLevelAwait; // Module declarations cannot contain `await`.
38973897

38983898
// The following properties are used only to report grammar errors
3899-
node.decorators = undefined;
3899+
node.illegalDecorators = undefined;
39003900
return node;
39013901
}
39023902

@@ -3916,7 +3916,7 @@ namespace ts {
39163916

39173917
function finishUpdateModuleDeclaration(updated: Mutable<ModuleDeclaration>, original: ModuleDeclaration) {
39183918
if (updated !== original) {
3919-
updated.decorators = original.decorators;
3919+
updated.illegalDecorators = original.illegalDecorators;
39203920
}
39213921
return update(updated, original);
39223922
}
@@ -3961,7 +3961,7 @@ namespace ts {
39613961
node.transformFlags = TransformFlags.ContainsTypeScript;
39623962

39633963
// The following properties are used only to report grammar errors
3964-
node.decorators = undefined;
3964+
node.illegalDecorators = undefined;
39653965
node.modifiers = undefined;
39663966
return node;
39673967
}
@@ -3975,7 +3975,7 @@ namespace ts {
39753975

39763976
function finishUpdateNamespaceExportDeclaration(updated: Mutable<NamespaceExportDeclaration>, original: NamespaceExportDeclaration) {
39773977
if (updated !== original) {
3978-
updated.decorators = original.decorators;
3978+
updated.illegalDecorators = original.illegalDecorators;
39793979
updated.modifiers = original.modifiers;
39803980
}
39813981
return update(updated, original);
@@ -4000,7 +4000,7 @@ namespace ts {
40004000
node.transformFlags &= ~TransformFlags.ContainsPossibleTopLevelAwait; // Import= declaration is always parsed in an Await context
40014001

40024002
// The following properties are used only to report grammar errors
4003-
node.decorators = undefined;
4003+
node.illegalDecorators = undefined;
40044004
return node;
40054005
}
40064006

@@ -4022,7 +4022,7 @@ namespace ts {
40224022

40234023
function finishUpdateImportEqualsDeclaration(updated: Mutable<ImportEqualsDeclaration>, original: ImportEqualsDeclaration) {
40244024
if (updated !== original) {
4025-
updated.decorators = original.decorators;
4025+
updated.illegalDecorators = original.illegalDecorators;
40264026
}
40274027
return update(updated, original);
40284028
}
@@ -4045,7 +4045,7 @@ namespace ts {
40454045
node.transformFlags &= ~TransformFlags.ContainsPossibleTopLevelAwait; // always parsed in an Await context
40464046

40474047
// The following properties are used only to report grammar errors
4048-
node.decorators = undefined;
4048+
node.illegalDecorators = undefined;
40494049
return node;
40504050
}
40514051

@@ -4067,7 +4067,7 @@ namespace ts {
40674067

40684068
function finishUpdateImportDeclaration(updated: Mutable<ImportDeclaration>, original: ImportDeclaration) {
40694069
if (updated !== original) {
4070-
updated.decorators = original.decorators;
4070+
updated.illegalDecorators = original.illegalDecorators;
40714071
}
40724072
return update(updated, original);
40734073
}
@@ -4235,7 +4235,7 @@ namespace ts {
42354235
node.transformFlags &= ~TransformFlags.ContainsPossibleTopLevelAwait; // always parsed in an Await context
42364236

42374237
// The following properties are used only to report grammar errors
4238-
node.decorators = undefined;
4238+
node.illegalDecorators = undefined;
42394239
return node;
42404240
}
42414241

@@ -4253,7 +4253,7 @@ namespace ts {
42534253

42544254
function finishUpdateExportAssignment(updated: Mutable<ExportAssignment>, original: ExportAssignment) {
42554255
if (updated !== original) {
4256-
updated.decorators = original.decorators;
4256+
updated.illegalDecorators = original.illegalDecorators;
42574257
}
42584258
return update(updated, original);
42594259
}
@@ -4279,7 +4279,7 @@ namespace ts {
42794279
node.transformFlags &= ~TransformFlags.ContainsPossibleTopLevelAwait; // always parsed in an Await context
42804280

42814281
// The following properties are used only to report grammar errors
4282-
node.decorators = undefined;
4282+
node.illegalDecorators = undefined;
42834283
return node;
42844284
}
42854285

@@ -4303,7 +4303,7 @@ namespace ts {
43034303

43044304
function finishUpdateExportDeclaration(updated: Mutable<ExportDeclaration>, original: ExportDeclaration) {
43054305
if (updated !== original) {
4306-
updated.decorators = original.decorators;
4306+
updated.illegalDecorators = original.illegalDecorators;
43074307
}
43084308
return update(updated, original);
43094309
}
@@ -5162,7 +5162,7 @@ namespace ts {
51625162
propagateChildFlags(node.initializer);
51635163

51645164
// The following properties are used only to report grammar errors
5165-
node.decorators = undefined;
5165+
node.illegalDecorators = undefined;
51665166
node.modifiers = undefined;
51675167
node.questionToken = undefined;
51685168
node.exclamationToken = undefined;
@@ -5180,7 +5180,7 @@ namespace ts {
51805180
function finishUpdatePropertyAssignment(updated: Mutable<PropertyAssignment>, original: PropertyAssignment) {
51815181
// copy children used only for error reporting
51825182
if (updated !== original) {
5183-
updated.decorators = original.decorators;
5183+
updated.illegalDecorators = original.illegalDecorators;
51845184
updated.modifiers = original.modifiers;
51855185
updated.questionToken = original.questionToken;
51865186
updated.exclamationToken = original.exclamationToken;
@@ -5202,7 +5202,7 @@ namespace ts {
52025202

52035203
// The following properties are used only to report grammar errors
52045204
node.equalsToken = undefined;
5205-
node.decorators = undefined;
5205+
node.illegalDecorators = undefined;
52065206
node.modifiers = undefined;
52075207
node.questionToken = undefined;
52085208
node.exclamationToken = undefined;
@@ -5221,7 +5221,7 @@ namespace ts {
52215221
if (updated !== original) {
52225222
// copy children used only for error reporting
52235223
updated.equalsToken = original.equalsToken;
5224-
updated.decorators = original.decorators;
5224+
updated.illegalDecorators = original.illegalDecorators;
52255225
updated.modifiers = original.modifiers;
52265226
updated.questionToken = original.questionToken;
52275227
updated.exclamationToken = original.exclamationToken;

0 commit comments

Comments
 (0)