Stop getFlowTypeOfProperty overwriting with base class property (#1432)

Author: sandersn

internal/checker/checker.go

@@ -10908,7 +10908,9 @@ func (c *Checker) getControlFlowContainer(node *ast.Node) *ast.Node {
 func (c *Checker) getFlowTypeOfProperty(reference *ast.Node, prop *ast.Symbol) *Type {
 	initialType := c.undefinedType
 	if prop != nil && prop.ValueDeclaration != nil && (!c.isAutoTypedProperty(prop) || prop.ValueDeclaration.ModifierFlags()&ast.ModifierFlagsAmbient != 0) {
-		initialType = c.getTypeOfPropertyInBaseClass(prop)
+		if baseType := c.getTypeOfPropertyInBaseClass(prop); baseType != nil {
+			initialType = baseType
+		}
 	}
 	return c.getFlowTypeOfReferenceEx(reference, c.autoType, initialType, nil, nil)
 }
@@ -26217,7 +26219,13 @@ func (c *Checker) isAssignmentToReadonlyEntity(expr *ast.Node, symbol *ast.Symbo
 }
 
 func (c *Checker) isThisPropertyAccessInConstructor(node *ast.Node, prop *ast.Symbol) bool {
-	return isThisProperty(node) && c.isAutoTypedProperty(prop) && ast.GetThisContainer(node, true /*includeArrowFunctions*/, false /*includeClassComputedPropertyName*/) == c.getDeclaringConstructor(prop)
+	var constructor *ast.Node
+	if kind, location := c.isConstructorDeclaredThisProperty(prop); kind == thisAssignmentDeclarationConstructor {
+		constructor = location
+	} else if isThisProperty(node) && c.isAutoTypedProperty(prop) {
+		constructor = c.getDeclaringConstructor(prop)
+	}
+	return ast.GetThisContainer(node, true /*includeArrowFunctions*/, false /*includeClassComputedPropertyName*/) == constructor
 }
 
 func (c *Checker) isAutoTypedProperty(symbol *ast.Symbol) bool {

testdata/baselines/reference/conformance/controlFlowJSClassProperty.js

@@ -0,0 +1,47 @@
+//// [tests/cases/conformance/salsa/controlFlowJSClassProperty.ts] ////
+
+//// [controlFlowJSClassProperty.js]
+export class C {
+  name = "CompileDiagnostic";
+
+  /**
+   * @param {[number, number] | undefined} position
+   */
+  constructor(position) {
+    if (position) {
+      this.position = position;
+    }
+  }
+}
+var c = new C([1, 2]);
+c.position;
+
+
+//// [controlFlowJSClassProperty.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.C = void 0;
+class C {
+    name = "CompileDiagnostic";
+    /**
+     * @param {[number, number] | undefined} position
+     */
+    constructor(position) {
+        if (position) {
+            this.position = position;
+        }
+    }
+}
+exports.C = C;
+var c = new C([1, 2]);
+c.position;
+
+
+//// [controlFlowJSClassProperty.d.ts]
+export declare class C {
+    name: string;
+    /**
+     * @param {[number, number] | undefined} position
+     */
+    constructor(position: [number, number] | undefined);
+}

testdata/baselines/reference/conformance/controlFlowJSClassProperty.symbols

@@ -0,0 +1,35 @@
+//// [tests/cases/conformance/salsa/controlFlowJSClassProperty.ts] ////
+
+=== controlFlowJSClassProperty.js ===
+export class C {
+>C : Symbol(C, Decl(controlFlowJSClassProperty.js, 0, 0))
+
+  name = "CompileDiagnostic";
+>name : Symbol(name, Decl(controlFlowJSClassProperty.js, 0, 16))
+
+  /**
+   * @param {[number, number] | undefined} position
+   */
+  constructor(position) {
+>position : Symbol(position, Decl(controlFlowJSClassProperty.js, 6, 14))
+
+    if (position) {
+>position : Symbol(position, Decl(controlFlowJSClassProperty.js, 6, 14))
+
+      this.position = position;
+>this.position : Symbol(position, Decl(controlFlowJSClassProperty.js, 7, 19))
+>this : Symbol(C, Decl(controlFlowJSClassProperty.js, 0, 0))
+>position : Symbol(position, Decl(controlFlowJSClassProperty.js, 7, 19))
+>position : Symbol(position, Decl(controlFlowJSClassProperty.js, 6, 14))
+    }
+  }
+}
+var c = new C([1, 2]);
+>c : Symbol(c, Decl(controlFlowJSClassProperty.js, 12, 3))
+>C : Symbol(C, Decl(controlFlowJSClassProperty.js, 0, 0))
+
+c.position;
+>c.position : Symbol(position, Decl(controlFlowJSClassProperty.js, 7, 19))
+>c : Symbol(c, Decl(controlFlowJSClassProperty.js, 12, 3))
+>position : Symbol(position, Decl(controlFlowJSClassProperty.js, 7, 19))
+

testdata/baselines/reference/conformance/controlFlowJSClassProperty.types

@@ -0,0 +1,41 @@
+//// [tests/cases/conformance/salsa/controlFlowJSClassProperty.ts] ////
+
+=== controlFlowJSClassProperty.js ===
+export class C {
+>C : C
+
+  name = "CompileDiagnostic";
+>name : string
+>"CompileDiagnostic" : "CompileDiagnostic"
+
+  /**
+   * @param {[number, number] | undefined} position
+   */
+  constructor(position) {
+>position : [number, number] | undefined
+
+    if (position) {
+>position : [number, number] | undefined
+
+      this.position = position;
+>this.position = position : [number, number]
+>this.position : any
+>this : this
+>position : any
+>position : [number, number]
+    }
+  }
+}
+var c = new C([1, 2]);
+>c : C
+>new C([1, 2]) : C
+>C : typeof C
+>[1, 2] : [number, number]
+>1 : 1
+>2 : 2
+
+c.position;
+>c.position : [number, number] | undefined
+>c : C
+>position : [number, number] | undefined
+

testdata/baselines/reference/submodule/compiler/checkIndexConstraintOfJavascriptClassExpression.types

@@ -25,9 +25,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) {

testdata/baselines/reference/submodule/compiler/checkJsFiles_noErrorLocation.types

@@ -27,9 +27,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
   }

testdata/baselines/reference/submodule/compiler/checkSuperCallBeforeThisAccessing9.types

@@ -14,9 +14,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;

testdata/baselines/reference/submodule/compiler/classExtendingAny.types

@@ -69,9 +69,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() {

testdata/baselines/reference/submodule/compiler/classFieldSuperNotAccessibleJs.types

@@ -9,9 +9,9 @@ class YaddaBase {
     constructor() {
         this.roots = "hi";
 >this.roots = "hi" : "hi"
->this.roots : string
+>this.roots : any
 >this : this
->roots : string
+>roots : any
 >"hi" : "hi"
 
         /** @type number */

testdata/baselines/reference/submodule/compiler/jsFileClassPropertyType.types

@@ -7,9 +7,9 @@ class C {
   constructor () {
       this.p = 0;
 >this.p = 0 : 0
->this.p : number
+>this.p : any
 >this : this
->p : number
+>p : any
 >0 : 0
   }
 }