Fix invalid cast (microsoft#20426)

Andy · web-flow · commit 76eafe0e7573 · 2018-01-08T10:37:48.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -13462,7 +13462,7 @@ namespace ts {
             }
         }
 
-        function findFirstSuperCall(n: Node): Node {
+        function findFirstSuperCall(n: Node): SuperCall | undefined {
             if (isSuperCall(n)) {
                 return n;
             }
@@ -13478,12 +13478,12 @@ namespace ts {
          *
          * @param constructor constructor-function to look for super statement
          */
-        function getSuperCallInConstructor(constructor: ConstructorDeclaration): ExpressionStatement {
+        function getSuperCallInConstructor(constructor: ConstructorDeclaration): SuperCall | undefined {
             const links = getNodeLinks(constructor);
 
             // Only trying to find super-call if we haven't yet tried to find one.  Once we try, we will record the result
             if (links.hasSuperCall === undefined) {
-                links.superCall = <ExpressionStatement>findFirstSuperCall(constructor.body);
+                links.superCall = findFirstSuperCall(constructor.body);
                 links.hasSuperCall = links.superCall ? true : false;
             }
             return links.superCall;
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -3372,7 +3372,7 @@ namespace ts {
         resolvedJsxElementAttributesType?: Type;  // resolved element attributes type of a JSX openinglike element
         resolvedJsxElementAllAttributesType?: Type;  // resolved all element attributes type of a JSX openinglike element
         hasSuperCall?: boolean;           // recorded result when we try to find super-call. We only try to find one if this flag is undefined, indicating that we haven't made an attempt.
-        superCall?: ExpressionStatement;  // Cached first super-call found in the constructor. Used in checking whether super is called before this-accessing
+        superCall?: SuperCall;  // Cached first super-call found in the constructor. Used in checking whether super is called before this-accessing
         switchTypes?: Type[];             // Cached array of switch case expression types
     }
 

Original file line number	Diff line number	Diff line change
`@@ -13462,7 +13462,7 @@ namespace ts {`
`13462`	`13462`	`}`
`13463`	`13463`	`}`
`13464`	`13464`
`13465`		`- function findFirstSuperCall(n: Node): Node {`
	`13465`	`+ function findFirstSuperCall(n: Node): SuperCall \| undefined {`
`13466`	`13466`	`if (isSuperCall(n)) {`
`13467`	`13467`	`return n;`
`13468`	`13468`	`}`
`@@ -13478,12 +13478,12 @@ namespace ts {`
`13478`	`13478`	`*`
`13479`	`13479`	`* @param constructor constructor-function to look for super statement`
`13480`	`13480`	`*/`
`13481`		`- function getSuperCallInConstructor(constructor: ConstructorDeclaration): ExpressionStatement {`
	`13481`	`+ function getSuperCallInConstructor(constructor: ConstructorDeclaration): SuperCall \| undefined {`
`13482`	`13482`	`const links = getNodeLinks(constructor);`
`13483`	`13483`
`13484`	`13484`	`// Only trying to find super-call if we haven't yet tried to find one. Once we try, we will record the result`
`13485`	`13485`	`if (links.hasSuperCall === undefined) {`
`13486`		`- links.superCall = <ExpressionStatement>findFirstSuperCall(constructor.body);`
	`13486`	`+ links.superCall = findFirstSuperCall(constructor.body);`
`13487`	`13487`	`links.hasSuperCall = links.superCall ? true : false;`
`13488`	`13488`	`}`
`13489`	`13489`	`return links.superCall;`
Original file line number	Diff line number	Diff line change
`@@ -3372,7 +3372,7 @@ namespace ts {`
`3372`	`3372`	`resolvedJsxElementAttributesType?: Type; // resolved element attributes type of a JSX openinglike element`
`3373`	`3373`	`resolvedJsxElementAllAttributesType?: Type; // resolved all element attributes type of a JSX openinglike element`
`3374`	`3374`	`hasSuperCall?: boolean; // recorded result when we try to find super-call. We only try to find one if this flag is undefined, indicating that we haven't made an attempt.`
`3375`		`- superCall?: ExpressionStatement; // Cached first super-call found in the constructor. Used in checking whether super is called before this-accessing`
	`3375`	`+ superCall?: SuperCall; // Cached first super-call found in the constructor. Used in checking whether super is called before this-accessing`
`3376`	`3376`	`switchTypes?: Type[]; // Cached array of switch case expression types`
`3377`	`3377`	`}`
`3378`	`3378`