From 824293f5e4c8b3c9f26c601cfc45c4bc7ccaf63d Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 16 Jul 2015 13:40:36 -0700 Subject: [PATCH 1/5] Fix CRLF --- src/compiler/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/types.ts b/src/compiler/types.ts index e0f16a00c2b..9570617a106 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1774,10 +1774,10 @@ namespace ts { StringLike = String | StringLiteral, NumberLike = Number | Enum, ObjectType = Class | Interface | Reference | Tuple | Anonymous, - UnionOrIntersection = Union | Intersection, + UnionOrIntersection = Union | Intersection, StructuredType = ObjectType | Union | Intersection, /* @internal */ - RequiresWidening = ContainsUndefinedOrNull | ContainsObjectLiteral + RequiresWidening = ContainsUndefinedOrNull | ContainsObjectLiteral } // Properties common to all types From 58cbf9171191ad2b0e4ac1ac6eb23e86fa7185ec Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 16 Jul 2015 13:41:19 -0700 Subject: [PATCH 2/5] Add check for super when extending null --- src/compiler/checker.ts | 12 +++++++++--- src/compiler/diagnosticInformationMap.generated.ts | 1 + src/compiler/diagnosticMessages.json | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index f8bafa7a38f..634d64516a4 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10248,19 +10248,25 @@ namespace ts { // TS 1.0 spec (April 2014): 8.3.2 // Constructors of classes with no extends clause may not contain super calls, whereas // constructors of derived classes must contain at least one super call somewhere in their function body. - if (getClassExtendsHeritageClauseElement(node.parent)) { + let containingClassDecl = node.parent; + if (getClassExtendsHeritageClauseElement(containingClassDecl)) { + let baseConstructorType = getBaseConstructorTypeOfClass(containingClassDecl); if (containsSuperCall(node.body)) { + if (baseConstructorType === nullType) { + error(node, Diagnostics.A_constructor_can_not_contain_super_call_when_a_class_extends_null); + } + // The first statement in the body of a constructor must be a super call if both of the following are true: // - The containing class is a derived class. // - The constructor declares parameter properties // or the containing class declares instance member variables with initializers. + let statements = (node.body).statements; let superCallShouldBeFirst = forEach((node.parent).members, isInstancePropertyWithInitializer) || forEach(node.parameters, p => p.flags & (NodeFlags.Public | NodeFlags.Private | NodeFlags.Protected)); if (superCallShouldBeFirst) { - let statements = (node.body).statements; if (!statements.length || statements[0].kind !== SyntaxKind.ExpressionStatement || !isSuperCallExpression((statements[0]).expression)) { error(node, Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties); } @@ -10270,7 +10276,7 @@ namespace ts { } } } - else { + else if (baseConstructorType !== nullType) { error(node, Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call); } } diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts index a0a95d47c8c..80698217a4b 100644 --- a/src/compiler/diagnosticInformationMap.generated.ts +++ b/src/compiler/diagnosticInformationMap.generated.ts @@ -613,5 +613,6 @@ namespace ts { Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: DiagnosticCategory.Error, key: "Expected corresponding JSX closing tag for '{0}'." }, JSX_attribute_expected: { code: 17003, category: DiagnosticCategory.Error, key: "JSX attribute expected." }, Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: DiagnosticCategory.Error, key: "Cannot use JSX unless the '--jsx' flag is provided." }, + A_constructor_can_not_contain_super_call_when_a_class_extends_null: { code: 17005, category: DiagnosticCategory.Error, key: "A constructor can not contain super call when a class extends null" }, }; } \ No newline at end of file diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index acf4e74ae9f..6f1185eb250 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2445,5 +2445,9 @@ "Cannot use JSX unless the '--jsx' flag is provided.": { "category": "Error", "code": 17004 + }, + "A constructor can not contain super call when a class extends null": { + "category": "Error", + "code": 17005 } } From 13aba26ced01b09a30cff6f012e70230c150684a Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 16 Jul 2015 13:41:39 -0700 Subject: [PATCH 3/5] Add tests and baseline --- .../reference/classExtendsNull.errors.txt | 21 +++++++++++ tests/baselines/reference/classExtendsNull.js | 35 +++++++++++++++++++ tests/cases/compiler/classExtendsNull.ts | 12 +++++++ 3 files changed, 68 insertions(+) create mode 100644 tests/baselines/reference/classExtendsNull.errors.txt create mode 100644 tests/baselines/reference/classExtendsNull.js create mode 100644 tests/cases/compiler/classExtendsNull.ts diff --git a/tests/baselines/reference/classExtendsNull.errors.txt b/tests/baselines/reference/classExtendsNull.errors.txt new file mode 100644 index 00000000000..93ef3b7765e --- /dev/null +++ b/tests/baselines/reference/classExtendsNull.errors.txt @@ -0,0 +1,21 @@ +tests/cases/compiler/classExtendsNull.ts(2,5): error TS17005: A constructor can not contain super call when a class extends null + + +==== tests/cases/compiler/classExtendsNull.ts (1 errors) ==== + class C extends null { + constructor() { + ~~~~~~~~~~~~~~~ + super(); + ~~~~~~~~~~~~~~~~ + return Object.create(null); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + } + ~~~~~ +!!! error TS17005: A constructor can not contain super call when a class extends null + } + + class D extends null { + constructor() { + return Object.create(null); + } + } \ No newline at end of file diff --git a/tests/baselines/reference/classExtendsNull.js b/tests/baselines/reference/classExtendsNull.js new file mode 100644 index 00000000000..5627f10dca6 --- /dev/null +++ b/tests/baselines/reference/classExtendsNull.js @@ -0,0 +1,35 @@ +//// [classExtendsNull.ts] +class C extends null { + constructor() { + super(); + return Object.create(null); + } +} + +class D extends null { + constructor() { + return Object.create(null); + } +} + +//// [classExtendsNull.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var C = (function (_super) { + __extends(C, _super); + function C() { + _super.call(this); + return Object.create(null); + } + return C; +})(null); +var D = (function (_super) { + __extends(D, _super); + function D() { + return Object.create(null); + } + return D; +})(null); diff --git a/tests/cases/compiler/classExtendsNull.ts b/tests/cases/compiler/classExtendsNull.ts new file mode 100644 index 00000000000..5532fa72702 --- /dev/null +++ b/tests/cases/compiler/classExtendsNull.ts @@ -0,0 +1,12 @@ +class C extends null { + constructor() { + super(); + return Object.create(null); + } +} + +class D extends null { + constructor() { + return Object.create(null); + } +} \ No newline at end of file From 3270e71fcf66bc10a4b4f002a00297c5c0b7c470 Mon Sep 17 00:00:00 2001 From: Yui T Date: Wed, 22 Jul 2015 14:36:06 -0700 Subject: [PATCH 4/5] Address CR --- src/compiler/checker.ts | 6 ++++-- src/compiler/diagnosticInformationMap.generated.ts | 2 +- src/compiler/diagnosticMessages.json | 2 +- tests/baselines/reference/classExtendsNull.errors.txt | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 634d64516a4..0ccf23164cb 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10250,11 +10250,13 @@ namespace ts { // constructors of derived classes must contain at least one super call somewhere in their function body. let containingClassDecl = node.parent; if (getClassExtendsHeritageClauseElement(containingClassDecl)) { - let baseConstructorType = getBaseConstructorTypeOfClass(containingClassDecl); + let symbol = getSymbolOfNode(containingClassDecl); + let type = getDeclaredTypeOfSymbol(symbol); + let baseConstructorType = getBaseConstructorTypeOfClass(type); if (containsSuperCall(node.body)) { if (baseConstructorType === nullType) { - error(node, Diagnostics.A_constructor_can_not_contain_super_call_when_a_class_extends_null); + error(node, Diagnostics.A_constructor_cannot_contain_super_call_when_a_class_extends_null); } // The first statement in the body of a constructor must be a super call if both of the following are true: diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts index 80698217a4b..44f14ac0995 100644 --- a/src/compiler/diagnosticInformationMap.generated.ts +++ b/src/compiler/diagnosticInformationMap.generated.ts @@ -613,6 +613,6 @@ namespace ts { Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: DiagnosticCategory.Error, key: "Expected corresponding JSX closing tag for '{0}'." }, JSX_attribute_expected: { code: 17003, category: DiagnosticCategory.Error, key: "JSX attribute expected." }, Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: DiagnosticCategory.Error, key: "Cannot use JSX unless the '--jsx' flag is provided." }, - A_constructor_can_not_contain_super_call_when_a_class_extends_null: { code: 17005, category: DiagnosticCategory.Error, key: "A constructor can not contain super call when a class extends null" }, + A_constructor_cannot_contain_super_call_when_a_class_extends_null: { code: 17005, category: DiagnosticCategory.Error, key: "A constructor cannot contain 'super' call when a class extends 'null'" }, }; } \ No newline at end of file diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 6f1185eb250..1203c5ef61e 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2446,7 +2446,7 @@ "category": "Error", "code": 17004 }, - "A constructor can not contain super call when a class extends null": { + "A constructor cannot contain 'super' call when a class extends 'null'": { "category": "Error", "code": 17005 } diff --git a/tests/baselines/reference/classExtendsNull.errors.txt b/tests/baselines/reference/classExtendsNull.errors.txt index 93ef3b7765e..cc5de5cda83 100644 --- a/tests/baselines/reference/classExtendsNull.errors.txt +++ b/tests/baselines/reference/classExtendsNull.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/classExtendsNull.ts(2,5): error TS17005: A constructor can not contain super call when a class extends null +tests/cases/compiler/classExtendsNull.ts(2,5): error TS17005: A constructor cannot contain 'super' call when a class extends 'null' ==== tests/cases/compiler/classExtendsNull.ts (1 errors) ==== @@ -11,7 +11,7 @@ tests/cases/compiler/classExtendsNull.ts(2,5): error TS17005: A constructor can ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } ~~~~~ -!!! error TS17005: A constructor can not contain super call when a class extends null +!!! error TS17005: A constructor cannot contain 'super' call when a class extends 'null' } class D extends null { From 442855f7e1fc91b8e70f07e5eac83ed9ce2b32cf Mon Sep 17 00:00:00 2001 From: Yui T Date: Sun, 26 Jul 2015 20:46:03 -0700 Subject: [PATCH 5/5] Address CR --- src/compiler/checker.ts | 10 +++++----- src/compiler/diagnosticInformationMap.generated.ts | 2 +- src/compiler/diagnosticMessages.json | 4 ++-- tests/baselines/reference/classExtendsNull.errors.txt | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 0ccf23164cb..2932de8e99b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10250,25 +10250,25 @@ namespace ts { // constructors of derived classes must contain at least one super call somewhere in their function body. let containingClassDecl = node.parent; if (getClassExtendsHeritageClauseElement(containingClassDecl)) { - let symbol = getSymbolOfNode(containingClassDecl); - let type = getDeclaredTypeOfSymbol(symbol); - let baseConstructorType = getBaseConstructorTypeOfClass(type); + let containingClassSymbol = getSymbolOfNode(containingClassDecl); + let containingClassInstanceType = getDeclaredTypeOfSymbol(containingClassSymbol); + let baseConstructorType = getBaseConstructorTypeOfClass(containingClassInstanceType); if (containsSuperCall(node.body)) { if (baseConstructorType === nullType) { - error(node, Diagnostics.A_constructor_cannot_contain_super_call_when_a_class_extends_null); + error(node, Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null); } // The first statement in the body of a constructor must be a super call if both of the following are true: // - The containing class is a derived class. // - The constructor declares parameter properties // or the containing class declares instance member variables with initializers. - let statements = (node.body).statements; let superCallShouldBeFirst = forEach((node.parent).members, isInstancePropertyWithInitializer) || forEach(node.parameters, p => p.flags & (NodeFlags.Public | NodeFlags.Private | NodeFlags.Protected)); if (superCallShouldBeFirst) { + let statements = (node.body).statements; if (!statements.length || statements[0].kind !== SyntaxKind.ExpressionStatement || !isSuperCallExpression((statements[0]).expression)) { error(node, Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties); } diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts index 44f14ac0995..cdfe28eb781 100644 --- a/src/compiler/diagnosticInformationMap.generated.ts +++ b/src/compiler/diagnosticInformationMap.generated.ts @@ -613,6 +613,6 @@ namespace ts { Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: DiagnosticCategory.Error, key: "Expected corresponding JSX closing tag for '{0}'." }, JSX_attribute_expected: { code: 17003, category: DiagnosticCategory.Error, key: "JSX attribute expected." }, Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: DiagnosticCategory.Error, key: "Cannot use JSX unless the '--jsx' flag is provided." }, - A_constructor_cannot_contain_super_call_when_a_class_extends_null: { code: 17005, category: DiagnosticCategory.Error, key: "A constructor cannot contain 'super' call when a class extends 'null'" }, + A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: DiagnosticCategory.Error, key: "A constructor cannot contain a 'super' call when its class extends 'null'" }, }; } \ No newline at end of file diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 1203c5ef61e..d0023ce6cfd 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1,4 +1,4 @@ -{ + { "Unterminated string literal.": { "category": "Error", "code": 1002 @@ -2446,7 +2446,7 @@ "category": "Error", "code": 17004 }, - "A constructor cannot contain 'super' call when a class extends 'null'": { + "A constructor cannot contain a 'super' call when its class extends 'null'": { "category": "Error", "code": 17005 } diff --git a/tests/baselines/reference/classExtendsNull.errors.txt b/tests/baselines/reference/classExtendsNull.errors.txt index cc5de5cda83..7bb44774826 100644 --- a/tests/baselines/reference/classExtendsNull.errors.txt +++ b/tests/baselines/reference/classExtendsNull.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/classExtendsNull.ts(2,5): error TS17005: A constructor cannot contain 'super' call when a class extends 'null' +tests/cases/compiler/classExtendsNull.ts(2,5): error TS17005: A constructor cannot contain a 'super' call when its class extends 'null' ==== tests/cases/compiler/classExtendsNull.ts (1 errors) ==== @@ -11,7 +11,7 @@ tests/cases/compiler/classExtendsNull.ts(2,5): error TS17005: A constructor cann ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } ~~~~~ -!!! error TS17005: A constructor cannot contain 'super' call when a class extends 'null' +!!! error TS17005: A constructor cannot contain a 'super' call when its class extends 'null' } class D extends null {