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

package/dist/analyzer/backgroundAnalysisProgram.d.ts

@@ -6,27 +6,26 @@ import { ConsoleInterface } from '../common/console';
 import { Diagnostic } from '../common/diagnostic';
 import { LanguageServiceExtension } from '../common/extensibility';
 import { Range } from '../common/textRange';
-import { IndexResults } from '../languageService/documentSymbolProvider';
 import { AnalysisCompleteCallback } from './analysis';
 import { CacheManager } from './cacheManager';
 import { ImportResolver } from './importResolver';
-import { MaxAnalysisTime, OpenFileOptions, Program } from './program';
+import { Indices, MaxAnalysisTime, OpenFileOptions, Program } from './program';
 export declare class BackgroundAnalysisProgram {
     private _console;
     private _configOptions;
     private _importResolver;
-    private _backgroundAnalysis?;
+    protected _backgroundAnalysis?: BackgroundAnalysisBase | undefined;
     private _maxAnalysisTime?;
     private _disableChecker?;
     private _program;
     private _onAnalysisCompletion;
-    private _indices;
     constructor(_console: ConsoleInterface, _configOptions: ConfigOptions, _importResolver: ImportResolver, extension?: LanguageServiceExtension, _backgroundAnalysis?: BackgroundAnalysisBase | undefined, _maxAnalysisTime?: MaxAnalysisTime | undefined, _disableChecker?: boolean | undefined, cacheManager?: CacheManager);
     get configOptions(): ConfigOptions;
     get importResolver(): ImportResolver;
     get program(): Program;
     get host(): import("../common/host").Host;
     get backgroundAnalysis(): BackgroundAnalysisBase | undefined;
+    contains(filePath: string): boolean;
     setConfigOptions(configOptions: ConfigOptions): void;
     setImportResolver(importResolver: ImportResolver): void;
     setTrackedFiles(filePaths: string[]): void;
@@ -35,23 +34,22 @@ export declare class BackgroundAnalysisProgram {
     getChainedFilePath(filePath: string): string | undefined;
     updateChainedFilePath(filePath: string, chainedFilePath: string | undefined): void;
     updateOpenFileContents(path: string, version: number | null, contents: TextDocumentContentChangeEvent[], options: OpenFileOptions): void;
-    setFileClosed(filePath: string): void;
+    setFileClosed(filePath: string, isTracked?: boolean): void;
     markAllFilesDirty(evenIfContentsAreSame: boolean, indexingNeeded?: boolean): void;
     markFilesDirty(filePaths: string[], evenIfContentsAreSame: boolean, indexingNeeded?: boolean): void;
     setCompletionCallback(callback?: AnalysisCompleteCallback): void;
     startAnalysis(token: CancellationToken): boolean;
-    test_setIndexing(workspaceIndices: Map<string, IndexResults>, libraryIndices: Map<string | undefined, Map<string, IndexResults>>): void;
     startIndexing(indexOptions: IndexOptions): void;
     refreshIndexing(): void;
     cancelIndexing(): void;
-    getIndexing(filePath: string): Map<string, IndexResults> | undefined;
+    getIndexing(filePath: string): Map<string, import("../languageService/documentSymbolProvider").IndexResults> | undefined;
     getDiagnosticsForRange(filePath: string, range: Range, token: CancellationToken): Promise<Diagnostic[]>;
     writeTypeStub(targetImportPath: string, targetIsSingleFile: boolean, stubPath: string, token: CancellationToken): Promise<any>;
     invalidateAndForceReanalysis(rebuildUserFileIndexing: boolean, rebuildLibraryIndexing: boolean): void;
     restart(): void;
     dispose(): void;
     private _ensurePartialStubPackages;
-    private _getIndices;
     private _reportDiagnosticsForRemovedFiles;
+    protected _getIndices(): Indices | undefined;
 }
-export declare type BackgroundAnalysisProgramFactory = (console: ConsoleInterface, configOptions: ConfigOptions, importResolver: ImportResolver, extension?: LanguageServiceExtension, backgroundAnalysis?: BackgroundAnalysisBase, maxAnalysisTime?: MaxAnalysisTime, cacheManager?: CacheManager) => BackgroundAnalysisProgram;
+export declare type BackgroundAnalysisProgramFactory = (serviceId: string, console: ConsoleInterface, configOptions: ConfigOptions, importResolver: ImportResolver, extension?: LanguageServiceExtension, backgroundAnalysis?: BackgroundAnalysisBase, maxAnalysisTime?: MaxAnalysisTime, cacheManager?: CacheManager) => BackgroundAnalysisProgram;

package/dist/analyzer/backgroundAnalysisProgram.js

@@ -36,6 +36,9 @@ class BackgroundAnalysisProgram {
     get backgroundAnalysis() {
         return this._backgroundAnalysis;
     }
+    contains(filePath) {
+        return !!this._program.getSourceFile(filePath);
+    }
     setConfigOptions(configOptions) {
         var _a;
         this._configOptions = configOptions;
@@ -79,10 +82,10 @@ class BackgroundAnalysisProgram {
         this._program.setFileOpened(path, version, contents, options);
         this.markFilesDirty([path], /* evenIfContentsAreSame */ true);
     }
-    setFileClosed(filePath) {
+    setFileClosed(filePath, isTracked) {
         var _a;
-        (_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.setFileClosed(filePath);
-        const diagnostics = this._program.setFileClosed(filePath);
+        (_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.setFileClosed(filePath, isTracked);
+        const diagnostics = this._program.setFileClosed(filePath, isTracked);
         this._reportDiagnosticsForRemovedFiles(diagnostics);
     }
     markAllFilesDirty(evenIfContentsAreSame, indexingNeeded = true) {
@@ -102,37 +105,26 @@ class BackgroundAnalysisProgram {
     }
     startAnalysis(token) {
         if (this._backgroundAnalysis) {
-            this._backgroundAnalysis.startAnalysis(this._indices, token);
+            this._backgroundAnalysis.startAnalysis(this._getIndices(), token);
             return false;
         }
         return (0, analysis_1.analyzeProgram)(this._program, this._maxAnalysisTime, this._configOptions, this._onAnalysisCompletion, this._console, token);
     }
-    test_setIndexing(workspaceIndices, libraryIndices) {
-        const indices = this._getIndices();
-        for (const [filePath, indexResults] of workspaceIndices) {
-            indices.setWorkspaceIndex(filePath, indexResults);
-        }
-        for (const [execEnvRoot, map] of libraryIndices) {
-            for (const [libraryPath, indexResults] of map) {
-                indices.setIndex(execEnvRoot, libraryPath, indexResults);
-            }
-        }
-    }
     startIndexing(indexOptions) {
         var _a;
-        (_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.startIndexing(indexOptions, this._configOptions, this.importResolver, this.host.kind, this._getIndices());
+        (_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.startIndexing(indexOptions, this._configOptions, this.importResolver, this.host.kind);
     }
     refreshIndexing() {
         var _a;
-        (_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.refreshIndexing(this._configOptions, this.importResolver, this.host.kind, this._indices);
+        (_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.refreshIndexing(this._configOptions, this.importResolver, this.host.kind);
     }
     cancelIndexing() {
         var _a;
-        (_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.cancelIndexing(this._configOptions);
+        (_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.cancelIndexing();
     }
     getIndexing(filePath) {
         var _a;
-        return (_a = this._indices) === null || _a === void 0 ? void 0 : _a.getIndex(this._configOptions.findExecEnvironment(filePath).root);
+        return (_a = this._getIndices()) === null || _a === void 0 ? void 0 : _a.getIndex(this._configOptions.findExecEnvironment(filePath).root);
     }
     async getDiagnosticsForRange(filePath, range, token) {
         if (this._backgroundAnalysis) {
@@ -174,39 +166,6 @@ class BackgroundAnalysisProgram {
         (_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.ensurePartialStubPackages(execEnv.root);
         return this._importResolver.ensurePartialStubPackages(execEnv);
     }
-    _getIndices() {
-        if (!this._indices) {
-            const program = this._program;
-            // The map holds onto index results of library files per execution root.
-            // The map will be refreshed together when library files are re-scanned.
-            // It can't be cached by sourceFile since some of library files won't have
-            // corresponding sourceFile created.
-            const map = new Map();
-            this._indices = {
-                setWorkspaceIndex(path, indexResults) {
-                    var _a;
-                    // Index result of workspace file will be cached by each sourceFile
-                    // and it will go away when the source file goes away.
-                    (_a = program.getSourceFile(path)) === null || _a === void 0 ? void 0 : _a.cacheIndexResults(indexResults);
-                },
-                getIndex(execEnv) {
-                    return map.get(execEnv);
-                },
-                setIndex(execEnv, path, indexResults) {
-                    let indicesMap = map.get(execEnv);
-                    if (!indicesMap) {
-                        indicesMap = new Map();
-                        map.set(execEnv, indicesMap);
-                    }
-                    indicesMap.set(path, indexResults);
-                },
-                reset() {
-                    map.clear();
-                },
-            };
-        }
-        return this._indices;
-    }
     _reportDiagnosticsForRemovedFiles(fileDiags) {
         if (fileDiags.length > 0) {
             // If analysis is running in the foreground process, report any
@@ -225,6 +184,9 @@ class BackgroundAnalysisProgram {
             }
         }
     }
+    _getIndices() {
+        return undefined;
+    }
 }
 exports.BackgroundAnalysisProgram = BackgroundAnalysisProgram;
 //# sourceMappingURL=backgroundAnalysisProgram.js.map

package/dist/analyzer/backgroundAnalysisProgram.js.map

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

package/dist/analyzer/binder.js

@@ -43,7 +43,6 @@ const diagnosticRules_1 = require("../common/diagnosticRules");
 const pathUtils_1 = require("../common/pathUtils");
 const positionUtils_1 = require("../common/positionUtils");
 const textRange_1 = require("../common/textRange");
-const textRange_2 = require("../common/textRange");
 const localize_1 = require("../localization/localize");
 const AnalyzerNodeInfo = __importStar(require("./analyzerNodeInfo"));
 const codeFlowTypes_1 = require("./codeFlowTypes");
@@ -111,7 +110,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
             // Bind implicit names.
             // List taken from https://docs.python.org/3/reference/import.html#__name__
-            this._addImplicitSymbolToCurrentScope('__doc__', node, 'str | None');
             this._addImplicitSymbolToCurrentScope('__name__', node, 'str');
             this._addImplicitSymbolToCurrentScope('__qualname__', node, 'str');
             this._addImplicitSymbolToCurrentScope('__loader__', node, 'Any');
@@ -123,6 +121,10 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             this._addImplicitSymbolToCurrentScope('__dict__', node, 'Dict[str, Any]');
             this._addImplicitSymbolToCurrentScope('__annotations__', node, 'Dict[str, Any]');
             this._addImplicitSymbolToCurrentScope('__builtins__', node, 'Any');
+            // If there is a static docstring provided in the module, assume
+            // that the type of `__doc__` is `str` rather than `str | None`.
+            const moduleDocString = ParseTreeUtils.getDocString(node.statements);
+            this._addImplicitSymbolToCurrentScope('__doc__', node, moduleDocString ? 'str' : 'str | None');
             // Create a start node for the module.
             this._currentFlowNode = this._createStartFlowNode();
             this._walkStatementsAndReportUnreachable(node.statements);
@@ -212,7 +214,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             type: 6 /* Class */,
             node,
             path: this._fileInfo.filePath,
-            range: (0, positionUtils_1.convertOffsetsToRange)(node.name.start, textRange_2.TextRange.getEnd(node.name), this._fileInfo.lines),
+            range: (0, positionUtils_1.convertTextRangeToRange)(node.name, this._fileInfo.lines),
             moduleName: this._fileInfo.moduleName,
             isInExceptSuite: this._isInExceptSuite,
         };
@@ -257,7 +259,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             isMethod: !!containingClassNode,
             isGenerator: false,
             path: this._fileInfo.filePath,
-            range: (0, positionUtils_1.convertOffsetsToRange)(node.name.start, textRange_2.TextRange.getEnd(node.name), this._fileInfo.lines),
+            range: (0, positionUtils_1.convertTextRangeToRange)(node.name, this._fileInfo.lines),
             moduleName: this._fileInfo.moduleName,
             isInExceptSuite: this._isInExceptSuite,
         };
@@ -311,7 +313,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                                 type: 2 /* Parameter */,
                                 node: paramNode,
                                 path: this._fileInfo.filePath,
-                                range: (0, positionUtils_1.convertOffsetsToRange)(paramNode.start, textRange_2.TextRange.getEnd(paramNode), this._fileInfo.lines),
+                                range: (0, positionUtils_1.convertTextRangeToRange)(paramNode, this._fileInfo.lines),
                                 moduleName: this._fileInfo.moduleName,
                                 isInExceptSuite: this._isInExceptSuite,
                             };
@@ -368,7 +370,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                                 type: 2 /* Parameter */,
                                 node: paramNode,
                                 path: this._fileInfo.filePath,
-                                range: (0, positionUtils_1.convertOffsetsToRange)(paramNode.start, textRange_2.TextRange.getEnd(paramNode), this._fileInfo.lines),
+                                range: (0, positionUtils_1.convertTextRangeToRange)(paramNode, this._fileInfo.lines),
                                 moduleName: this._fileInfo.moduleName,
                                 isInExceptSuite: this._isInExceptSuite,
                             };
@@ -478,6 +480,9 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             if (param.boundExpression) {
                 this.walk(param.boundExpression);
             }
+            if (param.defaultExpression) {
+                this.walk(param.defaultExpression);
+            }
         });
         node.parameters.forEach((param) => {
             const name = param.name;
@@ -486,7 +491,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 type: 3 /* TypeParameter */,
                 node: param,
                 path: this._fileInfo.filePath,
-                range: (0, positionUtils_1.convertOffsetsToRange)(node.start, textRange_2.TextRange.getEnd(node), this._fileInfo.lines),
+                range: (0, positionUtils_1.convertTextRangeToRange)(node, this._fileInfo.lines),
                 moduleName: this._fileInfo.moduleName,
                 isInExceptSuite: this._isInExceptSuite,
             };
@@ -512,7 +517,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             type: 4 /* TypeAlias */,
             node,
             path: this._fileInfo.filePath,
-            range: (0, positionUtils_1.convertOffsetsToRange)(node.name.start, textRange_2.TextRange.getEnd(node.name), this._fileInfo.lines),
+            range: (0, positionUtils_1.convertTextRangeToRange)(node.name, this._fileInfo.lines),
             moduleName: this._fileInfo.moduleName,
             isInExceptSuite: this._isInExceptSuite,
         };
@@ -552,13 +557,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 }
             }
         }
-        // If this is an annotated variable assignment within a class body,
-        // we need to evaluate the type annotation first.
-        const bindVariableBeforeRhsEvaluation = node.leftExpression.nodeType === 54 /* TypeAnnotation */ &&
-            ParseTreeUtils.getEnclosingClass(node, /* stopAtFunction */ true) !== undefined;
-        if (!bindVariableBeforeRhsEvaluation) {
-            this.walk(node.rightExpression);
-        }
+        this.walk(node.rightExpression);
         let isPossibleTypeAlias = true;
         if (ParseTreeUtils.getEnclosingFunction(node)) {
             // We will assume that type aliases are defined only at the module level
@@ -578,9 +577,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         this._addInferredTypeAssignmentForVariable(node.leftExpression, node.rightExpression, isPossibleTypeAlias);
         // If we didn't create assignment target flow nodes above, do so now.
         this._createAssignmentTargetFlowNodes(node.leftExpression, /* walkTargets */ true, /* unbound */ false);
-        if (bindVariableBeforeRhsEvaluation) {
-            this.walk(node.rightExpression);
-        }
         // Is this an assignment to dunder all?
         if (this._currentScope.type === 3 /* Module */) {
             if ((node.leftExpression.nodeType === 38 /* Name */ && node.leftExpression.value === '__all__') ||
@@ -762,13 +758,23 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         return false;
     }
     visitTypeAnnotation(node) {
+        var _a;
         if (this._handleTypingStubAssignmentOrAnnotation(node)) {
             return false;
         }
-        this.walk(node.typeAnnotation);
+        // If this is an annotated variable assignment within a class body,
+        // we need to evaluate the type annotation first.
+        const bindVariableBeforeAnnotationEvaluation = ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 3 /* Assignment */ &&
+            ParseTreeUtils.getEnclosingClass(node, /* stopAtFunction */ true) !== undefined;
+        if (!bindVariableBeforeAnnotationEvaluation) {
+            this.walk(node.typeAnnotation);
+        }
         this._createVariableAnnotationFlowNode();
         this._bindPossibleTupleNamedTarget(node.valueExpression);
         this._addTypeDeclarationForVariable(node.valueExpression, node.typeAnnotation);
+        if (bindVariableBeforeAnnotationEvaluation) {
+            this.walk(node.typeAnnotation);
+        }
         // For type annotations that are not part of assignments (e.g. simple variable
         // annotations), we need to populate the reference map. Otherwise the type
         // analyzer's code flow engine won't run and detect cases where the variable
@@ -973,7 +979,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     isConstant: (0, symbolNameUtils_1.isConstantName)(node.name.value),
                     inferredTypeSource: node,
                     path: this._fileInfo.filePath,
-                    range: (0, positionUtils_1.convertOffsetsToRange)(node.name.start, textRange_2.TextRange.getEnd(node.name), this._fileInfo.lines),
+                    range: (0, positionUtils_1.convertTextRangeToRange)(node.name, this._fileInfo.lines),
                     moduleName: this._fileInfo.moduleName,
                     isInExceptSuite: this._isInExceptSuite,
                 };
@@ -1248,6 +1254,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         return true;
     }
     visitImportFrom(node) {
+        var _a;
         const typingSymbolsOfInterest = ['Final', 'TypeAlias', 'ClassVar', 'Required', 'NotRequired', 'Annotated'];
         const dataclassesSymbolsOfInterest = ['InitVar'];
         const importInfo = AnalyzerNodeInfo.getImportInfo(node.module);
@@ -1280,6 +1287,9 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             }
             if (importInfo) {
                 const names = [];
+                // Note that this scope uses a wildcard import, so we cannot shortcut
+                // any code flow checks. All expressions are potentially in play.
+                (_a = this._currentScopeCodeFlowExpressions) === null || _a === void 0 ? void 0 : _a.add(codeFlowTypes_1.wildcardImportReferenceKey);
                 const lookupInfo = this._fileInfo.importLookup(resolvedPath);
                 if (lookupInfo) {
                     const wildcardNames = this._getWildcardImportNames(lookupInfo);
@@ -1343,6 +1353,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                                             isInExceptSuite: this._isInExceptSuite,
                                         };
                                         localSymbol.addDeclaration(aliasDecl);
+                                        names.push(name);
                                     }
                                 }
                             }
@@ -1401,7 +1412,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                             node: importSymbolNode,
                             path: implicitImport.path,
                             loadSymbolsFromPath: true,
-                            range: (0, textRange_1.getEmptyRange)(),
+                            range: (0, positionUtils_1.convertTextRangeToRange)(importSymbolNode, this._fileInfo.lines),
                             usesLocalName: false,
                             moduleName: this._fileInfo.moduleName,
                             isInExceptSuite: this._isInExceptSuite,
@@ -1423,7 +1434,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         usesLocalName: !!importSymbolNode.alias,
                         symbolName: importedName,
                         submoduleFallback,
-                        range: (0, textRange_1.getEmptyRange)(),
+                        range: (0, positionUtils_1.convertTextRangeToRange)(nameNode, this._fileInfo.lines),
                         moduleName: this._fileInfo.moduleName,
                         isInExceptSuite: this._isInExceptSuite,
                         isNativeLib: importInfo === null || importInfo === void 0 ? void 0 : importInfo.isNativeLib,
@@ -1707,7 +1718,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     isConstant: (0, symbolNameUtils_1.isConstantName)(node.target.value),
                     inferredTypeSource: node,
                     path: this._fileInfo.filePath,
-                    range: (0, positionUtils_1.convertOffsetsToRange)(node.target.start, textRange_2.TextRange.getEnd(node.target), this._fileInfo.lines),
+                    range: (0, positionUtils_1.convertTextRangeToRange)(node.target, this._fileInfo.lines),
                     moduleName: this._fileInfo.moduleName,
                     isInExceptSuite: this._isInExceptSuite,
                 };
@@ -1772,7 +1783,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 isConstant: (0, symbolNameUtils_1.isConstantName)(slotName),
                 isDefinedBySlots: true,
                 path: this._fileInfo.filePath,
-                range: (0, positionUtils_1.convertOffsetsToRange)(slotNameNode.start, slotNameNode.start + slotNameNode.length, this._fileInfo.lines),
+                range: (0, positionUtils_1.convertTextRangeToRange)(slotNameNode, this._fileInfo.lines),
                 moduleName: this._fileInfo.moduleName,
                 isInExceptSuite: this._isInExceptSuite,
             };
@@ -1814,7 +1825,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 isConstant: (0, symbolNameUtils_1.isConstantName)(target.value),
                 inferredTypeSource: target.parent,
                 path: this._fileInfo.filePath,
-                range: (0, positionUtils_1.convertOffsetsToRange)(target.start, textRange_2.TextRange.getEnd(target), this._fileInfo.lines),
+                range: (0, positionUtils_1.convertTextRangeToRange)(target, this._fileInfo.lines),
                 moduleName: this._fileInfo.moduleName,
                 isInExceptSuite: this._isInExceptSuite,
             };
@@ -1894,7 +1905,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 node,
                 path: pathOfLastSubmodule,
                 loadSymbolsFromPath: false,
-                range: (0, textRange_1.getEmptyRange)(),
+                range: importAlias ? (0, positionUtils_1.convertTextRangeToRange)(importAlias, this._fileInfo.lines) : (0, textRange_1.getEmptyRange)(),
                 usesLocalName: !!importAlias,
                 moduleName: importInfo.importName,
                 firstNamePart: firstNamePartValue,
@@ -1910,7 +1921,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 node,
                 path: pathOfLastSubmodule,
                 loadSymbolsFromPath: true,
-                range: (0, textRange_1.getEmptyRange)(),
+                range: importAlias ? (0, positionUtils_1.convertTextRangeToRange)(importAlias, this._fileInfo.lines) : (0, textRange_1.getEmptyRange)(),
                 usesLocalName: !!importAlias,
                 moduleName: (_a = importInfo === null || importInfo === void 0 ? void 0 : importInfo.importName) !== null && _a !== void 0 ? _a : '',
                 firstNamePart: firstNamePartValue,
@@ -2649,7 +2660,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         isInferenceAllowedInPyTyped: this._isInferenceAllowedInPyTyped(name.value),
                         typeAliasName: isPossibleTypeAlias ? target : undefined,
                         path: this._fileInfo.filePath,
-                        range: (0, positionUtils_1.convertOffsetsToRange)(name.start, textRange_2.TextRange.getEnd(name), this._fileInfo.lines),
+                        range: (0, positionUtils_1.convertTextRangeToRange)(name, this._fileInfo.lines),
                         moduleName: this._fileInfo.moduleName,
                         isInExceptSuite: this._isInExceptSuite,
                         docString: this._getVariableDocString(target),
@@ -2692,7 +2703,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         inferredTypeSource: source,
                         isDefinedByMemberAccess: true,
                         path: this._fileInfo.filePath,
-                        range: (0, positionUtils_1.convertOffsetsToRange)(target.memberName.start, target.memberName.start + target.memberName.length, this._fileInfo.lines),
+                        range: (0, positionUtils_1.convertTextRangeToRange)(target.memberName, this._fileInfo.lines),
                         moduleName: this._fileInfo.moduleName,
                         isInExceptSuite: this._isInExceptSuite,
                         docString: this._getVariableDocString(target),
@@ -2790,7 +2801,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         typeAliasName: isExplicitTypeAlias ? target : undefined,
                         path: this._fileInfo.filePath,
                         typeAnnotationNode,
-                        range: (0, positionUtils_1.convertOffsetsToRange)(name.start, textRange_2.TextRange.getEnd(name), this._fileInfo.lines),
+                        range: (0, positionUtils_1.convertTextRangeToRange)(name, this._fileInfo.lines),
                         moduleName: this._fileInfo.moduleName,
                         isInExceptSuite: this._isInExceptSuite,
                         docString: this._getVariableDocString(target),
@@ -2854,7 +2865,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         isFinal: finalInfo.isFinal,
                         path: this._fileInfo.filePath,
                         typeAnnotationNode: finalInfo.isFinal && !finalInfo.finalTypeNode ? undefined : typeAnnotation,
-                        range: (0, positionUtils_1.convertOffsetsToRange)(target.memberName.start, target.memberName.start + target.memberName.length, this._fileInfo.lines),
+                        range: (0, positionUtils_1.convertTextRangeToRange)(target.memberName, this._fileInfo.lines),
                         moduleName: this._fileInfo.moduleName,
                         isInExceptSuite: this._isInExceptSuite,
                         docString: this._getVariableDocString(target),
@@ -3206,7 +3217,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 type: 7 /* SpecialBuiltInClass */,
                 node: annotationNode,
                 path: this._fileInfo.filePath,
-                range: (0, positionUtils_1.convertOffsetsToRange)(annotationNode.start, textRange_2.TextRange.getEnd(annotationNode), this._fileInfo.lines),
+                range: (0, positionUtils_1.convertTextRangeToRange)(annotationNode, this._fileInfo.lines),
                 moduleName: this._fileInfo.moduleName,
                 isInExceptSuite: this._isInExceptSuite,
             });