@zzzen/pyright-internal 1.2.0-dev.20240324 → 1.2.0-dev.20240407

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

@@ -63,13 +63,13 @@ class TestLanguageService {
     constructor(workspace, console, fs, options) {
         this.console = console;
         this.fs = fs;
-        this.rootUri = uri_1.Uri.file('/');
         this.window = new TestWindow();
         this.supportAdvancedEdits = true;
         this._workspace = workspace;
+        this.serviceProvider = this._workspace.service.serviceProvider;
         this._defaultWorkspace = {
             workspaceName: '',
-            rootUri: uri_1.Uri.empty(),
+            rootUri: undefined,
             pythonPath: undefined,
             pythonPathKind: workspaceFactory_1.WorkspacePythonPathKind.Mutable,
             kinds: [workspaceFactory_1.WellKnownWorkspaceKinds.Test],

package/dist/tests/harness/fourslash/testLanguageService.js.map

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

package/dist/tests/harness/fourslash/testState.d.ts

@@ -7,16 +7,16 @@ import { ConfigOptions } from '../../../common/configOptions';
 import { ConsoleInterface } from '../../../common/console';
 import { FileEditAction } from '../../../common/editAction';
 import { ReadOnlyFileSystem } from '../../../common/fileSystem';
+import { LanguageServerInterface } from '../../../common/languageServerInterface';
 import { ServiceProvider } from '../../../common/serviceProvider';
 import { DocumentRange, Position, Range as PositionRange, TextRange } from '../../../common/textRange';
 import { Uri } from '../../../common/uri/uri';
-import { LanguageServerInterface } from '../../../languageServerBase';
 import { DefinitionFilter } from '../../../languageService/definitionProvider';
 import { CollectionResult } from '../../../languageService/documentSymbolCollector';
 import { ParseNode } from '../../../parser/parseNodes';
-import { ParseResults } from '../../../parser/parser';
+import { ParseFileResults } from '../../../parser/parser';
 import { PyrightFileSystem } from '../../../pyrightFileSystem';
-import { Workspace } from '../../../workspaceFactory';
+import { NormalWorkspace, Workspace } from '../../../workspaceFactory';
 import * as vfs from '../vfs/filesystem';
 import { FourSlashData, FourSlashFile, Marker, MultiMap, Range } from './fourSlashTypes';
 export interface TextChange {
@@ -38,7 +38,7 @@ export declare class TestState {
     private readonly _hostSpecificFeatures;
     readonly testFS: vfs.TestFileSystem;
     readonly fs: PyrightFileSystem;
-    readonly workspace: Workspace;
+    readonly workspace: NormalWorkspace;
     readonly console: ConsoleInterface;
     readonly rawConfigJson: any | undefined;
     readonly serviceProvider: ServiceProvider;
@@ -163,7 +163,7 @@ export declare class TestState {
         [marker: string]: {
             references: DocumentRange[];
         };
-    }, createDocumentRange?: (fileUri: Uri, result: CollectionResult, parseResults: ParseResults) => DocumentRange, convertToLocation?: (fs: ReadOnlyFileSystem, ranges: DocumentRange) => Location | undefined): void;
+    }, createDocumentRange?: (fileUri: Uri, result: CollectionResult, parseResults: ParseFileResults) => DocumentRange, convertToLocation?: (fs: ReadOnlyFileSystem, ranges: DocumentRange) => Location | undefined): void;
     verifyShowCallHierarchyGetIncomingCalls(map: {
         [marker: string]: {
             items: _.FourSlashCallHierarchyItem[];
@@ -221,7 +221,7 @@ export declare class TestState {
     protected verifyCompletionItem(expected: _.FourSlashCompletionItem, actual: CompletionItem): void;
     private _convertGlobalOptionsToConfigOptions;
     private _applyTestConfigOptions;
-    private _getParseResult;
+    private _getParserOutput;
     private _getTextRangeCollection;
     private _messageAtLastKnownMarker;
     private _checkPostEditInvariants;

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

@@ -78,7 +78,8 @@ 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(uri_1.Uri.file(vfs.MODULE_PATH), [factory_1.libFolder, factory_1.distlibFolder]);
+// Make sure everything is in lower case since it has hard coded `isCaseSensitive`: true.
+const testAccessHost = new testAccessHost_1.TestAccessHost(uriUtils_1.UriEx.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
@@ -111,7 +112,7 @@ class TestState {
         const service = this._createAnalysisService(this.console, this._hostSpecificFeatures.importResolverFactory, this._hostSpecificFeatures.backgroundAnalysisProgramFactory, configOptions);
         this.workspace = {
             workspaceName: 'test workspace',
-            rootUri: uri_1.Uri.file(vfsInfo.projectRoot),
+            rootUri: uri_1.Uri.file(vfsInfo.projectRoot, this.serviceProvider),
             pythonPath: undefined,
             pythonPathKind: workspaceFactory_1.WorkspacePythonPathKind.Mutable,
             kinds: [workspaceFactory_1.WellKnownWorkspaceKinds.Test],
@@ -134,7 +135,6 @@ class TestState {
         if (!delayFileInitialization) {
             this.initializeFiles();
         }
-        (0, uriUtils_1.setTestingMode)(true);
     }
     get importResolver() {
         return this.workspace.service.getImportResolver();
@@ -162,7 +162,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(uri_1.Uri.file(filePath))) === null || _b === void 0 ? void 0 : _b.test_enableIPythonMode(true);
+                (_b = this.program.getSourceFile(uri_1.Uri.file(filePath, this.serviceProvider))) === null || _b === void 0 ? void 0 : _b.test_enableIPythonMode(true);
             }
         }
     }
@@ -194,7 +194,7 @@ class TestState {
         }
     }
     getMappedFilePath(path) {
-        const uri = uri_1.Uri.file(path);
+        const uri = uri_1.Uri.file(path, this.serviceProvider);
         this.importResolver.ensurePartialStubPackages(this.configOptions.findExecEnvironment(uri));
         return this.fs.getMappedUri(uri).getFilePath();
     }
@@ -271,7 +271,7 @@ class TestState {
         const lineEnd = lineStart + this._getLineContent(index).length;
         this.selectRange({
             fileName: this.activeFile.fileName,
-            fileUri: uri_1.Uri.file(this.activeFile.fileName),
+            fileUri: this.activeFile.fileUri,
             pos: lineStart,
             end: lineEnd,
         });
@@ -325,7 +325,7 @@ class TestState {
         const fileToOpen = this.findFile(indexOrName);
         fileToOpen.fileName = (0, pathUtils_1.normalizeSlashes)(fileToOpen.fileName);
         this.activeFile = fileToOpen;
-        this.program.setFileOpened(uri_1.Uri.file(this.activeFile.fileName), 1, fileToOpen.content);
+        this.program.setFileOpened(this.activeFile.fileUri, 1, fileToOpen.content);
         return fileToOpen;
     }
     openFiles(indexOrNames) {
@@ -493,6 +493,8 @@ class TestState {
         // make sure we don't use cache built from other tests
         this.workspace.service.invalidateAndForceReanalysis(backgroundAnalysisProgram_1.InvalidatedReason.Reanalyzed);
         this.analyze();
+        // Local copy to use in capture.
+        const serviceProvider = this.serviceProvider;
         for (const range of this.getRanges()) {
             const name = this.getMarkerName(range.marker);
             if (!map[name]) {
@@ -552,7 +554,7 @@ class TestState {
                     // 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)(uri_1.Uri.parse(a, serviceProvider).getFilePath());
                     }
                     return (0, pathUtils_1.normalizeSlashes)(a);
                 }
@@ -566,7 +568,7 @@ class TestState {
         // 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 uri_1.Uri.file(arg, this.serviceProvider).toString();
             }
             return arg;
         });
@@ -604,7 +606,7 @@ class TestState {
             const codeActions = await this._getCodeActions(range);
             if (verifyCodeActionCount) {
                 if (codeActions.length !== Object.keys(map).length) {
-                    this.raiseError(`doesn't contain expected result: ${(0, utils_1.stringify)(map[name])}, actual: ${(0, utils_1.stringify)(codeActions)}`);
+                    this.raiseError(`doesn't contain expected result count: ${(0, utils_1.stringify)(map[name])}, actual: ${(0, utils_1.stringify)(codeActions)}`);
                 }
             }
             const matches = codeActions.filter((c) => c.title === map[name].title);
@@ -769,7 +771,7 @@ class TestState {
             }
             const expected = map[name];
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            const actual = new signatureHelpProvider_1.SignatureHelpProvider(this.program, uri_1.Uri.file(fileName), position, docFormat, 
+            const actual = new signatureHelpProvider_1.SignatureHelpProvider(this.program, uri_1.Uri.file(fileName, this.serviceProvider), position, docFormat, 
             /* hasSignatureLabelOffsetCapability */ true, 
             /* hasActiveParameterCapability */ true, 
             /* context */ undefined, vscode_languageserver_1.CancellationToken.None).getSignatureHelp();
@@ -822,11 +824,11 @@ class TestState {
                 var _a;
                 return {
                     ...c,
-                    uri: (_a = c.uri) !== null && _a !== void 0 ? _a : uri_1.Uri.file(c.path),
+                    uri: (_a = c.uri) !== null && _a !== void 0 ? _a : uri_1.Uri.file(c.path, this.serviceProvider),
                 };
             });
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            const actual = new referencesProvider_1.ReferencesProvider(this.program, vscode_languageserver_1.CancellationToken.None, createDocumentRange, convertToLocation).reportReferences(uri_1.Uri.file(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, this.serviceProvider), 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);
@@ -846,7 +848,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, uri_1.Uri.file(fileName), position, vscode_languageserver_1.CancellationToken.None).getIncomingCalls();
+            const actual = new callHierarchyProvider_1.CallHierarchyProvider(this.program, uri_1.Uri.file(fileName, this.serviceProvider), 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`);
@@ -854,7 +856,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, uri_1.Uri.file(e).toString())).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, this.serviceProvider).toString())).length) >= 1);
                 }
             }
         }
@@ -872,7 +874,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, uri_1.Uri.file(fileName), position, vscode_languageserver_1.CancellationToken.None).getOutgoingCalls();
+            const actual = new callHierarchyProvider_1.CallHierarchyProvider(this.program, uri_1.Uri.file(fileName, this.serviceProvider), 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`);
@@ -880,7 +882,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, uri_1.Uri.file(e).toString())).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, this.serviceProvider).toString())).length) >= 1);
                 }
             }
         }
