update isInPropertyInitializerOrClassStaticBlock

Author: Zzzen

src/compiler/checker.ts

@@ -25347,7 +25347,7 @@ namespace ts {
             // To avoid that we will give an error to users if they use arguments objects in arrow function so that they
             // can explicitly bound arguments objects
             if (symbol === argumentsSymbol) {
-                if (isArgumentsInPropertyInitializerOrClassStaticBlock(node)) {
+                if (isInPropertyInitializerOrClassStaticBlock(node, /* ignoreArrowFunctions */true)) {
                     error(node, Diagnostics.arguments_cannot_be_referenced_in_property_initializers_or_class_static_initialization_block);
                     return errorType;
                 }
@@ -28869,11 +28869,12 @@ namespace ts {
             }
         }
 
-        function isInPropertyInitializerOrClassStaticBlock(node: Node): boolean {
+        function isInPropertyInitializerOrClassStaticBlock(node: Node, ignoreArrowFunctions?: boolean): boolean {
             return !!findAncestor(node, node => {
                 switch (node.kind) {
                     case SyntaxKind.PropertyDeclaration:
-                        return true;
+                    case SyntaxKind.ClassStaticBlockDeclaration:
+                            return true;
                     case SyntaxKind.PropertyAssignment:
                     case SyntaxKind.MethodDeclaration:
                     case SyntaxKind.GetAccessor:
@@ -28889,23 +28890,10 @@ namespace ts {
                     case SyntaxKind.ExpressionWithTypeArguments:
                     case SyntaxKind.HeritageClause:
                         return false;
+                    case SyntaxKind.JsxClosingElement:  // already reported in JsxOpeningElement
+                        return "quit";
                     case SyntaxKind.ArrowFunction:
-                    case SyntaxKind.ExpressionStatement:
-                        return isBlock(node.parent) && isClassStaticBlockDeclaration(node.parent.parent) ? true : "quit";
-                    default:
-                        return isExpressionNode(node) ? false : "quit";
-                }
-            });
-        }
-
-        function isArgumentsInPropertyInitializerOrClassStaticBlock(node: Node): boolean {
-            return !!findAncestor(node, node => {
-                switch(node.kind) {
-                    case SyntaxKind.PropertyDeclaration:
-                    case SyntaxKind.ClassStaticBlockDeclaration:
-                        return true;
-                    case SyntaxKind.ArrowFunction:
-                        return false;
+                        return ignoreArrowFunctions ? false : "quit";
                     default:
                         return isFunctionLikeDeclaration(node) ? "quit" : false;
                 }

tests/baselines/reference/classStaticBlock6.errors.txt

@@ -13,9 +13,11 @@ tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts(42,18): er
 tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts(45,17): error TS2522: The 'arguments' object cannot be referenced in an async function or method in ES3 and ES5. Consider using a standard function or method.
 tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts(46,22): error TS1109: Expression expected.
 tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts(55,13): error TS2815: 'arguments' cannot be referenced in property initializers or class static initialization block.
+tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts(66,14): error TS2729: Property 'b' is used before its initialization.
+tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts(68,18): error TS2729: Property 'b' is used before its initialization.
 
 
-==== tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts (15 errors) ====
+==== tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts (17 errors) ====
     class B {
         static a = 1;
     }
@@ -108,4 +110,20 @@ tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts(55,13): er
             }
         }
     }
-    
+    
+    class foo2 {
+        static {
+            this.b  // should error
+                 ~
+!!! error TS2729: Property 'b' is used before its initialization.
+!!! related TS2728 tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts:72:12: 'b' is declared here.
+            if (1) {
+                this.b; // should error
+                     ~
+!!! error TS2729: Property 'b' is used before its initialization.
+!!! related TS2728 tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts:72:12: 'b' is declared here.
+            }
+        }
+    
+        static b = 1;
+    }

tests/baselines/reference/classStaticBlock6.js

@@ -61,7 +61,17 @@ function foo1 () {
         }
     }
 }
-
+
+class foo2 {
+    static {
+        this.b  // should error
+        if (1) {
+            this.b; // should error
+        }
+    }
+
+    static b = 1;
+}
 
 //// [classStaticBlock6.js]
 var __extends = (this && this.__extends) || (function () {
@@ -115,6 +125,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var _this = this;
 var B = /** @class */ (function () {
     function B() {
     }
@@ -211,3 +222,17 @@ function foo1() {
         }
     })();
 }
+var foo2 = /** @class */ (function () {
+    function foo2() {
+    }
+    var _a;
+    _a = foo2;
+    (function () {
+        _a.b; // should error
+        if (1) {
+            _a.b; // should error
+        }
+    })();
+    foo2.b = 1;
+    return foo2;
+}());

tests/baselines/reference/classStaticBlock6.symbols

@@ -102,3 +102,23 @@ function foo1 () {
     }
 }
 
+class foo2 {
+>foo2 : Symbol(foo2, Decl(classStaticBlock6.ts, 61, 1))
+
+    static {
+        this.b  // should error
+>this.b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 69, 5))
+>this : Symbol(foo2, Decl(classStaticBlock6.ts, 61, 1))
+>b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 69, 5))
+
+        if (1) {
+            this.b; // should error
+>this.b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 69, 5))
+>this : Symbol(foo2, Decl(classStaticBlock6.ts, 61, 1))
+>b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 69, 5))
+        }
+    }
+
+    static b = 1;
+>b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 69, 5))
+}

tests/baselines/reference/classStaticBlock6.types

@@ -123,3 +123,26 @@ function foo1 () {
     }
 }
 
+class foo2 {
+>foo2 : foo2
+
+    static {
+        this.b  // should error
+>this.b : number
+>this : typeof foo2
+>b : number
+
+        if (1) {
+>1 : 1
+
+            this.b; // should error
+>this.b : number
+>this : typeof foo2
+>b : number
+        }
+    }
+
+    static b = 1;
+>b : number
+>1 : 1
+}

tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts

@@ -60,3 +60,14 @@ function foo1 () {
         }
     }
 }
+
+class foo2 {
+    static {
+        this.b  // should error
+        if (1) {
+            this.b; // should error
+        }
+    }
+
+    static b = 1;
+}