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

package/dist/tests/harness/fourslash/testState.js

@@ -51,6 +51,8 @@ const positionUtils_1 = require("../../../common/positionUtils");
 const serviceProviderExtensions_1 = require("../../../common/serviceProviderExtensions");
 const stringUtils_1 = require("../../../common/stringUtils");
 const textRange_1 = require("../../../common/textRange");
+const uri_1 = require("../../../common/uri/uri");
+const uriUtils_1 = require("../../../common/uri/uriUtils");
 const workspaceEditUtils_1 = require("../../../common/workspaceEditUtils");
 const callHierarchyProvider_1 = require("../../../languageService/callHierarchyProvider");
 const completionProvider_1 = require("../../../languageService/completionProvider");
@@ -74,7 +76,7 @@ const fourSlashTypes_1 = require("./fourSlashTypes");
 const testLanguageService_1 = require("./testLanguageService");
 const testStateUtils_1 = require("./testStateUtils");
 const workspaceEditTestUtils_1 = require("./workspaceEditTestUtils");
-const testAccessHost = new testAccessHost_1.TestAccessHost(vfs.MODULE_PATH, [factory_1.libFolder, factory_1.distlibFolder]);
+const testAccessHost = new testAccessHost_1.TestAccessHost(uri_1.Uri.file(vfs.MODULE_PATH), [factory_1.libFolder, factory_1.distlibFolder]);
 class TestState {
     constructor(projectRoot, testData, mountPaths, hostSpecificFeatures, testFS, 
     // Setting delayFileInitialization to true enables derived class constructors to execute
@@ -101,16 +103,15 @@ class TestState {
         this.rawConfigJson = vfsInfo.rawConfigJson;
         const configOptions = this._convertGlobalOptionsToConfigOptions(vfsInfo.projectRoot, mountPaths);
         if (this.rawConfigJson) {
-            configOptions.initializeFromJson(this.rawConfigJson, 'basic', this.serviceProvider, testAccessHost);
+            configOptions.initializeFromJson(this.rawConfigJson, 'standard', this.serviceProvider, testAccessHost);
             this._applyTestConfigOptions(configOptions);
         }
         const service = this._createAnalysisService(this.console, this._hostSpecificFeatures.importResolverFactory, this._hostSpecificFeatures.backgroundAnalysisProgramFactory, configOptions);
         this.workspace = {
             workspaceName: 'test workspace',
-            rootPath: vfsInfo.projectRoot,
+            rootUri: uri_1.Uri.file(vfsInfo.projectRoot),
             pythonPath: undefined,
             pythonPathKind: workspaceFactory_1.WorkspacePythonPathKind.Mutable,
-            uri: (0, pathUtils_1.convertPathToUri)(this.fs, vfsInfo.projectRoot),
             kinds: [workspaceFactory_1.WellKnownWorkspaceKinds.Test],
             service: service,
             disableLanguageServices: false,
@@ -130,7 +131,7 @@ class TestState {
         if (!delayFileInitialization) {
             this.initializeFiles();
         }
-        (0, pathUtils_1.setTestingMode)(true);
+        (0, uriUtils_1.setTestingMode)(true);
     }
     get importResolver() {
         return this.workspace.service.getImportResolver();
@@ -158,7 +159,7 @@ class TestState {
         for (const filePath of this.files) {
             const file = this._vfsFiles[filePath];
             if ((_a = file.meta) === null || _a === void 0 ? void 0 : _a["ipythonmode" /* MetadataOptionNames.ipythonMode */]) {
-                (_b = this.program.getSourceFile(filePath)) === null || _b === void 0 ? void 0 : _b.test_enableIPythonMode(true);
+                (_b = this.program.getSourceFile(uri_1.Uri.file(filePath))) === null || _b === void 0 ? void 0 : _b.test_enableIPythonMode(true);
             }
         }
     }
@@ -190,8 +191,9 @@ class TestState {
         }
     }
     getMappedFilePath(path) {
-        this.importResolver.ensurePartialStubPackages(this.configOptions.findExecEnvironment(path));
-        return this.fs.getMappedFilePath(path);
+        const uri = uri_1.Uri.file(path);
+        this.importResolver.ensurePartialStubPackages(this.configOptions.findExecEnvironment(uri));
+        return this.fs.getMappedUri(uri).getFilePath();
     }
     getMarkerName(m) {
         return (0, testStateUtils_1.getMarkerName)(this.testData, m);
@@ -232,12 +234,6 @@ class TestState {
     convertPositionRange(range) {
         return this.convertOffsetsToRange(range.fileName, range.pos, range.end);
     }
-    convertPathToUri(path) {
-        return (0, pathUtils_1.convertPathToUri)(this.fs, path);
-    }
-    getDirectoryPath(path) {
-        return (0, pathUtils_1.getDirectoryPath)(path);
-    }
     getPathSep() {
         return path.sep;
     }
@@ -321,7 +317,7 @@ class TestState {
         const fileToOpen = this.findFile(indexOrName);
         fileToOpen.fileName = (0, pathUtils_1.normalizeSlashes)(fileToOpen.fileName);
         this.activeFile = fileToOpen;
-        this.program.setFileOpened(this.activeFile.fileName, 1, fileToOpen.content);
+        this.program.setFileOpened(uri_1.Uri.file(this.activeFile.fileName), 1, fileToOpen.content);
         return fileToOpen;
     }
     openFiles(indexOrNames) {
@@ -534,6 +530,11 @@ class TestState {
         function convertToString(args) {
             return args === null || args === void 0 ? void 0 : args.map((a) => {
                 if ((0, core_1.isString)(a)) {
+                    // Might be a URI. For comparison purposes in a test, convert it into a
+                    // file path.
+                    if (a.startsWith('file://')) {
+                        return (0, pathUtils_1.normalizeSlashes)(uri_1.Uri.parse(a, true).getFilePath());
+                    }
                     return (0, pathUtils_1.normalizeSlashes)(a);
                 }
                 return JSON.stringify(a);
@@ -541,7 +542,16 @@ class TestState {
         }
     }
     async verifyCommand(command, files) {
+        var _a;
         this.analyze();
+        // Convert command arguments to file Uri strings. That's the expected input for command arguments.
+        const convertedArgs = (_a = command.arguments) === null || _a === void 0 ? void 0 : _a.map((arg) => {
+            if (typeof arg === 'string' && (arg.endsWith('.py') || arg.endsWith('.pyi'))) {
+                return uri_1.Uri.file(arg).toString();
+            }
+            return arg;
+        });
+        command.arguments = convertedArgs;
         const commandResult = await this._hostSpecificFeatures.execute(new testLanguageService_1.TestLanguageService(this.workspace, this.console, this.fs), { command: command.command, arguments: command.arguments || [] }, vscode_languageserver_1.CancellationToken.None);
         if (command.command === 'pyright.createtypestub') {
             await this._verifyFiles(files);
@@ -612,7 +622,7 @@ class TestState {
                 continue;
             }
             const rangePos = this.convertOffsetsToRange(range.fileName, range.pos, range.end);
-            const provider = new hoverProvider_1.HoverProvider(this.program, range.fileName, rangePos.start, kind, vscode_languageserver_1.CancellationToken.None);
+            const provider = new hoverProvider_1.HoverProvider(this.program, uri_1.Uri.file(range.fileName), rangePos.start, kind, vscode_languageserver_1.CancellationToken.None);
             const actual = provider.getHover();
             // if expected is null then there should be nothing shown on hover
             if (expected === null) {
@@ -740,7 +750,7 @@ class TestState {
             }
             const expected = map[name];
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            const actual = new signatureHelpProvider_1.SignatureHelpProvider(this.program, fileName, position, docFormat, 
+            const actual = new signatureHelpProvider_1.SignatureHelpProvider(this.program, uri_1.Uri.file(fileName), position, docFormat, 
             /* hasSignatureLabelOffsetCapability */ true, 
             /* hasActiveParameterCapability */ true, 
             /* context */ undefined, vscode_languageserver_1.CancellationToken.None).getSignatureHelp();
@@ -788,9 +798,16 @@ class TestState {
             if (!(name in map)) {
                 continue;
             }
-            const expected = map[name].references;
+            let expected = map[name].references;
+            expected = expected.map((c) => {
+                var _a;
+                return {
+                    ...c,
+                    uri: (_a = c.uri) !== null && _a !== void 0 ? _a : uri_1.Uri.file(c.path),
+                };
+            });
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            const actual = new referencesProvider_1.ReferencesProvider(this.program, vscode_languageserver_1.CancellationToken.None, createDocumentRange, convertToLocation).reportReferences(fileName, position, /* includeDeclaration */ true);
+            const actual = new referencesProvider_1.ReferencesProvider(this.program, vscode_languageserver_1.CancellationToken.None, createDocumentRange, convertToLocation).reportReferences(uri_1.Uri.file(fileName), position, /* includeDeclaration */ true);
             assert_1.default.strictEqual((_a = actual === null || actual === void 0 ? void 0 : actual.length) !== null && _a !== void 0 ? _a : 0, expected.length, `${name} has failed`);
             for (const r of (0, navigationUtils_1.convertDocumentRangesToLocation)(this.program.fileSystem, expected, convertToLocation)) {
                 assert_1.default.equal(actual === null || actual === void 0 ? void 0 : actual.filter((d) => this._deepEqual(d, r)).length, 1);
@@ -810,7 +827,7 @@ class TestState {
             const expectedRange = map[name].items.map((x) => x.range);
             const expectedName = map[name].items.map((x) => x.name);
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            const actual = new callHierarchyProvider_1.CallHierarchyProvider(this.program, fileName, position, vscode_languageserver_1.CancellationToken.None).getIncomingCalls();
+            const actual = new callHierarchyProvider_1.CallHierarchyProvider(this.program, uri_1.Uri.file(fileName), position, vscode_languageserver_1.CancellationToken.None).getIncomingCalls();
             assert_1.default.strictEqual((_a = actual === null || actual === void 0 ? void 0 : actual.length) !== null && _a !== void 0 ? _a : 0, expectedFilePath.length, `${name} has failed`);
             assert_1.default.strictEqual((_b = actual === null || actual === void 0 ? void 0 : actual.length) !== null && _b !== void 0 ? _b : 0, expectedRange.length, `${name} has failed`);
             assert_1.default.strictEqual((_c = actual === null || actual === void 0 ? void 0 : actual.length) !== null && _c !== void 0 ? _c : 0, expectedName.length, `${name} has failed`);
@@ -818,7 +835,7 @@ class TestState {
                 for (const a of actual) {
                     assert_1.default.strictEqual(expectedRange === null || expectedRange === void 0 ? void 0 : expectedRange.filter((e) => this._deepEqual(a.from.range, e)).length, 1);
                     assert_1.default.strictEqual(expectedName === null || expectedName === void 0 ? void 0 : expectedName.filter((e) => this._deepEqual(a.from.name, e)).length, 1);
-                    assert_1.default.ok((expectedFilePath === null || expectedFilePath === void 0 ? void 0 : expectedFilePath.filter((e) => this._deepEqual(a.from.uri, (0, pathUtils_1.convertPathToUri)(this.program.fileSystem, e))).length) >= 1);
+                    assert_1.default.ok((expectedFilePath === null || expectedFilePath === void 0 ? void 0 : expectedFilePath.filter((e) => this._deepEqual(a.from.uri, uri_1.Uri.file(e).toString())).length) >= 1);
                 }
             }
         }
@@ -836,7 +853,7 @@ class TestState {
             const expectedRange = map[name].items.map((x) => x.range);
             const expectedName = map[name].items.map((x) => x.name);
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            const actual = new callHierarchyProvider_1.CallHierarchyProvider(this.program, fileName, position, vscode_languageserver_1.CancellationToken.None).getOutgoingCalls();
+            const actual = new callHierarchyProvider_1.CallHierarchyProvider(this.program, uri_1.Uri.file(fileName), position, vscode_languageserver_1.CancellationToken.None).getOutgoingCalls();
             assert_1.default.strictEqual((_a = actual === null || actual === void 0 ? void 0 : actual.length) !== null && _a !== void 0 ? _a : 0, expectedFilePath.length, `${name} has failed`);
             assert_1.default.strictEqual((_b = actual === null || actual === void 0 ? void 0 : actual.length) !== null && _b !== void 0 ? _b : 0, expectedRange.length, `${name} has failed`);
             assert_1.default.strictEqual((_c = actual === null || actual === void 0 ? void 0 : actual.length) !== null && _c !== void 0 ? _c : 0, expectedName.length, `${name} has failed`);
@@ -844,7 +861,7 @@ class TestState {
                 for (const a of actual) {
                     assert_1.default.strictEqual(expectedRange === null || expectedRange === void 0 ? void 0 : expectedRange.filter((e) => this._deepEqual(a.to.range, e)).length, 1);
                     assert_1.default.strictEqual(expectedName === null || expectedName === void 0 ? void 0 : expectedName.filter((e) => this._deepEqual(a.to.name, e)).length, 1);
-                    assert_1.default.ok((expectedFilePath === null || expectedFilePath === void 0 ? void 0 : expectedFilePath.filter((e) => this._deepEqual(a.to.uri, (0, pathUtils_1.convertPathToUri)(this.program.fileSystem, e))).length) >= 1);
+                    assert_1.default.ok((expectedFilePath === null || expectedFilePath === void 0 ? void 0 : expectedFilePath.filter((e) => this._deepEqual(a.to.uri, uri_1.Uri.file(e).toString())).length) >= 1);
                 }
             }
         }
@@ -870,7 +887,7 @@ class TestState {
             const fileName = marker.fileName;
             const expected = map[name].references;
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            const actual = new documentHighlightProvider_1.DocumentHighlightProvider(this.program, fileName, position, vscode_languageserver_1.CancellationToken.None).getDocumentHighlight();
+            const actual = new documentHighlightProvider_1.DocumentHighlightProvider(this.program, uri_1.Uri.file(fileName), position, vscode_languageserver_1.CancellationToken.None).getDocumentHighlight();
             assert_1.default.equal((_a = actual === null || actual === void 0 ? void 0 : actual.length) !== null && _a !== void 0 ? _a : 0, expected.length);
             for (const r of expected) {
                 const match = actual === null || actual === void 0 ? void 0 : actual.filter((h) => this._deepEqual(h.range, r.range));
@@ -881,6 +898,15 @@ class TestState {
             }
         }
     }
+    fixupDefinitionsToMatchExpected(actual) {
+        return actual === null || actual === void 0 ? void 0 : actual.map((a) => {
+            const { uri, ...restOfActual } = a;
+            return {
+                ...restOfActual,
+                path: uri.getFilePath(),
+            };
+        });
+    }
     verifyFindDefinitions(map, filter = definitionProvider_1.DefinitionFilter.All) {
         var _a;
         this.analyze();
@@ -891,16 +917,18 @@ class TestState {
                 continue;
             }
             const expected = map[name].definitions;
+            const uri = uri_1.Uri.file(fileName);
             // If we're going to def from a file, act like it's open.
-            if (!this.program.getSourceFileInfo(fileName)) {
+            if (!this.program.getSourceFileInfo(uri)) {
                 const file = this.testData.files.find((v) => v.fileName === fileName);
                 if (file) {
-                    this.program.setFileOpened(fileName, file.version, file.content);
+                    this.program.setFileOpened(uri, file.version, file.content);
                 }
             }
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            const actual = new definitionProvider_1.DefinitionProvider(this.program, fileName, position, filter, vscode_languageserver_1.CancellationToken.None).getDefinitions();
+            let actual = new definitionProvider_1.DefinitionProvider(this.program, uri, position, filter, vscode_languageserver_1.CancellationToken.None).getDefinitions();
             assert_1.default.equal((_a = actual === null || actual === void 0 ? void 0 : actual.length) !== null && _a !== void 0 ? _a : 0, expected.length, `No definitions found for marker "${name}"`);
+            actual = this.fixupDefinitionsToMatchExpected(actual);
             for (const r of expected) {
                 assert_1.default.equal(actual === null || actual === void 0 ? void 0 : actual.filter((d) => this._deepEqual(d, r)).length, 1, `No match found for ${JSON.stringify(r)} from marker ${name}`);
             }
@@ -917,7 +945,8 @@ class TestState {
             }
             const expected = map[name].definitions;
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            const actual = new definitionProvider_1.TypeDefinitionProvider(this.program, fileName, position, vscode_languageserver_1.CancellationToken.None).getDefinitions();
+            let actual = new definitionProvider_1.TypeDefinitionProvider(this.program, uri_1.Uri.file(fileName), position, vscode_languageserver_1.CancellationToken.None).getDefinitions();
+            actual = this.fixupDefinitionsToMatchExpected(actual);
             assert_1.default.strictEqual((_a = actual === null || actual === void 0 ? void 0 : actual.length) !== null && _a !== void 0 ? _a : 0, expected.length, name);
             for (const r of expected) {
                 assert_1.default.strictEqual(actual === null || actual === void 0 ? void 0 : actual.filter((d) => this._deepEqual(d, r)).length, 1, name);
@@ -933,10 +962,16 @@ class TestState {
                 continue;
             }
             const expected = map[name];
+            expected.changes = expected.changes.map((c) => {
+                var _a;
+                return {
+                    ...c,
+                    fileUri: (_a = c.fileUri) !== null && _a !== void 0 ? _a : uri_1.Uri.file(c.filePath),
+                };
+            });
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            const actual = new renameProvider_1.RenameProvider(this.program, fileName, position, vscode_languageserver_1.CancellationToken.None).renameSymbol(expected.newName, 
-            /* isDefaultWorkspace */ false, isUntitled);
-            (0, workspaceEditTestUtils_1.verifyWorkspaceEdit)((0, workspaceEditUtils_1.convertToWorkspaceEdit)(this.program.fileSystem, { edits: expected.changes, fileOperations: [] }), actual !== null && actual !== void 0 ? actual : { documentChanges: [] });
+            const actual = new renameProvider_1.RenameProvider(this.program, uri_1.Uri.file(fileName), position, vscode_languageserver_1.CancellationToken.None).renameSymbol(expected.newName, /* isDefaultWorkspace */ false, isUntitled);
+            (0, workspaceEditTestUtils_1.verifyWorkspaceEdit)((0, workspaceEditUtils_1.convertToWorkspaceEdit)({ edits: expected.changes, fileOperations: [] }), actual !== null && actual !== void 0 ? actual : { documentChanges: [] });
         }
     }
     setCancelled(numberOfCalls) {
@@ -988,7 +1023,7 @@ class TestState {
             snippet: true,
             lazyEdit: false,
         };
-        const provider = new completionProvider_1.CompletionProvider(this.program, this.workspace.rootPath, filePath, completionPosition, options, vscode_languageserver_1.CancellationToken.None);
+        const provider = new completionProvider_1.CompletionProvider(this.program, this.workspace.rootUri, uri_1.Uri.file(filePath), completionPosition, options, vscode_languageserver_1.CancellationToken.None);
         return {
             getCompletions: () => provider.getCompletions(),
             resolveCompletionItem: (i) => provider.resolveCompletionItem(i),
@@ -1063,7 +1098,7 @@ class TestState {
         }
     }
     _convertGlobalOptionsToConfigOptions(projectRoot, mountPaths) {
-        const configOptions = new configOptions_1.ConfigOptions(projectRoot);
+        const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.file(projectRoot));
         // add more global options as we need them
         const newConfigOptions = this._applyTestConfigOptions(configOptions, mountPaths);
         // default tests to run use compact signatures.
@@ -1077,15 +1112,15 @@ class TestState {
         configOptions.checkOnlyOpenFiles = false;
         // make sure we set typing path
         if (configOptions.stubPath === undefined) {
-            configOptions.stubPath = (0, pathUtils_1.normalizePath)((0, pathUtils_1.combinePaths)(vfs.MODULE_PATH, 'typings'));
+            configOptions.stubPath = uri_1.Uri.file(vfs.MODULE_PATH).combinePaths('typings');
         }
-        configOptions.include.push((0, pathUtils_1.getFileSpec)(this.serviceProvider, configOptions.projectRoot, '.'));
-        configOptions.exclude.push((0, pathUtils_1.getFileSpec)(this.serviceProvider, configOptions.projectRoot, factory_1.typeshedFolder));
-        configOptions.exclude.push((0, pathUtils_1.getFileSpec)(this.serviceProvider, configOptions.projectRoot, factory_1.distlibFolder));
-        configOptions.exclude.push((0, pathUtils_1.getFileSpec)(this.serviceProvider, configOptions.projectRoot, factory_1.libFolder));
+        configOptions.include.push((0, uriUtils_1.getFileSpec)(configOptions.projectRoot, '.'));
+        configOptions.exclude.push((0, uriUtils_1.getFileSpec)(configOptions.projectRoot, factory_1.typeshedFolder));
+        configOptions.exclude.push((0, uriUtils_1.getFileSpec)(configOptions.projectRoot, factory_1.distlibFolder.getFilePath()));
+        configOptions.exclude.push((0, uriUtils_1.getFileSpec)(configOptions.projectRoot, factory_1.libFolder.getFilePath()));
         if (mountPaths) {
             for (const mountPath of mountPaths.keys()) {
-                configOptions.exclude.push((0, pathUtils_1.getFileSpec)(this.serviceProvider, configOptions.projectRoot, mountPath));
+                configOptions.exclude.push((0, uriUtils_1.getFileSpec)(configOptions.projectRoot, mountPath));
             }
         }
         if (configOptions.functionSignatureDisplay === undefined) {
@@ -1094,7 +1129,7 @@ class TestState {
         return configOptions;
     }
     _getParseResult(fileName) {
-        const file = this.program.getBoundSourceFile(fileName);
+        const file = this.program.getBoundSourceFile(uri_1.Uri.file(fileName));
         return file === null || file === void 0 ? void 0 : file.getParseResults();
     }
     _getTextRangeCollection(fileName) {
@@ -1105,7 +1140,7 @@ class TestState {
             }
         }
         // slow path
-        const fileContents = this.fs.readFileSync(fileName, 'utf8');
+        const fileContents = this.fs.readFileSync(uri_1.Uri.file(fileName), 'utf8');
         const tokenizer = new tokenizer_1.Tokenizer();
         return tokenizer.tokenize(fileContents).lines;
     }
@@ -1122,9 +1157,10 @@ class TestState {
         var _a, _b;
         let fileContent = this.getFileContent(fileName);
         fileContent = fileContent.slice(0, editStart) + newText + fileContent.slice(editEnd);
-        this.testFS.writeFileSync(fileName, fileContent, 'utf8');
-        const newVersion = ((_b = (_a = this.program.getSourceFile(fileName)) === null || _a === void 0 ? void 0 : _a.getClientVersion()) !== null && _b !== void 0 ? _b : -1) + 1;
-        this.program.setFileOpened(fileName, newVersion, fileContent);
+        const uri = uri_1.Uri.file(fileName);
+        this.testFS.writeFileSync(uri, fileContent, 'utf8');
+        const newVersion = ((_b = (_a = this.program.getSourceFile(uri)) === null || _a === void 0 ? void 0 : _a.getClientVersion()) !== null && _b !== void 0 ? _b : -1) + 1;
+        this.program.setFileOpened(uri, newVersion, fileContent);
         for (const marker of this.testData.markers) {
             if (marker.fileName === fileName) {
                 marker.position = this._updatePosition(marker.position, editStart, editEnd, newText);
@@ -1238,20 +1274,22 @@ class TestState {
         return position <= editStart ? position : position < editEnd ? -1 : position + length - +(editEnd - editStart);
     }
     _getDiagnosticsPerFile() {
-        const sourceFiles = this.files.map((f) => this.program.getSourceFile(f));
+        const sourceFiles = this.files.map((f) => this.program.getSourceFile(uri_1.Uri.file(f)));
         const results = sourceFiles.map((sourceFile, index) => {
             if (sourceFile) {
                 const diagnostics = sourceFile.getDiagnostics(this.configOptions) || [];
-                const filePath = sourceFile.getFilePath();
+                const fileUri = sourceFile.getUri();
                 const value = {
-                    filePath,
+                    fileUri,
                     parseResults: sourceFile.getParseResults(),
                     errors: diagnostics.filter((diag) => diag.category === 0 /* DiagnosticCategory.Error */),
                     warnings: diagnostics.filter((diag) => diag.category === 1 /* DiagnosticCategory.Warning */),
                     information: diagnostics.filter((diag) => diag.category === 2 /* DiagnosticCategory.Information */),
                     unused: diagnostics.filter((diag) => diag.category === 3 /* DiagnosticCategory.UnusedCode */),
                 };
-                return [filePath, value];
+                // Don't use the uri key, but rather the file name, because other spots
+                // in the test data assume file paths.
+                return [this.files[index], value];
             }
             else {
                 this.raiseError(`Source file not found for ${this.files[index]}`);
@@ -1276,6 +1314,7 @@ class TestState {
             const fileExtension = (0, pathUtils_1.getFileExtension)(path).toLowerCase();
             return fileExtension === '.py' || fileExtension === '.pyi';
         })
+            .map((path) => uri_1.Uri.file(path))
             .filter((path) => service.isTracked(path)));
         return service;
     }
@@ -1290,7 +1329,8 @@ class TestState {
         return true;
     }
     async _waitForFile(filePath) {
-        while (!this.fs.existsSync(filePath)) {
+        const uri = uri_1.Uri.file(filePath);
+        while (!this.fs.existsSync(uri)) {
             await new Promise((res) => setTimeout(() => {
                 res();
             }, 200));
@@ -1302,7 +1342,7 @@ class TestState {
             start: this.convertOffsetToPosition(file, range.pos),
             end: this.convertOffsetToPosition(file, range.end),
         };
-        return this._hostSpecificFeatures.getCodeActionsForPosition(this.workspace, file, textRange, vscode_languageserver_1.CancellationToken.None);
+        return this._hostSpecificFeatures.getCodeActionsForPosition(this.workspace, uri_1.Uri.file(file), textRange, vscode_languageserver_1.CancellationToken.None);
     }
     async _verifyFiles(files) {
         for (const filePath of Object.keys(files)) {
@@ -1310,7 +1350,7 @@ class TestState {
             const normalizedFilePath = (0, pathUtils_1.normalizeSlashes)(filePath);
             // wait until the file exists
             await this._waitForFile(normalizedFilePath);
-            const actual = this.fs.readFileSync(normalizedFilePath, 'utf8');
+            const actual = this.fs.readFileSync(uri_1.Uri.file(normalizedFilePath), 'utf8');
             if (actual !== expected) {
                 this.raiseError(`doesn't contain expected result: ${(0, utils_1.stringify)(expected)}, actual: ${(0, utils_1.stringify)(actual)}`);
             }
@@ -1374,7 +1414,7 @@ exports.getNodeForRange = getNodeForRange;
 function getNodeAtMarker(codeOrState, markerName = 'marker') {
     const state = (0, core_1.isString)(codeOrState) ? parseAndGetTestState(codeOrState).state : codeOrState;
     const marker = state.getMarkerByName(markerName);
-    const sourceFile = state.program.getBoundSourceFile(marker.fileName);
+    const sourceFile = state.program.getBoundSourceFile(uri_1.Uri.file(marker.fileName));
     (0, assert_1.default)(sourceFile);
     const parserResults = sourceFile.getParseResults();
     (0, assert_1.default)(parserResults);