@@ -906,7 +908,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, uri_1.Uri.file(fileName), position, vscode_languageserver_1.CancellationToken.None).getDocumentHighlight();
+            const actual = new documentHighlightProvider_1.DocumentHighlightProvider(this.program, uri_1.Uri.file(fileName, this.serviceProvider), 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));
@@ -936,7 +938,7 @@ class TestState {
                 continue;
             }
             const expected = map[name].definitions;
-            const uri = uri_1.Uri.file(fileName);
+            const uri = uri_1.Uri.file(fileName, this.serviceProvider);
             // If we're going to def from a file, act like it's open.
             if (!this.program.getSourceFileInfo(uri)) {
                 const file = this.testData.files.find((v) => v.fileName === fileName);
@@ -964,7 +966,7 @@ class TestState {
             }
             const expected = map[name].definitions;
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            let actual = new definitionProvider_1.TypeDefinitionProvider(this.program, uri_1.Uri.file(fileName), position, vscode_languageserver_1.CancellationToken.None).getDefinitions();
+            let actual = new definitionProvider_1.TypeDefinitionProvider(this.program, uri_1.Uri.file(fileName, this.serviceProvider), 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) {
@@ -985,11 +987,13 @@ class TestState {
                 var _a;
                 return {
                     ...c,
-                    fileUri: (_a = c.fileUri) !== null && _a !== void 0 ? _a : uri_1.Uri.file(c.filePath),
+                    fileUri: (_a = c.fileUri) !== null && _a !== void 0 ? _a : uri_1.Uri.file(c.filePath, this.serviceProvider),
                 };
             });
             const position = this.convertOffsetToPosition(fileName, marker.position);
-            const actual = new renameProvider_1.RenameProvider(this.program, isUntitled ? uri_1.Uri.parse(`untitled:${fileName.replace(/\\/g, '/')}`, true) : uri_1.Uri.file(fileName), position, vscode_languageserver_1.CancellationToken.None).renameSymbol(expected.newName, /* isDefaultWorkspace */ false, isUntitled);
+            const actual = new renameProvider_1.RenameProvider(this.program, isUntitled
+                ? uri_1.Uri.parse(`untitled:${fileName.replace(/\\/g, '/')}`, this.serviceProvider)
+                : uri_1.Uri.file(fileName, this.serviceProvider), 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: [] });
         }
     }
