Added more specific diagnostic message

rbuckton · rbuckton · commit 9336886fc234 · 2016-12-06T10:57:52.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -10405,7 +10405,7 @@ namespace ts {
             return baseConstructorType === nullWideningType;
         }
 
-        function checkThisBeforeSuper(node: Node, container: Node) {
+        function checkThisBeforeSuper(node: Node, container: Node, diagnosticMessage: DiagnosticMessage) {
             const containingClassDecl = <ClassDeclaration>container.parent;
             const baseTypeNode = getClassExtendsHeritageClauseElement(containingClassDecl);
 
@@ -10423,7 +10423,7 @@ namespace ts {
                 // "this" is not accessed as a parameter of the super-call.
                 if (!superCall || superCall.end > node.pos) {
                     // In ES6, super inside constructor of class-declaration has to precede "this" accessing
-                    error(node, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
+                    error(node, diagnosticMessage);
                 }
             }
         }
@@ -10435,7 +10435,7 @@ namespace ts {
             let needToCaptureLexicalThis = false;
 
             if (container.kind === SyntaxKind.Constructor) {
-                checkThisBeforeSuper(node, container);
+                checkThisBeforeSuper(node, container, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
             }
 
             // Now skip arrow functions to get the "real" owner of 'this'.
@@ -10584,7 +10584,7 @@ namespace ts {
             }
 
             if (!isCallExpression && container.kind === SyntaxKind.Constructor) {
-                checkThisBeforeSuper(node, container);
+                checkThisBeforeSuper(node, container, Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class);
             }
 
             if ((getModifierFlags(container) & ModifierFlags.Static) || isCallExpression) {
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -3165,6 +3165,10 @@
         "category": "Error",
         "code": 17010
     },
+    "'super' must be called before accessing a property of 'super' in the constructor of a derived class.": {
+        "category": "Error",
+        "code": 17011
+    },
 
     "Circularity detected while resolving configuration: {0}": {
         "category": "Error",
diff --git a/tests/baselines/reference/superAccess2.errors.txt b/tests/baselines/reference/superAccess2.errors.txt
@@ -2,13 +2,13 @@ tests/cases/compiler/superAccess2.ts(7,15): error TS1034: 'super' must be follow
 tests/cases/compiler/superAccess2.ts(8,17): error TS2338: 'super' property access is permitted only in a constructor, member function, or member accessor of a derived class.
 tests/cases/compiler/superAccess2.ts(8,22): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(11,28): error TS2336: 'super' cannot be referenced in constructor arguments.
-tests/cases/compiler/superAccess2.ts(11,28): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superAccess2.ts(11,28): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superAccess2.ts(11,33): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(11,40): error TS2336: 'super' cannot be referenced in constructor arguments.
-tests/cases/compiler/superAccess2.ts(11,40): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superAccess2.ts(11,40): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superAccess2.ts(11,45): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(11,59): error TS2336: 'super' cannot be referenced in constructor arguments.
-tests/cases/compiler/superAccess2.ts(11,59): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superAccess2.ts(11,59): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superAccess2.ts(11,64): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(15,19): error TS1034: 'super' must be followed by an argument list or member access.
 tests/cases/compiler/superAccess2.ts(17,15): error TS2339: Property 'y' does not exist on type 'P'.
@@ -37,19 +37,19 @@ tests/cases/compiler/superAccess2.ts(21,15): error TS2339: Property 'x' does not
                                ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
                                ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                                     ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
                                            ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
                                            ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                                                 ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
                                                               ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
                                                               ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                                                                    ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
             super();
diff --git a/tests/baselines/reference/superInConstructorParam1.errors.txt b/tests/baselines/reference/superInConstructorParam1.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/superInConstructorParam1.ts(8,3): error TS2377: Constructors for derived classes must contain a 'super' call.
 tests/cases/compiler/superInConstructorParam1.ts(8,19): error TS2336: 'super' cannot be referenced in constructor arguments.
-tests/cases/compiler/superInConstructorParam1.ts(8,19): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superInConstructorParam1.ts(8,19): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 
 
 ==== tests/cases/compiler/superInConstructorParam1.ts (3 errors) ====
@@ -16,7 +16,7 @@ tests/cases/compiler/superInConstructorParam1.ts(8,19): error TS17009: 'super' m
                       ~~~~~
 !!! error TS2336: 'super' cannot be referenced in constructor arguments.
                       ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
       }
     ~~~
 !!! error TS2377: Constructors for derived classes must contain a 'super' call.
diff --git a/tests/baselines/reference/superNewCall1.errors.txt b/tests/baselines/reference/superNewCall1.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/compiler/superNewCall1.ts(9,5): error TS2377: Constructors for derived classes must contain a 'super' call.
 tests/cases/compiler/superNewCall1.ts(10,9): error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
-tests/cases/compiler/superNewCall1.ts(10,13): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superNewCall1.ts(10,13): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 
 
 ==== tests/cases/compiler/superNewCall1.ts (3 errors) ====
@@ -19,7 +19,7 @@ tests/cases/compiler/superNewCall1.ts(10,13): error TS17009: 'super' must be cal
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2351: Cannot use 'new' with an expression whose type lacks a call or construct signature.
                 ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
         }
     ~~~~~
 !!! error TS2377: Constructors for derived classes must contain a 'super' call.
diff --git a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(7,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
-tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(13,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(7,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
+tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(13,15): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 
 
 ==== tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts (2 errors) ====
@@ -11,14 +11,14 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/superProperty
         constructor() {
             super.x();
             ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
             super();
         }
     }
     class C2 extends B {
         constructor() {
             super(super.x());
                   ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
         }
     }
diff --git a/tests/baselines/reference/superWithTypeArgument.errors.txt b/tests/baselines/reference/superWithTypeArgument.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/superWithTypeArgument.ts(6,5): error TS2377: Constructors for derived classes must contain a 'super' call.
-tests/cases/compiler/superWithTypeArgument.ts(7,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superWithTypeArgument.ts(7,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument.ts(7,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
@@ -14,7 +14,7 @@ tests/cases/compiler/superWithTypeArgument.ts(7,14): error TS1034: 'super' must
             super<T>();
     ~~~~~~~~~~~~~~~~~~~
             ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }
diff --git a/tests/baselines/reference/superWithTypeArgument2.errors.txt b/tests/baselines/reference/superWithTypeArgument2.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/superWithTypeArgument2.ts(6,5): error TS2377: Constructors for derived classes must contain a 'super' call.
-tests/cases/compiler/superWithTypeArgument2.ts(7,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superWithTypeArgument2.ts(7,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument2.ts(7,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
@@ -14,7 +14,7 @@ tests/cases/compiler/superWithTypeArgument2.ts(7,14): error TS1034: 'super' must
             super<T>(x);
     ~~~~~~~~~~~~~~~~~~~~
             ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }
diff --git a/tests/baselines/reference/superWithTypeArgument3.errors.txt b/tests/baselines/reference/superWithTypeArgument3.errors.txt
@@ -1,5 +1,5 @@
 tests/cases/compiler/superWithTypeArgument3.ts(7,5): error TS2377: Constructors for derived classes must contain a 'super' call.
-tests/cases/compiler/superWithTypeArgument3.ts(8,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+tests/cases/compiler/superWithTypeArgument3.ts(8,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument3.ts(8,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
@@ -15,7 +15,7 @@ tests/cases/compiler/superWithTypeArgument3.ts(8,14): error TS1034: 'super' must
             super<T>();
     ~~~~~~~~~~~~~~~~~~~
             ~~~~~
-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }

Original file line number	Diff line number	Diff line change
`@@ -10405,7 +10405,7 @@ namespace ts {`
`10405`	`10405`	`return baseConstructorType === nullWideningType;`
`10406`	`10406`	`}`
`10407`	`10407`
`10408`		`- function checkThisBeforeSuper(node: Node, container: Node) {`
	`10408`	`+ function checkThisBeforeSuper(node: Node, container: Node, diagnosticMessage: DiagnosticMessage) {`
`10409`	`10409`	`const containingClassDecl = <ClassDeclaration>container.parent;`
`10410`	`10410`	`const baseTypeNode = getClassExtendsHeritageClauseElement(containingClassDecl);`
`10411`	`10411`
`@@ -10423,7 +10423,7 @@ namespace ts {`
`10423`	`10423`	`// "this" is not accessed as a parameter of the super-call.`
`10424`	`10424`	`if (!superCall \|\| superCall.end > node.pos) {`
`10425`	`10425`	`// In ES6, super inside constructor of class-declaration has to precede "this" accessing`
`10426`		`- error(node, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);`
	`10426`	`+ error(node, diagnosticMessage);`
`10427`	`10427`	`}`
`10428`	`10428`	`}`
`10429`	`10429`	`}`
`@@ -10435,7 +10435,7 @@ namespace ts {`
`10435`	`10435`	`let needToCaptureLexicalThis = false;`
`10436`	`10436`
`10437`	`10437`	`if (container.kind === SyntaxKind.Constructor) {`
`10438`		`- checkThisBeforeSuper(node, container);`
	`10438`	`+ checkThisBeforeSuper(node, container, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);`
`10439`	`10439`	`}`
`10440`	`10440`
`10441`	`10441`	`// Now skip arrow functions to get the "real" owner of 'this'.`
`@@ -10584,7 +10584,7 @@ namespace ts {`
`10584`	`10584`	`}`
`10585`	`10585`
`10586`	`10586`	`if (!isCallExpression && container.kind === SyntaxKind.Constructor) {`
`10587`		`- checkThisBeforeSuper(node, container);`
	`10587`	`+ checkThisBeforeSuper(node, container, Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class);`
`10588`	`10588`	`}`
`10589`	`10589`
`10590`	`10590`	`if ((getModifierFlags(container) & ModifierFlags.Static) \|\| isCallExpression) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(7,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.`
`2`		`-tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(13,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.`
	`1`	`+tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(7,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.`
	`2`	`+tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(13,15): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.`
`3`	`3`
`4`	`4`
`5`	`5`	`==== tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts (2 errors) ====`
`@@ -11,14 +11,14 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/superProperty`
`11`	`11`	`constructor() {`
`12`	`12`	`super.x();`
`13`	`13`	`~~~~~`
`14`		`-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.`
	`14`	`+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.`
`15`	`15`	`super();`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`class C2 extends B {`
`19`	`19`	`constructor() {`
`20`	`20`	`super(super.x());`
`21`	`21`	`~~~~~`
`22`		`-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.`
	`22`	`+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`tests/cases/compiler/superWithTypeArgument.ts(6,5): error TS2377: Constructors for derived classes must contain a 'super' call.`
`2`		`-tests/cases/compiler/superWithTypeArgument.ts(7,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.`
	`2`	`+tests/cases/compiler/superWithTypeArgument.ts(7,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.`
`3`	`3`	`tests/cases/compiler/superWithTypeArgument.ts(7,14): error TS1034: 'super' must be followed by an argument list or member access.`
`4`	`4`
`5`	`5`
`@@ -14,7 +14,7 @@ tests/cases/compiler/superWithTypeArgument.ts(7,14): error TS1034: 'super' must`
`14`	`14`	`super<T>();`
`15`	`15`	`~~~~~~~~~~~~~~~~~~~`
`16`	`16`	`~~~~~`
`17`		`-!!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class.`
	`17`	`+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.`
`18`	`18`	`~`
`19`	`19`	`!!! error TS1034: 'super' must be followed by an argument list or member access.`
`20`	`20`	`}`