Defer checking of class static blocks

src/compiler/checker.ts

@@ -42368,7 +42368,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
     }
 
-    function checkClassStaticBlockDeclaration(node: ClassStaticBlockDeclaration) {
+    function checkClassStaticBlockDeclarationDeferred(node: ClassStaticBlockDeclaration) {
         checkGrammarModifiers(node);
 
         forEachChild(node, checkSourceElement);
@@ -48904,7 +48904,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             case SyntaxKind.MethodSignature:
                 return checkMethodDeclaration(node as MethodDeclaration | MethodSignature);
             case SyntaxKind.ClassStaticBlockDeclaration:
-                return checkClassStaticBlockDeclaration(node as ClassStaticBlockDeclaration);
+                return checkNodeDeferred(node);
             case SyntaxKind.Constructor:
                 return checkConstructorDeclaration(node as ConstructorDeclaration);
             case SyntaxKind.GetAccessor:
@@ -49217,6 +49217,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             case SyntaxKind.MethodSignature:
                 checkFunctionExpressionOrObjectLiteralMethodDeferred(node as FunctionExpression);
                 break;
+            case SyntaxKind.ClassStaticBlockDeclaration:
+                checkClassStaticBlockDeclarationDeferred(node as ClassStaticBlockDeclaration);
+                break;
             case SyntaxKind.GetAccessor:
             case SyntaxKind.SetAccessor:
                 checkAccessorDeclaration(node as AccessorDeclaration);

tests/baselines/reference/classStaticBlockDoNotSpoilVariance1.symbols

@@ -0,0 +1,84 @@
+//// [tests/cases/conformance/classes/classStaticBlock/classStaticBlockDoNotSpoilVariance1.ts] ////
+
+=== classStaticBlockDoNotSpoilVariance1.ts ===
+class A<T = number> {
+>A : Symbol(A, Decl(classStaticBlockDoNotSpoilVariance1.ts, 0, 0))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 0, 8))
+
+  static {
+    type _<T extends A = A> = T;
+>_ : Symbol(_, Decl(classStaticBlockDoNotSpoilVariance1.ts, 1, 10))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 2, 11))
+>A : Symbol(A, Decl(classStaticBlockDoNotSpoilVariance1.ts, 0, 0))
+>A : Symbol(A, Decl(classStaticBlockDoNotSpoilVariance1.ts, 0, 0))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 2, 11))
+  }
+
+  value!: T;
+>value : Symbol(A.value, Decl(classStaticBlockDoNotSpoilVariance1.ts, 3, 3))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 0, 8))
+
+  child!: InstanceType<typeof A.B<A<T>>>;
+>child : Symbol(A.child, Decl(classStaticBlockDoNotSpoilVariance1.ts, 5, 12))
+>InstanceType : Symbol(InstanceType, Decl(lib.es5.d.ts, --, --))
+>A.B : Symbol(A.B, Decl(classStaticBlockDoNotSpoilVariance1.ts, 6, 41))
+>A : Symbol(A, Decl(classStaticBlockDoNotSpoilVariance1.ts, 0, 0))
+>B : Symbol(A.B, Decl(classStaticBlockDoNotSpoilVariance1.ts, 6, 41))
+>A : Symbol(A, Decl(classStaticBlockDoNotSpoilVariance1.ts, 0, 0))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 0, 8))
+
+  static B = class B<T extends A = A> {
+>B : Symbol(A.B, Decl(classStaticBlockDoNotSpoilVariance1.ts, 6, 41))
+>B : Symbol(B, Decl(classStaticBlockDoNotSpoilVariance1.ts, 8, 12))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 8, 21))
+>A : Symbol(A, Decl(classStaticBlockDoNotSpoilVariance1.ts, 0, 0))
+>A : Symbol(A, Decl(classStaticBlockDoNotSpoilVariance1.ts, 0, 0))
+
+    parent!: T;
+>parent : Symbol(B.parent, Decl(classStaticBlockDoNotSpoilVariance1.ts, 8, 39))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 8, 21))
+
+  };
+}
+
+const A2 = class A2<T = number> {
+>A2 : Symbol(A2, Decl(classStaticBlockDoNotSpoilVariance1.ts, 13, 5))
+>A2 : Symbol(A2, Decl(classStaticBlockDoNotSpoilVariance1.ts, 13, 10))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 13, 20))
+
+  static {
+    type _<T extends A2 = A2> = T;
+>_ : Symbol(_, Decl(classStaticBlockDoNotSpoilVariance1.ts, 14, 10))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 15, 11))
+>A2 : Symbol(A2, Decl(classStaticBlockDoNotSpoilVariance1.ts, 13, 10))
+>A2 : Symbol(A2, Decl(classStaticBlockDoNotSpoilVariance1.ts, 13, 10))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 15, 11))
+  }
+
+  value!: T;
+>value : Symbol(A2.value, Decl(classStaticBlockDoNotSpoilVariance1.ts, 16, 3))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 13, 20))
+
+  child!: InstanceType<typeof A2.B<A2<T>>>;
+>child : Symbol(A2.child, Decl(classStaticBlockDoNotSpoilVariance1.ts, 18, 12))
+>InstanceType : Symbol(InstanceType, Decl(lib.es5.d.ts, --, --))
+>A2.B : Symbol(A2.B, Decl(classStaticBlockDoNotSpoilVariance1.ts, 19, 43))
+>A2 : Symbol(A2, Decl(classStaticBlockDoNotSpoilVariance1.ts, 13, 10))
+>B : Symbol(A2.B, Decl(classStaticBlockDoNotSpoilVariance1.ts, 19, 43))
+>A2 : Symbol(A2, Decl(classStaticBlockDoNotSpoilVariance1.ts, 13, 10))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 13, 20))
+
+  static B = class B<T extends A2 = A2> {
+>B : Symbol(A2.B, Decl(classStaticBlockDoNotSpoilVariance1.ts, 19, 43))
+>B : Symbol(B, Decl(classStaticBlockDoNotSpoilVariance1.ts, 21, 12))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 21, 21))
+>A2 : Symbol(A2, Decl(classStaticBlockDoNotSpoilVariance1.ts, 13, 10))
+>A2 : Symbol(A2, Decl(classStaticBlockDoNotSpoilVariance1.ts, 13, 10))
+
+    parent!: T;
+>parent : Symbol(B.parent, Decl(classStaticBlockDoNotSpoilVariance1.ts, 21, 41))
+>T : Symbol(T, Decl(classStaticBlockDoNotSpoilVariance1.ts, 21, 21))
+
+  };
+};
+

