@zzzen/pyright-internal 1.2.0-dev.20231203 → 1.2.0-dev.20231217

package/dist/analyzer/namedTuples.js

@@ -89,7 +89,7 @@ function createNamedTupleType(evaluator, errorNode, argList, includesTypes) {
         }
     }
     const namedTupleType = evaluator.getTypingType(errorNode, 'NamedTuple') || types_1.UnknownType.create();
-    const classType = types_1.ClassType.createInstantiable(className, ParseTreeUtils.getClassFullName(errorNode, fileInfo.moduleName, className), fileInfo.moduleName, fileInfo.filePath, 16777216 /* ClassTypeFlags.ReadOnlyInstanceVariables */, ParseTreeUtils.getTypeSourceId(errorNode), 
+    const classType = types_1.ClassType.createInstantiable(className, ParseTreeUtils.getClassFullName(errorNode, fileInfo.moduleName, className), fileInfo.moduleName, fileInfo.fileUri, 16777216 /* ClassTypeFlags.ReadOnlyInstanceVariables */, ParseTreeUtils.getTypeSourceId(errorNode), 
     /* declaredMetaclass */ undefined, (0, types_1.isInstantiableClass)(namedTupleType) ? namedTupleType.details.effectiveMetaclass : types_1.UnknownType.create());
     classType.details.baseClasses.push(namedTupleType);
     classType.details.typeVarScopeId = ParseTreeUtils.getScopeIdForNode(errorNode);
@@ -159,7 +159,7 @@ function createNamedTupleType(evaluator, errorNode, argList, includesTypes) {
                             type: 1 /* DeclarationType.Variable */,
                             node: stringNode,
                             isRuntimeTypeExpression: true,
-                            path: fileInfo.filePath,
+                            uri: fileInfo.fileUri,
                             range: (0, positionUtils_1.convertOffsetsToRange)(stringNode.start, textRange_1.TextRange.getEnd(stringNode), fileInfo.lines),
                             moduleName: fileInfo.moduleName,
                             isInExceptSuite: false,
@@ -236,7 +236,7 @@ function createNamedTupleType(evaluator, errorNode, argList, includesTypes) {
                         const declaration = {
                             type: 1 /* DeclarationType.Variable */,
                             node: entryNameNode,
-                            path: fileInfo.filePath,
+                            uri: fileInfo.fileUri,
                             typeAnnotationNode: entryTypeNode,
                             range: (0, positionUtils_1.convertOffsetsToRange)(entryNameNode.start, textRange_1.TextRange.getEnd(entryNameNode), fileInfo.lines),
                             moduleName: fileInfo.moduleName,

package/dist/analyzer/namedTuples.js.map

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

package/dist/analyzer/packageTypeReport.d.ts

@@ -1,4 +1,5 @@
 import { Diagnostic, DiagnosticWithinFile } from '../common/diagnostic';
+import { Uri } from '../common/uri/uri';
 import { ScopeType } from './scope';
 export declare enum SymbolCategory {
     Indeterminate = 0,
@@ -21,7 +22,7 @@ export interface SymbolInfo {
     category: SymbolCategory;
     name: string;
     fullName: string;
-    filePath: string;
+    fileUri: Uri;
     isExported: boolean;
     typeKnownStatus: TypeKnownStatus;
     referenceCount: number;
@@ -30,7 +31,7 @@ export interface SymbolInfo {
 }
 export interface ModuleInfo {
     name: string;
-    path: string;
+    uri: Uri;
     isExported: boolean;
 }
 export type AlternateSymbolNameMap = Map<string, string[]>;
@@ -38,10 +39,10 @@ export interface PackageTypeReport {
     packageName: string;
     moduleName: string;
     ignoreExternal: boolean;
-    packageRootDirectory: string | undefined;
-    moduleRootDirectory: string | undefined;
+    packageRootDirectoryUri: Uri | undefined;
+    moduleRootDirectoryUri: Uri | undefined;
     isModuleSingleFile: boolean;
-    pyTypedPath: string | undefined;
+    pyTypedPathUri: Uri | undefined;
     missingFunctionDocStringCount: number;
     missingClassDocStringCount: number;
     missingDefaultParamCount: number;
@@ -50,4 +51,4 @@ export interface PackageTypeReport {
     generalDiagnostics: Diagnostic[];
     symbols: Map<string, SymbolInfo>;
 }
-export declare function getEmptyReport(packageName: string, packageRootDirectory: string, moduleName: string, moduleRootDirectory: string, isModuleSingleFile: boolean, ignoreExternal: boolean): PackageTypeReport;
+export declare function getEmptyReport(packageName: string, packageRootUri: Uri, moduleName: string, moduleRootUri: Uri, isModuleSingleFile: boolean, ignoreExternal: boolean): PackageTypeReport;

package/dist/analyzer/packageTypeReport.js

@@ -32,15 +32,15 @@ var TypeKnownStatus;
     TypeKnownStatus[TypeKnownStatus["PartiallyUnknown"] = 2] = "PartiallyUnknown";
     TypeKnownStatus[TypeKnownStatus["Unknown"] = 3] = "Unknown";
 })(TypeKnownStatus || (exports.TypeKnownStatus = TypeKnownStatus = {}));
-function getEmptyReport(packageName, packageRootDirectory, moduleName, moduleRootDirectory, isModuleSingleFile, ignoreExternal) {
+function getEmptyReport(packageName, packageRootUri, moduleName, moduleRootUri, isModuleSingleFile, ignoreExternal) {
     const report = {
         packageName,
         ignoreExternal,
-        packageRootDirectory,
+        packageRootDirectoryUri: packageRootUri,
         moduleName,
-        moduleRootDirectory,
+        moduleRootDirectoryUri: moduleRootUri,
         isModuleSingleFile,
-        pyTypedPath: undefined,
+        pyTypedPathUri: undefined,
         missingFunctionDocStringCount: 0,
         missingClassDocStringCount: 0,
         missingDefaultParamCount: 0,

package/dist/analyzer/packageTypeReport.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageTypeReport.js","sourceRoot":"","sources":["../../../src/analyzer/packageTypeReport.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAKH,IAAY,cAUX;AAVD,WAAY,cAAc;IACtB,qEAAa,CAAA;IACb,uDAAM,CAAA;IACN,qDAAK,CAAA;IACL,2DAAQ,CAAA;IACR,2DAAQ,CAAA;IACR,2DAAQ,CAAA;IACR,uDAAM,CAAA;IACN,yDAAO,CAAA;IACP,6DAAS,CAAA;AACb,CAAC,EAVW,cAAc,8BAAd,cAAc,QAUzB;AAED,yEAAyE;AACzE,4DAA4D;AAC5D,IAAkB,eAKjB;AALD,WAAkB,eAAe;IAC7B,uDAAS,CAAA;IACT,+DAAa,CAAA;IACb,6EAAoB,CAAA;IACpB,2DAAW,CAAA;AACf,CAAC,EALiB,eAAe,+BAAf,eAAe,QAKhC;AAoDD,SAAgB,cAAc,CAC1B,WAAmB,EACnB,oBAA4B,EAC5B,UAAkB,EAClB,mBAA2B,EAC3B,kBAA2B,EAC3B,cAAuB;IAEvB,MAAM,MAAM,GAAsB;QAC9B,WAAW;QACX,cAAc;QACd,oBAAoB;QACpB,UAAU;QACV,mBAAmB;QACnB,kBAAkB;QAClB,WAAW,EAAE,SAAS;QACtB,6BAA6B,EAAE,CAAC;QAChC,0BAA0B,EAAE,CAAC;QAC7B,wBAAwB,EAAE,CAAC;QAC3B,oBAAoB,EAAE,IAAI,GAAG,EAAoB;QACjD,OAAO,EAAE,IAAI,GAAG,EAAsB;QACtC,kBAAkB,EAAE,EAAE;QACtB,OAAO,EAAE,IAAI,GAAG,EAAsB;KACzC,CAAC;IACF,OAAO,MAAM,CAAC;AAClB,CAAC;AAzBD,wCAyBC"}
+{"version":3,"file":"packageTypeReport.js","sourceRoot":"","sources":["../../../src/analyzer/packageTypeReport.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAMH,IAAY,cAUX;AAVD,WAAY,cAAc;IACtB,qEAAa,CAAA;IACb,uDAAM,CAAA;IACN,qDAAK,CAAA;IACL,2DAAQ,CAAA;IACR,2DAAQ,CAAA;IACR,2DAAQ,CAAA;IACR,uDAAM,CAAA;IACN,yDAAO,CAAA;IACP,6DAAS,CAAA;AACb,CAAC,EAVW,cAAc,8BAAd,cAAc,QAUzB;AAED,yEAAyE;AACzE,4DAA4D;AAC5D,IAAkB,eAKjB;AALD,WAAkB,eAAe;IAC7B,uDAAS,CAAA;IACT,+DAAa,CAAA;IACb,6EAAoB,CAAA;IACpB,2DAAW,CAAA;AACf,CAAC,EALiB,eAAe,+BAAf,eAAe,QAKhC;AAoDD,SAAgB,cAAc,CAC1B,WAAmB,EACnB,cAAmB,EACnB,UAAkB,EAClB,aAAkB,EAClB,kBAA2B,EAC3B,cAAuB;IAEvB,MAAM,MAAM,GAAsB;QAC9B,WAAW;QACX,cAAc;QACd,uBAAuB,EAAE,cAAc;QACvC,UAAU;QACV,sBAAsB,EAAE,aAAa;QACrC,kBAAkB;QAClB,cAAc,EAAE,SAAS;QACzB,6BAA6B,EAAE,CAAC;QAChC,0BAA0B,EAAE,CAAC;QAC7B,wBAAwB,EAAE,CAAC;QAC3B,oBAAoB,EAAE,IAAI,GAAG,EAAoB;QACjD,OAAO,EAAE,IAAI,GAAG,EAAsB;QACtC,kBAAkB,EAAE,EAAE;QACtB,OAAO,EAAE,IAAI,GAAG,EAAsB;KACzC,CAAC;IACF,OAAO,MAAM,CAAC;AAClB,CAAC;AAzBD,wCAyBC"}

package/dist/analyzer/packageTypeVerifier.js

@@ -17,6 +17,8 @@ const diagnostic_1 = require("../common/diagnostic");
 const fullAccessHost_1 = require("../common/fullAccessHost");
 const pathUtils_1 = require("../common/pathUtils");
 const textRange_1 = require("../common/textRange");
+const uri_1 = require("../common/uri/uri");
+const uriUtils_1 = require("../common/uri/uriUtils");
 const importResolver_1 = require("./importResolver");
 const packageTypeReport_1 = require("./packageTypeReport");
 const program_1 = require("./program");
@@ -30,8 +32,8 @@ class PackageTypeVerifier {
         this._serviceProvider = _serviceProvider;
         this._packageName = _packageName;
         this._ignoreExternal = _ignoreExternal;
-        const host = new fullAccessHost_1.FullAccessHost(_serviceProvider.fs());
-        this._configOptions = new configOptions_1.ConfigOptions('');
+        const host = new fullAccessHost_1.FullAccessHost(_serviceProvider);
+        this._configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty());
         this._configOptions.defaultPythonPlatform = commandLineOptions.pythonPlatform;
         this._configOptions.defaultPythonVersion = commandLineOptions.pythonVersion;
         // Make sure we have default python version and platform set if the user didn't
@@ -42,8 +44,8 @@ class PackageTypeVerifier {
         if (_ignoreExternal) {
             this._configOptions.evaluateUnknownImportsAsAny = true;
         }
-        this._execEnv = this._configOptions.findExecEnvironment('.');
-        this._importResolver = new importResolver_1.ImportResolver(this._serviceProvider, this._configOptions, new fullAccessHost_1.FullAccessHost(this._serviceProvider.fs()));
+        this._execEnv = this._configOptions.findExecEnvironment(uri_1.Uri.file('.', _serviceProvider.fs().isCaseSensitive));
+        this._importResolver = new importResolver_1.ImportResolver(this._serviceProvider, this._configOptions, new fullAccessHost_1.FullAccessHost(this._serviceProvider));
         this._program = new program_1.Program(this._importResolver, this._configOptions, this._serviceProvider);
     }
     verify() {
@@ -52,31 +54,31 @@ class PackageTypeVerifier {
         const moduleNameParts = trimmedModuleName.split('.');
         const packageDirectoryInfo = this._getDirectoryInfoForModule(moduleNameParts[0]);
         const moduleDirectoryInfo = this._getDirectoryInfoForModule(trimmedModuleName);
-        const report = (0, packageTypeReport_1.getEmptyReport)(moduleNameParts[0], (_a = packageDirectoryInfo === null || packageDirectoryInfo === void 0 ? void 0 : packageDirectoryInfo.moduleDirectory) !== null && _a !== void 0 ? _a : '', trimmedModuleName, (_b = moduleDirectoryInfo === null || moduleDirectoryInfo === void 0 ? void 0 : moduleDirectoryInfo.moduleDirectory) !== null && _b !== void 0 ? _b : '', (_c = moduleDirectoryInfo === null || moduleDirectoryInfo === void 0 ? void 0 : moduleDirectoryInfo.isModuleSingleFile) !== null && _c !== void 0 ? _c : false, this._ignoreExternal);
+        const report = (0, packageTypeReport_1.getEmptyReport)(moduleNameParts[0], (_a = packageDirectoryInfo === null || packageDirectoryInfo === void 0 ? void 0 : packageDirectoryInfo.moduleDirectory) !== null && _a !== void 0 ? _a : uri_1.Uri.empty(), trimmedModuleName, (_b = moduleDirectoryInfo === null || moduleDirectoryInfo === void 0 ? void 0 : moduleDirectoryInfo.moduleDirectory) !== null && _b !== void 0 ? _b : uri_1.Uri.empty(), (_c = moduleDirectoryInfo === null || moduleDirectoryInfo === void 0 ? void 0 : moduleDirectoryInfo.isModuleSingleFile) !== null && _c !== void 0 ? _c : false, this._ignoreExternal);
         const commonDiagnostics = report.generalDiagnostics;
         try {
             if (!trimmedModuleName) {
                 commonDiagnostics.push(new diagnostic_1.Diagnostic(0 /* DiagnosticCategory.Error */, `Module name "${trimmedModuleName}" is invalid`, (0, textRange_1.getEmptyRange)()));
             }
-            else if (!report.moduleRootDirectory) {
+            else if (!report.moduleRootDirectoryUri) {
                 commonDiagnostics.push(new diagnostic_1.Diagnostic(0 /* DiagnosticCategory.Error */, `Module "${trimmedModuleName}" cannot be resolved`, (0, textRange_1.getEmptyRange)()));
             }
             else {
                 let pyTypedInfo;
-                if (report.moduleRootDirectory) {
-                    pyTypedInfo = this._getDeepestPyTypedInfo(report.moduleRootDirectory, moduleNameParts);
+                if (report.moduleRootDirectoryUri) {
+                    pyTypedInfo = this._getDeepestPyTypedInfo(report.moduleRootDirectoryUri, moduleNameParts);
                 }
                 // If we couldn't find any "py.typed" info in the module path, search again
                 // starting at the package root.
-                if (!pyTypedInfo && report.packageRootDirectory) {
-                    pyTypedInfo = this._getDeepestPyTypedInfo(report.packageRootDirectory, moduleNameParts);
+                if (!pyTypedInfo && report.packageRootDirectoryUri) {
+                    pyTypedInfo = this._getDeepestPyTypedInfo(report.packageRootDirectoryUri, moduleNameParts);
                 }
                 if (!pyTypedInfo) {
                     commonDiagnostics.push(new diagnostic_1.Diagnostic(0 /* DiagnosticCategory.Error */, 'No py.typed file found', (0, textRange_1.getEmptyRange)()));
                 }
                 else {
-                    report.pyTypedPath = pyTypedInfo.pyTypedPath;
-                    const publicModules = this._getListOfPublicModules(report.moduleRootDirectory, report.isModuleSingleFile, trimmedModuleName);
+                    report.pyTypedPathUri = pyTypedInfo.pyTypedPath;
+                    const publicModules = this._getListOfPublicModules(report.moduleRootDirectoryUri, report.isModuleSingleFile, trimmedModuleName);
                     // If the filter eliminated all modules, report an error.
                     if (publicModules.length === 0) {
                         commonDiagnostics.push(new diagnostic_1.Diagnostic(0 /* DiagnosticCategory.Error */, `Module "${trimmedModuleName}" cannot be resolved`, (0, textRange_1.getEmptyRange)()));
@@ -128,7 +130,7 @@ class PackageTypeVerifier {
         let subNameParts = Array.from(packageNameParts);
         // Find the deepest py.typed file that corresponds to the requested submodule.
         while (subNameParts.length >= 1) {
-            const packageSubdir = (0, pathUtils_1.combinePaths)(rootDirectory, ...subNameParts.slice(1));
+            const packageSubdir = rootDirectory.combinePaths(...subNameParts.slice(1));
             const pyTypedInfo = (0, pyTypedUtils_1.getPyTypedInfo)(this._serviceProvider.fs(), packageSubdir);
             if (pyTypedInfo) {
                 return pyTypedInfo;
@@ -138,18 +140,18 @@ class PackageTypeVerifier {
         return undefined;
     }
     _resolveImport(moduleName) {
-        return this._importResolver.resolveImport('', this._execEnv, (0, importResolver_1.createImportedModuleDescriptor)(moduleName));
+        return this._importResolver.resolveImport(uri_1.Uri.empty(), this._execEnv, (0, importResolver_1.createImportedModuleDescriptor)(moduleName));
     }
     _getPublicSymbolsForModule(moduleName, publicSymbols, alternateSymbolNames) {
         const importResult = this._resolveImport(moduleName);
         if (importResult.isImportFound) {
-            const modulePath = importResult.resolvedPaths[importResult.resolvedPaths.length - 1];
+            const modulePath = importResult.resolvedUris[importResult.resolvedUris.length - 1];
             this._program.addTrackedFiles([modulePath], /* isThirdPartyImport */ true, /* isInPyTypedPackage */ true);
             const sourceFile = this._program.getBoundSourceFile(modulePath);
             if (sourceFile) {
                 const module = {
                     name: moduleName,
-                    path: modulePath,
+                    uri: modulePath,
                     isExported: true,
                 };
                 const parseTree = sourceFile.getParseResults().parseTree;
@@ -212,13 +214,13 @@ class PackageTypeVerifier {
             report.generalDiagnostics.push(new diagnostic_1.Diagnostic(0 /* DiagnosticCategory.Error */, `No inlined types found for module "${moduleName}" because stub package was present`, (0, textRange_1.getEmptyRange)()));
         }
         else {
-            const modulePath = importResult.resolvedPaths[importResult.resolvedPaths.length - 1];
+            const modulePath = importResult.resolvedUris[importResult.resolvedUris.length - 1];
             const module = {
                 name: moduleName,
-                path: modulePath,
+                uri: modulePath,
                 isExported: true,
             };
-            report.modules.set(modulePath, module);
+            report.modules.set(modulePath.key, module);
             this._program.addTrackedFiles([modulePath], /* isThirdPartyImport */ true, /* isInPyTypedPackage */ true);
             const sourceFile = this._program.getBoundSourceFile(modulePath);
             if (sourceFile) {
@@ -233,9 +235,9 @@ class PackageTypeVerifier {
     }
     // Scans the directory structure for a list of public modules
     // within the package.
-    _getListOfPublicModules(moduleRootPath, isModuleSingleFile, moduleName) {
+    _getListOfPublicModules(moduleRoot, isModuleSingleFile, moduleName) {
         const publicModules = [];
-        this._addPublicModulesRecursive(moduleRootPath, isModuleSingleFile, moduleName, publicModules);
+        this._addPublicModulesRecursive(moduleRoot, isModuleSingleFile, moduleName, publicModules);
         // Make sure modules are unique. There may be duplicates if a ".py" and ".pyi"
         // exist for some modules.
         const uniqueModules = [];
@@ -254,7 +256,7 @@ class PackageTypeVerifier {
             let isFile = entry.isFile();
             let isDirectory = entry.isDirectory();
             if (entry.isSymbolicLink()) {
-                const stat = (0, pathUtils_1.tryStat)(this._serviceProvider.fs(), (0, pathUtils_1.combinePaths)(dirPath, entry.name));
+                const stat = (0, uriUtils_1.tryStat)(this._serviceProvider.fs(), dirPath.combinePaths(entry.name));
                 if (stat) {
                     isFile = stat.isFile();
                     isDirectory = stat.isDirectory();
@@ -284,7 +286,7 @@ class PackageTypeVerifier {
             }
             else if (isDirectory) {
                 if (!(0, symbolNameUtils_1.isPrivateOrProtectedName)(entry.name) && this._isLegalModulePartName(entry.name)) {
-                    this._addPublicModulesRecursive((0, pathUtils_1.combinePaths)(dirPath, entry.name), isModuleSingleFile, `${modulePath}.${entry.name}`, publicModules);
+                    this._addPublicModulesRecursive(dirPath.combinePaths(entry.name), isModuleSingleFile, `${modulePath}.${entry.name}`, publicModules);
                 }
             }
         });
@@ -354,7 +356,7 @@ class PackageTypeVerifier {
                     const decls = symbol.getDeclarations();
                     const primaryDecl = decls.length > 0 ? decls[decls.length - 1] : undefined;
                     const declRange = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.range) || (0, textRange_1.getEmptyRange)();
-                    const declPath = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.path) || '';
+                    const declPath = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.uri) || uri_1.Uri.empty();
                     const symbolCategory = this._getSymbolCategory(symbol, symbolType);
                     const isExported = publicSymbols.has(fullName);
                     // If the only reference to this symbol is a "__slots__" entry, we will
@@ -368,7 +370,7 @@ class PackageTypeVerifier {
                         category: symbolCategory,
                         name,
                         fullName,
-                        filePath: module.path,
+                        fileUri: declPath,
                         isExported,
                         typeKnownStatus: 0 /* TypeKnownStatus.Known */,
                         referenceCount: 1,
@@ -384,7 +386,7 @@ class PackageTypeVerifier {
                     const decls = symbol.getDeclarations();
                     const primaryDecl = decls.length > 0 ? decls[decls.length - 1] : undefined;
                     const declRange = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.range) || (0, textRange_1.getEmptyRange)();
-                    const declPath = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.path) || '';
+                    const declPath = (primaryDecl === null || primaryDecl === void 0 ? void 0 : primaryDecl.uri) || uri_1.Uri.empty();
                     const extraInfo = new diagnostic_1.DiagnosticAddendum();
                     if (baseSymbolType) {
                         extraInfo.addMessage(`Type declared in base class is "${this._program.printType(baseSymbolType)}"`);
@@ -406,16 +408,16 @@ class PackageTypeVerifier {
     // Determines whether the type for the symbol in question is fully known.
     // If not, it adds diagnostics to the symbol information and updates the
     // typeKnownStatus field.
-    _getSymbolTypeKnownStatus(report, symbolInfo, type, declRange, declFilePath, publicSymbols, skipDocStringCheck = false) {
+    _getSymbolTypeKnownStatus(report, symbolInfo, type, declRange, declFileUri, publicSymbols, skipDocStringCheck = false) {
         let knownStatus = 0 /* TypeKnownStatus.Known */;
         if (type.typeAliasInfo && type.typeAliasInfo.typeArguments) {
             type.typeAliasInfo.typeArguments.forEach((typeArg, index) => {
                 if ((0, types_1.isUnknown)(typeArg)) {
-                    this._addSymbolError(symbolInfo, `Type argument ${index + 1} for type alias "${type.typeAliasInfo.name}" has unknown type`, declRange, declFilePath);
+                    this._addSymbolError(symbolInfo, `Type argument ${index + 1} for type alias "${type.typeAliasInfo.name}" has unknown type`, declRange, declFileUri);
                     knownStatus = 3 /* TypeKnownStatus.Unknown */;
                 }
                 else if ((0, typeUtils_1.isPartlyUnknown)(typeArg)) {
-                    this._addSymbolError(symbolInfo, `Type argument ${index + 1} for type alias "${type.typeAliasInfo.name}" has partially unknown type`, declRange, declFilePath);
+                    this._addSymbolError(symbolInfo, `Type argument ${index + 1} for type alias "${type.typeAliasInfo.name}" has partially unknown type`, declRange, declFileUri);
                     knownStatus = 2 /* TypeKnownStatus.PartiallyUnknown */;
                 }
             });
@@ -424,7 +426,7 @@ class PackageTypeVerifier {
             const ambiguousDiag = new diagnostic_1.DiagnosticAddendum();
             ambiguousDiag.addMessage(`Inferred type is "${this._program.printType(type)}"`);
             this._addSymbolError(symbolInfo, 'Type is missing type annotation and could be inferred differently by type checkers' +
-                ambiguousDiag.getString(), declRange, declFilePath);
+                ambiguousDiag.getString(), declRange, declFileUri);
             knownStatus = this._updateKnownStatusIfWorse(knownStatus, 1 /* TypeKnownStatus.Ambiguous */);
         }
         switch (type.category) {
@@ -434,25 +436,25 @@ class PackageTypeVerifier {
             case 9 /* TypeCategory.TypeVar */:
                 break;
             case 1 /* TypeCategory.Unknown */: {
-                this._addSymbolError(symbolInfo, `Type unknown for ${PackageTypeVerifier.getSymbolCategoryString(symbolInfo.category)} "${symbolInfo.fullName}"`, declRange, declFilePath);
+                this._addSymbolError(symbolInfo, `Type unknown for ${PackageTypeVerifier.getSymbolCategoryString(symbolInfo.category)} "${symbolInfo.fullName}"`, declRange, declFileUri);
                 knownStatus = this._updateKnownStatusIfWorse(knownStatus, 3 /* TypeKnownStatus.Unknown */);
                 break;
             }
             case 8 /* TypeCategory.Union */: {
                 (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
-                    knownStatus = this._updateKnownStatusIfWorse(knownStatus, this._getSymbolTypeKnownStatus(report, symbolInfo, subtype, declRange, declFilePath, publicSymbols));
+                    knownStatus = this._updateKnownStatusIfWorse(knownStatus, this._getSymbolTypeKnownStatus(report, symbolInfo, subtype, declRange, declFileUri, publicSymbols));
                 });
                 break;
             }
             case 5 /* TypeCategory.OverloadedFunction */: {
                 for (const overload of type.overloads) {
-                    knownStatus = this._updateKnownStatusIfWorse(knownStatus, this._getSymbolTypeKnownStatus(report, symbolInfo, overload, declRange, declFilePath, publicSymbols));
+                    knownStatus = this._updateKnownStatusIfWorse(knownStatus, this._getSymbolTypeKnownStatus(report, symbolInfo, overload, declRange, declFileUri, publicSymbols));
                 }
                 break;
             }
             case 4 /* TypeCategory.Function */: {
                 if (!this._shouldIgnoreType(report, type.details.fullName)) {
-                    knownStatus = this._updateKnownStatusIfWorse(knownStatus, this._getFunctionTypeKnownStatus(report, type, publicSymbols, symbolInfo, declRange, declFilePath, undefined /* diag */, skipDocStringCheck));
+                    knownStatus = this._updateKnownStatusIfWorse(knownStatus, this._getFunctionTypeKnownStatus(report, type, publicSymbols, symbolInfo, declRange, declFileUri, undefined /* diag */, skipDocStringCheck));
                 }
                 break;
             }
@@ -480,7 +482,7 @@ class PackageTypeVerifier {
                         }
                         // Don't require docstrings for setters or deleters.
                         const skipDocStringCheck = methodName !== 'fget';
-                        knownStatus = this._updateKnownStatusIfWorse(knownStatus, this._getSymbolTypeKnownStatus(report, symbolInfo, accessType, (0, textRange_1.getEmptyRange)(), '', publicSymbols, skipDocStringCheck));
+                        knownStatus = this._updateKnownStatusIfWorse(knownStatus, this._getSymbolTypeKnownStatus(report, symbolInfo, accessType, (0, textRange_1.getEmptyRange)(), uri_1.Uri.empty(), publicSymbols, skipDocStringCheck));
                     });
                     break;
                 }
@@ -495,13 +497,13 @@ class PackageTypeVerifier {
                 if (type.typeArguments) {
                     type.typeArguments.forEach((typeArg, index) => {
                         if ((0, types_1.isUnknown)(typeArg)) {
-                            this._addSymbolError(symbolInfo, `Type argument ${index + 1} for class "${type.details.name}" has unknown type`, declRange, declFilePath);
+                            this._addSymbolError(symbolInfo, `Type argument ${index + 1} for class "${type.details.name}" has unknown type`, declRange, declFileUri);
                             knownStatus = this._updateKnownStatusIfWorse(knownStatus, 3 /* TypeKnownStatus.Unknown */);
                         }
                         else if ((0, typeUtils_1.isPartlyUnknown)(typeArg)) {
                             const diag = new diagnostic_1.DiagnosticAddendum();
                             diag.addMessage(`Type is ${this._program.printType(typeArg)}`);
-                            this._addSymbolError(symbolInfo, `Type argument ${index + 1} for class "${type.details.name}" has partially unknown type` + diag.getString(), declRange, declFilePath);
+                            this._addSymbolError(symbolInfo, `Type argument ${index + 1} for class "${type.details.name}" has partially unknown type` + diag.getString(), declRange, declFileUri);
                             knownStatus = this._updateKnownStatusIfWorse(knownStatus, 2 /* TypeKnownStatus.PartiallyUnknown */);
                         }
                     });
@@ -512,7 +514,7 @@ class PackageTypeVerifier {
                 if (!this._shouldIgnoreType(report, type.moduleName)) {
                     const moduleSymbol = this._getSymbolForModule(report, type, publicSymbols);
                     if (moduleSymbol.typeKnownStatus !== 0 /* TypeKnownStatus.Known */) {
-                        this._addSymbolError(symbolInfo, `Module "${moduleSymbol.fullName}" is partially unknown`, declRange, declFilePath);
+                        this._addSymbolError(symbolInfo, `Module "${moduleSymbol.fullName}" is partially unknown`, declRange, declFileUri);
                         knownStatus = this._updateKnownStatusIfWorse(knownStatus, moduleSymbol.typeKnownStatus);
                     }
                 }
@@ -523,11 +525,11 @@ class PackageTypeVerifier {
         symbolInfo.typeKnownStatus = this._updateKnownStatusIfWorse(symbolInfo.typeKnownStatus, knownStatus);
         return knownStatus;
     }
-    _getFunctionTypeKnownStatus(report, type, publicSymbols, symbolInfo, declRange, declFilePath, diag, skipDocStringCheck = false) {
+    _getFunctionTypeKnownStatus(report, type, publicSymbols, symbolInfo, declRange, declFileUri, diag, skipDocStringCheck = false) {
         let knownStatus = 0 /* TypeKnownStatus.Known */;
         // If the file path wasn't provided, try to get it from the type.
-        if (type.details.declaration && !declFilePath) {
-            declFilePath = type.details.declaration.path;
+        if (type.details.declaration && !declFileUri) {
+            declFileUri = type.details.declaration.uri;
         }
         type.details.parameters.forEach((param, index) => {
             // Skip nameless parameters like "*" and "/".
@@ -542,7 +544,7 @@ class PackageTypeVerifier {
                             types_1.FunctionType.isConstructorMethod(type));
                     if (!isSynthesized) {
                         if (symbolInfo) {
-                            this._addSymbolError(symbolInfo, `Type annotation for parameter "${param.name}" is missing`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFilePath !== null && declFilePath !== void 0 ? declFilePath : '');
+                            this._addSymbolError(symbolInfo, `Type annotation for parameter "${param.name}" is missing`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFileUri !== null && declFileUri !== void 0 ? declFileUri : uri_1.Uri.empty());
                         }
                         diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(`Type annotation for parameter "${param.name}" is missing`);
                         knownStatus = this._updateKnownStatusIfWorse(knownStatus, 3 /* TypeKnownStatus.Unknown */);
@@ -550,7 +552,7 @@ class PackageTypeVerifier {
                 }
                 else if ((0, types_1.isUnknown)(param.type)) {
                     if (symbolInfo) {
-                        this._addSymbolError(symbolInfo, `Type of parameter "${param.name}" is unknown`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFilePath !== null && declFilePath !== void 0 ? declFilePath : '');
+                        this._addSymbolError(symbolInfo, `Type of parameter "${param.name}" is unknown`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFileUri !== null && declFileUri !== void 0 ? declFileUri : uri_1.Uri.empty());
                         diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(`Type of parameter "${param.name}" is unknown`);
                     }
                     knownStatus = this._updateKnownStatusIfWorse(knownStatus, 3 /* TypeKnownStatus.Unknown */);
@@ -561,7 +563,7 @@ class PackageTypeVerifier {
                     if (paramKnownStatus !== 0 /* TypeKnownStatus.Known */) {
                         extraInfo.addMessage(`Parameter type is "${this._program.printType(param.type)}"`);
                         if (symbolInfo) {
-                            this._addSymbolError(symbolInfo, `Type of parameter "${param.name}" is partially unknown` + extraInfo.getString(), declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFilePath !== null && declFilePath !== void 0 ? declFilePath : '');
+                            this._addSymbolError(symbolInfo, `Type of parameter "${param.name}" is partially unknown` + extraInfo.getString(), declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFileUri !== null && declFileUri !== void 0 ? declFileUri : uri_1.Uri.empty());
                         }
                         if (diag) {
                             const subDiag = diag.createAddendum();
@@ -576,7 +578,7 @@ class PackageTypeVerifier {
         if (type.details.declaredReturnType) {
             if ((0, types_1.isUnknown)(type.details.declaredReturnType)) {
                 if (symbolInfo) {
-                    this._addSymbolError(symbolInfo, `Return type is unknown`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFilePath !== null && declFilePath !== void 0 ? declFilePath : '');
+                    this._addSymbolError(symbolInfo, `Return type is unknown`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFileUri !== null && declFileUri !== void 0 ? declFileUri : uri_1.Uri.empty());
                 }
                 knownStatus = this._updateKnownStatusIfWorse(knownStatus, 3 /* TypeKnownStatus.Unknown */);
             }
@@ -586,7 +588,7 @@ class PackageTypeVerifier {
                 if (returnTypeKnownStatus !== 0 /* TypeKnownStatus.Known */) {
                     extraInfo.addMessage(`Return type is "${this._program.printType(type.details.declaredReturnType)}"`);
                     if (symbolInfo) {
-                        this._addSymbolError(symbolInfo, `Return type is partially unknown` + extraInfo.getString(), declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFilePath !== null && declFilePath !== void 0 ? declFilePath : '');
+                        this._addSymbolError(symbolInfo, `Return type is partially unknown` + extraInfo.getString(), declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFileUri !== null && declFileUri !== void 0 ? declFileUri : uri_1.Uri.empty());
                     }
                     if (diag) {
                         const subDiag = diag.createAddendum();
@@ -601,7 +603,7 @@ class PackageTypeVerifier {
             // Init methods have an implied return type.
             if (type.details.name !== '__init__') {
                 if (symbolInfo) {
-                    this._addSymbolError(symbolInfo, `Return type annotation is missing`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFilePath !== null && declFilePath !== void 0 ? declFilePath : '');
+                    this._addSymbolError(symbolInfo, `Return type annotation is missing`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFileUri !== null && declFileUri !== void 0 ? declFileUri : uri_1.Uri.empty());
                 }
                 diag === null || diag === void 0 ? void 0 : diag.createAddendum().addMessage(`Return type annotation is missing`);
                 knownStatus = this._updateKnownStatusIfWorse(knownStatus, 3 /* TypeKnownStatus.Unknown */);
@@ -622,14 +624,14 @@ class PackageTypeVerifier {
             }
             if (!skipDocStringCheck) {
                 if (symbolInfo) {
-                    this._addSymbolWarning(symbolInfo, `No docstring found for function "${symbolInfo.fullName}"`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFilePath !== null && declFilePath !== void 0 ? declFilePath : '');
+                    this._addSymbolWarning(symbolInfo, `No docstring found for function "${symbolInfo.fullName}"`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFileUri !== null && declFileUri !== void 0 ? declFileUri : uri_1.Uri.empty());
                 }
                 report.missingFunctionDocStringCount++;
             }
         }
         if (type.details.parameters.find((param) => param.defaultType && (0, typeUtils_1.isEllipsisType)(param.defaultType))) {
             if (symbolInfo) {
-                this._addSymbolWarning(symbolInfo, `One or more default values in function "${symbolInfo.fullName}" is specified as "..."`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFilePath !== null && declFilePath !== void 0 ? declFilePath : '');
+                this._addSymbolWarning(symbolInfo, `One or more default values in function "${symbolInfo.fullName}" is specified as "..."`, declRange !== null && declRange !== void 0 ? declRange : (0, textRange_1.getEmptyRange)(), declFileUri !== null && declFileUri !== void 0 ? declFileUri : uri_1.Uri.empty());
             }
             report.missingDefaultParamCount++;
         }
@@ -649,7 +651,7 @@ class PackageTypeVerifier {
             category: packageTypeReport_1.SymbolCategory.Class,
             name: type.details.name,
             fullName: type.details.fullName,
-            filePath: type.details.filePath,
+            fileUri: type.details.fileUri,
             isExported: publicSymbols.has(type.details.fullName),
             typeKnownStatus: 0 /* TypeKnownStatus.Known */,
             referenceCount: 1,
@@ -659,7 +661,7 @@ class PackageTypeVerifier {
         this._addSymbol(report, symbolInfo);
         // Determine whether the class has a proper doc string.
         if (symbolInfo.isExported && !type.details.docString) {
-            this._addSymbolWarning(symbolInfo, `No docstring found for class "${type.details.fullName}"`, (0, textRange_1.getEmptyRange)(), '');
+            this._addSymbolWarning(symbolInfo, `No docstring found for class "${type.details.fullName}"`, (0, textRange_1.getEmptyRange)(), uri_1.Uri.empty());
             report.missingClassDocStringCount++;
         }
         const symbolTableTypeKnownStatus = this._getTypeKnownStatusForSymbolTable(report, type.details.fullName, type.details.fields, 2 /* ScopeType.Class */, publicSymbols, (name, symbol) => {
@@ -682,7 +684,7 @@ class PackageTypeVerifier {
         // Add information for the metaclass.
         if (type.details.effectiveMetaclass) {
             if (!(0, types_1.isInstantiableClass)(type.details.effectiveMetaclass)) {
-                this._addSymbolError(symbolInfo, `Type of metaclass unknown`, (0, textRange_1.getEmptyRange)(), '');
+                this._addSymbolError(symbolInfo, `Type of metaclass unknown`, (0, textRange_1.getEmptyRange)(), uri_1.Uri.empty());
                 symbolInfo.typeKnownStatus = this._updateKnownStatusIfWorse(symbolInfo.typeKnownStatus, 2 /* TypeKnownStatus.PartiallyUnknown */);
             }
             else {
@@ -690,7 +692,7 @@ class PackageTypeVerifier {
                 const metaclassKnownStatus = this._getTypeKnownStatus(report, type.details.effectiveMetaclass, publicSymbols, diag);
                 if (metaclassKnownStatus !== 0 /* TypeKnownStatus.Known */) {
                     this._addSymbolError(symbolInfo, `Type of metaclass "${type.details.effectiveMetaclass}" is partially unknown` +
-                        diag.getString(), (0, textRange_1.getEmptyRange)(), '');
+                        diag.getString(), (0, textRange_1.getEmptyRange)(), uri_1.Uri.empty());
                     symbolInfo.typeKnownStatus = this._updateKnownStatusIfWorse(symbolInfo.typeKnownStatus, metaclassKnownStatus);
                 }
             }
@@ -698,7 +700,7 @@ class PackageTypeVerifier {
         // Add information for base classes.
         type.details.baseClasses.forEach((baseClass) => {
             if (!(0, types_1.isInstantiableClass)(baseClass)) {
-                this._addSymbolError(symbolInfo, `Type of base class unknown`, (0, textRange_1.getEmptyRange)(), '');
+                this._addSymbolError(symbolInfo, `Type of base class unknown`, (0, textRange_1.getEmptyRange)(), uri_1.Uri.empty());
                 symbolInfo.typeKnownStatus = this._updateKnownStatusIfWorse(symbolInfo.typeKnownStatus, 2 /* TypeKnownStatus.PartiallyUnknown */);
             }
             else {
@@ -710,7 +712,7 @@ class PackageTypeVerifier {
                 const diag = new diagnostic_1.DiagnosticAddendum();
                 const baseClassTypeStatus = this._getTypeKnownStatus(report, baseClass, publicSymbols, diag);
                 if (baseClassTypeStatus !== 0 /* TypeKnownStatus.Known */) {
-                    this._addSymbolError(symbolInfo, `Type of base class "${baseClass.details.fullName}" is partially unknown` + diag.getString(), (0, textRange_1.getEmptyRange)(), '');
+                    this._addSymbolError(symbolInfo, `Type of base class "${baseClass.details.fullName}" is partially unknown` + diag.getString(), (0, textRange_1.getEmptyRange)(), uri_1.Uri.empty());
                     symbolInfo.typeKnownStatus = this._updateKnownStatusIfWorse(symbolInfo.typeKnownStatus, baseClassTypeStatus);
                 }
             }
@@ -728,7 +730,7 @@ class PackageTypeVerifier {
             category: packageTypeReport_1.SymbolCategory.Module,
             name: type.moduleName,
             fullName: type.moduleName,
-            filePath: type.filePath,
+            fileUri: type.fileUri,
             isExported: publicSymbols.has(type.moduleName),
             typeKnownStatus: 0 /* TypeKnownStatus.Known */,
             referenceCount: 1,
@@ -872,14 +874,16 @@ class PackageTypeVerifier {
     }
     _getDirectoryInfoForModule(moduleName) {
         var _a;
-        const importResult = this._importResolver.resolveImport('', this._execEnv, (0, importResolver_1.createImportedModuleDescriptor)(moduleName));
+        const importResult = this._importResolver.resolveImport(uri_1.Uri.empty(), this._execEnv, (0, importResolver_1.createImportedModuleDescriptor)(moduleName));
         if (importResult.isImportFound) {
-            const resolvedPath = importResult.resolvedPaths[importResult.resolvedPaths.length - 1];
+            const resolvedPath = importResult.resolvedUris[importResult.resolvedUris.length - 1];
             // If it's a namespace package with no __init__.py(i), use the package
             // directory instead.
-            const moduleDirectory = resolvedPath ? (0, pathUtils_1.getDirectoryPath)(resolvedPath) : (_a = importResult.packageDirectory) !== null && _a !== void 0 ? _a : '';
+            const moduleDirectory = resolvedPath
+                ? resolvedPath.getDirectory()
+                : (_a = importResult.packageDirectory) !== null && _a !== void 0 ? _a : uri_1.Uri.empty();
             let isModuleSingleFile = false;
-            if (resolvedPath && (0, pathUtils_1.stripFileExtension)((0, pathUtils_1.getFileName)(resolvedPath)) !== '__init__') {
+            if (resolvedPath && (0, pathUtils_1.stripFileExtension)(resolvedPath.fileName) !== '__init__') {
                 isModuleSingleFile = true;
             }
             return {
@@ -922,16 +926,16 @@ class PackageTypeVerifier {
         (0, debug_1.assert)(!report.symbols.has(symbolInfo.fullName));
         report.symbols.set(symbolInfo.fullName, symbolInfo);
     }
-    _addSymbolError(symbolInfo, message, declRange, declFilePath) {
+    _addSymbolError(symbolInfo, message, declRange, declUri) {
         symbolInfo.diagnostics.push({
             diagnostic: new diagnostic_1.Diagnostic(0 /* DiagnosticCategory.Error */, message, declRange),
-            filePath: declFilePath,
+            uri: declUri,
         });
     }
-    _addSymbolWarning(symbolInfo, message, declRange, declFilePath) {
+    _addSymbolWarning(symbolInfo, message, declRange, declUri) {
         symbolInfo.diagnostics.push({
             diagnostic: new diagnostic_1.Diagnostic(1 /* DiagnosticCategory.Warning */, message, declRange),
-            filePath: declFilePath,
+            uri: declUri,
         });
     }
     _updateKnownStatusIfWorse(currentStatus, newStatus) {