microsoft
diff --git a/‎src/compiler/binder.ts
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎src/compiler/binder.ts
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/compiler/checker.ts
Copy file name to clipboard
+129-56Lines changed: 129 additions & 56 deletions b/‎src/compiler/checker.ts
Copy file name to clipboard
+129-56Lines changed: 129 additions & 56 deletions
diff --git a/‎src/compiler/types.ts
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎src/compiler/types.ts
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎tests/baselines/reference/checkExportsObjectAssignPrototypeProperty.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/baselines/reference/checkIndexConstraintOfJavascriptClassExpression.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎tests/baselines/reference/checkIndexConstraintOfJavascriptClassExpression.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/baselines/reference/checkJsFiles_noErrorLocation.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎tests/baselines/reference/checkJsFiles_noErrorLocation.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/baselines/reference/checkSuperCallBeforeThisAccessing9.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎tests/baselines/reference/checkSuperCallBeforeThisAccessing9.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/baselines/reference/classCanExtendConstructorFunction.types
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎tests/baselines/reference/classCanExtendConstructorFunction.types
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎tests/baselines/reference/classExtendingAny.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎tests/baselines/reference/classExtendingAny.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/baselines/reference/constructorFunctions.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎tests/baselines/reference/constructorFunctions.types
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -649,7 +649,7 @@ namespace ts {
                 }
                 // We create a return control flow graph for IIFEs and constructors. For constructors
                 // we use the return control flow graph in strict property initialization checks.
-                currentReturnTarget = isIIFE || node.kind === SyntaxKind.Constructor ? createBranchLabel() : undefined;
+                currentReturnTarget = isIIFE || node.kind === SyntaxKind.Constructor || (isInJSFile && (node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.FunctionExpression)) ? createBranchLabel() : undefined;
                 currentExceptionTarget = undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
