@zzzen/pyright-internal 1.2.0-dev.20221016 → 1.2.0-dev.20221204

package/dist/analyzer/program.js

@@ -78,7 +78,7 @@ class Program {
             var _a;
             let sourceFileInfo;
             if (typeof filePathOrModule === 'string') {
-                sourceFileInfo = this._getSourceFileInfoFromPath(filePathOrModule);
+                sourceFileInfo = this.getSourceFileInfo(filePathOrModule);
             }
             else {
                 // Resolve the import.
@@ -91,12 +91,12 @@ class Program {
                     let resolvedPath = importResult.resolvedPaths[importResult.resolvedPaths.length - 1];
                     if (resolvedPath) {
                         // See if the source file already exists in the program.
-                        sourceFileInfo = this._getSourceFileInfoFromPath(resolvedPath);
+                        sourceFileInfo = this.getSourceFileInfo(resolvedPath);
                         if (!sourceFileInfo) {
                             resolvedPath = (0, pathUtils_1.normalizePathCase)(this._fs, resolvedPath);
                             // Start tracking the source file.
                             this.addTrackedFile(resolvedPath);
-                            sourceFileInfo = this._getSourceFileInfoFromPath(resolvedPath);
+                            sourceFileInfo = this.getSourceFileInfo(resolvedPath);
                         }
                     }
                 }
@@ -193,7 +193,7 @@ class Program {
         });
     }
     addTrackedFile(filePath, isThirdPartyImport = false, isInPyTypedPackage = false) {
-        let sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        let sourceFileInfo = this.getSourceFileInfo(filePath);
         const importName = this._getImportNameForFile(filePath);
         if (sourceFileInfo) {
             // The module name may have changed based on updates to the
@@ -221,7 +221,7 @@ class Program {
     }
     setFileOpened(filePath, version, contents, options) {
         var _a, _b;
-        let sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        let sourceFileInfo = this.getSourceFileInfo(filePath);
         if (!sourceFileInfo) {
             const importName = this._getImportNameForFile(filePath);
             const sourceFile = new sourceFile_1.SourceFile(this._fs, filePath, importName, 
@@ -231,7 +231,7 @@ class Program {
             sourceFileInfo = {
                 sourceFile,
                 isTracked: (_b = options === null || options === void 0 ? void 0 : options.isTracked) !== null && _b !== void 0 ? _b : false,
-                chainedSourceFile: chainedFilePath ? this._getSourceFileInfoFromPath(chainedFilePath) : undefined,
+                chainedSourceFile: chainedFilePath ? this.getSourceFileInfo(chainedFilePath) : undefined,
                 isOpenByClient: true,
                 isTypeshedFile: false,
                 isThirdPartyImport: false,
@@ -256,23 +256,22 @@ class Program {
     }
     getChainedFilePath(filePath) {
         var _a;
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         return (_a = sourceFileInfo === null || sourceFileInfo === void 0 ? void 0 : sourceFileInfo.chainedSourceFile) === null || _a === void 0 ? void 0 : _a.sourceFile.getFilePath();
     }
     updateChainedFilePath(filePath, chainedFilePath) {
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         if (sourceFileInfo) {
-            sourceFileInfo.chainedSourceFile = chainedFilePath
-                ? this._getSourceFileInfoFromPath(chainedFilePath)
-                : undefined;
+            sourceFileInfo.chainedSourceFile = chainedFilePath ? this.getSourceFileInfo(chainedFilePath) : undefined;
             sourceFileInfo.sourceFile.markDirty();
             this._markFileDirtyRecursive(sourceFileInfo, new Set());
         }
     }
-    setFileClosed(filePath) {
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+    setFileClosed(filePath, isTracked) {
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         if (sourceFileInfo) {
             sourceFileInfo.isOpenByClient = false;
+            sourceFileInfo.isTracked = isTracked !== null && isTracked !== void 0 ? isTracked : sourceFileInfo.isTracked;
             sourceFileInfo.sourceFile.setClientVersion(null, []);
             // There is no guarantee that content is saved before the file is closed.
             // We need to mark the file dirty so we can re-analyze next time.
@@ -285,9 +284,6 @@ class Program {
         }
         return this._removeUnneededFiles();
     }
-    isFileOpen(filePath) {
-        return this._getSourceFileInfoFromPath(filePath) !== undefined;
-    }
     markAllFilesDirty(evenIfContentsAreSame, indexingNeeded = true) {
         const markDirtySet = new Set();
         this._sourceFileList.forEach((sourceFileInfo) => {
@@ -308,7 +304,7 @@ class Program {
     markFilesDirty(filePaths, evenIfContentsAreSame, indexingNeeded = true) {
         const markDirtySet = new Set();
         filePaths.forEach((filePath) => {
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (sourceFileInfo) {
                 const fileName = (0, pathUtils_1.getFileName)(filePath);
                 // Handle builtins and __builtins__ specially. They are implicitly
@@ -369,7 +365,7 @@ class Program {
         return this._sourceFileList.some((i) => i.sourceFile.getFilePath().startsWith(normalized));
     }
     getSourceFile(filePath) {
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         if (!sourceFileInfo) {
             return undefined;
         }
@@ -379,8 +375,11 @@ class Program {
         var _a;
         return (_a = this.getBoundSourceFileInfo(filePath)) === null || _a === void 0 ? void 0 : _a.sourceFile;
     }
+    getSourceFileInfo(filePath) {
+        return this._sourceFileMap.get((0, pathUtils_1.normalizePathCase)(this._fs, filePath));
+    }
     getBoundSourceFileInfo(filePath) {
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         if (!sourceFileInfo) {
             return undefined;
         }
@@ -401,7 +400,7 @@ class Program {
                 const effectiveMaxTime = maxTime ? maxTime.openFilesTimeInMs : Number.MAX_VALUE;
                 // Check the open files.
                 for (const sourceFileInfo of openFiles) {
-                    if (this._checkTypes(sourceFileInfo)) {
+                    if (this._checkTypes(sourceFileInfo, token)) {
                         if (elapsedTime.getDurationInMilliseconds() > effectiveMaxTime) {
                             return true;
                         }
@@ -421,7 +420,7 @@ class Program {
                     if (!(0, sourceFileInfoUtils_1.isUserCode)(sourceFileInfo)) {
                         continue;
                     }
-                    if (this._checkTypes(sourceFileInfo)) {
+                    if (this._checkTypes(sourceFileInfo, token)) {
                         if (elapsedTime.getDurationInMilliseconds() > effectiveMaxTime) {
                             return true;
                         }
@@ -579,10 +578,10 @@ class Program {
         const evaluator = this._evaluator || this._createNewEvaluator();
         return evaluator.getEffectiveTypeOfSymbol(symbol);
     }
-    printType(type, expandTypeAlias) {
+    printType(type, options) {
         this._handleMemoryHighUsage();
         const evaluator = this._evaluator || this._createNewEvaluator();
-        return evaluator.printType(type, expandTypeAlias);
+        return evaluator.printType(type, options);
     }
     static _getPrintTypeFlags(configOptions) {
         let flags = 0 /* None */;
@@ -622,7 +621,7 @@ class Program {
     // We need to track the relationship so if the original type stub is removed from the
     // program, we can remove the corresponding shadowed file and any files it imports.
     _addShadowedFile(stubFile, shadowImplPath) {
-        let shadowFileInfo = this._getSourceFileInfoFromPath(shadowImplPath);
+        let shadowFileInfo = this.getSourceFileInfo(shadowImplPath);
         if (!shadowFileInfo) {
             const importName = this._getImportNameForFile(shadowImplPath);
             const sourceFile = new sourceFile_1.SourceFile(this._fs, shadowImplPath, importName, 
@@ -752,7 +751,7 @@ class Program {
         }
         return false;
     }
-    _checkTypes(fileToCheck) {
+    _checkTypes(fileToCheck, token) {
         return this._logTracker.log(`analyzing: ${fileToCheck.sourceFile.getFilePath()}`, (logState) => {
             // If the file isn't needed because it was eliminated from the
             // transitive closure or deleted, skip the file rather than wasting
@@ -777,7 +776,8 @@ class Program {
                 }
             }
             if (!this._disableChecker) {
-                fileToCheck.sourceFile.check(this._importResolver, this._evaluator);
+                const execEnv = this._configOptions.findExecEnvironment(fileToCheck.sourceFile.getFilePath());
+                fileToCheck.sourceFile.check(this._importResolver, this._evaluator, execEnv, this._createSourceMapper(execEnv, token, fileToCheck), (p) => (0, sourceFileInfoUtils_1.isUserCode)(this.getSourceFileInfo(p)));
             }
             // For very large programs, we may need to discard the evaluator and
             // its cached types to avoid running out of heap space.
@@ -892,7 +892,7 @@ class Program {
         });
         circDep.normalizeOrder();
         const firstFilePath = circDep.getPaths()[0];
-        const firstSourceFile = this._getSourceFileInfoFromPath(firstFilePath);
+        const firstSourceFile = this.getSourceFileInfo(firstFilePath);
         (0, debug_1.assert)(firstSourceFile !== undefined);
         firstSourceFile.sourceFile.addCircularDependency(circDep);
     }
@@ -911,7 +911,7 @@ class Program {
         }
     }
     getTextOnRange(filePath, range, token) {
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         if (!sourceFileInfo) {
             return undefined;
         }
@@ -932,7 +932,7 @@ class Program {
         });
     }
     getAutoImports(filePath, range, similarityLimit, nameMap, options, token) {
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         if (!sourceFileInfo) {
             return [];
         }
@@ -1022,36 +1022,38 @@ class Program {
     }
     getDefinitionsForPosition(filePath, position, filter, token) {
         return this._runEvaluatorWithCancellationToken(token, () => {
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (!sourceFileInfo) {
                 return undefined;
             }
             this._bindFile(sourceFileInfo);
             const execEnv = this._configOptions.findExecEnvironment(filePath);
-            return sourceFileInfo.sourceFile.getDefinitionsForPosition(this._createSourceMapper(execEnv, sourceFileInfo), position, filter, this._evaluator, token);
+            return sourceFileInfo.sourceFile.getDefinitionsForPosition(this._createSourceMapper(execEnv, token, sourceFileInfo), position, filter, this._evaluator, token);
         });
     }
     getTypeDefinitionsForPosition(filePath, position, token) {
         return this._runEvaluatorWithCancellationToken(token, () => {
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (!sourceFileInfo) {
                 return undefined;
             }
             this._bindFile(sourceFileInfo);
             const execEnv = this._configOptions.findExecEnvironment(filePath);
-            return sourceFileInfo.sourceFile.getTypeDefinitionsForPosition(this._createSourceMapper(execEnv, sourceFileInfo, /* mapCompiled */ false, /* preferStubs */ true), position, this._evaluator, filePath, token);
+            return sourceFileInfo.sourceFile.getTypeDefinitionsForPosition(this._createSourceMapper(execEnv, token, sourceFileInfo, 
+            /* mapCompiled */ false, 
+            /* preferStubs */ true), position, this._evaluator, filePath, token);
         });
     }
     reportReferencesForPosition(filePath, position, includeDeclaration, reporter, token) {
         this._runEvaluatorWithCancellationToken(token, () => {
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (!sourceFileInfo) {
                 return;
             }
             const invokedFromUserFile = (0, sourceFileInfoUtils_1.isUserCode)(sourceFileInfo);
             this._bindFile(sourceFileInfo);
             const execEnv = this._configOptions.findExecEnvironment(filePath);
-            const referencesResult = sourceFileInfo.sourceFile.getDeclarationForPosition(this._createSourceMapper(execEnv, sourceFileInfo), position, this._evaluator, reporter, token);
+            const referencesResult = sourceFileInfo.sourceFile.getDeclarationForPosition(this._createSourceMapper(execEnv, token, sourceFileInfo), position, this._evaluator, reporter, token);
             if (!referencesResult) {
                 return;
             }
@@ -1083,7 +1085,7 @@ class Program {
                             // Already included.
                             continue;
                         }
-                        const declFileInfo = this._getSourceFileInfoFromPath(decl.path);
+                        const declFileInfo = this.getSourceFileInfo(decl.path);
                         if (!declFileInfo) {
                             // The file the declaration belongs to doesn't belong to the program.
                             continue;
@@ -1116,7 +1118,7 @@ class Program {
         this._handleMemoryHighUsage();
         return this._runEvaluatorWithCancellationToken(token, () => {
             var _a;
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (!sourceFileInfo) {
                 return undefined;
             }
@@ -1137,7 +1139,7 @@ class Program {
     }
     addSymbolsForDocument(filePath, symbolList, token) {
         return this._runEvaluatorWithCancellationToken(token, () => {
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (sourceFileInfo) {
                 if (!sourceFileInfo.sourceFile.getCachedIndexResults()) {
                     // If we already have cached index for this file, no need to bind this file.
@@ -1175,40 +1177,40 @@ class Program {
     }
     getHoverForPosition(filePath, position, format, token) {
         return this._runEvaluatorWithCancellationToken(token, () => {
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (!sourceFileInfo) {
                 return undefined;
             }
             this._bindFile(sourceFileInfo);
             const execEnv = this._configOptions.findExecEnvironment(filePath);
-            return sourceFileInfo.sourceFile.getHoverForPosition(this._createSourceMapper(execEnv, sourceFileInfo, /* mapCompiled */ true), position, format, this._evaluator, token);
+            return sourceFileInfo.sourceFile.getHoverForPosition(this._createSourceMapper(execEnv, token, sourceFileInfo, /* mapCompiled */ true), position, format, this._evaluator, token);
         });
     }
     getDocumentHighlight(filePath, position, token) {
         return this._runEvaluatorWithCancellationToken(token, () => {
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (!sourceFileInfo) {
                 return undefined;
             }
             this._bindFile(sourceFileInfo);
             const execEnv = this._configOptions.findExecEnvironment(filePath);
-            return sourceFileInfo.sourceFile.getDocumentHighlight(this._createSourceMapper(execEnv, sourceFileInfo), position, this._evaluator, token);
+            return sourceFileInfo.sourceFile.getDocumentHighlight(this._createSourceMapper(execEnv, token, sourceFileInfo), position, this._evaluator, token);
         });
     }
     getSignatureHelpForPosition(filePath, position, format, token) {
         return this._runEvaluatorWithCancellationToken(token, () => {
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (!sourceFileInfo) {
                 return undefined;
             }
             this._bindFile(sourceFileInfo);
             const execEnv = this._configOptions.findExecEnvironment(filePath);
-            return sourceFileInfo.sourceFile.getSignatureHelpForPosition(position, this._createSourceMapper(execEnv, sourceFileInfo, /* mapCompiled */ true), this._evaluator, format, token);
+            return sourceFileInfo.sourceFile.getSignatureHelpForPosition(position, this._createSourceMapper(execEnv, token, sourceFileInfo, /* mapCompiled */ true), this._evaluator, format, token);
         });
     }
     async getCompletionsForPosition(filePath, position, workspacePath, options, nameMap, libraryMap, token) {
         var _a;
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         if (!sourceFileInfo) {
             return undefined;
         }
@@ -1217,8 +1219,7 @@ class Program {
             const result = this._runEvaluatorWithCancellationToken(token, () => {
                 this._bindFile(sourceFileInfo);
                 const execEnv = this._configOptions.findExecEnvironment(filePath);
-                return sourceFileInfo.sourceFile.getCompletionsForPosition(position, workspacePath, this._configOptions, this._importResolver, this._lookUpImport, this._evaluator, options, this._createSourceMapper(execEnv, sourceFileInfo, /* mapCompiled */ true), nameMap, libraryMap, () => this._buildModuleSymbolsMap(sourceFileInfo, !!libraryMap, 
-                /* includeIndexUserSymbols */ false, token), token);
+                return sourceFileInfo.sourceFile.getCompletionsForPosition(position, workspacePath, this._configOptions, this._importResolver, this._lookUpImport, this._evaluator, options, this._createSourceMapper(execEnv, token, sourceFileInfo, /* mapCompiled */ true), nameMap, libraryMap, () => this._buildModuleSymbolsMap(sourceFileInfo, !!libraryMap, options.includeUserSymbolsInAutoImport, token), token);
             });
             ls.add(`found ${(_a = result === null || result === void 0 ? void 0 : result.completionMap.size) !== null && _a !== void 0 ? _a : 'null'} items`);
             return result;
@@ -1243,20 +1244,19 @@ class Program {
     }
     resolveCompletionItem(filePath, completionItem, options, nameMap, libraryMap, token) {
         return this._runEvaluatorWithCancellationToken(token, () => {
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (!sourceFileInfo) {
                 return;
             }
             this._bindFile(sourceFileInfo);
             const execEnv = this._configOptions.findExecEnvironment(filePath);
-            sourceFileInfo.sourceFile.resolveCompletionItem(this._configOptions, this._importResolver, this._lookUpImport, this._evaluator, options, this._createSourceMapper(execEnv, sourceFileInfo, /* mapCompiled */ true), nameMap, libraryMap, () => this._buildModuleSymbolsMap(sourceFileInfo, !!libraryMap, 
-            /* includeIndexUserSymbols */ false, token), completionItem, token);
+            sourceFileInfo.sourceFile.resolveCompletionItem(this._configOptions, this._importResolver, this._lookUpImport, this._evaluator, options, this._createSourceMapper(execEnv, token, sourceFileInfo, /* mapCompiled */ true), nameMap, libraryMap, () => this._buildModuleSymbolsMap(sourceFileInfo, !!libraryMap, options.includeUserSymbolsInAutoImport, token), completionItem, token);
         });
     }
     renameModule(path, newPath, token) {
         return this._runEvaluatorWithCancellationToken(token, () => {
             if ((0, pathUtils_1.isFile)(this._fs, path)) {
-                const fileInfo = this._getSourceFileInfoFromPath(path);
+                const fileInfo = this.getSourceFileInfo(path);
                 if (!fileInfo) {
                     return undefined;
                 }
@@ -1271,7 +1271,7 @@ class Program {
     }
     moveSymbolAtPosition(filePath, newFilePath, position, token) {
         return this._runEvaluatorWithCancellationToken(token, () => {
-            const fileInfo = this._getSourceFileInfoFromPath(filePath);
+            const fileInfo = this.getSourceFileInfo(filePath);
             if (!fileInfo) {
                 return undefined;
             }
@@ -1294,7 +1294,7 @@ class Program {
             }
             const execEnv = this._configOptions.findExecEnvironment(filePath);
             const declarations = documentSymbolCollector_1.DocumentSymbolCollector.getDeclarationsForNode(node, this._evaluator, 
-            /* resolveLocalNames */ false, token, this._createSourceMapper(execEnv, fileInfo));
+            /* resolveLocalNames */ false, token, this._createSourceMapper(execEnv, token, fileInfo));
             const renameModuleProvider = renameModuleProvider_1.RenameModuleProvider.createForSymbol(this._importResolver, this._configOptions, this._evaluator, filePath, newFilePath, declarations, token);
             if (!renameModuleProvider) {
                 return undefined;
@@ -1305,7 +1305,7 @@ class Program {
     }
     canRenameSymbolAtPosition(filePath, position, isDefaultWorkspace, allowModuleRename, token) {
         return this._runEvaluatorWithCancellationToken(token, () => {
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (!sourceFileInfo) {
                 return undefined;
             }
@@ -1333,7 +1333,7 @@ class Program {
     renameSymbolAtPosition(filePath, position, newName, isDefaultWorkspace, allowModuleRename, token) {
         return this._runEvaluatorWithCancellationToken(token, () => {
             var _a;
-            const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+            const sourceFileInfo = this.getSourceFileInfo(filePath);
             if (!sourceFileInfo) {
                 return undefined;
             }
@@ -1418,13 +1418,13 @@ class Program {
         });
     }
     getCallForPosition(filePath, position, token) {
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         if (!sourceFileInfo) {
             return undefined;
         }
         this._bindFile(sourceFileInfo);
         const execEnv = this._configOptions.findExecEnvironment(filePath);
-        const referencesResult = sourceFileInfo.sourceFile.getDeclarationForPosition(this._createSourceMapper(execEnv, sourceFileInfo), position, this._evaluator, undefined, token);
+        const referencesResult = sourceFileInfo.sourceFile.getDeclarationForPosition(this._createSourceMapper(execEnv, token, sourceFileInfo), position, this._evaluator, undefined, token);
         if (!referencesResult || referencesResult.declarations.length === 0) {
             return undefined;
         }
@@ -1432,13 +1432,13 @@ class Program {
         return callHierarchyProvider_1.CallHierarchyProvider.getCallForDeclaration(referencesResult.symbolName, targetDecl, this._evaluator, token);
     }
     getIncomingCallsForPosition(filePath, position, token) {
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         if (!sourceFileInfo) {
             return undefined;
         }
         this._bindFile(sourceFileInfo);
         const execEnv = this._configOptions.findExecEnvironment(filePath);
-        const referencesResult = sourceFileInfo.sourceFile.getDeclarationForPosition(this._createSourceMapper(execEnv, sourceFileInfo), position, this._evaluator, undefined, token);
+        const referencesResult = sourceFileInfo.sourceFile.getDeclarationForPosition(this._createSourceMapper(execEnv, token, sourceFileInfo), position, this._evaluator, undefined, token);
         if (!referencesResult || referencesResult.declarations.length === 0) {
             return undefined;
         }
@@ -1459,13 +1459,13 @@ class Program {
         return items;
     }
     getOutgoingCallsForPosition(filePath, position, token) {
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         if (!sourceFileInfo) {
             return undefined;
         }
         this._bindFile(sourceFileInfo);
         const execEnv = this._configOptions.findExecEnvironment(filePath);
-        const referencesResult = sourceFileInfo.sourceFile.getDeclarationForPosition(this._createSourceMapper(execEnv, sourceFileInfo), position, this._evaluator, undefined, token);
+        const referencesResult = sourceFileInfo.sourceFile.getDeclarationForPosition(this._createSourceMapper(execEnv, token, sourceFileInfo), position, this._evaluator, undefined, token);
         if (!referencesResult || referencesResult.declarations.length === 0) {
             return undefined;
         }
@@ -1473,7 +1473,7 @@ class Program {
         return callHierarchyProvider_1.CallHierarchyProvider.getOutgoingCallsForDeclaration(targetDecl, sourceFileInfo.sourceFile.getParseResults(), this._evaluator, token);
     }
     performQuickAction(filePath, command, args, token) {
-        const sourceFileInfo = this._getSourceFileInfoFromPath(filePath);
+        const sourceFileInfo = this.getSourceFileInfo(filePath);
         if (!sourceFileInfo) {
             return undefined;
         }
@@ -1497,7 +1497,7 @@ class Program {
         this._parsedFileCount = 0;
     }
     test_createSourceMapper(execEnv, from) {
-        return this._createSourceMapper(execEnv, /*from*/ from, /* mapCompiled */ false);
+        return this._createSourceMapper(execEnv, vscode_languageserver_1.CancellationToken.None, /*from*/ from, /* mapCompiled */ false);
     }
     _getRenameSymbolMode(sourceFileInfo, referencesResult, isDefaultWorkspace) {
         // We have 2 different cases
@@ -1513,10 +1513,10 @@ class Program {
             (userFile && !referencesResult.requiresGlobalSearch) ||
             (!userFile &&
                 sourceFileInfo.isOpenByClient &&
-                referencesResult.declarations.every((d) => this._getSourceFileInfoFromPath(d.path) === sourceFileInfo))) {
+                referencesResult.declarations.every((d) => this.getSourceFileInfo(d.path) === sourceFileInfo))) {
             return 'singleFileMode';
         }
-        if (referencesResult.declarations.every((d) => (0, sourceFileInfoUtils_1.isUserCode)(this._getSourceFileInfoFromPath(d.path)))) {
+        if (referencesResult.declarations.every((d) => (0, sourceFileInfoUtils_1.isUserCode)(this.getSourceFileInfo(d.path)))) {
             return 'multiFileMode';
         }
         // Rename is not allowed.
@@ -1525,11 +1525,11 @@ class Program {
     }
     _supportRenameModule(declarations, isDefaultWorkspace) {
         // Rename module is not supported for standalone file and all decls must be on a user file.
-        return !isDefaultWorkspace && declarations.every((d) => (0, sourceFileInfoUtils_1.isUserCode)(this._getSourceFileInfoFromPath(d.path)));
+        return !isDefaultWorkspace && declarations.every((d) => (0, sourceFileInfoUtils_1.isUserCode)(this.getSourceFileInfo(d.path)));
     }
     _getReferenceResult(sourceFileInfo, filePath, position, allowModuleRename, token) {
         const execEnv = this._configOptions.findExecEnvironment(filePath);
-        const referencesResult = sourceFileInfo.sourceFile.getDeclarationForPosition(this._createSourceMapper(execEnv), position, this._evaluator, undefined, token);
+        const referencesResult = sourceFileInfo.sourceFile.getDeclarationForPosition(this._createSourceMapper(execEnv, token), position, this._evaluator, undefined, token);
         if (!referencesResult) {
             return undefined;
         }
@@ -1718,15 +1718,15 @@ class Program {
         }
         return false;
     }
-    _createSourceMapper(execEnv, from, mapCompiled, preferStubs) {
+    _createSourceMapper(execEnv, token, from, mapCompiled, preferStubs) {
         const sourceMapper = new sourceMapper_1.SourceMapper(this._importResolver, execEnv, this._evaluator, (stubFilePath, implFilePath) => {
-            const stubFileInfo = this._getSourceFileInfoFromPath(stubFilePath);
+            const stubFileInfo = this.getSourceFileInfo(stubFilePath);
             if (!stubFileInfo) {
                 return undefined;
             }
             this._addShadowedFile(stubFileInfo, implFilePath);
             return this.getBoundSourceFile(implFilePath);
-        }, (f) => this.getBoundSourceFileInfo(f), mapCompiled !== null && mapCompiled !== void 0 ? mapCompiled : false, preferStubs !== null && preferStubs !== void 0 ? preferStubs : false, from);
+        }, (f) => this.getBoundSourceFileInfo(f), (f) => this.getSourceFileInfo(f), mapCompiled !== null && mapCompiled !== void 0 ? mapCompiled : false, preferStubs !== null && preferStubs !== void 0 ? preferStubs : false, from, token);
         return sourceMapper;
     }
     _isImportAllowed(importer, importResult, isImportStubFile) {
@@ -1761,6 +1761,14 @@ class Program {
                     thirdPartyImportAllowed = true;
                 }
             }
+            else if (importer.isThirdPartyImport) {
+                // If the importing file is a third-party import, allow importing of
+                // additional third-party imports. This supports the case where the importer
+                // is in a py.typed library but is importing from another non-py.typed
+                // library. It also supports the case where someone explicitly opens a
+                // library source file in their editor.
+                thirdPartyImportAllowed = true;
+            }
             // Some libraries ship with stub files that import from non-stubs. Don't
             // explore those.
             // Don't explore any third-party files unless they're type stub files
@@ -1894,8 +1902,8 @@ class Program {
                 // We found a new import to add. See if it's already part
                 // of the program.
                 let importedFileInfo;
-                if (this._getSourceFileInfoFromPath(importInfo.path)) {
-                    importedFileInfo = this._getSourceFileInfoFromPath(importInfo.path);
+                if (this.getSourceFileInfo(importInfo.path)) {
+                    importedFileInfo = this.getSourceFileInfo(importInfo.path);
                 }
                 else {
                     const importName = this._getImportNameForFile(importInfo.path);
@@ -1924,8 +1932,8 @@ class Program {
         // specified by the source file.
         sourceFileInfo.imports = [];
         newImportPathMap.forEach((_, path) => {
-            if (this._getSourceFileInfoFromPath(path)) {
-                sourceFileInfo.imports.push(this._getSourceFileInfoFromPath(path));
+            if (this.getSourceFileInfo(path)) {
+                sourceFileInfo.imports.push(this.getSourceFileInfo(path));
             }
         });
         // Resolve the builtins import for the file. This needs to be
@@ -1934,7 +1942,7 @@ class Program {
         const builtinsImport = sourceFileInfo.sourceFile.getBuiltinsImport();
         if (builtinsImport && builtinsImport.isImportFound) {
             const resolvedBuiltinsPath = builtinsImport.resolvedPaths[builtinsImport.resolvedPaths.length - 1];
-            sourceFileInfo.builtinsImport = this._getSourceFileInfoFromPath(resolvedBuiltinsPath);
+            sourceFileInfo.builtinsImport = this.getSourceFileInfo(resolvedBuiltinsPath);
         }
         // Resolve the ipython display import for the file. This needs to be
         // analyzed before the file can be analyzed.
@@ -1942,13 +1950,10 @@ class Program {
         const ipythonDisplayImport = sourceFileInfo.sourceFile.getIPythonDisplayImport();
         if (ipythonDisplayImport && ipythonDisplayImport.isImportFound) {
             const resolvedIPythonDisplayPath = ipythonDisplayImport.resolvedPaths[ipythonDisplayImport.resolvedPaths.length - 1];
-            sourceFileInfo.ipythonDisplayImport = this._getSourceFileInfoFromPath(resolvedIPythonDisplayPath);
+            sourceFileInfo.ipythonDisplayImport = this.getSourceFileInfo(resolvedIPythonDisplayPath);
         }
         return filesAdded;
     }
-    _getSourceFileInfoFromPath(filePath) {
-        return this._sourceFileMap.get((0, pathUtils_1.normalizePathCase)(this._fs, filePath));
-    }
     _removeSourceFileFromListAndMap(filePath, indexToRemove) {
         this._sourceFileMap.delete((0, pathUtils_1.normalizePathCase)(this._fs, filePath));
         this._sourceFileList.splice(indexToRemove, 1);