Merge pull request microsoft#3913 from ShyykoSerhiy/fix-3859

mhegazy · mhegazy · commit 84a6ee1fb9b6 · 2015-07-23T00:09:05.000-07:00
Fixed "False error when using directive prologues inside constructor with initialized properties."
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -10439,22 +10439,35 @@ namespace ts {
             if (getClassExtendsHeritageClauseElement(<ClassDeclaration>node.parent)) {
 
                 if (containsSuperCall(node.body)) {
-                    // The first statement in the body of a constructor must be a super call if both of the following are true:
+                    // The first statement in the body of a constructor (excluding prologue directives) 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 superCallShouldBeFirst =
                         forEach((<ClassDeclaration>node.parent).members, isInstancePropertyWithInitializer) ||
                         forEach(node.parameters, p => p.flags & (NodeFlags.Public | NodeFlags.Private | NodeFlags.Protected));
 
+                    // Skip past any prologue directives to find the first statement
+                    // to ensure that it was a super call.
                     if (superCallShouldBeFirst) {
                         let statements = (<Block>node.body).statements;
-                        if (!statements.length || statements[0].kind !== SyntaxKind.ExpressionStatement || !isSuperCallExpression((<ExpressionStatement>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);
+                        let superCallStatement: ExpressionStatement;
+                        for (let statement of statements) {
+                            if (statement.kind === SyntaxKind.ExpressionStatement && isSuperCallExpression((<ExpressionStatement>statement).expression)) {
+                                superCallStatement = <ExpressionStatement>statement;
+                                break;
+                            }
+                            if (!isPrologueDirective(statement)) {
+                                break;
+                            }
                         }
+                        if (!superCallStatement) {
+                            error(node, Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties);
+                        } 
                         else {
                             // In such a required super call, it is a compile-time error for argument expressions to reference this.
-                            markThisReferencesAsErrors((<ExpressionStatement>statements[0]).expression);
+                            markThisReferencesAsErrors(superCallStatement.expression);
                         }
                     }
                 }
diff --git a/tests/baselines/reference/strictModeInConstructor.errors.txt b/tests/baselines/reference/strictModeInConstructor.errors.txt
@@ -1,8 +1,7 @@
-tests/cases/compiler/strictModeInConstructor.ts(9,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
 tests/cases/compiler/strictModeInConstructor.ts(27,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
 
 
-==== tests/cases/compiler/strictModeInConstructor.ts (2 errors) ====
+==== tests/cases/compiler/strictModeInConstructor.ts (1 errors) ====
     class A {
     }
     
@@ -12,14 +11,9 @@ tests/cases/compiler/strictModeInConstructor.ts(27,5): error TS2376: A 'super' c
         public s: number = 9;
     
         constructor () {
-        ~~~~~~~~~~~~~~~~
             "use strict";   // No error
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             super();
-    ~~~~~~~~~~~~~~~~
         }
-    ~~~~~
-!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.
     }
     
     class C extends A {

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`		`-tests/cases/compiler/strictModeInConstructor.ts(9,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.`
`2`	`1`	`tests/cases/compiler/strictModeInConstructor.ts(27,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.`
`3`	`2`
`4`	`3`
`5`		`-==== tests/cases/compiler/strictModeInConstructor.ts (2 errors) ====`
	`4`	`+==== tests/cases/compiler/strictModeInConstructor.ts (1 errors) ====`
`6`	`5`	`class A {`
`7`	`6`	`}`
`8`	`7`
`@@ -12,14 +11,9 @@ tests/cases/compiler/strictModeInConstructor.ts(27,5): error TS2376: A 'super' c`
`12`	`11`	`public s: number = 9;`
`13`	`12`
`14`	`13`	`constructor () {`
`15`		`- ~~~~~~~~~~~~~~~~`
`16`	`14`	`"use strict"; // No error`
`17`		`- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
`18`	`15`	`super();`
`19`		`- ~~~~~~~~~~~~~~~~`
`20`	`16`	`}`
`21`		`- ~~~~~`
`22`		`-!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties.`
`23`	`17`	`}`
`24`	`18`
`25`	`19`	`class C extends A {`