@@ -670,8 +670,8 @@ namespace ts {
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
                     currentFlow = finishFlowLabel(currentReturnTarget);
-                    if (node.kind === SyntaxKind.Constructor) {
-                        (<ConstructorDeclaration>node).returnFlowNode = currentFlow;
+                    if (node.kind === SyntaxKind.Constructor || (isInJSFile && (node.kind === SyntaxKind.FunctionDeclaration || node.kind === SyntaxKind.FunctionExpression))) {
+                        (<FunctionLikeDeclaration>node).returnFlowNode = currentFlow;
                     }
                 }
                 if (!isIIFE) {
 
@@ -1107,6 +1107,7 @@ namespace ts {
         exclamationToken?: ExclamationToken;
         body?: Block | Expression;
         /* @internal */ endFlowNode?: FlowNode;
+        /* @internal */ returnFlowNode?: FlowNode;
     }
 
     export type FunctionLikeDeclaration =
@@ -1152,7 +1153,6 @@ namespace ts {
         kind: SyntaxKind.Constructor;
         parent: ClassLikeDeclaration;
         body?: FunctionBody;
-        /* @internal */ returnFlowNode?: FlowNode;
     }
 
     /** For when we encounter a semicolon in a class declaration. ES6 allows these as class elements. */
@@ -4157,6 +4157,7 @@ namespace ts {
         deferralParent?: Type;              // Source union/intersection of a deferred type
         cjsExportMerged?: Symbol;           // Version of the symbol with all non export= exports merged with the export= target
         typeOnlyDeclaration?: TypeOnlyCompatibleAliasDeclaration | false; // First resolved alias declaration that makes the symbol only usable in type constructs
+        isConstructorDeclaredProperty?: boolean;  // Property declared through 'this.x = ...' assignment in constructor
     }
 
     /* @internal */
 
@@ -105,9 +105,9 @@ function Person(name) {
 
     this.name = name;
 >this.name = name : string
->this.name : string
+>this.name : any
 >this : this
->name : string
+>name : any
 >name : string
 }
 Person.prototype.describe = function () {
 
@@ -23,9 +23,9 @@ someFunction(function(BaseClass) {
 
             this.foo = "bar";
 >this.foo = "bar" : "bar"
->this.foo : string
+>this.foo : any
 >this : this
->foo : string
+>foo : any
 >"bar" : "bar"
         }
         _render(error) {
 
@@ -25,9 +25,9 @@ class B extends A {
 
     this.foo = () => 3;
 >this.foo = () => 3 : () => number
->this.foo : () => number
+>this.foo : any
 >this : this
->foo : () => number
+>foo : any
 >() => 3 : () => number
 >3 : 3
   }
 
@@ -12,9 +12,9 @@ class Derived {
 
         this.x = 10;
 >this.x = 10 : 10
->this.x : number
+>this.x : any
 >this : this
->x : number
+>x : any
 >10 : 10
 
         var that = this;
 
@@ -9,9 +9,9 @@ function Wagon(numberOxen) {
 
     this.numberOxen = numberOxen
 >this.numberOxen = numberOxen : number
->this.numberOxen : number
+>this.numberOxen : any
 >this : this
->numberOxen : number
+>numberOxen : any
 >numberOxen : number
 }
 /** @param {Wagon[]=} wagons */
@@ -91,9 +91,9 @@ class Sql extends Wagon {
 
         this.foonly = 12
 >this.foonly = 12 : 12
->this.foonly : number
+>this.foonly : any
 >this : this
->foonly : number
+>foonly : any
 >12 : 12
     }
     /**
 
@@ -67,9 +67,9 @@ class B extends Err {
 
         this.wat = 12
 >this.wat = 12 : 12
->this.wat : number
+>this.wat : any
 >this : this
->wat : number
+>wat : any
 >12 : 12
     }
     f() {
 
@@ -143,9 +143,9 @@ function C6() {
 
   this.functions = [x => x, x => x + 1, x => x - 1]
 >this.functions = [x => x, x => x + 1, x => x - 1] : ((x: any) => any)[]
->this.functions : ((x: any) => any)[]
+>this.functions : any
 >this : this
->functions : ((x: any) => any)[]
+>functions : any
 >[x => x, x => x + 1, x => x - 1] : ((x: any) => any)[]
 >x => x : (x: any) => any
 >x : any
Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,7 @@ namespace ts {`
`649`	`649`	`}`
`650`	`650`	`// We create a return control flow graph for IIFEs and constructors. For constructors`
`651`	`651`	`// we use the return control flow graph in strict property initialization checks.`
`652`		`- currentReturnTarget = isIIFE \|\| node.kind === SyntaxKind.Constructor ? createBranchLabel() : undefined;`
	`652`	`+ currentReturnTarget = isIIFE \|\| node.kind === SyntaxKind.Constructor \|\| (isInJSFile && (node.kind === SyntaxKind.FunctionDeclaration \|\| node.kind === SyntaxKind.FunctionExpression)) ? createBranchLabel() : undefined;`
`653`	`653`	`currentExceptionTarget = undefined;`
`654`	`654`	`currentBreakTarget = undefined;`
`655`	`655`	`currentContinueTarget = undefined;`
`@@ -670,8 +670,8 @@ namespace ts {`
`670`	`670`	`if (currentReturnTarget) {`
`671`	`671`	`addAntecedent(currentReturnTarget, currentFlow);`
`672`	`672`	`currentFlow = finishFlowLabel(currentReturnTarget);`
`673`		`- if (node.kind === SyntaxKind.Constructor) {`
`674`		`- (<ConstructorDeclaration>node).returnFlowNode = currentFlow;`
	`673`	`+ if (node.kind === SyntaxKind.Constructor \|\| (isInJSFile && (node.kind === SyntaxKind.FunctionDeclaration \|\| node.kind === SyntaxKind.FunctionExpression))) {`
	`674`	`+ (<FunctionLikeDeclaration>node).returnFlowNode = currentFlow;`
`675`	`675`	`}`
`676`	`676`	`}`
`677`	`677`	`if (!isIIFE) {`
Original file line number	Diff line number	Diff line change
`@@ -1107,6 +1107,7 @@ namespace ts {`
`1107`	`1107`	`exclamationToken?: ExclamationToken;`
`1108`	`1108`	`body?: Block \| Expression;`
`1109`	`1109`	`/* @internal */ endFlowNode?: FlowNode;`
	`1110`	`+ /* @internal */ returnFlowNode?: FlowNode;`
`1110`	`1111`	`}`
`1111`	`1112`
`1112`	`1113`	`export type FunctionLikeDeclaration =`
`@@ -1152,7 +1153,6 @@ namespace ts {`
`1152`	`1153`	`kind: SyntaxKind.Constructor;`
`1153`	`1154`	`parent: ClassLikeDeclaration;`
`1154`	`1155`	`body?: FunctionBody;`
`1155`		`- /* @internal */ returnFlowNode?: FlowNode;`
`1156`	`1156`	`}`
`1157`	`1157`
`1158`	`1158`	`/** For when we encounter a semicolon in a class declaration. ES6 allows these as class elements. */`
`@@ -4157,6 +4157,7 @@ namespace ts {`
`4157`	`4157`	`deferralParent?: Type; // Source union/intersection of a deferred type`
`4158`	`4158`	`cjsExportMerged?: Symbol; // Version of the symbol with all non export= exports merged with the export= target`
`4159`	`4159`	`typeOnlyDeclaration?: TypeOnlyCompatibleAliasDeclaration \| false; // First resolved alias declaration that makes the symbol only usable in type constructs`
	`4160`	`+ isConstructorDeclaredProperty?: boolean; // Property declared through 'this.x = ...' assignment in constructor`
`4160`	`4161`	`}`
`4161`	`4162`
`4162`	`4163`	`/* @internal */`