tests/baselines/reference/classStaticBlockDoNotSpoilVariance1.types

@@ -0,0 +1,85 @@
+//// [tests/cases/conformance/classes/classStaticBlock/classStaticBlockDoNotSpoilVariance1.ts] ////
+
+=== classStaticBlockDoNotSpoilVariance1.ts ===
+class A<T = number> {
+>A : A<T>
+>  : ^^^^
+
+  static {
+    type _<T extends A = A> = T;
+>_ : T
+>  : ^
+  }
+
+  value!: T;
+>value : T
+>      : ^
+
+  child!: InstanceType<typeof A.B<A<T>>>;
+>child : B<A<T>>
+>      : ^^^^^^^
+>A.B : typeof B
+>    : ^^^^^^^^
+>A : typeof A
+>  : ^^^^^^^^
+>B : typeof B
+>  : ^^^^^^^^
+
+  static B = class B<T extends A = A> {
+>B : typeof B
+>  : ^^^^^^^^
+>class B<T extends A = A> {    parent!: T;  } : typeof B
+>                                             : ^^^^^^^^
+>B : typeof B
+>  : ^^^^^^^^
+
+    parent!: T;
+>parent : T
+>       : ^
+
+  };
+}
+
+const A2 = class A2<T = number> {
+>A2 : typeof A2
+>   : ^^^^^^^^^
+>class A2<T = number> {  static {    type _<T extends A2 = A2> = T;  }  value!: T;  child!: InstanceType<typeof A2.B<A2<T>>>;  static B = class B<T extends A2 = A2> {    parent!: T;  };} : typeof A2
+>                                                                                                                                                                                          : ^^^^^^^^^
+>A2 : typeof A2
+>   : ^^^^^^^^^
+
+  static {
+    type _<T extends A2 = A2> = T;
+>_ : T
+>  : ^
+  }
+
+  value!: T;
+>value : T
+>      : ^
+
+  child!: InstanceType<typeof A2.B<A2<T>>>;
+>child : B<A2<T>>
+>      : ^^^^^^^^
+>A2.B : typeof B
+>     : ^^^^^^^^
+>A2 : typeof A2
+>   : ^^^^^^^^^
+>B : typeof B
+>  : ^^^^^^^^
+
+  static B = class B<T extends A2 = A2> {
+>B : typeof B
+>  : ^^^^^^^^
+>class B<T extends A2 = A2> {    parent!: T;  } : typeof B
+>                                               : ^^^^^^^^
+>B : typeof B
+>  : ^^^^^^^^
+
+    parent!: T;
+>parent : T
+>       : ^
+
+  };
+};
+

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

@@ -0,0 +1,29 @@
+// @strict: true
+// @target: esnext
+// @noEmit: true
+
+class A<T = number> {
+  static {
+    type _<T extends A = A> = T;
+  }
+
+  value!: T;
+  child!: InstanceType<typeof A.B<A<T>>>;
+
+  static B = class B<T extends A = A> {
+    parent!: T;
+  };
+}
+
+const A2 = class A2<T = number> {
+  static {
+    type _<T extends A2 = A2> = T;
+  }
+
+  value!: T;
+  child!: InstanceType<typeof A2.B<A2<T>>>;
+
+  static B = class B<T extends A2 = A2> {
+    parent!: T;
+  };
+};

tests/cases/fourslash/quickInfoAvoidsClassVarianceCircularity1.ts

@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts'/>
+
+// @strict: true
+
+//// class A<T extends number = number> {
+////   value!: T;
+////   child!: InstanceType<typeof A.B<A<T>>>;
+////
+////   static B = class B<T extends A> {
+////     parent!: T;
+////   };
+//// }
+////
+//// var a = new A();
+////
+//// a.child.parent.value/**/;
+
+verify.quickInfoAt("", "(property) A<number>.value: number");
+verify.getSemanticDiagnostics([]);