microsoft/pyright
1
1
Fork 0
mirror of https://github.com/microsoft/pyright.git synced 2024-09-11 07:55:56 +03:00
Code Issues Projects Releases Wiki Activity

Minor code cleanup — improved comments, etc.

Browse Source
This commit is contained in:
Eric Traut 2022-06-09 17:49:28 -07:00
parent 376bf81935
commit c5153a557c
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/pyright-internal/src/analyzer/importResolver.ts
View File

@ -142,8 +142,8 @@ export class ImportResolver {
execEnv: ExecutionEnvironment,
moduleDescriptor: ImportedModuleDescriptor
): ImportResult {
// wrap internal call to _resolveImport() to prevent calling any
// child class version of resolveImport()
// Wrap internal call to _resolveImport() to prevent calling any
// child class version of resolveImport().
return this._resolveImport(sourceFilePath, execEnv, moduleDescriptor);
}
@ -272,6 +272,7 @@ export class ImportResolver {
} else {
// Is it already cached?
const cachedResults = this._lookUpResultsInCache(execEnv, importName, moduleDescriptor.importedSymbols);
if (cachedResults) {
// In most cases, we can simply return a cached entry. However, there are cases
// where the cached entry refers to a previously-resolved namespace package
@ -288,13 +289,24 @@ export class ImportResolver {
}
}
const bestImport = this._resolveBestAbsoluteImport(sourceFilePath, execEnv, moduleDescriptor, true);
const bestImport = this._resolveBestAbsoluteImport(
sourceFilePath,
execEnv,
moduleDescriptor,
/* allowPyi */ true
);
if (bestImport) {
if (bestImport.isStubFile) {
bestImport.nonStubImportResult =
this._resolveBestAbsoluteImport(sourceFilePath, execEnv, moduleDescriptor, false) ||
notFoundResult;
this._resolveBestAbsoluteImport(
sourceFilePath,
execEnv,
moduleDescriptor,
/* allowPyi */ false
) || notFoundResult;
}
return this.addResultsToCache(execEnv, importName, bestImport, moduleDescriptor.importedSymbols);
}
}
@ -1508,6 +1520,7 @@ export class ImportResolver {
importName,
importFailureInfo
);
if (importInfo.isImportFound) {
importInfo.importType = isStdLib ? ImportType.BuiltIn : ImportType.ThirdParty;
return importInfo;