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

package/dist/analyzer/sourceEnumerator.js

@@ -11,6 +11,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceEnumerator = void 0;
 const uriUtils_1 = require("../common/uri/uriUtils");
 const envMarkers = [['bin', 'activate'], ['Scripts', 'activate'], ['pyvenv.cfg'], ['conda-meta']];
+// Thresholds that define a "slow" enumeration. Kept at module scope so both the
+// long-operation console warning and the `wasSlowEnumeration` getter derive
+// "slow" from the same condition rather than from whether the warning was logged.
+const longOperationLimitInMs = 10000;
+const nFilesToSuggestSubfolder = 50;
+// Configuration file names that mark a directory as a candidate "nearest
+// configuration" root. These are collected during the normal source-file walk
+// (see `getDiscoveredConfigFiles`) so Pylance can create virtual workspaces
+// without performing a second traversal. Whether a `pyproject.toml` actually
+// qualifies (i.e. has a `[tool.pyright]` section) is decided by the caller.
+const pyrightConfigFileName = 'pyrightconfig.json';
+const pyprojectTomlFileName = 'pyproject.toml';
 class SourceEnumerator {
     constructor(include, _excludes, _autoExcludeVenv, _fs, _console) {
         this._excludes = _excludes;
@@ -29,12 +41,36 @@ class SourceEnumerator {
         // potentially spanning multiple include roots, so Pylance can later filter
         // workspace indexing against the full discovered set.
         this._symlinkedDirectoryRoots = new Map();
+        // Candidate "nearest configuration" files (pyrightconfig.json / pyproject.toml)
+        // encountered during the walk, keyed by file uri. Surfaced to Pylance so it can
+        // create virtual workspaces without re-walking the tree. Directories that are
+        // auto-excluded (venvs) or excluded by config are never read, so configs under
+        // them are naturally skipped.
+        this._discoveredConfigFiles = new Map();
         this._includesToExplore = include.slice(0).reverse();
+        // Resolve include roots to their real paths up front (an include root may
+        // itself be a symlink) so we can bound enumeration to directories that
+        // physically live under one of the workspace's include roots.
+        this._includeRoots = include.map((spec) => (0, uriUtils_1.tryRealpath)(_fs, spec.wildcardRoot) ?? spec.wildcardRoot);
         this._console.log(`Searching for source files`);
     }
+    get wasSlowEnumeration() {
+        // Derived from the elapsed-time / file-count threshold rather than from
+        // `_loggedLongOperationError` so "slow" stays independent of whether the
+        // console warning was logged. Sibling changes that alter the logging
+        // behavior (e.g. suppressing repeats) then can't silently disable this.
+        return this._isSlowEnumeration();
+    }
     getSymlinkedDirectoryRoots() {
         return Array.from(this._symlinkedDirectoryRoots.values());
     }
+    // Returns the configuration files (pyrightconfig.json / pyproject.toml)
+    // discovered during enumeration. The caller decides which ones actually
+    // qualify as a configuration root (e.g. a pyproject.toml must contain a
+    // [tool.pyright] section).
+    getDiscoveredConfigFiles() {
+        return Array.from(this._discoveredConfigFiles.values());
+    }
     // Enumerates as many files as possible within the specified
     // time limit and returns all matching files.
     enumerate(timeLimitInMs) {
@@ -52,11 +88,9 @@ class SourceEnumerator {
         }
         this._elapsedTimeInMs += Date.now() - startTime;
         if (!this._loggedLongOperationError) {
-            const longOperationLimitInMs = 10000;
-            const nFilesToSuggestSubfolder = 50;
             // If this is taking a long time, log an error to help the user
             // diagnose and mitigate the problem.
-            if (this._elapsedTimeInMs >= longOperationLimitInMs && this._numFilesVisited >= nFilesToSuggestSubfolder) {
+            if (this._isSlowEnumeration()) {
                 this._console.error(`Enumeration of workspace source files is taking longer than ${longOperationLimitInMs * 0.001} seconds.\n` +
                     'This may be because:\n' +
                     '* You have opened your home directory or entire hard drive as a workspace\n' +
@@ -76,6 +110,9 @@ class SourceEnumerator {
             isComplete: this._isComplete,
         };
     }
+    _isSlowEnumeration() {
+        return this._elapsedTimeInMs >= longOperationLimitInMs && this._numFilesVisited >= nFilesToSuggestSubfolder;
+    }
     _recordSymlinkedDirectoryRoot(root) {
         for (const existingRoot of this._symlinkedDirectoryRoots.values()) {
             if (root.isChild(existingRoot)) {
@@ -117,6 +154,14 @@ class SourceEnumerator {
             return;
         }
         this._seenDirs.add(realDirPath.key);
+        // A symlink that resolves outside every include root is not a recursive
+        // cycle (so `_seenDirs` won't catch it), but following it would pull in
+        // directories that don't belong to the workspace -- in the worst case a
+        // link to filesystem root "/" would enumerate the entire disk (issue #6006).
+        // Skip silently: external symlinks are legitimate and shouldn't be noisy.
+        if (this._includeRoots.length > 0 && !this._includeRoots.some((root) => realDirPath.startsWith(root))) {
+            return;
+        }
         if (this._autoExcludeVenv) {
             if (envMarkers.some((f) => this._fs.existsSync(dir.uri.resolvePaths(...f)))) {
                 this._autoExcludeDirs.push(dir.uri);
@@ -133,6 +178,15 @@ class SourceEnumerator {
                 this._numFilesVisited++;
                 this._matches.set(file.key, file);
             }
+            // Collect candidate configuration files. They are not `.py`/`.pyi`, so they
+            // never match include specs, but we still honor `exclude` specs: skip any
+            // config file explicitly excluded by the user (directory-level excludes and
+            // venv auto-exclusion already prevent us from reading excluded directories).
+            const fileName = file.fileName;
+            if ((fileName === pyrightConfigFileName || fileName === pyprojectTomlFileName) &&
+                !uriUtils_1.FileSpec.isInPath(file, this._excludes)) {
+                this._discoveredConfigFiles.set(file.key, file);
+            }
         }
         for (const subDir of directories.slice().reverse()) {
             if (subDir.matchesRegex(dir.includeRegExp) || dir.hasDirectoryWildcard) {

package/dist/analyzer/sourceEnumerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"sourceEnumerator.js","sourceRoot":"","sources":["../../../../../src/analyzer/sourceEnumerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sourceEnumerator.js","sourceRoot":"","sources":["../../../../../src/analyzer/sourceEnumerator.ts"],"names":[],"mappings":"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"}

package/dist/analyzer/sourceFile.d.ts

@@ -6,11 +6,14 @@ import { FileSystem } from '../common/fileSystem';
 import { LogTracker } from '../common/logTracker';
 import { ServiceProvider } from '../common/serviceProvider';
 import '../common/serviceProviderExtensions';
+import * as StringUtils from '../common/stringUtils';
 import { TextRange } from '../common/textRange';
 import { TextRangeCollection } from '../common/textRangeCollection';
 import { Uri } from '../common/uri/uri';
-import { ParseFileResults, ParserOutput } from '../parser/parser';
+import { ModuleNode } from '../parser/parseNodes';
+import { ParseFileResults, ParseOptions, ParserOutput } from '../parser/parser';
 import { ImportLookup } from './analyzerFileInfo';
+import * as AnalyzerNodeInfo from './analyzerNodeInfo';
 import { CellChainIndexProvider } from './cellChainIndex';
 import { CircularDependency } from './circularDependency';
 import { ImportResolver } from './importResolver';
@@ -25,6 +28,8 @@ export declare enum IPythonMode {
 }
 export interface SourceFileEditMode {
     readonly isEditMode: boolean;
+    readonly isClonedProgram?: boolean;
+    readonly analysisContextOwner?: object;
 }
 export declare class SourceFile {
     readonly serviceProvider: ServiceProvider;
@@ -68,9 +73,9 @@ export declare class SourceFile {
     getCheckTime(): number | undefined;
     restore(): string | undefined;
     didContentsChangeOnDisk(): boolean;
-    dropParseAndBindInfo(): void;
+    dropParseAndBindInfo(): ModuleNode | undefined;
     markDirty(): void;
-    markReanalysisRequired(forceRebinding: boolean): void;
+    markReanalysisRequired(forceRebinding: boolean, nodeInfoReader: AnalyzerNodeInfo.AnalyzerNodeInfoReader): void;
     getFileContentsVersion(): number;
     getClientVersion(): number | undefined;
     getSemanticVersion(): number;
@@ -99,17 +104,18 @@ export declare class SourceFile {
     isNoCircularDependencyConfirmed(): boolean;
     setHitMaxImportDepth(maxImportDepth: number): void;
     parse(configOptions: ConfigOptions, importResolver: ImportResolver, content?: string): boolean;
-    bind(configOptions: ConfigOptions, importLookup: ImportLookup, builtinsScope: Scope | undefined, futureImports: Set<string>, cellChainIndex: CellChainIndexProvider | undefined): void;
-    check(configOptions: ConfigOptions, importLookup: ImportLookup, importResolver: ImportResolver, evaluator: TypeEvaluator, dependentFiles?: ParserOutput[]): void;
+    bind(configOptions: ConfigOptions, importLookup: ImportLookup, builtinsScope: Scope | undefined, futureImports: Set<string>, cellChainIndex: CellChainIndexProvider | undefined, nodeInfoContext: AnalyzerNodeInfo.AnalyzerNodeInfoContext): boolean;
+    check(configOptions: ConfigOptions, importLookup: ImportLookup, importResolver: ImportResolver, evaluator: TypeEvaluator, dependentFiles: ParserOutput[] | undefined, nodeInfoReader: AnalyzerNodeInfo.AnalyzerNodeInfoReader): void;
     test_enableIPythonMode(enable: boolean): void;
     protected createDiagnosticSink(): DiagnosticSink;
     protected createTextRangeDiagnosticSink(lines: TextRangeCollection<TextRange>): TextRangeDiagnosticSink;
+    protected readFileContents(): string;
+    protected parseFileContents(fileContents: string, parseOptions: ParseOptions, diagSink: DiagnosticSink, contentHash: StringUtils.StringFingerprint): ParseFileResults;
     private _makeFileId;
     private _recomputeDiagnostics;
     private _cachePreEditState;
     private _addTaskListDiagnostics;
     private _buildFileInfo;
-    private _cleanParseTreeIfRequired;
     private _resolveImports;
     private _getPathForLogging;
     private _parseFile;

package/dist/analyzer/sourceFile.js

@@ -68,7 +68,6 @@ const AnalyzerNodeInfo = __importStar(require("./analyzerNodeInfo"));
 const binder_1 = require("./binder");
 const checker_1 = require("./checker");
 const CommentUtils = __importStar(require("./commentUtils"));
-const parseTreeCleaner_1 = require("./parseTreeCleaner");
 const testWalker_1 = require("./testWalker");
 // Limit the number of import cycles tracked per source file.
 const _maxImportCyclesPerFile = 4;
@@ -98,14 +97,11 @@ class WriteableData {
         // Number that is incremented every time semantic of the file
         // might have changed.
         this.semanticVersion = 0;
-        // Length and hash of the file the last time it was read from disk.
+        // Length and fingerprint of the latest file contents supplied by disk or the client.
         this.lastFileContentLength = undefined;
         this.lastFileContentHash = undefined;
         // Version of file contents that have been analyzed.
         this.analyzedFileContentsVersion = -1;
-        // Do we need to walk the parse tree and clean
-        // the binder information hanging from it?
-        this.parseTreeNeedsCleaning = false;
         // Reentrancy check for binding and checking.
         this.isBindingInProgress = false;
         this.isCheckingInProgress = false;
@@ -129,6 +125,7 @@ class WriteableData {
         this.isBindingNeeded = true;
         // Do we have valid diagnostic results from a checking pass?
         this.isCheckingNeeded = true;
+        this.importInfo = [];
         // True if the file appears to have been deleted.
         this.isFileDeleted = false;
         // Empty
@@ -143,12 +140,11 @@ class WriteableData {
  isCheckingNeeded=${this.isCheckingNeeded},
  isFileDeleted=${this.isFileDeleted},
  hitMaxImportDepth=${this.hitMaxImportDepth},
- parseTreeNeedsCleaning=${this.parseTreeNeedsCleaning},
  fileContentsVersion=${this.fileContentsVersion},
  analyzedFileContentsVersion=${this.analyzedFileContentsVersion},
  clientDocumentVersion=${this.clientDocumentVersion},
  lastFileContentLength=${this.lastFileContentLength},
- lastFileContentHash=${this.lastFileContentHash},
+ lastFileContentHash=${JSON.stringify(this.lastFileContentHash)},
  typeIgnoreAll=${this.typeIgnoreAll},
  imports=${this.imports?.length},
  builtinsImport=${this.builtinsImport?.importName},
@@ -307,7 +303,7 @@ class SourceFile {
         if (this._writableData.lastFileContentLength === undefined) {
             return true;
         }
-        // Read in the latest file contents and see if the hash matches
+        // Read in the latest file contents and see if the fingerprint matches
         // that of the previous contents.
         try {
             // Read the file's contents.
@@ -316,7 +312,9 @@ class SourceFile {
                 if (fileContents.length !== this._writableData.lastFileContentLength) {
                     return true;
                 }
-                if (StringUtils.hashString(fileContents) !== this._writableData.lastFileContentHash) {
+                const contentHash = StringUtils.getStringFingerprint(fileContents);
+                if (!this._writableData.lastFileContentHash ||
+                    !StringUtils.areStringFingerprintsEqual(contentHash, this._writableData.lastFileContentHash)) {
                     return true;
                 }
             }
@@ -337,16 +335,20 @@ class SourceFile {
         // If we are actively binding or checking this file, we can't
         // safely drop parse and binding info.
         if (this._writableData.isBindingInProgress || this._writableData.isCheckingInProgress) {
-            return;
+            return undefined;
         }
         this._fireFileDirtyEvent();
+        const parseTree = this._writableData.parserOutput?.parseTree;
         this._writableData.parserOutput = undefined;
         this._writableData.tokenizerLines = undefined;
         this._writableData.tokenizerOutput = undefined;
         this._writableData.parsedFileContents = undefined;
+        this._writableData.parsedFileContentsHash = undefined;
         this._writableData.moduleSymbolTable = undefined;
         this._writableData.isBindingNeeded = true;
+        this._writableData.importInfo = [];
         this._writableData.imports = [];
+        return parseTree;
     }
     markDirty() {
         this._writableData.fileContentsVersion++;
@@ -358,7 +360,7 @@ class SourceFile {
         this._writableData.lineCount = undefined;
         this._fireFileDirtyEvent();
     }
-    markReanalysisRequired(forceRebinding) {
+    markReanalysisRequired(forceRebinding, nodeInfoReader) {
         // Keep the parse info, but reset the analysis to the beginning.
         this._writableData.semanticVersion++;
         this._writableData.isCheckingNeeded = true;
@@ -367,12 +369,12 @@ class SourceFile {
         // we need to rebind because a dependent import may have changed.
         if (this._writableData.parserOutput) {
             if (this._writableData.parserOutput.containsWildcardImport ||
-                AnalyzerNodeInfo.getDunderAllInfo(this._writableData.parserOutput.parseTree) !== undefined ||
+                AnalyzerNodeInfo.getDunderAllInfo(this._writableData.parserOutput.parseTree, nodeInfoReader) !==
+                    undefined ||
                 forceRebinding) {
                 // We don't need to rebuild index data since wildcard
                 // won't affect user file indices. User file indices
                 // don't contain import alias info.
-                this._writableData.parseTreeNeedsCleaning = true;
                 this._writableData.isBindingNeeded = true;
                 this._writableData.moduleSymbolTable = undefined;
             }
@@ -412,7 +414,7 @@ class SourceFile {
                     `which exceeds the maximum supported file size of ${exports.maxSourceFileSize}`);
                 throw new Error('File larger than max');
             }
-            return this.fileSystem.readFileSync(this._uri, 'utf8');
+            return this.readFileContents();
         }
         catch (error) {
             return undefined;
@@ -431,10 +433,11 @@ class SourceFile {
         else {
             this._writableData.clientDocumentVersion = version;
             this._writableData.clientDocumentContents = contents;
-            const contentsHash = StringUtils.hashString(contents);
+            const contentsHash = StringUtils.getStringFingerprint(contents);
             // Have the contents of the file changed?
             if (contents.length !== this._writableData.lastFileContentLength ||
-                contentsHash !== this._writableData.lastFileContentHash) {
+                !this._writableData.lastFileContentHash ||
+                !StringUtils.areStringFingerprintsEqual(contentsHash, this._writableData.lastFileContentHash)) {
                 this.markDirty();
             }
             this._writableData.lastFileContentLength = contents.length;
@@ -473,7 +476,8 @@ class SourceFile {
         // Otherwise re-tokenize the contents on demand.
         const tokenizeContents = this._tokenizeContents.bind(this);
         const parsedFileContents = this._writableData.parsedFileContents;
-        const contentHash = this._writableData.lastFileContentHash || StringUtils.hashString(this._writableData.parsedFileContents);
+        const contentHash = this._writableData.parsedFileContentsHash ??
+            StringUtils.getStringFingerprint(this._writableData.parsedFileContents);
         let tokenizerOutput = this._writableData.tokenizerOutput;
         return {
             contentHash,
@@ -531,6 +535,7 @@ class SourceFile {
             }
             const diagSink = this.createDiagnosticSink();
             let fileContents = this.getOpenFileContents();
+            let contentHash = fileContents !== undefined ? this._writableData.lastFileContentHash : undefined;
             if (fileContents === undefined) {
                 try {
                     const startTime = timing_1.timingStats.readFileTime.totalTime;
@@ -540,27 +545,31 @@ class SourceFile {
                         if (fileContents === undefined) {
                             throw new Error("Can't get file content");
                         }
-                        // Remember the length and hash for comparison purposes.
+                        // Remember the length and fingerprint for comparison purposes.
                         this._writableData.lastFileContentLength = fileContents.length;
-                        this._writableData.lastFileContentHash = StringUtils.hashString(fileContents);
+                        contentHash = StringUtils.getStringFingerprint(fileContents);
+                        this._writableData.lastFileContentHash = contentHash;
                     });
                     logState.add(`fs read ${timing_1.timingStats.readFileTime.totalTime - startTime}ms`);
                 }
                 catch (error) {
                     diagSink.addError(`Source file could not be read`, (0, textRange_1.getEmptyRange)());
                     fileContents = '';
+                    contentHash = StringUtils.getStringFingerprint(fileContents);
                     if (!this.fileSystem.existsSync(this._uri)) {
                         this._writableData.isFileDeleted = true;
                     }
                 }
             }
             try {
+                contentHash ?? (contentHash = StringUtils.getStringFingerprint(fileContents));
                 // Parse the token stream, building the abstract syntax tree.
-                const parseFileResults = this._parseFile(configOptions, this._uri, fileContents, this._ipythonMode !== IPythonMode.None, diagSink);
+                const parseFileResults = this._parseFile(configOptions, this._uri, fileContents, this._ipythonMode !== IPythonMode.None, diagSink, contentHash);
                 (0, debug_1.assert)(parseFileResults !== undefined && parseFileResults.tokenizerOutput !== undefined);
                 this._writableData.parserOutput = parseFileResults.parserOutput;
                 this._writableData.tokenizerLines = parseFileResults.tokenizerOutput.lines;
                 this._writableData.parsedFileContents = fileContents;
+                this._writableData.parsedFileContentsHash = parseFileResults.contentHash;
                 this._writableData.typeIgnoreLines = parseFileResults.tokenizerOutput.typeIgnoreLines;
                 this._writableData.typeIgnoreAll = parseFileResults.tokenizerOutput.typeIgnoreAll;
                 this._writableData.pyrightIgnoreLines = parseFileResults.tokenizerOutput.pyrightIgnoreLines;
@@ -575,6 +584,7 @@ class SourceFile {
                     const importResult = this._resolveImports(importResolver, parseFileResults.parserOutput.importedModules, execEnvironment);
                     this._writableData.imports = importResult.imports;
                     this._writableData.builtinsImport = importResult.builtinsImportResult;
+                    this._writableData.importInfo = importResult.importInfo;
                     this._writableData.parseDiagnostics = diagSink.fetchAndClear();
                     this._writableData.taskListDiagnostics = [];
                     this._addTaskListDiagnostics(configOptions.taskListTokens, parseFileResults, this._writableData.taskListDiagnostics);
@@ -599,9 +609,12 @@ class SourceFile {
                 }));
                 // Create dummy parse results.
                 this._writableData.parsedFileContents = '';
+                this._writableData.parsedFileContentsHash = StringUtils.getStringFingerprint('');
                 this._writableData.tokenizerLines = new textRangeCollection_1.TextRangeCollection([]);
+                const parseTree = parseNodes_1.ModuleNode.create({ start: 0, length: 0 });
                 this._writableData.parserOutput = {
-                    parseTree: parseNodes_1.ModuleNode.create({ start: 0, length: 0 }),
+                    parseTree,
+                    stringAnnotations: (0, parseNodes_1.getParserStringAnnotationInfo)(parseTree),
                     importedModules: [],
                     futureImports: new Set(),
                     containsWildcardImport: false,
@@ -622,6 +635,7 @@ class SourceFile {
                 };
                 this._writableData.imports = undefined;
                 this._writableData.builtinsImport = undefined;
+                this._writableData.importInfo = [];
                 const diagSink = this.createDiagnosticSink();
                 diagSink.addError(localize_1.LocMessage.internalParseError().format({
                     file: this.getUri().toUserVisibleString(),
@@ -635,38 +649,44 @@ class SourceFile {
             this._writableData.analyzedFileContentsVersion = this._writableData.fileContentsVersion;
             this._writableData.isBindingNeeded = true;
             this._writableData.isCheckingNeeded = true;
-            this._writableData.parseTreeNeedsCleaning = false;
             this._writableData.hitMaxImportDepth = undefined;
             this._recomputeDiagnostics(configOptions);
             return true;
         });
     }
-    bind(configOptions, importLookup, builtinsScope, futureImports, cellChainIndex) {
+    bind(configOptions, importLookup, builtinsScope, futureImports, cellChainIndex, nodeInfoContext) {
         (0, debug_1.assert)(!this.isParseRequired(), 'Bind called before parsing');
         (0, debug_1.assert)(this.isBindingRequired(), 'Bind called unnecessarily');
         (0, debug_1.assert)(!this._writableData.isBindingInProgress, 'Bind called while binding in progress');
         (0, debug_1.assert)(this._writableData.parserOutput !== undefined, 'Parse results not available');
         return this._logTracker.log(`binding: ${this._getPathForLogging(this._uri)}`, () => {
+            let bound = false;
             try {
                 // Perform name binding.
                 timing_1.timingStats.bindTime.timeOperation(() => {
-                    this._cleanParseTreeIfRequired();
+                    const parseTree = this._writableData.parserOutput.parseTree;
+                    const bindingSession = nodeInfoContext.beginWrite(parseTree);
+                    const nodeInfo = AnalyzerNodeInfo.createAnalyzerNodeInfoAccessor(bindingSession, bindingSession);
+                    this._writableData.importInfo.forEach((record) => nodeInfo.setImportInfo(record.node, record.importResult));
                     const fileInfo = this._buildFileInfo(configOptions, importLookup, builtinsScope, futureImports);
-                    AnalyzerNodeInfo.setFileInfo(this._writableData.parserOutput.parseTree, fileInfo);
-                    const binder = new binder_1.Binder(fileInfo, configOptions.indexGenerationMode, cellChainIndex);
+                    nodeInfo.setFileInfo(parseTree, fileInfo);
+                    const binder = new binder_1.Binder(fileInfo, configOptions.indexGenerationMode, cellChainIndex, nodeInfo);
                     this._writableData.isBindingInProgress = true;
-                    binder.bindModule(this._writableData.parserOutput.parseTree);
+                    binder.bindModule(parseTree);
+                    const bindDiagnostics = fileInfo.diagnosticSink.fetchAndClear();
+                    const moduleScope = nodeInfo.getScope(parseTree);
+                    (0, debug_1.assert)(moduleScope !== undefined, 'Module scope not returned by binder');
+                    nodeInfoContext.publish(bindingSession);
+                    this._writableData.moduleSymbolTable = moduleScope.symbolTable;
+                    this._writableData.bindDiagnostics = bindDiagnostics;
                     // If we're in "test mode" (used for unit testing), run an additional
                     // "test walker" over the parse tree to validate its internal consistency.
                     if (configOptions.internalTestMode) {
                         const testWalker = new testWalker_1.TestWalker();
                         testWalker.walk(this._writableData.parserOutput.parseTree);
                     }
-                    this._writableData.bindDiagnostics = fileInfo.diagnosticSink.fetchAndClear();
-                    const moduleScope = AnalyzerNodeInfo.getScope(this._writableData.parserOutput.parseTree);
-                    (0, debug_1.assert)(moduleScope !== undefined, 'Module scope not returned by binder');
-                    this._writableData.moduleSymbolTable = moduleScope.symbolTable;
                 });
+                bound = true;
             }
             catch (e) {
                 const message = (e.stack ? e.stack.toString() : undefined) ||
@@ -689,12 +709,13 @@ class SourceFile {
                 this._writableData.isBindingInProgress = false;
             }
             // Prepare for the next stage of the analysis.
-            this._writableData.isCheckingNeeded = true;
+            this._writableData.isCheckingNeeded = bound;
             this._writableData.isBindingNeeded = false;
             this._recomputeDiagnostics(configOptions);
+            return bound;
         });
     }
-    check(configOptions, importLookup, importResolver, evaluator, dependentFiles) {
+    check(configOptions, importLookup, importResolver, evaluator, dependentFiles, nodeInfoReader) {
         (0, debug_1.assert)(!this.isParseRequired(), `Check called before parsing: state=${this._writableData.debugPrint()}`);
         (0, debug_1.assert)(!this.isBindingRequired(), `Check called before binding: state=${this._writableData.debugPrint()}`);
         (0, debug_1.assert)(!this._writableData.isBindingInProgress, 'Check called while binding in progress');
@@ -705,11 +726,12 @@ class SourceFile {
             try {
                 timing_1.timingStats.typeCheckerTime.timeOperation(() => {
                     const checkDuration = new timing_1.Duration();
-                    const checker = new checker_1.Checker(importResolver, evaluator, this._writableData.parserOutput, dependentFiles);
+                    const nodeInfo = AnalyzerNodeInfo.createAnalyzerNodeInfoAccessor(nodeInfoReader);
+                    const checker = new checker_1.Checker(importResolver, evaluator, this._writableData.parserOutput, dependentFiles, nodeInfo);
                     this._writableData.isCheckingInProgress = true;
                     checker.check();
                     this._writableData.isCheckingNeeded = false;
-                    const fileInfo = AnalyzerNodeInfo.getFileInfo(this._writableData.parserOutput.parseTree);
+                    const fileInfo = nodeInfo.getFileInfo(this._writableData.parserOutput.parseTree);
                     this._writableData.checkerDiagnostics = fileInfo.diagnosticSink.fetchAndClear();
                     this._writableData.checkTime = checkDuration.getDurationInMilliseconds();
                 });
@@ -754,6 +776,12 @@ class SourceFile {
     createTextRangeDiagnosticSink(lines) {
         return new diagnosticSink_1.TextRangeDiagnosticSink(lines);
     }
+    readFileContents() {
+        return this.fileSystem.readFileSync(this._uri, 'utf8');
+    }
+    parseFileContents(fileContents, parseOptions, diagSink, contentHash) {
+        return new parser_1.Parser().parseSourceFile(fileContents, parseOptions, diagSink, contentHash);
+    }
     // Creates a short string that can be used to uniquely identify
     // this file from all other files. It is used in the type evaluator
     // to distinguish between types that are defined in different files
@@ -1072,17 +1100,9 @@ class SourceFile {
         };
         return fileInfo;
     }
-    _cleanParseTreeIfRequired() {
-        if (this._writableData.parserOutput) {
-            if (this._writableData.parseTreeNeedsCleaning) {
-                const cleanerWalker = new parseTreeCleaner_1.ParseTreeCleanerWalker(this._writableData.parserOutput.parseTree);
-                cleanerWalker.clean();
-                this._writableData.parseTreeNeedsCleaning = false;
-            }
-        }
-    }
     _resolveImports(importResolver, moduleImports, execEnv) {
         const imports = [];
+        const importInfo = [];
         const resolveAndAddIfNotSelf = (nameParts, skipMissingImport = false) => {
             const importResult = importResolver.resolveImport(this._uri, execEnv, {
                 leadingDots: 0,
@@ -1121,7 +1141,7 @@ class SourceFile {
             // name node in the parse tree so we can access it later
             // (for hover and definition support).
             if (moduleImport.nameParts.length === moduleImport.nameNode.d.nameParts.length) {
-                AnalyzerNodeInfo.setImportInfo(moduleImport.nameNode, importResult);
+                importInfo.push({ node: moduleImport.nameNode, importResult });
             }
             else {
                 // For implicit imports of higher-level modules within a multi-part
@@ -1130,18 +1150,22 @@ class SourceFile {
                 // case, store the import info on the name part node.
                 (0, debug_1.assert)(moduleImport.nameParts.length > 0);
                 (0, debug_1.assert)(moduleImport.nameParts.length - 1 < moduleImport.nameNode.d.nameParts.length);
-                AnalyzerNodeInfo.setImportInfo(moduleImport.nameNode.d.nameParts[moduleImport.nameParts.length - 1], importResult);
+                importInfo.push({
+                    node: moduleImport.nameNode.d.nameParts[moduleImport.nameParts.length - 1],
+                    importResult,
+                });
             }
         }
         return {
             imports,
             builtinsImportResult,
+            importInfo,
         };
     }
     _getPathForLogging(fileUri) {
         return (0, logTracker_1.getPathForLogging)(this.fileSystem, fileUri);
     }
-    _parseFile(configOptions, fileUri, fileContents, useNotebookMode, diagSink) {
+    _parseFile(configOptions, fileUri, fileContents, useNotebookMode, diagSink, contentHash) {
         // Use the configuration options to determine the environment zin which
         // this source file will be executed.
         const execEnvironment = configOptions.findExecEnvironment(fileUri);
@@ -1153,8 +1177,7 @@ class SourceFile {
         parseOptions.pythonVersion = execEnvironment.pythonVersion;
         parseOptions.skipFunctionAndClassBody = configOptions.indexGenerationMode ?? false;
         // Parse the token stream, building the abstract syntax tree.
-        const parser = new parser_1.Parser();
-        return parser.parseSourceFile(fileContents, parseOptions, diagSink);
+        return this.parseFileContents(fileContents, parseOptions, diagSink, contentHash);
     }
     _tokenizeContents(fileContents, contentHash) {
         const tokenizer = new tokenizer_1.Tokenizer();
@@ -1162,7 +1185,8 @@ class SourceFile {
         // When the file is open, cache the tokenizer results.
         // Because the tokenizer is lazy, ensure that the state remains unchanged before caching its output.
         if (this._writableData.clientDocumentContents !== undefined &&
-            this._writableData.lastFileContentHash === contentHash) {
+            this._writableData.lastFileContentHash &&
+            StringUtils.areStringFingerprintsEqual(this._writableData.lastFileContentHash, contentHash)) {
             this._writableData.tokenizerOutput = output;
             // Replace the existing tokenizerLines with the newly-returned
             // version. They should have the same contents, but we want to use