@zzzen/pyright-internal 1.2.0-dev.20250413 → 1.2.0-dev.20250802

package/dist/analyzer/program.d.ts

@@ -8,7 +8,7 @@ import { EditableProgram, ProgramView } from '../common/extensibility';
 import { LogTracker } from '../common/logTracker';
 import { ServiceProvider } from '../common/serviceProvider';
 import '../common/serviceProviderExtensions';
-import { Range } from '../common/textRange';
+import { Range, TextRange } from '../common/textRange';
 import { Uri } from '../common/uri/uri';
 import { ParseFileResults, ParserOutput } from '../parser/parser';
 import { RequiringAnalysisCount } from './analysis';
@@ -16,7 +16,7 @@ import { ImportResolver } from './importResolver';
 import { IPythonMode, SourceFile } from './sourceFile';
 import { SourceFileInfo } from './sourceFileInfo';
 import { SourceMapper } from './sourceMapper';
-import { Symbol } from './symbol';
+import { Symbol, SymbolTable } from './symbol';
 import { PrintTypeOptions, TypeEvaluator } from './typeEvaluatorTypes';
 import { Type } from './types';
 export interface MaxAnalysisTime {
@@ -24,10 +24,15 @@ export interface MaxAnalysisTime {
     noOpenFilesTimeInMs: number;
 }
 export type PreCheckCallback = (parserOutput: ParserOutput, evaluator: TypeEvaluator) => void;
+export interface ChangedRange {
+    range: TextRange;
+    delta: number;
+}
 export interface OpenFileOptions {
     isTracked: boolean;
     ipythonMode: IPythonMode;
     chainedFileUri: Uri | undefined;
+    changedRange?: ChangedRange;
 }
 export declare class Program {
     readonly serviceProvider: ServiceProvider;
@@ -43,6 +48,7 @@ export declare class Program {
     private _configOptions;
     private _importResolver;
     private _evaluator;
+    private _disposed;
     private _parsedFileCount;
     private _preCheckCallback;
     private _editModeTracker;
@@ -55,6 +61,7 @@ export declare class Program {
     get configOptions(): ConfigOptions;
     get importResolver(): ImportResolver;
     get fileSystem(): import("../common/fileSystem").FileSystem;
+    get isDisposed(): boolean;
     dispose(): void;
     enterEditMode(): void;
     exitEditMode(): FileEditAction[];
@@ -87,6 +94,7 @@ export declare class Program {
     getBoundSourceFile(uri: Uri): SourceFile | undefined;
     getSourceFileInfoList(): readonly SourceFileInfo[];
     getSourceFileInfo(uri: Uri): SourceFileInfo | undefined;
+    getModuleSymbolTable(fileUri: Uri): SymbolTable | undefined;
     getBoundSourceFileInfo(uri: Uri, content?: string, force?: boolean): SourceFileInfo | undefined;
     analyze(maxTime?: MaxAnalysisTime, token?: CancellationToken): boolean;
     analyzeFile(fileUri: Uri, token?: CancellationToken): boolean;
@@ -96,6 +104,7 @@ export declare class Program {
     getSourceMapper(fileUri: Uri, token: CancellationToken, mapCompiled?: boolean, preferStubs?: boolean): SourceMapper;
     getParserOutput(fileUri: Uri): ParserOutput | undefined;
     getParseResults(fileUri: Uri): ParseFileResults | undefined;
+    getParseDiagnostics(fileUri: Uri): Diagnostic[] | undefined;
     handleMemoryHighUsage(): void;
     printDetailedAnalysisTimes(): void;
     printDependencies(projectRootDir: Uri, verbose: boolean): void;
@@ -108,6 +117,7 @@ export declare class Program {
     clone(): Program;
     getCacheUsage(): number;
     emptyCache(): void;
+    bindShadowFile(stubFileUri: Uri, shadowFile: Uri): SourceFile | undefined;
     private _handleMemoryHighUsage;
     private _discardCachedParseResults;
     private _runEvaluatorWithCancellationToken;

package/dist/analyzer/program.js

@@ -97,6 +97,7 @@ class Program {
         this._disableChecker = _disableChecker;
         this._sourceFileList = [];
         this._sourceFileMap = new Map();
+        this._disposed = false;
         this._parsedFileCount = 0;
         this._editModeTracker = new EditModeTracker();
         this._lookUpImport = (fileUriOrModule, options) => {
@@ -198,8 +199,12 @@ class Program {
     get fileSystem() {
         return this._importResolver.fileSystem;
     }
+    get isDisposed() {
+        return this._disposed;
+    }
     dispose() {
         this._cacheManager.unregisterCacheOwner(this);
+        this._disposed = true;
     }
     enterEditMode() {
         this._editModeTracker.enable();
@@ -218,10 +223,10 @@ class Program {
             const newContents = fileInfo.restore();
             if (newContents) {
                 // Create a text document so we can compute the edits.
-                const textDocument = vscode_languageserver_textdocument_1.TextDocument.create(fileInfo.sourceFile.getUri().toString(), 'python', 1, fileInfo.sourceFile.getFileContent() || '');
+                const textDocument = vscode_languageserver_textdocument_1.TextDocument.create(fileInfo.uri.toString(), 'python', 1, fileInfo.contents || '');
                 // Add an edit action to the list.
                 edits.push({
-                    fileUri: fileInfo.sourceFile.getUri(),
+                    fileUri: fileInfo.uri,
                     range: {
                         start: { line: 0, character: 0 },
                         end: { line: textDocument.lineCount, character: 0 },
@@ -239,7 +244,7 @@ class Program {
                     // We don't need to care about file diagnostics since in edit mode
                     // checker won't run.
                     v.sourceFile.prepareForClose();
-                    this._removeSourceFileFromListAndMap(v.sourceFile.getUri(), i);
+                    this._removeSourceFileFromListAndMap(v.uri, i);
                 }
             }
         }
@@ -273,7 +278,7 @@ class Program {
             // Files that are not in the tracked file list are
             // marked as no longer tracked.
             this._sourceFileList.forEach((oldFile) => {
-                const fileUri = oldFile.sourceFile.getUri();
+                const fileUri = oldFile.uri;
                 if (!newFileMap.has(fileUri.key)) {
                     oldFile.isTracked = false;
                 }
@@ -321,10 +326,8 @@ class Program {
             sourceFileInfo.isTracked = true;
             return sourceFileInfo.sourceFile;
         }
-        const sourceFile = this._sourceFileFactory.createSourceFile(this.serviceProvider, fileUri, importName, isThirdPartyImport, isInPyTypedPackage, 
-        /* isModulePrivate */ false, this._editModeTracker, this._console, this._logTracker);
-        sourceFileInfo = new sourceFileInfo_1.SourceFileInfo(sourceFile, 
-        /* isTypeshedFile */ false, isThirdPartyImport, isInPyTypedPackage, this._editModeTracker, {
+        const sourceFile = this._sourceFileFactory.createSourceFile(this.serviceProvider, fileUri, importName, isThirdPartyImport, isInPyTypedPackage, this._editModeTracker, this._console, this._logTracker);
+        sourceFileInfo = new sourceFileInfo_1.SourceFileInfo(sourceFile, sourceFile.isTypingStubFile() || sourceFile.isTypeshedStubFile() || sourceFile.isBuiltInStubFile(), isThirdPartyImport, isInPyTypedPackage, this._editModeTracker, {
             isTracked: true,
         });
         this._addToSourceFileListAndMap(sourceFileInfo);
@@ -335,7 +338,7 @@ class Program {
         if (!sourceFileInfo) {
             const moduleImportInfo = this._getModuleImportInfoForFile(fileUri);
             const sourceFile = this._sourceFileFactory.createSourceFile(this.serviceProvider, fileUri, moduleImportInfo.moduleName, 
-            /* isThirdPartyImport */ false, moduleImportInfo.isThirdPartyPyTypedPresent, moduleImportInfo.isModulePrivate, this._editModeTracker, this._console, this._logTracker, options?.ipythonMode ?? sourceFile_1.IPythonMode.None);
+            /* isThirdPartyImport */ false, moduleImportInfo.isThirdPartyPyTypedPresent, this._editModeTracker, this._console, this._logTracker, options?.ipythonMode ?? sourceFile_1.IPythonMode.None);
             const chainedFilePath = options?.chainedFileUri;
             sourceFileInfo = new sourceFileInfo_1.SourceFileInfo(sourceFile, 
             /* isTypeshedFile */ false, 
@@ -360,7 +363,7 @@ class Program {
     }
     getChainedUri(fileUri) {
         const sourceFileInfo = this.getSourceFileInfo(fileUri);
-        return sourceFileInfo?.chainedSourceFile?.sourceFile.getUri();
+        return sourceFileInfo?.chainedSourceFile?.uri;
     }
     updateChainedUri(fileUri, chainedFileUri) {
         const sourceFileInfo = this.getSourceFileInfo(fileUri);
@@ -452,10 +455,10 @@ class Program {
         return this._sourceFileList.filter((s) => s.isOpenByClient);
     }
     getOwnedFiles() {
-        return this._sourceFileList.filter((s) => (0, sourceFileInfoUtils_1.isUserCode)(s) && this.owns(s.sourceFile.getUri()));
+        return this._sourceFileList.filter((s) => (0, sourceFileInfoUtils_1.isUserCode)(s) && this.owns(s.uri));
     }
     getCheckingRequiredFiles() {
-        return this._sourceFileList.filter((s) => s.isOpenByClient && this.owns(s.sourceFile.getUri()) && s.sourceFile.isCheckingRequired());
+        return this._sourceFileList.filter((s) => s.isOpenByClient && this.owns(s.uri) && s.sourceFile.isCheckingRequired());
     }
     getFilesToAnalyzeCount() {
         let filesToAnalyzeCount = 0;
@@ -486,7 +489,7 @@ class Program {
     }
     containsSourceFileIn(folder) {
         for (const normalizedSourceFilePath of this._sourceFileMap.values()) {
-            if (normalizedSourceFilePath.sourceFile.getUri().startsWith(folder)) {
+            if (normalizedSourceFilePath.uri.startsWith(folder)) {
                 return true;
             }
         }
@@ -520,6 +523,13 @@ class Program {
         }
         return undefined;
     }
+    getModuleSymbolTable(fileUri) {
+        const sourceFileInfo = this.getSourceFileInfo(fileUri);
+        if (sourceFileInfo) {
+            return sourceFileInfo.sourceFile.getModuleSymbolTable();
+        }
+        return undefined;
+    }
     getBoundSourceFileInfo(uri, content, force) {
         const sourceFileInfo = this.getSourceFileInfo(uri);
         if (!sourceFileInfo) {
@@ -620,6 +630,11 @@ class Program {
         /* content */ undefined, 
         /* force */ true)?.sourceFile.getParseResults();
     }
+    getParseDiagnostics(fileUri) {
+        return this.getBoundSourceFileInfo(fileUri, 
+        /* content */ undefined, 
+        /* force */ true)?.sourceFile.getParseDiagnostics();
+    }
     handleMemoryHighUsage() {
         this._handleMemoryHighUsage();
     }
@@ -635,7 +650,7 @@ class Program {
         this._console.info('Analysis time by file');
         sortedFiles.forEach((sfInfo) => {
             const checkTimeInMs = sfInfo.sourceFile.getCheckTime();
-            this._console.info(`${checkTimeInMs}ms: ${sfInfo.sourceFile.getUri()}`);
+            this._console.info(`${checkTimeInMs}ms: ${sfInfo.uri}`);
         });
     }
     // Prints import dependency information for each of the files in
@@ -645,12 +660,12 @@ class Program {
         const sortedFiles = this._sourceFileList
             .filter((s) => !s.isTypeshedFile)
             .sort((a, b) => {
-            return fs.getOriginalUri(a.sourceFile.getUri()) < fs.getOriginalUri(b.sourceFile.getUri()) ? 1 : -1;
+            return fs.getOriginalUri(a.uri) < fs.getOriginalUri(b.uri) ? 1 : -1;
         });
         const zeroImportFiles = [];
         sortedFiles.forEach((sfInfo) => {
             this._console.info('');
-            const fileUri = fs.getOriginalUri(sfInfo.sourceFile.getUri());
+            const fileUri = fs.getOriginalUri(sfInfo.uri);
             let fileString = fileUri.toString();
             const relPath = projectRootDir.getRelativePathComponents(fileUri);
             if (relPath) {
@@ -660,13 +675,13 @@ class Program {
             this._console.info(` Imports     ${sfInfo.imports.length} ` + `file${sfInfo.imports.length === 1 ? '' : 's'}`);
             if (verbose) {
                 sfInfo.imports.forEach((importInfo) => {
-                    this._console.info(`    ${fs.getOriginalUri(importInfo.sourceFile.getUri())}`);
+                    this._console.info(`    ${fs.getOriginalUri(importInfo.uri)}`);
                 });
             }
             this._console.info(` Imported by ${sfInfo.importedBy.length} ` + `file${sfInfo.importedBy.length === 1 ? '' : 's'}`);
             if (verbose) {
                 sfInfo.importedBy.forEach((importInfo) => {
-                    this._console.info(`    ${fs.getOriginalUri(importInfo.sourceFile.getUri())}`);
+                    this._console.info(`    ${fs.getOriginalUri(importInfo.uri)}`);
                 });
             }
             if (sfInfo.importedBy.length === 0) {
@@ -684,7 +699,7 @@ class Program {
     writeTypeStub(targetImportPath, targetIsSingleFile, stubPath, token) {
         for (const sourceFileInfo of this._sourceFileList) {
             (0, cancellationUtils_1.throwIfCancellationRequested)(token);
-            const fileUri = sourceFileInfo.sourceFile.getUri();
+            const fileUri = sourceFileInfo.uri;
             // Generate type stubs only for the files within the target path,
             // not any files that the target module happened to import.
             const relativePath = targetImportPath.getRelativePath(fileUri);
@@ -762,7 +777,7 @@ class Program {
                             diag.category !== 5 /* DiagnosticCategory.Deprecated */);
                     }
                     fileDiagnostics.push({
-                        fileUri: sourceFileInfo.sourceFile.getUri(),
+                        fileUri: sourceFileInfo.uri,
                         version: sourceFileInfo.sourceFile.getClientVersion(),
                         diagnostics,
                     });
@@ -777,7 +792,7 @@ class Program {
                 // This condition occurs when the user switches from workspace to
                 // "open files only" mode. Clear all diagnostics for this file.
                 fileDiagnostics.push({
-                    fileUri: sourceFileInfo.sourceFile.getUri(),
+                    fileUri: sourceFileInfo.uri,
                     version: sourceFileInfo.sourceFile.getClientVersion(),
                     diagnostics: [],
                 });
@@ -803,7 +818,7 @@ class Program {
         const program = new Program(this._importResolver, this._configOptions, this.serviceProvider, new logTracker_1.LogTracker(this._console, 'Cloned'), this._disableChecker);
         // Cloned program will use whatever user files the program currently has.
         const userFiles = this.getUserFiles();
-        program.setTrackedFiles(userFiles.map((i) => i.sourceFile.getUri()));
+        program.setTrackedFiles(userFiles.map((i) => i.uri));
         program.markAllFilesDirty(/* evenIfContentsAreSame */ true);
         // Make sure we keep editor content (open file) which could be different than one in the file system.
         for (const fileInfo of this.getOpened()) {
@@ -811,9 +826,9 @@ class Program {
             if (version === undefined) {
                 continue;
             }
-            program.setFileOpened(fileInfo.sourceFile.getUri(), version, fileInfo.sourceFile.getOpenFileContents() ?? '', {
-                chainedFileUri: fileInfo.chainedSourceFile?.sourceFile.getUri(),
-                ipythonMode: fileInfo.sourceFile.getIPythonMode(),
+            program.setFileOpened(fileInfo.uri, version, fileInfo.sourceFile.getOpenFileContents() ?? '', {
+                chainedFileUri: fileInfo.chainedSourceFile?.uri,
+                ipythonMode: fileInfo.ipythonMode,
                 isTracked: fileInfo.isTracked,
             });
         }
@@ -836,6 +851,20 @@ class Program {
         this._parsedFileCount = 0;
         this.serviceProvider.tryGet(serviceKeys_1.ServiceKeys.stateMutationListeners)?.forEach((l) => l.onClearCache?.());
     }
+    bindShadowFile(stubFileUri, shadowFile) {
+        let stubFileInfo = this.getSourceFileInfo(stubFileUri);
+        if (!stubFileInfo) {
+            // make sure uri exits before adding interimFile
+            if (!this.fileSystem.existsSync(stubFileUri)) {
+                return undefined;
+            }
+            // Special case for import statement like "import X.Y". The SourceFile
+            // for X might not be in memory since import `X.Y` only brings in Y.
+            stubFileInfo = this.addInterimFile(stubFileUri);
+        }
+        this._addShadowedFile(stubFileInfo, shadowFile);
+        return this.getBoundSourceFile(shadowFile);
+    }
     _handleMemoryHighUsage() {
         const cacheUsage = this._cacheManager.getCacheUsage();
         const usedHeapRatio = this._cacheManager.getUsedHeapRatio(this._configOptions.verboseOutput ? this._console : undefined);
@@ -899,13 +928,13 @@ class Program {
                 // Clear only if there are any errors for this file.
                 if (fileInfo.diagnosticsVersion !== undefined) {
                     fileDiagnostics.push({
-                        fileUri: fileInfo.sourceFile.getUri(),
+                        fileUri: fileInfo.uri,
                         version: fileInfo.sourceFile.getClientVersion(),
                         diagnostics: [],
                     });
                 }
                 fileInfo.sourceFile.prepareForClose();
-                this._removeSourceFileFromListAndMap(fileInfo.sourceFile.getUri(), i);
+                this._removeSourceFileFromListAndMap(fileInfo.uri, i);
                 // Unlink any imports and remove them from the list if
                 // they are no longer referenced.
                 fileInfo.imports.forEach((importedFile) => {
@@ -923,13 +952,13 @@ class Program {
                             // Clear if there are any errors for this import.
                             if (importedFile.diagnosticsVersion !== undefined) {
                                 fileDiagnostics.push({
-                                    fileUri: importedFile.sourceFile.getUri(),
+                                    fileUri: importedFile.uri,
                                     version: importedFile.sourceFile.getClientVersion(),
                                     diagnostics: [],
                                 });
                             }
                             importedFile.sourceFile.prepareForClose();
-                            this._removeSourceFileFromListAndMap(importedFile.sourceFile.getUri(), indexToRemove);
+                            this._removeSourceFileFromListAndMap(importedFile.uri, indexToRemove);
                             i--;
                         }
                     }
@@ -945,7 +974,7 @@ class Program {
                 // out the errors for the now-closed file.
                 if (!this._shouldCheckFile(fileInfo) && fileInfo.diagnosticsVersion !== undefined) {
                     fileDiagnostics.push({
-                        fileUri: fileInfo.sourceFile.getUri(),
+                        fileUri: fileInfo.uri,
                         version: fileInfo.sourceFile.getClientVersion(),
                         diagnostics: [],
                     });
@@ -979,7 +1008,7 @@ class Program {
         if (fileInfo.isTracked || fileInfo.isOpenByClient || fileInfo.shadows.length > 0) {
             return true;
         }
-        const fileUri = fileInfo.sourceFile.getUri();
+        const fileUri = fileInfo.uri;
         // Avoid infinite recursion.
         if (recursionSet.has(fileUri.key)) {
             return false;
@@ -993,20 +1022,7 @@ class Program {
         return false;
     }
     _createSourceMapper(execEnv, token, from, mapCompiled, preferStubs) {
-        const sourceMapper = new sourceMapper_1.SourceMapper(this._importResolver, execEnv, this._evaluator, (stubFileUri, implFileUri) => {
-            let stubFileInfo = this.getSourceFileInfo(stubFileUri);
-            if (!stubFileInfo) {
-                // make sure uri exits before adding interimFile
-                if (!this.fileSystem.existsSync(stubFileUri)) {
-                    return undefined;
-                }
-                // Special case for import statement like "import X.Y". The SourceFile
-                // for X might not be in memory since import `X.Y` only brings in Y.
-                stubFileInfo = this.addInterimFile(stubFileUri);
-            }
-            this._addShadowedFile(stubFileInfo, implFileUri);
-            return this.getBoundSourceFile(implFileUri);
-        }, (f) => {
+        const sourceMapper = new sourceMapper_1.SourceMapper(this._importResolver, execEnv, this._evaluator, (stubFileUri, implFileUri) => this.bindShadowFile(stubFileUri, implFileUri), (f) => {
             let fileInfo = this.getBoundSourceFileInfo(f);
             if (!fileInfo) {
                 // make sure uri exits before adding interimFile
@@ -1096,29 +1112,21 @@ class Program {
         const getThirdPartyImportInfo = (importResult) => {
             let isThirdPartyImport = false;
             let isPyTypedPresent = false;
-            let isModulePrivate = false;
             if (importResult.importType === 1 /* ImportType.ThirdParty */) {
                 isThirdPartyImport = true;
                 if (importResult.pyTypedInfo) {
                     isPyTypedPresent = true;
                 }
-                if (importResult.isModulePrivate) {
-                    isModulePrivate = true;
-                }
             }
             else if (sourceFileInfo.isThirdPartyImport && importResult.importType === 2 /* ImportType.Local */) {
                 isThirdPartyImport = true;
                 if (sourceFileInfo.isThirdPartyPyTypedPresent) {
                     isPyTypedPresent = true;
                 }
-                if (importResult.isModulePrivate) {
-                    isModulePrivate = true;
-                }
             }
             return {
                 isThirdPartyImport,
                 isPyTypedPresent,
-                isModulePrivate,
             };
         };
         // Create a map of unique imports, since imports can appear more than once.
@@ -1129,13 +1137,12 @@ class Program {
                 sourceFileInfo.chainedSourceFile = undefined;
             }
             else {
-                const fileUri = sourceFileInfo.chainedSourceFile.sourceFile.getUri();
+                const fileUri = sourceFileInfo.chainedSourceFile.uri;
                 newImportPathMap.set(fileUri.key, {
                     path: fileUri,
                     isTypeshedFile: false,
                     isThirdPartyImport: false,
                     isPyTypedPresent: false,
-                    isModulePrivate: false,
                 });
             }
         }
@@ -1151,7 +1158,6 @@ class Program {
                                 isTypeshedFile: !!importResult.isStdlibTypeshedFile || !!importResult.isThirdPartyTypeshedFile,
                                 isThirdPartyImport: thirdPartyTypeInfo.isThirdPartyImport,
                                 isPyTypedPresent: thirdPartyTypeInfo.isPyTypedPresent,
-                                isModulePrivate: thirdPartyTypeInfo.isModulePrivate,
                             });
                         }
                     }
@@ -1165,7 +1171,6 @@ class Program {
                                 isTypeshedFile: !!importResult.isStdlibTypeshedFile || !!importResult.isThirdPartyTypeshedFile,
                                 isThirdPartyImport: thirdPartyTypeInfo.isThirdPartyImport,
                                 isPyTypedPresent: thirdPartyTypeInfo.isPyTypedPresent,
-                                isModulePrivate: thirdPartyTypeInfo.isModulePrivate,
                             });
                         }
                     }
@@ -1179,7 +1184,7 @@ class Program {
                     if (!sourceFileInfo.sourceFile.isStubFile() && !importResult.isStdlibTypeshedFile) {
                         if (options.verboseOutput) {
                             this._console.info(`Could not resolve source for '${importResult.importName}' ` +
-                                `in file '${sourceFileInfo.sourceFile.getUri().toUserVisibleString()}'`);
+                                `in file '${sourceFileInfo.uri.toUserVisibleString()}'`);
                             if (importResult.nonStubImportResult.importFailureInfo) {
                                 importResult.nonStubImportResult.importFailureInfo.forEach((diag) => {
                                     this._console.info(`  ${diag}`);
@@ -1191,7 +1196,7 @@ class Program {
             }
             else if (options.verboseOutput) {
                 this._console.info(`Could not import '${importResult.importName}' ` +
-                    `in file '${sourceFileInfo.sourceFile.getUri().toUserVisibleString()}'`);
+                    `in file '${sourceFileInfo.uri.toUserVisibleString()}'`);
                 if (importResult.importFailureInfo) {
                     importResult.importFailureInfo.forEach((diag) => {
                         this._console.info(`  ${diag}`);
@@ -1201,11 +1206,11 @@ class Program {
         });
         const updatedImportMap = new Map();
         sourceFileInfo.imports.forEach((importInfo) => {
-            const oldFilePath = importInfo.sourceFile.getUri();
+            const oldFilePath = importInfo.uri;
             // A previous import was removed.
             if (!newImportPathMap.has(oldFilePath.key)) {
                 importInfo.mutate((s) => {
-                    s.importedBy = s.importedBy.filter((fi) => !fi.sourceFile.getUri().equals(sourceFileInfo.sourceFile.getUri()));
+                    s.importedBy = s.importedBy.filter((fi) => !fi.uri.equals(sourceFileInfo.uri));
                 });
             }
             else {
@@ -1220,7 +1225,7 @@ class Program {
                 let importedFileInfo = this.getSourceFileInfo(importInfo.path);
                 if (!importedFileInfo) {
                     const moduleImportInfo = this._getModuleImportInfoForFile(importInfo.path);
-                    const sourceFile = this._sourceFileFactory.createSourceFile(this.serviceProvider, importInfo.path, moduleImportInfo.moduleName, importInfo.isThirdPartyImport, importInfo.isPyTypedPresent, importInfo.isModulePrivate, this._editModeTracker, this._console, this._logTracker);
+                    const sourceFile = this._sourceFileFactory.createSourceFile(this.serviceProvider, importInfo.path, moduleImportInfo.moduleName, importInfo.isThirdPartyImport, importInfo.isPyTypedPresent, this._editModeTracker, this._console, this._logTracker);
                     importedFileInfo = new sourceFileInfo_1.SourceFileInfo(sourceFile, importInfo.isTypeshedFile, importInfo.isThirdPartyImport, importInfo.isPyTypedPresent, this._editModeTracker);
                     this._addToSourceFileListAndMap(importedFileInfo);
                     filesAdded.push(importedFileInfo);
@@ -1258,7 +1263,7 @@ class Program {
         this._sourceFileList.splice(indexToRemove, 1);
     }
     _addToSourceFileListAndMap(fileInfo) {
-        const fileUri = fileInfo.sourceFile.getUri();
+        const fileUri = fileInfo.uri;
         // We should never add a file with the same path twice.
         (0, debug_1.assert)(!this._sourceFileMap.has(fileUri.key));
         // We should never have an empty URI for a source file.
@@ -1299,8 +1304,7 @@ class Program {
         const moduleImportInfo = this._getModuleImportInfoForFile(fileUri);
         const sourceFile = this._sourceFileFactory.createSourceFile(this.serviceProvider, fileUri, moduleImportInfo.moduleName, 
         /* isThirdPartyImport */ false, 
-        /* isInPyTypedPackage */ false, 
-        /* isModulePrivate */ false, this._editModeTracker, this._console, this._logTracker);
+        /* isInPyTypedPackage */ false, this._editModeTracker, this._console, this._logTracker);
         const sourceFileInfo = new sourceFileInfo_1.SourceFileInfo(sourceFile, 
         /* isTypeshedFile */ false, 
         /* isThirdPartyImport */ false, 
@@ -1363,7 +1367,7 @@ class Program {
         const implicitSet = new Set();
         let nextImplicitImport = this._getImplicitImports(fileToAnalyze);
         while (nextImplicitImport) {
-            const implicitPath = nextImplicitImport.sourceFile.getUri();
+            const implicitPath = nextImplicitImport.uri;
             if (implicitSet.has(implicitPath.key)) {
                 // We've found a cycle. Break out of the loop.
                 debug.fail(this.serviceProvider
@@ -1454,7 +1458,7 @@ class Program {
         return false;
     }
     _checkTypes(fileToCheck, token, chainedByList) {
-        return this._logTracker.log(`analyzing: ${fileToCheck.sourceFile.getUri()}`, (logState) => {
+        return this._logTracker.log(`analyzing: ${fileToCheck.uri}`, (logState) => {
             // If the file isn't needed because it was eliminated from the
             // transitive closure or deleted, skip the file rather than wasting
             // time on it.
@@ -1488,7 +1492,7 @@ class Program {
                     }
                 }
                 if (boundFile) {
-                    const execEnv = this._configOptions.findExecEnvironment(fileToCheck.sourceFile.getUri());
+                    const execEnv = this._configOptions.findExecEnvironment(fileToCheck.uri);
                     fileToCheck.sourceFile.check(this.configOptions, this._lookUpImport, this._importResolver, this._evaluator, this._createSourceMapper(execEnv, token, fileToCheck), dependentFiles);
                 }
             }
@@ -1500,8 +1504,7 @@ class Program {
                 // Don't detect import cycles when doing type stub generation. Some
                 // third-party modules are pretty convoluted.
                 // Or if the file is the notebook cell. notebook cell can't have cycles.
-                if (!this._allowedThirdPartyImports &&
-                    fileToCheck.sourceFile.getIPythonMode() !== sourceFile_1.IPythonMode.CellDocs) {
+                if (!this._allowedThirdPartyImports && fileToCheck.ipythonMode !== sourceFile_1.IPythonMode.CellDocs) {
                     // We need to force all of the files to be parsed and build
                     // a closure map for the files.
                     const closureMap = new Map();
@@ -1525,7 +1528,7 @@ class Program {
         });
     }
     _checkDependentFiles(fileToCheck, chainedByList, token) {
-        if (fileToCheck.sourceFile.getIPythonMode() !== sourceFile_1.IPythonMode.CellDocs) {
+        if (fileToCheck.ipythonMode !== sourceFile_1.IPythonMode.CellDocs) {
             return undefined;
         }
         // If we don't have chainedByList, it means none of them are checked yet.
@@ -1580,7 +1583,7 @@ class Program {
     _getImportsRecursive(file, closureMap, recursionCount) {
         // If the file is already in the closure map, we found a cyclical
         // dependency. Don't recur further.
-        const fileUri = file.sourceFile.getUri();
+        const fileUri = file.uri;
         if (closureMap.has(fileUri.key)) {
             return;
         }
@@ -1614,7 +1617,7 @@ class Program {
         if (sourceFileInfo.sourceFile.isNoCircularDependencyConfirmed()) {
             return false;
         }
-        const fileUri = sourceFileInfo.sourceFile.getUri();
+        const fileUri = sourceFileInfo.uri;
         filesVisited.set(fileUri.key, sourceFileInfo);
         let detectedCycle = false;
         if (dependencyMap.has(fileUri.key)) {
@@ -1658,7 +1661,7 @@ class Program {
     _logImportCycle(dependencyChain) {
         const circDep = new circularDependency_1.CircularDependency();
         dependencyChain.forEach((sourceFileInfo) => {
-            circDep.appendPath(sourceFileInfo.sourceFile.getUri());
+            circDep.appendPath(sourceFileInfo.uri);
         });
         circDep.normalizeOrder();
         const firstFilePath = circDep.getPaths()[0];
@@ -1667,7 +1670,7 @@ class Program {
         firstSourceFile.sourceFile.addCircularDependency(this.configOptions, circDep);
     }
     _markFileDirtyRecursive(sourceFileInfo, markSet, forceRebinding = false) {
-        const fileUri = sourceFileInfo.sourceFile.getUri();
+        const fileUri = sourceFileInfo.uri;
         // Don't mark it again if it's already been visited.
         if (markSet.has(fileUri.key)) {
             return;