fix(49719): omit TS2301 error with enabled usedefineforclassfields

Author: a-tarasyuk

src/compiler/checker.ts

@@ -2217,10 +2217,9 @@ namespace ts {
                 return undefined;
             }
 
-            if (propertyWithInvalidInitializer && !(getEmitScriptTarget(compilerOptions) === ScriptTarget.ESNext && useDefineForClassFields)) {
+            if (propertyWithInvalidInitializer && !useDefineForClassFields) {
                 // We have a match, but the reference occurred within a property initializer and the identifier also binds
-                // to a local variable in the constructor where the code will be emitted. Note that this is actually allowed
-                // with ESNext+useDefineForClassFields because the scope semantics are different.
+                // to a local variable in the constructor where the code will be emitted.
                 const propertyName = (propertyWithInvalidInitializer as PropertyDeclaration).name;
                 error(errorLocation, Diagnostics.Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor,
                     declarationNameToString(propertyName), diagnosticName(nameArg!));

src/testRunner/compilerRunner.ts

@@ -141,7 +141,8 @@ namespace Harness {
             "preserveConstEnums",
             "skipLibCheck",
             "exactOptionalPropertyTypes",
-            "useUnknownInCatchVariables"
+            "useDefineForClassFields",
+            "useUnknownInCatchVariables",
         ];
         private fileName: string;
         private justName: string;

tests/baselines/reference/classMemberInitializerScoping2(target=es2017,usedefineforclassfields=false).errors.txt

@@ -0,0 +1,12 @@
+tests/cases/compiler/classMemberInitializerScoping2.ts(3,9): error TS2301: Initializer of instance member variable 'p' cannot reference identifier 'x' declared in the constructor.
+
+
+==== tests/cases/compiler/classMemberInitializerScoping2.ts (1 errors) ====
+    const x = 1
+    class C {
+        p = x
+            ~
+!!! error TS2301: Initializer of instance member variable 'p' cannot reference identifier 'x' declared in the constructor.
+        constructor(x: string) { }
+    }
+    

tests/baselines/reference/classMemberInitializerScoping2(target=es2017,usedefineforclassfields=false).js

@@ -0,0 +1,15 @@
+//// [classMemberInitializerScoping2.ts]
+const x = 1
+class C {
+    p = x
+    constructor(x: string) { }
+}
+
+
+//// [classMemberInitializerScoping2.js]
+const x = 1;
+class C {
+    constructor(x) {
+        this.p = x;
+    }
+}

tests/baselines/reference/classMemberInitializerScoping2(target=es2017,usedefineforclassfields=false).symbols

@@ -0,0 +1,14 @@
+=== tests/cases/compiler/classMemberInitializerScoping2.ts ===
+const x = 1
+>x : Symbol(x, Decl(classMemberInitializerScoping2.ts, 0, 5))
+
+class C {
+>C : Symbol(C, Decl(classMemberInitializerScoping2.ts, 0, 11))
+
+    p = x
+>p : Symbol(C.p, Decl(classMemberInitializerScoping2.ts, 1, 9))
+
+    constructor(x: string) { }
+>x : Symbol(x, Decl(classMemberInitializerScoping2.ts, 3, 16))
+}
+

tests/baselines/reference/classMemberInitializerScoping2(target=es2017,usedefineforclassfields=false).types

@@ -0,0 +1,16 @@
+=== tests/cases/compiler/classMemberInitializerScoping2.ts ===
+const x = 1
+>x : 1
+>1 : 1
+
+class C {
+>C : C
+
+    p = x
+>p : any
+>x : any
+
+    constructor(x: string) { }
+>x : string
+}
+

tests/baselines/reference/classMemberInitializerScoping2(target=es2017,usedefineforclassfields=true).js

@@ -0,0 +1,20 @@
+//// [classMemberInitializerScoping2.ts]
+const x = 1
+class C {
+    p = x
+    constructor(x: string) { }
+}
+
+
+//// [classMemberInitializerScoping2.js]
+const x = 1;
+class C {
+    constructor(x) {
+        Object.defineProperty(this, "p", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: x
+        });
+    }
+}

tests/baselines/reference/classMemberInitializerScoping2(target=es2017,usedefineforclassfields=true).symbols

@@ -0,0 +1,15 @@
+=== tests/cases/compiler/classMemberInitializerScoping2.ts ===
+const x = 1
+>x : Symbol(x, Decl(classMemberInitializerScoping2.ts, 0, 5))
+
+class C {
+>C : Symbol(C, Decl(classMemberInitializerScoping2.ts, 0, 11))
+
+    p = x
+>p : Symbol(C.p, Decl(classMemberInitializerScoping2.ts, 1, 9))
+>x : Symbol(x, Decl(classMemberInitializerScoping2.ts, 0, 5))
+
+    constructor(x: string) { }
+>x : Symbol(x, Decl(classMemberInitializerScoping2.ts, 3, 16))
+}
+

tests/baselines/reference/classMemberInitializerScoping2(target=es2017,usedefineforclassfields=true).types

@@ -0,0 +1,16 @@
+=== tests/cases/compiler/classMemberInitializerScoping2.ts ===
+const x = 1
+>x : 1
+>1 : 1
+
+class C {
+>C : C
+
+    p = x
+>p : number
+>x : 1
+
+    constructor(x: string) { }
+>x : string
+}
+

tests/baselines/reference/classMemberInitializerScoping2(target=esnext,usedefineforclassfields=false).errors.txt

@@ -0,0 +1,12 @@
+tests/cases/compiler/classMemberInitializerScoping2.ts(3,9): error TS2301: Initializer of instance member variable 'p' cannot reference identifier 'x' declared in the constructor.
+
+
+==== tests/cases/compiler/classMemberInitializerScoping2.ts (1 errors) ====
+    const x = 1
+    class C {
+        p = x
+            ~
+!!! error TS2301: Initializer of instance member variable 'p' cannot reference identifier 'x' declared in the constructor.
+        constructor(x: string) { }
+    }
+