@zzzen/pyright-internal 1.2.0-dev.20260816 → 1.2.0-dev.20260830

package/dist/analyzer/backgroundAnalysisProgram.js

@@ -12,7 +12,7 @@ exports.BackgroundAnalysisProgram = exports.InvalidatedReason = void 0;
 require("../common/serviceProviderExtensions");
 const analysis_1 = require("./analysis");
 const program_1 = require("./program");
-const typeStubWriter_1 = require("./typeStubWriter");
+const typeStubGeneration_1 = require("./typeStubGeneration");
 var InvalidatedReason;
 (function (InvalidatedReason) {
     InvalidatedReason[InvalidatedReason["Reanalyzed"] = 0] = "Reanalyzed";
@@ -141,15 +141,11 @@ class BackgroundAnalysisProgram {
         }
         return this._program.getDiagnosticsForRange(fileUri, range);
     }
-    async writeTypeStub(targetImportUri, targetIsSingleFile, stubUri, token) {
+    async generateTypeStubFiles(plan, token) {
         if (this._backgroundAnalysis) {
-            return this._backgroundAnalysis.writeTypeStub(targetImportUri, targetIsSingleFile, stubUri, token);
+            return this._backgroundAnalysis.generateTypeStubFiles(plan, token);
         }
-        return new typeStubWriter_1.TypeStubWriter(this._program).writeTypeStub({
-            targetImportPath: targetImportUri,
-            targetIsSingleFile,
-            outputPath: stubUri,
-        }, token);
+        return (0, typeStubGeneration_1.generateTypeStubFiles)(this._program, plan, token);
     }
     invalidateAndForceReanalysis(reason, refreshOptions) {
         this._backgroundAnalysis?.invalidateAndForceReanalysis(reason);

package/dist/analyzer/backgroundAnalysisProgram.js.map

@@ -1 +1 @@
-{"version":3,"file":"backgroundAnalysisProgram.js","sourceRoot":"","sources":["../../../../../src/analyzer/backgroundAnalysisProgram.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AASH,+CAA6C;AAG7C,yCAAsE;AAEtE,uCAAsE;AACtE,qDAAkD;AAElD,IAAY,iBAKX;AALD,WAAY,iBAAiB;IACzB,qEAAU,CAAA;IACV,yFAAoB,CAAA;IACpB,2FAAqB,CAAA;IACrB,iHAAgC,CAAA;AACpC,CAAC,EALW,iBAAiB,iCAAjB,iBAAiB,QAK5B;AAED,MAAa,yBAAyB;IAMlC,YACuB,SAAiB,EACnB,gBAAiC,EAC1C,cAA6B,EAC7B,eAA+B,EAC/B,mBAAyC,EAChC,gBAAkC,EAClC,eAAyB,EAC1C,OAAiB;QAPE,cAAS,GAAT,SAAS,CAAQ;QACnB,qBAAgB,GAAhB,gBAAgB,CAAiB;QAC1C,mBAAc,GAAd,cAAc,CAAe;QAC7B,oBAAe,GAAf,eAAe,CAAgB;QAC/B,wBAAmB,GAAnB,mBAAmB,CAAsB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,oBAAe,GAAf,eAAe,CAAU;QAXtC,cAAS,GAAG,KAAK,CAAC;QActB,IAAI,CAAC,QAAQ;YACT,OAAO;gBACP,IAAI,iBAAO,CACP,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,gBAAgB,EACrB,SAAS,EACT,IAAI,CAAC,eAAe,EACpB,SAAS,CACZ,CAAC;QACN,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAED,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;IACrC,CAAC;IAED,IAAI,kBAAkB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IACpC,CAAC;IAED,aAAa,CAAC,OAAY;QACtB,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,gBAAgB,CAAC,aAA4B;QACzC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAC1D,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAClD,CAAC;IAED,iBAAiB,CAAC,cAA8B;QAC5C,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;QACtC,IAAI,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAE5D,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAChD,IAAI,CAAC,aAAa,CAAC,wBAAwB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC;IACrG,CAAC;IAED,eAAe,CAAC,QAAe;QAC3B,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;QACpD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,CAAC,iCAAiC,CAAC,WAAW,CAAC,CAAC;IACxD,CAAC;IAED,2BAA2B,CAAC,WAAqB;QAC7C,IAAI,CAAC,mBAAmB,EAAE,2BAA2B,CAAC,WAAW,CAAC,CAAC;QACnE,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;IAC3D,CAAC;IAED,aAAa,CAAC,OAAY,EAAE,OAAsB,EAAE,QAAgB,EAAE,OAAwB;QAC1F,IAAI,CAAC,mBAAmB,EAAE,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7E,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC;IAED,aAAa,CAAC,OAAY;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,gBAAgB,CAAC,OAAY,EAAE,UAA2B;QACtD,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACxD,CAAC;IAED,sBAAsB,CAAC,GAAQ,EAAE,OAAsB,EAAE,QAAgB,EAAE,OAAwB;QAC/F,IAAI,CAAC,mBAAmB,EAAE,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACzE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7D,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,EAAE,2BAA2B,CAAC,IAAI,CAAC,CAAC;IACjE,CAAC;IAED,aAAa,CAAC,OAAY;QACtB,IAAI,CAAC,mBAAmB,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,CAAC,iCAAiC,CAAC,WAAW,CAAC,CAAC;IACxD,CAAC;IAED,cAAc,CAAC,OAAY;QACvB,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,iBAAiB,CAAC,qBAA8B;QAC5C,IAAI,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;QACnE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;IAC3D,CAAC;IAED,cAAc,CAAC,QAAe,EAAE,qBAA8B;QAC1D,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;QAC1E,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;IAClE,CAAC;IAED,qBAAqB,CAAC,QAAmC;QACrD,IAAI,CAAC,qBAAqB,GAAG,QAAQ,CAAC;QACtC,IAAI,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC;IAED,aAAa,CAAC,KAAwB;QAClC,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC9C,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,OAAO,IAAA,yBAAc,EACjB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAC/B,KAAK,CACR,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAY,EAAE,KAAwB;QACpD,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,4BAA4B,CAAC,OAAY,EAAE,KAAwB;QACrE,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,mBAAmB,CAAC,4BAA4B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACjF,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC,4BAA4B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACtE,CAAC;IAED,cAAc;QACV,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,OAAY,EAAE,KAAY,EAAE,KAAwB;QAC7E,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,mBAAmB,CAAC,sBAAsB,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAClF,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,aAAa,CACf,eAAoB,EACpB,kBAA2B,EAC3B,OAAY,EACZ,KAAwB;QAExB,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,eAAe,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACvG,CAAC;QAED,OAAO,IAAI,+BAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,aAAa,CAClD;YACI,gBAAgB,EAAE,eAAe;YACjC,kBAAkB;YAClB,UAAU,EAAE,OAAO;SACtB,EACD,KAAK,CACR,CAAC;IACN,CAAC;IAED,4BAA4B,CAAC,MAAyB,EAAE,cAA+B;QACnF,IAAI,CAAC,mBAAmB,EAAE,4BAA4B,CAAC,MAAM,CAAC,CAAC;QAE/D,qDAAqD;QACrD,kBAAkB;QAClB,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC;QAEvC,qGAAqG;QACrG,2DAA2D;QAC3D,IACI,cAAc,EAAE,eAAe;YAC/B,cAAc,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC;YACvC,MAAM,KAAK,iBAAiB,CAAC,gCAAgC,EAC/D,CAAC;YACC,kDAAkD;YAClD,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1E,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACJ,gDAAgD;YAChD,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;IAED,OAAO;QACH,IAAI,CAAC,mBAAmB,EAAE,OAAO,EAAE,CAAC;IACxC,CAAC;IAED,OAAO;QACH,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,OAAO;QACX,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,mBAAmB,EAAE,QAAQ,EAAE,CAAC;QACrC,IAAI,CAAC,mBAAmB,EAAE,OAAO,EAAE,CAAC;IACxC,CAAC;IAED,aAAa;QACT,wCAAwC;QACxC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACjD,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;QAErC,uCAAuC;QACvC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;IAClC,CAAC;IAED,YAAY;QACR,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAClC,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;IACxC,CAAC;IAEO,0BAA0B,CAAC,OAA6B;QAC5D,IAAI,CAAC,mBAAmB,EAAE,yBAAyB,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC9E,OAAO,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACnE,CAAC;IAEO,iCAAiC,CAAC,SAA4B;QAClE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO;QACX,CAAC;QAED,+DAA+D;QAC/D,8DAA8D;QAC9D,qDAAqD;QACrD,IAAI,CAAC,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC1D,IAAI,CAAC,qBAAqB,CAAC;gBACvB,WAAW,EAAE,SAAS;gBACtB,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE;gBAC5C,sBAAsB,EAAE,IAAI,CAAC,QAAQ,CAAC,sBAAsB,EAAE;gBAC9D,qBAAqB,EAAE,IAAI,CAAC,QAAQ,CAAC,uBAAuB,EAAE;gBAC9D,kBAAkB,EAAE,KAAK;gBACzB,wBAAwB,EAAE,KAAK;gBAC/B,WAAW,EAAE,CAAC;gBACd,MAAM,EAAE,UAAU;aACrB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;CACJ;AA/QD,8DA+QC"}
+{"version":3,"file":"backgroundAnalysisProgram.js","sourceRoot":"","sources":["../../../../../src/analyzer/backgroundAnalysisProgram.ts"],"names":[],"mappings":"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"}

package/dist/analyzer/binder.d.ts

@@ -1,12 +1,14 @@
 import { AssertNode, AssignmentExpressionNode, AssignmentNode, AugmentedAssignmentNode, AwaitNode, BinaryOperationNode, BreakNode, CallNode, ClassNode, ComprehensionNode, ContinueNode, DelNode, ExceptNode, ForNode, FunctionNode, GlobalNode, IfNode, ImportAsNode, ImportFromNode, IndexNode, LambdaNode, MatchNode, MemberAccessNode, ModuleNameNode, ModuleNode, NameNode, NonlocalNode, ParseNode, PatternAsNode, PatternCaptureNode, PatternMappingExpandEntryNode, RaiseNode, ReturnNode, SuiteNode, TernaryNode, TryNode, TypeAliasNode, TypeAnnotationNode, TypeParameterListNode, UnaryOperationNode, WhileNode, WithNode, YieldFromNode, YieldNode } from '../parser/parseNodes';
 import { AnalyzerFileInfo } from './analyzerFileInfo';
+import * as AnalyzerNodeInfo from './analyzerNodeInfo';
 import { ParseTreeWalker } from './parseTreeWalker';
 import { CellChainIndexProvider } from './cellChainIndex';
 import { Scope } from './scope';
 export declare class Binder extends ParseTreeWalker {
     private _moduleSymbolOnly;
-    private readonly _cellChainIndex?;
+    private readonly _cellChainIndex;
     private readonly _fileInfo;
+    private readonly _nodeInfo;
     private _deferredBindingTasks;
     private _currentScope;
     private _currentFlowNode;
@@ -37,7 +39,7 @@ export declare class Binder extends ParseTreeWalker {
     private _potentialWildcardReexportSymbols;
     private _potentialPrivateSymbols;
     private _codeFlowComplexity;
-    constructor(fileInfo: AnalyzerFileInfo, _moduleSymbolOnly?: boolean, _cellChainIndex?: CellChainIndexProvider | undefined);
+    constructor(fileInfo: AnalyzerFileInfo, _moduleSymbolOnly: boolean | undefined, _cellChainIndex: CellChainIndexProvider | undefined, nodeInfo: AnalyzerNodeInfo.AnalyzerNodeInfoAccessor);
     bindModule(node: ModuleNode): void;
     visitModule(node: ModuleNode): boolean;
     visitSuite(node: SuiteNode): boolean;
@@ -161,8 +163,9 @@ export declare class ReturnFinder extends ParseTreeWalker {
     visitReturn(node: ReturnNode): boolean;
 }
 export declare class DummyScopeGenerator extends ParseTreeWalker {
+    private readonly _nodeInfo;
     private _currentScope;
-    constructor(currentScope: Scope | undefined);
+    constructor(currentScope: Scope | undefined, _nodeInfo: AnalyzerNodeInfo.AnalyzerNodeInfoAccessor);
     visitClass(node: ClassNode): boolean;
     visitFunction(node: FunctionNode): boolean;
     private _createNewScope;

package/dist/analyzer/binder.js

@@ -58,7 +58,6 @@ const positionUtils_1 = require("../common/positionUtils");
 const textRange_1 = require("../common/textRange");
 const uri_1 = require("../common/uri/uri");
 const localize_1 = require("../localization/localize");
-const AnalyzerNodeInfo = __importStar(require("./analyzerNodeInfo"));
 const codeFlowTypes_1 = require("./codeFlowTypes");
 const declaration_1 = require("./declaration");
 const importStatementUtils_1 = require("./importStatementUtils");
@@ -131,7 +130,7 @@ function doesCallExposeClassNamespace(scope, node) {
 // flow nodes. This number is somewhat arbitrary and is tuned empirically.
 const flowNodeComplexityContribution = 0.025;
 class Binder extends parseTreeWalker_1.ParseTreeWalker {
-    constructor(fileInfo, _moduleSymbolOnly = false, _cellChainIndex) {
+    constructor(fileInfo, _moduleSymbolOnly, _cellChainIndex, nodeInfo) {
         super();
         this._moduleSymbolOnly = _moduleSymbolOnly;
         this._cellChainIndex = _cellChainIndex;
@@ -176,6 +175,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         // the current function.
         this._codeFlowComplexity = 0;
         this._fileInfo = fileInfo;
+        this._nodeInfo = nodeInfo;
     }
     bindModule(node) {
         // We'll assume that if there is no builtins scope provided, we must be
@@ -185,8 +185,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._addTypingImportAliasesFromBuiltinsScope();
         this._createNewScope(isBuiltInModule ? 5 /* ScopeType.Builtin */ : 4 /* ScopeType.Module */, this._fileInfo.builtinsScope, 
         /* proxyScope */ undefined, chainedModuleLevelScopeLookup, () => {
-            AnalyzerNodeInfo.setScope(node, this._currentScope);
-            AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+            this._nodeInfo.setScope(node, this._currentScope);
+            this._nodeInfo.setFlowNode(node, this._currentFlowNode);
             // Bind implicit names.
             // List taken from https://docs.python.org/3/reference/import.html#__name__
             this._addImplicitSymbolToCurrentScope('__name__', node, 'str');
@@ -204,9 +204,9 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             this._currentFlowNode = this._createStartFlowNode();
             this._walkStatementsAndReportUnreachable(node.d.statements);
             // Associate the code flow node at the end of the module with the module.
-            AnalyzerNodeInfo.setAfterFlowNode(node, this._currentFlowNode);
-            AnalyzerNodeInfo.setCodeFlowExpressions(node, this._currentScopeCodeFlowExpressions);
-            AnalyzerNodeInfo.setCodeFlowComplexity(node, this._codeFlowComplexity);
+            this._nodeInfo.setAfterFlowNode(node, this._currentFlowNode);
+            this._nodeInfo.setCodeFlowExpressions(node, this._currentScopeCodeFlowExpressions);
+            this._nodeInfo.setCodeFlowComplexity(node, this._codeFlowComplexity);
         });
         // Perform all analysis that was deferred during the first pass.
         this._bindDeferred();
@@ -248,17 +248,17 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
         });
         if (this._dunderAllNames) {
-            AnalyzerNodeInfo.setDunderAllInfo(node, {
+            this._nodeInfo.setDunderAllInfo(node, {
                 names: this._dunderAllNames,
                 stringNodes: this._dunderAllStringNodes,
                 usesUnsupportedDunderAllForm: this._usesUnsupportedDunderAllForm,
             });
         }
         else {
-            AnalyzerNodeInfo.setDunderAllInfo(node, /* names */ undefined);
+            this._nodeInfo.setDunderAllInfo(node, /* names */ undefined);
         }
         // Set __all__ flags on the module symbols.
-        const scope = AnalyzerNodeInfo.getScope(node);
+        const scope = this._nodeInfo.getScope(node);
         if (scope && this._dunderAllNames) {
             for (const name of this._dunderAllNames) {
                 scope.symbolTable.get(name)?.setIsInDunderAll();
@@ -276,7 +276,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         return false;
     }
     visitModuleName(node) {
-        const importResult = AnalyzerNodeInfo.getImportInfo(node);
+        const importResult = this._nodeInfo.getImportInfo(node);
         (0, debug_1.assert)(importResult !== undefined);
         if (importResult.isNativeLib) {
             return true;
@@ -335,17 +335,17 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             symbol.addDeclaration(classDeclaration);
         }
         // Stash the declaration in the parse node for later access.
-        AnalyzerNodeInfo.setDeclaration(node, classDeclaration);
+        this._nodeInfo.setDeclaration(node, classDeclaration);
         let typeParamScope;
         if (node.d.typeParams) {
             this.walk(node.d.typeParams);
-            typeParamScope = AnalyzerNodeInfo.getScope(node.d.typeParams);
+            typeParamScope = this._nodeInfo.getScope(node.d.typeParams);
         }
         this.walkMultiple(node.d.arguments);
         this._createNewScope(3 /* ScopeType.Class */, typeParamScope ?? this._getNonClassParentScope(), 
         /* proxyScope */ undefined, 
         /* chainedModuleLevelScopeLookup */ undefined, () => {
-            AnalyzerNodeInfo.setScope(node, this._currentScope);
+            this._nodeInfo.setScope(node, this._currentScope);
             this._addImplicitSymbolToCurrentScope('__doc__', node, 'str | None');
             this._addImplicitSymbolToCurrentScope('__module__', node, 'str');
             this._dunderSlotsEntries = undefined;
@@ -387,7 +387,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     }
     visitFunction(node) {
         this._createVariableAnnotationFlowNode();
-        AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+        this._nodeInfo.setFlowNode(node, this._currentFlowNode);
         const symbol = this._bindNameToScope(this._currentScope, node.d.name);
         const containingClassNode = ParseTreeUtils.getEnclosingClass(node, /* stopAtFunction */ true);
         const functionDeclaration = {
@@ -404,7 +404,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             symbol.addDeclaration(functionDeclaration);
         }
         // Stash the declaration in the parse node for later access.
-        AnalyzerNodeInfo.setDeclaration(node, functionDeclaration);
+        this._nodeInfo.setDeclaration(node, functionDeclaration);
         // Walk the default values prior to the type parameters.
         node.d.params.forEach((param) => {
             if (param.d.defaultValue) {
@@ -414,7 +414,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         let typeParamScope;
         if (node.d.typeParams) {
             this.walk(node.d.typeParams);
-            typeParamScope = AnalyzerNodeInfo.getScope(node.d.typeParams);
+            typeParamScope = this._nodeInfo.getScope(node.d.typeParams);
         }
         this.walkMultiple(node.d.decorators);
         node.d.params.forEach((param) => {
@@ -436,7 +436,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._createNewScope(2 /* ScopeType.Function */, typeParamScope ?? this._getNonClassParentScope(), 
         /* proxyScope */ undefined, 
         /* chainedModuleLevelScopeLookup */ undefined, () => {
-            AnalyzerNodeInfo.setScope(node, this._currentScope);
+            this._nodeInfo.setScope(node, this._currentScope);
             const enclosingClass = ParseTreeUtils.getEnclosingClass(node);
             if (enclosingClass) {
                 // Add the implicit "__class__" symbol described in PEP 3135.
@@ -459,7 +459,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                                 isInExceptSuite: this._isInExceptSuite,
                             };
                             symbol.addDeclaration(paramDeclaration);
-                            AnalyzerNodeInfo.setDeclaration(paramNode.d.name, paramDeclaration);
+                            this._nodeInfo.setDeclaration(paramNode.d.name, paramDeclaration);
                         }
                         this._createFlowAssignment(paramNode.d.name);
                     }
@@ -471,15 +471,15 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 this._targetFunctionDeclaration = undefined;
                 // Associate the code flow node at the end of the suite with
                 // the suite.
-                AnalyzerNodeInfo.setAfterFlowNode(node.d.suite, this._currentFlowNode);
+                this._nodeInfo.setAfterFlowNode(node.d.suite, this._currentFlowNode);
                 // Compute the final return flow node and associate it with
                 // the function's parse node. If this node is unreachable, then
                 // the function never returns.
                 this._addAntecedent(this._currentReturnTarget, this._currentFlowNode);
                 const returnFlowNode = this._finishFlowLabel(this._currentReturnTarget);
-                AnalyzerNodeInfo.setAfterFlowNode(node, returnFlowNode);
-                AnalyzerNodeInfo.setCodeFlowExpressions(node, this._currentScopeCodeFlowExpressions);
-                AnalyzerNodeInfo.setCodeFlowComplexity(node, this._codeFlowComplexity);
+                this._nodeInfo.setAfterFlowNode(node, returnFlowNode);
+                this._nodeInfo.setCodeFlowExpressions(node, this._currentScopeCodeFlowExpressions);
+                this._nodeInfo.setCodeFlowComplexity(node, this._codeFlowComplexity);
             });
         });
         this._createAssignmentTargetFlowNodes(node.d.name, /* walkTargets */ false, /* unbound */ false);
@@ -488,7 +488,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     }
     visitLambda(node) {
         this._createVariableAnnotationFlowNode();
-        AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+        this._nodeInfo.setFlowNode(node, this._currentFlowNode);
         // Analyze the parameter defaults in the context of the parent's scope
         // before we add any names from the function's scope.
         node.d.params.forEach((param) => {
@@ -499,7 +499,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._createNewScope(2 /* ScopeType.Function */, this._getNonClassParentScope(), 
         /* proxyScope */ undefined, 
         /* chainedModuleLevelScopeLookup */ undefined, () => {
-            AnalyzerNodeInfo.setScope(node, this._currentScope);
+            this._nodeInfo.setScope(node, this._currentScope);
             const enclosingClass = ParseTreeUtils.getEnclosingClass(node);
             if (enclosingClass) {
                 // Lambdas create the same implicit __class__ closure as named functions.
@@ -521,16 +521,16 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                                 isInExceptSuite: this._isInExceptSuite,
                             };
                             symbol.addDeclaration(paramDeclaration);
-                            AnalyzerNodeInfo.setDeclaration(paramNode.d.name, paramDeclaration);
+                            this._nodeInfo.setDeclaration(paramNode.d.name, paramDeclaration);
                         }
                         this._createFlowAssignment(paramNode.d.name);
                         this.walk(paramNode.d.name);
-                        AnalyzerNodeInfo.setFlowNode(paramNode, this._currentFlowNode);
+                        this._nodeInfo.setFlowNode(paramNode, this._currentFlowNode);
                     }
                 });
                 // Walk the expression that make up the lambda body.
                 this.walk(node.d.expr);
-                AnalyzerNodeInfo.setCodeFlowExpressions(node, this._currentScopeCodeFlowExpressions);
+                this._nodeInfo.setCodeFlowExpressions(node, this._currentScopeCodeFlowExpressions);
             });
         });
         // We'll walk the child nodes in a deferred manner.
@@ -545,7 +545,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             const sortedArgs = ParseTreeUtils.getArgsByRuntimeOrder(node);
             sortedArgs.forEach((argNode) => {
                 if (this._currentFlowNode) {
-                    AnalyzerNodeInfo.setFlowNode(argNode, this._currentFlowNode);
+                    this._nodeInfo.setFlowNode(argNode, this._currentFlowNode);
                 }
                 this.walk(argNode);
             });
@@ -650,7 +650,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 isInExceptSuite: this._isInExceptSuite,
             };
             symbol.addDeclaration(paramDeclaration);
-            AnalyzerNodeInfo.setDeclaration(name, paramDeclaration);
+            this._nodeInfo.setDeclaration(name, paramDeclaration);
             if (typeParamsSeen.has(name.d.value)) {
                 this._addSyntaxError(localize_1.LocMessage.typeParameterExistingTypeParameter().format({ name: name.d.value }), name);
             }
@@ -663,7 +663,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 this.walk(param.d.defaultExpr);
             }
         });
-        AnalyzerNodeInfo.setScope(node, typeParamScope);
+        this._nodeInfo.setScope(node, typeParamScope);
         return false;
     }
     visitTypeAlias(node) {
@@ -672,7 +672,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         let typeParamScope;
         if (node.d.typeParams) {
             this.walk(node.d.typeParams);
-            typeParamScope = AnalyzerNodeInfo.getScope(node.d.typeParams);
+            typeParamScope = this._nodeInfo.getScope(node.d.typeParams);
         }
         const typeAliasDeclaration = {
             type: 4 /* DeclarationType.TypeAlias */,
@@ -688,7 +688,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             symbol.addDeclaration(typeAliasDeclaration);
         }
         // Stash the declaration in the parse node for later access.
-        AnalyzerNodeInfo.setDeclaration(node, typeAliasDeclaration);
+        this._nodeInfo.setDeclaration(node, typeAliasDeclaration);
         this._createAssignmentTargetFlowNodes(node.d.name, /* walkTargets */ true, /* unbound */ false);
         const prevScope = this._currentScope;
         this._currentScope = typeParamScope ?? this._currentScope;
@@ -857,7 +857,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             // Evaluate the operand expression.
             this.walk(node.d.rightExpr);
         });
-        const evaluationNode = ParseTreeUtils.getEvaluationNodeForAssignmentExpression(node);
+        const evaluationNode = ParseTreeUtils.getEvaluationNodeForAssignmentExpression(node, this._nodeInfo);
         if (!evaluationNode) {
             this._addSyntaxError(localize_1.LocMessage.assignmentExprContext(), node);
             this.walk(node.d.name);
@@ -867,7 +867,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             // because of the behavior defined in PEP 572. Targets of assignment
             // expressions don't bind to a list comprehension's scope but instead
             // bind to its containing scope.
-            const containerScope = AnalyzerNodeInfo.getScope(evaluationNode);
+            const containerScope = this._nodeInfo.getScope(evaluationNode);
             // If we're in a list comprehension (possibly nested), make sure that
             // local for targets don't collide with the target of the assignment
             // expression.
@@ -1071,10 +1071,10 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             this._targetFunctionDeclaration.returnStatements.push(node);
         }
         if (node.d.expr) {
-            AnalyzerNodeInfo.setFlowNode(node.d.expr, this._currentFlowNode);
+            this._nodeInfo.setFlowNode(node.d.expr, this._currentFlowNode);
             this.walk(node.d.expr);
         }
-        AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+        this._nodeInfo.setFlowNode(node, this._currentFlowNode);
         if (this._currentReturnTarget) {
             this._addAntecedent(this._currentReturnTarget, this._currentFlowNode);
         }
@@ -1100,15 +1100,15 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     }
     visitMemberAccess(node) {
         this.walk(node.d.leftExpr);
-        AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+        this._nodeInfo.setFlowNode(node, this._currentFlowNode);
         return false;
     }
     visitName(node) {
-        AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+        this._nodeInfo.setFlowNode(node, this._currentFlowNode);
         return false;
     }
     visitIndex(node) {
-        AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+        this._nodeInfo.setFlowNode(node, this._currentFlowNode);
         this.walk(node.d.leftExpr);
         // If we're within an 'Annotated' type annotation, set the flag.
         const wasInAnnotatedAnnotation = this._isInAnnotatedAnnotation;
@@ -1130,7 +1130,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             // Determine if the test condition is always true or always false. If so,
             // we can treat either the then or the else clause as unconditional.
             const constExprValue = StaticExpressions.evaluateStaticBoolLikeExpression(node.d.testExpr, this._fileInfo.executionEnvironment, this._fileInfo.definedConstants, this._typingImportAliases, this._sysImportAliases);
-            AnalyzerNodeInfo.setStaticConditionValue(node, constExprValue);
+            this._nodeInfo.setStaticConditionValue(node, constExprValue);
             this._bindConditional(node.d.testExpr, thenLabel, elseLabel);
             // Handle the if clause.
             this._currentFlowNode =
@@ -1369,7 +1369,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     }
     visitAwait(node) {
         // Make sure this is within an async lambda or function.
-        const execScopeNode = ParseTreeUtils.getExecutionScopeNode(node);
+        const execScopeNode = ParseTreeUtils.getExecutionScopeNode(node, this._nodeInfo);
         if (execScopeNode?.nodeType !== 31 /* ParseNodeType.Function */ || !execScopeNode.d.isAsync) {
             if (this._fileInfo.ipythonMode && execScopeNode?.nodeType === 36 /* ParseNodeType.Module */) {
                 // Top level await is allowed in ipython mode.
@@ -1466,7 +1466,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     this._potentialHiddenSymbols.set(symbolName, symbol);
                 }
             }
-            const importInfo = AnalyzerNodeInfo.getImportInfo(node.d.module);
+            const importInfo = this._nodeInfo.getImportInfo(node.d.module);
             (0, debug_1.assert)(importInfo !== undefined);
             if (symbol) {
                 this._createAliasDeclarationForMultipartImportName(node, node.d.alias, importInfo, symbol);
@@ -1489,8 +1489,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     visitImportFrom(node) {
         const typingSymbolsOfInterest = ['Final', 'ClassVar', 'Annotated'];
         const dataclassesSymbolsOfInterest = ['InitVar', 'KW_ONLY'];
-        const importInfo = AnalyzerNodeInfo.getImportInfo(node.d.module);
-        AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+        const importInfo = this._nodeInfo.getImportInfo(node.d.module);
+        this._nodeInfo.setFlowNode(node, this._currentFlowNode);
         let resolvedPath = uri_1.Uri.empty();
         if (importInfo && importInfo.isImportFound && !importInfo.isNativeLib) {
             resolvedPath = importInfo.resolvedUris[importInfo.resolvedUris.length - 1];
@@ -1630,7 +1630,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             node.d.imports.forEach((importSymbolNode) => {
                 const importedName = importSymbolNode.d.name.d.value;
                 const nameNode = importSymbolNode.d.alias || importSymbolNode.d.name;
-                AnalyzerNodeInfo.setFlowNode(importSymbolNode, this._currentFlowNode);
+                this._nodeInfo.setFlowNode(importSymbolNode, this._currentFlowNode);
                 const symbol = this._bindNameToScope(this._currentScope, nameNode);
                 if (symbol) {
                     // All import statements of the form `from . import x` treat x
@@ -1859,7 +1859,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._createNewScope(1 /* ScopeType.Comprehension */, this._getNonClassParentScope(), 
         /* proxyScope */ undefined, 
         /* chainedModuleLevelScopeLookup */ undefined, () => {
-            AnalyzerNodeInfo.setScope(node, this._currentScope);
+            this._nodeInfo.setScope(node, this._currentScope);
             const falseLabel = this._createBranchLabel();
             // We'll walk the forIfNodes list twice. The first time we'll
             // bind targets of for statements. The second time we'll walk
@@ -2197,7 +2197,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     }
     _createAliasDeclarationForMultipartImportName(node, importAlias, importInfo, symbol) {
         const firstNamePartValue = node.d.module.d.nameParts[0].d.value;
-        AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+        this._nodeInfo.setFlowNode(node, this._currentFlowNode);
         let uriOfFirstSubmodule;
         if (importInfo && importInfo.isImportFound && !importInfo.isNativeLib && importInfo.resolvedUris.length > 0) {
             uriOfFirstSubmodule = importInfo.resolvedUris[0];
@@ -2273,7 +2273,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         // See if there is import info for this part of the path. This allows us
         // to implicitly import all of the modules in a multi-part module name.
-        const implicitImportInfo = AnalyzerNodeInfo.getImportInfo(node.d.module.d.nameParts[0]);
+        const implicitImportInfo = this._nodeInfo.getImportInfo(node.d.module.d.nameParts[0]);
         if (implicitImportInfo && implicitImportInfo.resolvedUris.length) {
             newDecl.uri = implicitImportInfo.resolvedUris[0];
             newDecl.loadSymbolsFromPath = true;
@@ -2328,7 +2328,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     // is import info for this part of the path. This allows us to implicitly
                     // import all of the modules in a multi-part module name (e.g. "import a.b.c"
                     // imports "a" and "a.b" and "a.b.c").
-                    const implicitImportInfo = AnalyzerNodeInfo.getImportInfo(node.d.module.d.nameParts[i]);
+                    const implicitImportInfo = this._nodeInfo.getImportInfo(node.d.module.d.nameParts[i]);
                     if (implicitImportInfo && implicitImportInfo.resolvedUris.length) {
                         loaderActions.uri = implicitImportInfo.resolvedUris[i];
                         loaderActions.loadSymbolsFromPath = true;
@@ -2345,7 +2345,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     _walkStatementsAndReportUnreachable(statements) {
         let foundUnreachableStatement = false;
         for (const statement of statements) {
-            AnalyzerNodeInfo.setFlowNode(statement, this._currentFlowNode);
+            this._nodeInfo.setFlowNode(statement, this._currentFlowNode);
             if (!foundUnreachableStatement) {
                 foundUnreachableStatement = this._isCodeUnreachable();
             }
@@ -2366,7 +2366,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 // subtree, we need to create dummy scopes for them. The type analyzer
                 // depends on scopes being present.
                 if (!this._moduleSymbolOnly) {
-                    const dummyScopeGenerator = new DummyScopeGenerator(this._currentScope);
+                    const dummyScopeGenerator = new DummyScopeGenerator(this._currentScope, this._nodeInfo);
                     dummyScopeGenerator.walk(statement);
                 }
             }
@@ -2842,8 +2842,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         // introduced in except clauses. If there is no use the previous flow node
         // associated, use the previous flow node (applies in the del case).
         // Otherwise, the node will be evaluated as unbound at this point in the flow.
-        if (!unbound || AnalyzerNodeInfo.getFlowNode(node) === undefined) {
-            AnalyzerNodeInfo.setFlowNode(node, unbound ? prevFlowNode : this._currentFlowNode);
+        if (!unbound || this._nodeInfo.getFlowNode(node) === undefined) {
+            this._nodeInfo.setFlowNode(node, unbound ? prevFlowNode : this._currentFlowNode);
         }
     }
     _createFlowWildcardImport(node, names) {
@@ -2858,7 +2858,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             this._addExceptTargets(flowNode);
             this._currentFlowNode = flowNode;
         }
-        AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+        this._nodeInfo.setFlowNode(node, this._currentFlowNode);
     }
     _createFlowExhaustedMatch(node) {
         if (!this._isCodeUnreachable()) {
@@ -2871,7 +2871,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             };
             this._currentFlowNode = flowNode;
         }
-        AnalyzerNodeInfo.setAfterFlowNode(node, this._currentFlowNode);
+        this._nodeInfo.setAfterFlowNode(node, this._currentFlowNode);
     }
     _isCodeUnreachable() {
         return !!(this._currentFlowNode.flags &
@@ -3063,7 +3063,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         // state so that hits from later cells are correctly marked.
         return (name, context) => {
             for (const moduleNode of cellChainIndex.getLaterModuleNodes(fileUri) ?? []) {
-                const moduleScope = AnalyzerNodeInfo.getScope(moduleNode);
+                const moduleScope = this._nodeInfo.getScope(moduleNode);
                 if (!moduleScope) {
                     continue;
                 }
@@ -3335,8 +3335,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     _isKnownAnnotation(typeAnnotation, name, importAliases, symbolAliases) {
         let annotationNode = typeAnnotation;
         // Is this a quoted annotation?
-        if (annotationNode.nodeType === 48 /* ParseNodeType.StringList */ && annotationNode.d.annotation) {
-            annotationNode = annotationNode.d.annotation;
+        if (annotationNode.nodeType === 48 /* ParseNodeType.StringList */) {
+            annotationNode = this._nodeInfo.getStringAnnotation(annotationNode) ?? annotationNode;
         }
         if (annotationNode.nodeType === 38 /* ParseNodeType.Name */) {
             const alias = symbolAliases.get(annotationNode.d.value);
@@ -3408,8 +3408,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         let classVarTypeNode;
         while (typeAnnotation) {
             // Is this a quoted annotation?
-            if (typeAnnotation.nodeType === 48 /* ParseNodeType.StringList */ && typeAnnotation.d.annotation) {
-                typeAnnotation = typeAnnotation.d.annotation;
+            if (typeAnnotation.nodeType === 48 /* ParseNodeType.StringList */) {
+                typeAnnotation = this._nodeInfo.getStringAnnotation(typeAnnotation) ?? typeAnnotation;
             }
             if (typeAnnotation.nodeType === 27 /* ParseNodeType.Index */ &&
                 typeAnnotation.d.items.length > 0 &&
@@ -3508,7 +3508,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 }
             }
         }
-        const classScope = AnalyzerNodeInfo.getScope(classNode);
+        const classScope = this._nodeInfo.getScope(classNode);
         (0, debug_1.assert)(classScope !== undefined);
         return {
             classNode,
@@ -3715,7 +3715,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         if (symbol) {
             symbol.addDeclaration(specialBuiltInClassDeclaration);
         }
-        AnalyzerNodeInfo.setDeclaration(node, specialBuiltInClassDeclaration);
+        this._nodeInfo.setDeclaration(node, specialBuiltInClassDeclaration);
         return true;
     }
     _deferBinding(callback) {
@@ -3759,7 +3759,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         if (node.d.expr) {
             this.walk(node.d.expr);
         }
-        AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
+        this._nodeInfo.setFlowNode(node, this._currentFlowNode);
     }
     _getUniqueFlowNodeId() {
         this._codeFlowComplexity += flowNodeComplexityContribution;
@@ -3838,16 +3838,17 @@ exports.ReturnFinder = ReturnFinder;
 // will still evaluate these types, and it depends on the presence
 // of a scope.
 class DummyScopeGenerator extends parseTreeWalker_1.ParseTreeWalker {
-    constructor(currentScope) {
+    constructor(currentScope, _nodeInfo) {
         super();
+        this._nodeInfo = _nodeInfo;
         this._currentScope = currentScope;
     }
     visitClass(node) {
         const newScope = this._createNewScope(3 /* ScopeType.Class */, () => {
             this.walk(node.d.suite);
         });
-        if (!AnalyzerNodeInfo.getScope(node)) {
-            AnalyzerNodeInfo.setScope(node, newScope);
+        if (!this._nodeInfo.getScope(node)) {
+            this._nodeInfo.setScope(node, newScope);
         }
         return false;
     }
@@ -3855,8 +3856,8 @@ class DummyScopeGenerator extends parseTreeWalker_1.ParseTreeWalker {
         const newScope = this._createNewScope(2 /* ScopeType.Function */, () => {
             this.walk(node.d.suite);
         });
-        if (!AnalyzerNodeInfo.getScope(node)) {
-            AnalyzerNodeInfo.setScope(node, newScope);
+        if (!this._nodeInfo.getScope(node)) {
+            this._nodeInfo.setScope(node, newScope);
         }
         return false;
     }