simplify implementation

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 (isInPropertyInitializerOrClassStaticBlock(node, /* ignoreArrowFunctions */true)) {
+                if (isInPropertyInitializerOrClassStaticBlock(node, /* ignoreArrowFunctions */ true)) {
                     error(node, Diagnostics.arguments_cannot_be_referenced_in_property_initializers_or_class_static_initialization_block);
                     return errorType;
                 }
@@ -28874,28 +28874,16 @@ namespace ts {
                 switch (node.kind) {
                     case SyntaxKind.PropertyDeclaration:
                     case SyntaxKind.ClassStaticBlockDeclaration:
-                            return true;
-                    case SyntaxKind.PropertyAssignment:
-                    case SyntaxKind.MethodDeclaration:
-                    case SyntaxKind.GetAccessor:
-                    case SyntaxKind.SetAccessor:
-                    case SyntaxKind.SpreadAssignment:
-                    case SyntaxKind.ComputedPropertyName:
-                    case SyntaxKind.TemplateSpan:
-                    case SyntaxKind.JsxExpression:
-                    case SyntaxKind.JsxAttribute:
-                    case SyntaxKind.JsxAttributes:
-                    case SyntaxKind.JsxSpreadAttribute:
-                    case SyntaxKind.JsxOpeningElement:
-                    case SyntaxKind.ExpressionWithTypeArguments:
-                    case SyntaxKind.HeritageClause:
-                        return false;
+                        return true;
+                    case SyntaxKind.TypeQuery:
                     case SyntaxKind.JsxClosingElement:  // already reported in JsxOpeningElement
                         return "quit";
                     case SyntaxKind.ArrowFunction:
                         return ignoreArrowFunctions ? false : "quit";
+                    case SyntaxKind.Block:
+                        return isFunctionLikeDeclaration(node.parent) && node.parent.kind !== SyntaxKind.ArrowFunction ? "quit" : false;
                     default:
-                        return isFunctionLikeDeclaration(node) ? "quit" : false;
+                        return false;
                 }
             });
         }

tests/baselines/reference/classStaticBlock6.errors.txt

@@ -14,7 +14,7 @@ tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts(45,17): er
 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(69,18): error TS2729: Property 'b' is used before its initialization.
 
 
 ==== tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts (17 errors) ====
@@ -116,12 +116,13 @@ tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts(68,18): er
             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.
+!!! related TS2728 tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts:73:12: 'b' is declared here.
+            let b: typeof this.b;   // ok
             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.
+!!! related TS2728 tests/cases/conformance/classes/classStaticBlock/classStaticBlock6.ts:73:12: 'b' is declared here.
             }
         }
 

tests/baselines/reference/classStaticBlock6.js

@@ -65,6 +65,7 @@ function foo1 () {
 class foo2 {
     static {
         this.b  // should error
+        let b: typeof this.b;   // ok
         if (1) {
             this.b; // should error
         }
@@ -229,6 +230,7 @@ var foo2 = /** @class */ (function () {
     _a = foo2;
     (function () {
         _a.b; // should error
+        var b; // ok
         if (1) {
             _a.b; // should error
         }

tests/baselines/reference/classStaticBlock6.symbols

@@ -107,18 +107,24 @@ class foo2 {
 
     static {
         this.b  // should error
->this.b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 69, 5))
+>this.b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 70, 5))
 >this : Symbol(foo2, Decl(classStaticBlock6.ts, 61, 1))
->b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 69, 5))
+>b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 70, 5))
+
+        let b: typeof this.b;   // ok
+>b : Symbol(b, Decl(classStaticBlock6.ts, 66, 11))
+>this.b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 70, 5))
+>this : Symbol(foo2, Decl(classStaticBlock6.ts, 61, 1))
+>b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 70, 5))
 
         if (1) {
             this.b; // should error
->this.b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 69, 5))
+>this.b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 70, 5))
 >this : Symbol(foo2, Decl(classStaticBlock6.ts, 61, 1))
->b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 69, 5))
+>b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 70, 5))
         }
     }
 
     static b = 1;
->b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 69, 5))
+>b : Symbol(foo2.b, Decl(classStaticBlock6.ts, 70, 5))
 }

tests/baselines/reference/classStaticBlock6.types

@@ -130,6 +130,12 @@ class foo2 {
         this.b  // should error
 >this.b : number
 >this : typeof foo2
+>b : number
+
+        let b: typeof this.b;   // ok
+>b : number
+>this.b : number
+>this : typeof foo2
 >b : number
 
         if (1) {

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

@@ -64,6 +64,7 @@ function foo1 () {
 class foo2 {
     static {
         this.b  // should error
+        let b: typeof this.b;   // ok
         if (1) {
             this.b; // should error
         }