@@ -1056,7 +1060,7 @@ class TestState {
             snippet: true,
             lazyEdit: false,
         };
-        const provider = new completionProvider_1.CompletionProvider(this.program, uri_1.Uri.file(filePath), completionPosition, options, vscode_languageserver_1.CancellationToken.None);
+        const provider = new completionProvider_1.CompletionProvider(this.program, uri_1.Uri.file(filePath, this.serviceProvider), completionPosition, options, vscode_languageserver_1.CancellationToken.None);
         return {
             getCompletions: () => provider.getCompletions(),
             resolveCompletionItem: (i) => provider.resolveCompletionItem(i),
@@ -1131,7 +1135,7 @@ class TestState {
         }
     }
     _convertGlobalOptionsToConfigOptions(projectRoot, mountPaths) {
-        const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.file(projectRoot));
+        const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.file(projectRoot, this.serviceProvider));
         // add more global options as we need them
         const newConfigOptions = this._applyTestConfigOptions(configOptions, mountPaths);
         // default tests to run use compact signatures.
@@ -1145,7 +1149,7 @@ class TestState {
         configOptions.checkOnlyOpenFiles = false;
         // make sure we set typing path
         if (configOptions.stubPath === undefined) {
-            configOptions.stubPath = uri_1.Uri.file(vfs.MODULE_PATH).combinePaths('typings');
+            configOptions.stubPath = uri_1.Uri.file(vfs.MODULE_PATH, this.serviceProvider).combinePaths('typings');
         }
         configOptions.include.push((0, uriUtils_1.getFileSpec)(configOptions.projectRoot, '.'));
         configOptions.exclude.push((0, uriUtils_1.getFileSpec)(configOptions.projectRoot, factory_1.typeshedFolder.getFilePath()));
@@ -1161,19 +1165,20 @@ class TestState {
         }
         return configOptions;
     }
