fix(scope-manager): support static class blocks (#4211)

typescript-eslint · Nov 23, 2021 · f8e9125 · f8e9125
1 parent 46a9aee
commit f8e9125
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 0 deletions.
diff --git a/packages/scope-manager/src/ScopeManager.ts b/packages/scope-manager/src/ScopeManager.ts
@@ -20,6 +20,7 @@ import {
   WithScope,
 } from './scope';
 import { ClassFieldInitializerScope } from './scope/ClassFieldInitializerScope';
+import { ClassStaticBlockScope } from './scope/ClassStaticBlockScope';
 
 import { Variable } from './variable';
 
@@ -178,6 +179,15 @@ class ScopeManager {
     );
   }
 
+  public nestClassStaticBlockScope(
+    node: ClassStaticBlockScope['block'],
+  ): ClassStaticBlockScope {
+    assert(this.currentScope);
+    return this.nestScope(
+      new ClassStaticBlockScope(this, this.currentScope, node),
+    );
+  }
+
   public nestConditionalTypeScope(
     node: ConditionalTypeScope['block'],
   ): ConditionalTypeScope {

diff --git a/packages/scope-manager/src/scope/ClassStaticBlockScope.ts b/packages/scope-manager/src/scope/ClassStaticBlockScope.ts
@@ -0,0 +1,21 @@
+import { TSESTree } from '@typescript-eslint/types';
+import { Scope } from './Scope';
+import { ScopeBase } from './ScopeBase';
+import { ScopeType } from './ScopeType';
+import { ScopeManager } from '../ScopeManager';
+
+class ClassStaticBlockScope extends ScopeBase<
+  ScopeType.classStaticBlock,
+  TSESTree.Expression,
+  Scope
+> {
+  constructor(
+    scopeManager: ScopeManager,
+    upperScope: ClassStaticBlockScope['upper'],
+    block: ClassStaticBlockScope['block'],
+  ) {
+    super(scopeManager, ScopeType.classStaticBlock, upperScope, block, false);
+  }
+}
+
+export { ClassStaticBlockScope };
diff --git a/packages/scope-manager/src/scope/Scope.ts b/packages/scope-manager/src/scope/Scope.ts
@@ -1,6 +1,7 @@
 import { BlockScope } from './BlockScope';
 import { CatchScope } from './CatchScope';
 import { ClassFieldInitializerScope } from './ClassFieldInitializerScope';
+import { ClassStaticBlockScope } from './ClassStaticBlockScope';
 import { ClassScope } from './ClassScope';
 import { ConditionalTypeScope } from './ConditionalTypeScope';
 import { ForScope } from './ForScope';
@@ -21,6 +22,7 @@ type Scope =
   | CatchScope
   | ClassScope
   | ClassFieldInitializerScope
+  | ClassStaticBlockScope
   | ConditionalTypeScope
   | ForScope
   | FunctionExpressionNameScope

diff --git a/packages/scope-manager/src/scope/ScopeBase.ts b/packages/scope-manager/src/scope/ScopeBase.ts
@@ -126,6 +126,7 @@ const generator = createIdGenerator();
 type VariableScope = GlobalScope | FunctionScope | ModuleScope | TSModuleScope;
 const VARIABLE_SCOPE_TYPES = new Set([
   ScopeType.classFieldInitializer,
+  ScopeType.classStaticBlock,
   ScopeType.function,
   ScopeType.global,
   ScopeType.module,

diff --git a/packages/scope-manager/src/scope/ScopeType.ts b/packages/scope-manager/src/scope/ScopeType.ts
@@ -3,6 +3,7 @@ enum ScopeType {
   catch = 'catch',
   class = 'class',
   classFieldInitializer = 'class-field-initializer',
+  classStaticBlock = 'class-static-block',
   conditionalType = 'conditionalType',
   for = 'for',
   function = 'function',