@zzzen/pyright-internal 1.2.0-dev.20231126 → 1.2.0-dev.20231210

package/dist/analyzer/binder.js

@@ -47,6 +47,7 @@ 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 uri_1 = require("../common/uri/uri");
 const localize_1 = require("../localization/localize");
 const AnalyzerNodeInfo = __importStar(require("./analyzerNodeInfo"));
 const codeFlowTypes_1 = require("./codeFlowTypes");
@@ -224,7 +225,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         const classDeclaration = {
             type: 6 /* DeclarationType.Class */,
             node,
-            path: this._fileInfo.filePath,
+            uri: this._fileInfo.fileUri,
             range: (0, positionUtils_1.convertTextRangeToRange)(node.name, this._fileInfo.lines),
             moduleName: this._fileInfo.moduleName,
             isInExceptSuite: this._isInExceptSuite,
@@ -269,7 +270,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             node,
             isMethod: !!containingClassNode,
             isGenerator: false,
-            path: this._fileInfo.filePath,
+            uri: this._fileInfo.fileUri,
             range: (0, positionUtils_1.convertTextRangeToRange)(node.name, this._fileInfo.lines),
             moduleName: this._fileInfo.moduleName,
             isInExceptSuite: this._isInExceptSuite,
@@ -329,7 +330,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                             const paramDeclaration = {
                                 type: 2 /* DeclarationType.Parameter */,
                                 node: paramNode,
-                                path: this._fileInfo.filePath,
+                                uri: this._fileInfo.fileUri,
                                 range: (0, positionUtils_1.convertTextRangeToRange)(paramNode, this._fileInfo.lines),
                                 moduleName: this._fileInfo.moduleName,
                                 isInExceptSuite: this._isInExceptSuite,
@@ -387,7 +388,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                             const paramDeclaration = {
                                 type: 2 /* DeclarationType.Parameter */,
                                 node: paramNode,
-                                path: this._fileInfo.filePath,
+                                uri: this._fileInfo.fileUri,
                                 range: (0, positionUtils_1.convertTextRangeToRange)(paramNode, this._fileInfo.lines),
                                 moduleName: this._fileInfo.moduleName,
                                 isInExceptSuite: this._isInExceptSuite,
@@ -511,7 +512,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             const paramDeclaration = {
                 type: 3 /* DeclarationType.TypeParameter */,
                 node: param,
-                path: this._fileInfo.filePath,
+                uri: this._fileInfo.fileUri,
                 range: (0, positionUtils_1.convertTextRangeToRange)(node, this._fileInfo.lines),
                 moduleName: this._fileInfo.moduleName,
                 isInExceptSuite: this._isInExceptSuite,
@@ -542,10 +543,11 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         const typeAliasDeclaration = {
             type: 4 /* DeclarationType.TypeAlias */,
             node,
-            path: this._fileInfo.filePath,
+            uri: this._fileInfo.fileUri,
             range: (0, positionUtils_1.convertTextRangeToRange)(node.name, this._fileInfo.lines),
             moduleName: this._fileInfo.moduleName,
             isInExceptSuite: this._isInExceptSuite,
+            docString: this._getVariableDocString(node.expression),
         };
         const symbol = this._bindNameToScope(this._currentScope, node.name);
         if (symbol) {
@@ -1017,7 +1019,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     node: node.name,
                     isConstant: (0, symbolNameUtils_1.isConstantName)(node.name.value),
                     inferredTypeSource: node,
-                    path: this._fileInfo.filePath,
+                    uri: this._fileInfo.fileUri,
                     range: (0, positionUtils_1.convertTextRangeToRange)(node.name, this._fileInfo.lines),
                     moduleName: this._fileInfo.moduleName,
                     isInExceptSuite: this._isInExceptSuite,
@@ -1037,6 +1039,9 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         return false;
     }
     visitRaise(node) {
+        if (this._currentFlowNode) {
+            this._addExceptTargets(this._currentFlowNode);
+        }
         if (this._targetFunctionDeclaration) {
             if (!this._targetFunctionDeclaration.raiseStatements) {
                 this._targetFunctionDeclaration.raiseStatements = [];
@@ -1298,9 +1303,9 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         const dataclassesSymbolsOfInterest = ['InitVar'];
         const importInfo = AnalyzerNodeInfo.getImportInfo(node.module);
         AnalyzerNodeInfo.setFlowNode(node, this._currentFlowNode);
-        let resolvedPath = '';
+        let resolvedPath = uri_1.Uri.empty();
         if (importInfo && importInfo.isImportFound && !importInfo.isNativeLib) {
-            resolvedPath = importInfo.resolvedPaths[importInfo.resolvedPaths.length - 1];
+            resolvedPath = importInfo.resolvedUris[importInfo.resolvedUris.length - 1];
         }
         // If this file is a module __init__.py(i), relative imports of submodules
         // using the syntax "from .x import y" introduce a symbol x into the
@@ -1308,7 +1313,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         // symbols below) in case one of the imported symbols is the same name as the
         // submodule. In that case, we want to the symbol to appear later in the
         // declaration list because it should "win" when resolving the alias.
-        const fileName = (0, pathUtils_1.stripFileExtension)((0, pathUtils_1.getFileName)(this._fileInfo.filePath));
+        const fileName = (0, pathUtils_1.stripFileExtension)(this._fileInfo.fileUri.fileName);
         const isModuleInitFile = fileName === '__init__' && node.module.leadingDots === 1 && node.module.nameParts.length === 1;
         let isTypingImport = false;
         let isDataclassesImport = false;
@@ -1353,7 +1358,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                                 const aliasDecl = {
                                     type: 8 /* DeclarationType.Alias */,
                                     node,
-                                    path: resolvedPath,
+                                    uri: resolvedPath,
                                     loadSymbolsFromPath: true,
                                     range: (0, textRange_1.getEmptyRange)(),
                                     usesLocalName: false,
@@ -1373,7 +1378,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                                         const submoduleFallback = {
                                             type: 8 /* DeclarationType.Alias */,
                                             node,
-                                            path: implicitImport.path,
+                                            uri: implicitImport.uri,
                                             loadSymbolsFromPath: true,
                                             range: (0, textRange_1.getEmptyRange)(),
                                             usesLocalName: false,
@@ -1383,7 +1388,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                                         const aliasDecl = {
                                             type: 8 /* DeclarationType.Alias */,
                                             node,
-                                            path: resolvedPath,
+                                            uri: resolvedPath,
                                             loadSymbolsFromPath: true,
                                             usesLocalName: false,
                                             symbolName: name,
@@ -1451,7 +1456,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         submoduleFallback = {
                             type: 8 /* DeclarationType.Alias */,
                             node: importSymbolNode,
-                            path: implicitImport.path,
+                            uri: implicitImport.uri,
                             loadSymbolsFromPath: true,
                             range: (0, textRange_1.getEmptyRange)(),
                             usesLocalName: false,
@@ -1467,7 +1472,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                             if (node.module.leadingDots === 1 && node.module.nameParts.length === 0) {
                                 loadSymbolsFromPath = false;
                             }
-                            else if (resolvedPath === this._fileInfo.filePath) {
+                            else if (resolvedPath.equals(this._fileInfo.fileUri)) {
                                 loadSymbolsFromPath = false;
                             }
                         }
@@ -1475,7 +1480,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     const aliasDecl = {
                         type: 8 /* DeclarationType.Alias */,
                         node: importSymbolNode,
-                        path: resolvedPath,
+                        uri: resolvedPath,
                         loadSymbolsFromPath,
                         usesLocalName: !!importSymbolNode.alias,
                         symbolName: importedName,
@@ -1769,7 +1774,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     node: node.target,
                     isConstant: (0, symbolNameUtils_1.isConstantName)(node.target.value),
                     inferredTypeSource: node,
-                    path: this._fileInfo.filePath,
+                    uri: this._fileInfo.fileUri,
                     range: (0, positionUtils_1.convertTextRangeToRange)(node.target, this._fileInfo.lines),
                     moduleName: this._fileInfo.moduleName,
                     isInExceptSuite: this._isInExceptSuite,
@@ -1838,7 +1843,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 node: slotNameNode,
                 isConstant: (0, symbolNameUtils_1.isConstantName)(slotName),
                 isDefinedBySlots: true,
-                path: this._fileInfo.filePath,
+                uri: this._fileInfo.fileUri,
                 range: (0, positionUtils_1.convertTextRangeToRange)(slotNameNode, this._fileInfo.lines),
                 moduleName: this._fileInfo.moduleName,
                 isInExceptSuite: this._isInExceptSuite,
@@ -1880,7 +1885,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 node: target,
                 isConstant: (0, symbolNameUtils_1.isConstantName)(target.value),
                 inferredTypeSource: target.parent,
-                path: this._fileInfo.filePath,
+                uri: this._fileInfo.fileUri,
                 range: (0, positionUtils_1.convertTextRangeToRange)(target, this._fileInfo.lines),
                 moduleName: this._fileInfo.moduleName,
                 isInExceptSuite: this._isInExceptSuite,
@@ -1904,20 +1909,22 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         }
         // There should be only one declaration for the variable.
         const aliasDecl = varSymbol.getDeclarations().find((decl) => decl.type === 8 /* DeclarationType.Alias */);
-        const resolvedPath = (aliasDecl === null || aliasDecl === void 0 ? void 0 : aliasDecl.path) && aliasDecl.loadSymbolsFromPath
-            ? aliasDecl.path
-            : ((_a = aliasDecl === null || aliasDecl === void 0 ? void 0 : aliasDecl.submoduleFallback) === null || _a === void 0 ? void 0 : _a.path) && aliasDecl.submoduleFallback.loadSymbolsFromPath
-                ? aliasDecl.submoduleFallback.path
+        const resolvedUri = (aliasDecl === null || aliasDecl === void 0 ? void 0 : aliasDecl.uri) && !aliasDecl.uri.isEmpty() && aliasDecl.loadSymbolsFromPath
+            ? aliasDecl.uri
+            : ((_a = aliasDecl === null || aliasDecl === void 0 ? void 0 : aliasDecl.submoduleFallback) === null || _a === void 0 ? void 0 : _a.uri) &&
+                !aliasDecl.submoduleFallback.uri.isEmpty() &&
+                aliasDecl.submoduleFallback.loadSymbolsFromPath
+                ? aliasDecl.submoduleFallback.uri
                 : undefined;
-        if (!resolvedPath) {
+        if (!resolvedUri) {
             return undefined;
         }
-        let lookupInfo = this._fileInfo.importLookup(resolvedPath);
+        let lookupInfo = this._fileInfo.importLookup(resolvedUri);
         if (lookupInfo === null || lookupInfo === void 0 ? void 0 : lookupInfo.dunderAllNames) {
             return lookupInfo.dunderAllNames;
         }
-        if ((_b = aliasDecl === null || aliasDecl === void 0 ? void 0 : aliasDecl.submoduleFallback) === null || _b === void 0 ? void 0 : _b.path) {
-            lookupInfo = this._fileInfo.importLookup(aliasDecl.submoduleFallback.path);
+        if (((_b = aliasDecl === null || aliasDecl === void 0 ? void 0 : aliasDecl.submoduleFallback) === null || _b === void 0 ? void 0 : _b.uri) && !aliasDecl.submoduleFallback.uri.isEmpty()) {
+            lookupInfo = this._fileInfo.importLookup(aliasDecl.submoduleFallback.uri);
             return lookupInfo === null || lookupInfo === void 0 ? void 0 : lookupInfo.dunderAllNames;
         }
         return undefined;
@@ -1945,14 +1952,14 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             .getDeclarations()
             .find((decl) => decl.type === 8 /* DeclarationType.Alias */ && decl.firstNamePart === firstNamePartValue);
         let newDecl;
-        let pathOfLastSubmodule;
-        if (importInfo && importInfo.isImportFound && !importInfo.isNativeLib && importInfo.resolvedPaths.length > 0) {
-            pathOfLastSubmodule = importInfo.resolvedPaths[importInfo.resolvedPaths.length - 1];
+        let uriOfLastSubmodule;
+        if (importInfo && importInfo.isImportFound && !importInfo.isNativeLib && importInfo.resolvedUris.length > 0) {
+            uriOfLastSubmodule = importInfo.resolvedUris[importInfo.resolvedUris.length - 1];
         }
         else {
-            pathOfLastSubmodule = declaration_1.UnresolvedModuleMarker;
+            uriOfLastSubmodule = declaration_1.UnresolvedModuleMarker;
         }
-        const isResolved = importInfo && importInfo.isImportFound && !importInfo.isNativeLib && importInfo.resolvedPaths.length > 0;
+        const isResolved = importInfo && importInfo.isImportFound && !importInfo.isNativeLib && importInfo.resolvedUris.length > 0;
         if (existingDecl) {
             newDecl = existingDecl;
         }
@@ -1960,7 +1967,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             newDecl = {
                 type: 8 /* DeclarationType.Alias */,
                 node,
-                path: pathOfLastSubmodule,
+                uri: uriOfLastSubmodule,
                 loadSymbolsFromPath: false,
                 range: (0, textRange_1.getEmptyRange)(),
                 usesLocalName: !!importAlias,
@@ -1976,7 +1983,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             newDecl = {
                 type: 8 /* DeclarationType.Alias */,
                 node,
-                path: pathOfLastSubmodule,
+                uri: uriOfLastSubmodule,
                 loadSymbolsFromPath: true,
                 range: (0, textRange_1.getEmptyRange)(),
                 usesLocalName: !!importAlias,
@@ -1989,15 +1996,15 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         // See if there is import info for this part of the path. This allows us
         // to implicitly import all of the modules in a multi-part module name.
         const implicitImportInfo = AnalyzerNodeInfo.getImportInfo(node.module.nameParts[0]);
-        if (implicitImportInfo && implicitImportInfo.resolvedPaths.length) {
-            newDecl.path = implicitImportInfo.resolvedPaths[0];
+        if (implicitImportInfo && implicitImportInfo.resolvedUris.length) {
+            newDecl.uri = implicitImportInfo.resolvedUris[0];
             newDecl.loadSymbolsFromPath = true;
             this._addImplicitImportsToLoaderActions(implicitImportInfo, newDecl);
         }
         // Add the implicit imports for this module if it's the last
         // name part we're resolving.
         if (importAlias || node.module.nameParts.length === 1) {
-            newDecl.path = pathOfLastSubmodule;
+            newDecl.uri = uriOfLastSubmodule;
             newDecl.loadSymbolsFromPath = true;
             newDecl.isUnresolved = false;
             if (importInfo) {
@@ -2014,12 +2021,12 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     ? curLoaderActions.implicitImports.get(namePartValue)
                     : undefined;
                 if (!loaderActions) {
-                    const loaderActionPath = importInfo && i < importInfo.resolvedPaths.length
-                        ? importInfo.resolvedPaths[i]
+                    const loaderActionPath = importInfo && i < importInfo.resolvedUris.length
+                        ? importInfo.resolvedUris[i]
                         : declaration_1.UnresolvedModuleMarker;
                     // Allocate a new loader action.
                     loaderActions = {
-                        path: loaderActionPath,
+                        uri: loaderActionPath,
                         loadSymbolsFromPath: false,
                         implicitImports: new Map(),
                         isUnresolved: !isResolved,
@@ -2032,8 +2039,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 if (i === node.module.nameParts.length - 1) {
                     // If this is the last name part we're resolving, add in the
                     // implicit imports as well.
-                    if (importInfo && i < importInfo.resolvedPaths.length) {
-                        loaderActions.path = importInfo.resolvedPaths[i];
+                    if (importInfo && i < importInfo.resolvedUris.length) {
+                        loaderActions.uri = importInfo.resolvedUris[i];
                         loaderActions.loadSymbolsFromPath = true;
                         this._addImplicitImportsToLoaderActions(importInfo, loaderActions);
                     }
@@ -2044,8 +2051,8 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     // import all of the modules in a multi-part module name (e.g. "import a.b.c"
                     // imports "a" and "a.b" and "a.b.c").
                     const implicitImportInfo = AnalyzerNodeInfo.getImportInfo(node.module.nameParts[i]);
-                    if (implicitImportInfo && implicitImportInfo.resolvedPaths.length) {
-                        loaderActions.path = implicitImportInfo.resolvedPaths[i];
+                    if (implicitImportInfo && implicitImportInfo.resolvedUris.length) {
+                        loaderActions.uri = implicitImportInfo.resolvedUris[i];
                         loaderActions.loadSymbolsFromPath = true;
                         this._addImplicitImportsToLoaderActions(implicitImportInfo, loaderActions);
                     }
@@ -2691,7 +2698,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 type: 0 /* DeclarationType.Intrinsic */,
                 node,
                 intrinsicType: type,
-                path: this._fileInfo.filePath,
+                uri: this._fileInfo.fileUri,
                 range: (0, textRange_1.getEmptyRange)(),
                 moduleName: this._fileInfo.moduleName,
                 isInExceptSuite: this._isInExceptSuite,
@@ -2747,7 +2754,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         inferredTypeSource: source,
                         isInferenceAllowedInPyTyped: this._isInferenceAllowedInPyTyped(name.value),
                         typeAliasName: isPossibleTypeAlias ? target : undefined,
-                        path: this._fileInfo.filePath,
+                        uri: this._fileInfo.fileUri,
                         range: (0, positionUtils_1.convertTextRangeToRange)(name, this._fileInfo.lines),
                         moduleName: this._fileInfo.moduleName,
                         isInExceptSuite: this._isInExceptSuite,
@@ -2790,7 +2797,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         isConstant: (0, symbolNameUtils_1.isConstantName)(name.value),
                         inferredTypeSource: source,
                         isDefinedByMemberAccess: true,
-                        path: this._fileInfo.filePath,
+                        uri: this._fileInfo.fileUri,
                         range: (0, positionUtils_1.convertTextRangeToRange)(target.memberName, this._fileInfo.lines),
                         moduleName: this._fileInfo.moduleName,
                         isInExceptSuite: this._isInExceptSuite,
@@ -2869,7 +2876,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         isConstant: (0, symbolNameUtils_1.isConstantName)(name.value),
                         isFinal: finalInfo.isFinal,
                         typeAliasName: target,
-                        path: this._fileInfo.filePath,
+                        uri: this._fileInfo.fileUri,
                         typeAnnotationNode,
                         range: (0, positionUtils_1.convertTextRangeToRange)(name, this._fileInfo.lines),
                         moduleName: this._fileInfo.moduleName,
@@ -2933,7 +2940,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                         isConstant: (0, symbolNameUtils_1.isConstantName)(name.value),
                         isDefinedByMemberAccess: true,
                         isFinal: finalInfo.isFinal,
-                        path: this._fileInfo.filePath,
+                        uri: this._fileInfo.fileUri,
                         typeAnnotationNode: finalInfo.isFinal && !finalInfo.finalTypeNode ? undefined : typeAnnotation,
                         range: (0, positionUtils_1.convertTextRangeToRange)(target.memberName, this._fileInfo.lines),
                         moduleName: this._fileInfo.moduleName,
@@ -3134,7 +3141,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                 ? loaderActions.implicitImports.get(implicitImport.name)
                 : undefined;
             if (existingLoaderAction) {
-                existingLoaderAction.path = implicitImport.path;
+                existingLoaderAction.uri = implicitImport.uri;
                 existingLoaderAction.loadSymbolsFromPath = true;
             }
             else {
@@ -3142,7 +3149,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                     loaderActions.implicitImports = new Map();
                 }
                 loaderActions.implicitImports.set(implicitImport.name, {
-                    path: implicitImport.path,
+                    uri: implicitImport.uri,
                     loadSymbolsFromPath: true,
                     implicitImports: new Map(),
                 });
@@ -3201,7 +3208,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             symbol.addDeclaration({
                 type: 7 /* DeclarationType.SpecialBuiltInClass */,
                 node: annotationNode,
-                path: this._fileInfo.filePath,
+                uri: this._fileInfo.fileUri,
                 range: (0, positionUtils_1.convertTextRangeToRange)(annotationNode, this._fileInfo.lines),
                 moduleName: this._fileInfo.moduleName,
                 isInExceptSuite: this._isInExceptSuite,