-    _getParseResult(fileName) {
-        const file = this.program.getBoundSourceFile(uri_1.Uri.file(fileName));
+    _getParserOutput(fileName) {
+        const file = this.program.getBoundSourceFile(uri_1.Uri.file(fileName, this.serviceProvider));
         return file === null || file === void 0 ? void 0 : file.getParseResults();
     }
     _getTextRangeCollection(fileName) {
+        var _a;
         if (this.files.includes(fileName)) {
-            const parseResults = this._getParseResult(fileName);
-            if (parseResults) {
-                return parseResults.tokenizerOutput.lines;
+            const tokenizerOutput = (_a = this._getParserOutput(fileName)) === null || _a === void 0 ? void 0 : _a.tokenizerOutput;
+            if (tokenizerOutput) {
+                return tokenizerOutput.lines;
             }
         }
         // slow path
-        const fileContents = this.fs.readFileSync(uri_1.Uri.file(fileName), 'utf8');
+        const fileContents = this.fs.readFileSync(uri_1.Uri.file(fileName, this.serviceProvider), 'utf8');
         const tokenizer = new tokenizer_1.Tokenizer();
         return tokenizer.tokenize(fileContents).lines;
     }
@@ -1190,7 +1195,7 @@ class TestState {
         var _a, _b;
         let fileContent = this.getFileContent(fileName);
         fileContent = fileContent.slice(0, editStart) + newText + fileContent.slice(editEnd);
-        const uri = uri_1.Uri.file(fileName);
+        const uri = uri_1.Uri.file(fileName, this.serviceProvider);
         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);
@@ -1307,7 +1312,7 @@ class TestState {
         return position <= editStart ? position : position < editEnd ? -1 : position + length - +(editEnd - editStart);
     }
     _getDiagnosticsPerFile() {
-        const sourceFiles = this.files.map((f) => this.program.getSourceFile(uri_1.Uri.file(f)));
+        const sourceFiles = this.files.map((f) => this.program.getSourceFile(uri_1.Uri.file(f, this.serviceProvider)));
         const results = sourceFiles.map((sourceFile, index) => {
             if (sourceFile) {
                 const diagnostics = sourceFile.getDiagnostics(this.configOptions) || [];
@@ -1347,7 +1352,7 @@ class TestState {
             const fileExtension = (0, pathUtils_1.getFileExtension)(path).toLowerCase();
             return fileExtension === '.py' || fileExtension === '.pyi';
         })
-            .map((path) => uri_1.Uri.file(path))
+            .map((path) => uri_1.Uri.file(path, this.serviceProvider))
             .filter((path) => service.isTracked(path)));
         return service;
     }
@@ -1362,7 +1367,7 @@ class TestState {
         return true;
     }
     async _waitForFile(filePath) {
-        const uri = uri_1.Uri.file(filePath);
+        const uri = uri_1.Uri.file(filePath, this.serviceProvider);
         while (!this.fs.existsSync(uri)) {
             await new Promise((res) => setTimeout(() => {
                 res();
@@ -1383,7 +1388,7 @@ class TestState {
             const normalizedFilePath = (0, pathUtils_1.normalizeSlashes)(filePath);
             // wait until the file exists
             await this._waitForFile(normalizedFilePath);
-            const actual = this.fs.readFileSync(uri_1.Uri.file(normalizedFilePath), 'utf8');
+            const actual = this.fs.readFileSync(uri_1.Uri.file(normalizedFilePath, this.serviceProvider), 'utf8');
             if (actual !== expected) {
                 this.raiseError(`doesn't contain expected result: ${(0, utils_1.stringify)(expected)}, actual: ${(0, utils_1.stringify)(actual)}`);
             }
@@ -1451,7 +1456,7 @@ function getNodeAtMarker(codeOrState, markerName = 'marker') {
     (0, assert_1.default)(sourceFile);
     const parserResults = sourceFile.getParseResults();
     (0, assert_1.default)(parserResults);
-    const node = (0, parseTreeUtils_1.findNodeByOffset)(parserResults.parseTree, marker.position);
+    const node = (0, parseTreeUtils_1.findNodeByOffset)(parserResults.parserOutput.parseTree, marker.position);
     (0, assert_1.default)(node);
     return node;
 }