@zzzen/pyright-internal 1.2.0-dev.20241208 → 1.2.0-dev.20241222

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

@@ -100,12 +100,13 @@ class TestState {
         const vfsInfo = (0, testStateUtils_1.createVfsInfoFromFourSlashData)(projectRoot, testData);
         this._vfsFiles = vfsInfo.files;
         this.testFS =
-            testFS !== null && testFS !== void 0 ? testFS : (0, factory_1.createFromFileSystem)(host.HOST, vfsInfo.ignoreCase, { cwd: vfsInfo.projectRoot, files: vfsInfo.files, meta: testData.globalOptions }, mountPaths);
+            testFS ??
+                (0, factory_1.createFromFileSystem)(host.HOST, vfsInfo.ignoreCase, { cwd: vfsInfo.projectRoot, files: vfsInfo.files, meta: testData.globalOptions }, mountPaths);
         this.fs = new pyrightFileSystem_1.PyrightFileSystem(this.testFS);
         this.console = new console_1.ConsoleWithLogLevel(new console_1.NullConsole(), 'test');
         this.serviceProvider = (0, serviceProviderExtensions_1.createServiceProvider)(this.testFS, this.fs, this.console);
         this._cancellationToken = new fourSlashTypes_1.TestCancellationToken();
-        this._hostSpecificFeatures = hostSpecificFeatures !== null && hostSpecificFeatures !== void 0 ? hostSpecificFeatures : new testLanguageService_1.TestFeatures();
+        this._hostSpecificFeatures = hostSpecificFeatures ?? new testLanguageService_1.TestFeatures();
         this.files = vfsInfo.sourceFileNames;
         this.rawConfigJson = vfsInfo.rawConfigJson;
         const configOptions = this._convertGlobalOptionsToConfigOptions(vfsInfo.projectRoot, mountPaths);
@@ -151,15 +152,14 @@ class TestState {
         return this.getFileContent(this.activeFile.fileName).length;
     }
     initializeFiles() {
-        var _a, _b;
         if (this.files.length > 0) {
             // Open the first file by default
             this.openFile(this.files[0]);
         }
         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, this.serviceProvider))) === null || _b === void 0 ? void 0 : _b.test_enableIPythonMode(true);
+            if (file.meta?.["ipythonmode" /* MetadataOptionNames.ipythonMode */]) {
+                this.program.getSourceFile(uri_1.Uri.file(filePath, this.serviceProvider))?.test_enableIPythonMode(true);
             }
         }
     }
@@ -300,7 +300,7 @@ class TestState {
         return result;
     }
     getFilteredRanges(predicate) {
-        return this.getRanges().filter((r) => { var _a; return predicate(r.marker, (_a = r.marker) === null || _a === void 0 ? void 0 : _a.data, this.rangeText(r)); });
+        return this.getRanges().filter((r) => predicate(r.marker, r.marker?.data, this.rangeText(r)));
     }
     getRangeByMarkerName(markerName) {
         return (0, testStateUtils_1.getRangeByMarkerName)(this.testData, markerName);
@@ -486,7 +486,6 @@ class TestState {
         }
     }
     async verifyCodeActions(verifyMode, map) {
-        var _a, _b;
         // make sure we don't use cache built from other tests
         this.workspace.service.invalidateAndForceReanalysis(backgroundAnalysisProgram_1.InvalidatedReason.Reanalyzed);
         this.analyze();
@@ -540,7 +539,7 @@ class TestState {
                     const sourceFile = this.program.getSourceFile(uri);
                     const symbolsInTest2 = sourceFile
                         ? ', symbols in test2.py: ' +
-                            Array.from((_b = (_a = sourceFile.getModuleSymbolTable()) === null || _a === void 0 ? void 0 : _a.keys()) !== null && _b !== void 0 ? _b : []).join(',')
+                            Array.from(sourceFile.getModuleSymbolTable()?.keys() ?? []).join(',')
                         : '';
                     this.raiseError(`doesn't contain expected result: ${(0, utils_1.stringify)(expected)}, actual: ${(0, utils_1.stringify)(codeActions)}, diagnostics: ${(0, utils_1.stringify)(diagnostics)}${symbolsInTest2}`);
                 }
@@ -558,7 +557,7 @@ class TestState {
                     }
                 }
             }
-            return args === null || args === void 0 ? void 0 : args.map((a) => {
+            return 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.
@@ -572,10 +571,9 @@ 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) => {
+        const convertedArgs = command.arguments?.map((arg) => {
             if (typeof arg === 'string' && (arg.endsWith('.py') || arg.endsWith('.pyi'))) {
                 return uri_1.Uri.file(arg, this.serviceProvider).toString();
             }
@@ -604,7 +602,6 @@ class TestState {
         return (0, workspaceEditTestUtils_1.verifyWorkspaceEdit)(expected, actual, marker);
     }
     async verifyInvokeCodeAction(map, verifyCodeActionCount) {
-        var _a;
         this.analyze();
         for (const range of this.getRanges()) {
             const name = this.getMarkerName(range.marker);
@@ -625,7 +622,7 @@ class TestState {
             for (const codeAction of matches) {
                 const results = await this._hostSpecificFeatures.execute(ls, {
                     command: codeAction.command.command,
-                    arguments: ((_a = codeAction.command) === null || _a === void 0 ? void 0 : _a.arguments) || [],
+                    arguments: codeAction.command?.arguments || [],
                 }, vscode_languageserver_1.CancellationToken.None);
                 if (map[name].edits) {
                     const workspaceEdits = commandResult_1.CommandResult.is(results) ? results.edits : results;
@@ -770,7 +767,6 @@ class TestState {
         }
     }
     verifySignature(docFormat, map) {
-        var _a, _b;
         this.analyze();
         for (const marker of this.getMarkers()) {
             const fileName = marker.fileName;
@@ -813,14 +809,13 @@ class TestState {
             });
             assert_1.default.deepEqual(actual.signatures.map((sig) => sig.activeParameter), expected.activeParameters);
             if (expected.callHasParameters !== undefined) {
-                const isActive = (sig) => { var _a; return !expected.callHasParameters && !((_a = sig.parameters) === null || _a === void 0 ? void 0 : _a.length); };
-                const activeSignature = (_b = (_a = expected.signatures) === null || _a === void 0 ? void 0 : _a.findIndex(isActive)) !== null && _b !== void 0 ? _b : undefined;
+                const isActive = (sig) => !expected.callHasParameters && !sig.parameters?.length;
+                const activeSignature = expected.signatures?.findIndex(isActive) ?? undefined;
                 assert_1.default.equal(actual.activeSignature, activeSignature);
             }
         }
     }
     verifyFindAllReferences(map, createDocumentRange, convertToLocation) {
-        var _a;
         this.analyze();
         for (const name of this.getMarkerNames()) {
             const marker = this.getMarkerByName(name);
@@ -830,22 +825,20 @@ class TestState {
             }
             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, this.serviceProvider),
+                    uri: c.uri ?? 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, 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`);
+            assert_1.default.strictEqual(actual?.length ?? 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);
+                assert_1.default.equal(actual?.filter((d) => this._deepEqual(d, r)).length, 1);
             }
         }
     }
     verifyShowCallHierarchyGetIncomingCalls(map) {
-        var _a, _b, _c;
         this.analyze();
         for (const marker of this.getMarkers()) {
             const fileName = marker.fileName;
@@ -858,20 +851,19 @@ class TestState {
             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, 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`);
+            assert_1.default.strictEqual(actual?.length ?? 0, expectedFilePath.length, `${name} has failed`);
+            assert_1.default.strictEqual(actual?.length ?? 0, expectedRange.length, `${name} has failed`);
+            assert_1.default.strictEqual(actual?.length ?? 0, expectedName.length, `${name} has failed`);
             if (actual) {
                 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, this.serviceProvider).toString())).length) >= 1);
+                    assert_1.default.strictEqual(expectedRange?.filter((e) => this._deepEqual(a.from.range, e)).length, 1);
+                    assert_1.default.strictEqual(expectedName?.filter((e) => this._deepEqual(a.from.name, e)).length, 1);
+                    assert_1.default.ok(expectedFilePath?.filter((e) => this._deepEqual(a.from.uri, uri_1.Uri.file(e, this.serviceProvider).toString())).length >= 1);
                 }
             }
         }
     }
     verifyShowCallHierarchyGetOutgoingCalls(map) {
-        var _a, _b, _c;
         this.analyze();
         for (const marker of this.getMarkers()) {
             const fileName = marker.fileName;
@@ -884,20 +876,20 @@ class TestState {
             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, 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`);
+            assert_1.default.strictEqual(actual?.length ?? 0, expectedFilePath.length, `${name} has failed`);
+            assert_1.default.strictEqual(actual?.length ?? 0, expectedRange.length, `${name} has failed`);
+            assert_1.default.strictEqual(actual?.length ?? 0, expectedName.length, `${name} has failed`);
             if (actual) {
                 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, this.serviceProvider).toString())).length) >= 1);
+                    assert_1.default.strictEqual(expectedRange?.filter((e) => this._deepEqual(a.to.range, e)).length, 1);
+                    assert_1.default.strictEqual(expectedName?.filter((e) => this._deepEqual(a.to.name, e)).length, 1);
+                    assert_1.default.ok(expectedFilePath?.filter((e) => this._deepEqual(a.to.uri, uri_1.Uri.file(e, this.serviceProvider).toString())).length >= 1);
                 }
             }
         }
     }
     getDocumentHighlightKind(m) {
-        const kind = (m === null || m === void 0 ? void 0 : m.data) ? m.data.kind : undefined;
+        const kind = m?.data ? m.data.kind : undefined;
         switch (kind) {
             case 'text':
                 return vscode_languageserver_1.DocumentHighlightKind.Text;
@@ -910,7 +902,6 @@ class TestState {
         }
     }
     verifyHighlightReferences(map) {
-        var _a;
         this.analyze();
         for (const name of Object.keys(map)) {
             const marker = this.getMarkerByName(name);
@@ -918,10 +909,10 @@ class TestState {
             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, 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);
+            assert_1.default.equal(actual?.length ?? 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));
-                assert_1.default.equal(match === null || match === void 0 ? void 0 : match.length, 1);
+                const match = actual?.filter((h) => this._deepEqual(h.range, r.range));
+                assert_1.default.equal(match?.length, 1);
                 if (r.kind) {
                     assert_1.default.equal(match[0].kind, r.kind);
                 }
@@ -929,7 +920,7 @@ class TestState {
         }
     }
     fixupDefinitionsToMatchExpected(actual) {
-        return actual === null || actual === void 0 ? void 0 : actual.map((a) => {
+        return actual?.map((a) => {
             const { uri, ...restOfActual } = a;
             return {
                 ...restOfActual,
@@ -938,7 +929,6 @@ class TestState {
         });
     }
     verifyFindDefinitions(map, filter = definitionProvider_1.DefinitionFilter.All) {
-        var _a;
         this.analyze();
         for (const marker of this.getMarkers()) {
             const fileName = marker.fileName;
@@ -957,15 +947,14 @@ class TestState {
             }
             const position = this.convertOffsetToPosition(fileName, marker.position);
             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}"`);
+            assert_1.default.equal(actual?.length ?? 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}`);
+                assert_1.default.equal(actual?.filter((d) => this._deepEqual(d, r)).length, 1, `No match found for ${JSON.stringify(r)} from marker ${name}`);
             }
         }
     }
     verifyFindTypeDefinitions(map) {
-        var _a;
         this.analyze();
         for (const marker of this.getMarkers()) {
             const fileName = marker.fileName;
@@ -977,9 +966,9 @@ class TestState {
             const position = this.convertOffsetToPosition(fileName, marker.position);
             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);
+            assert_1.default.strictEqual(actual?.length ?? 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);
+                assert_1.default.strictEqual(actual?.filter((d) => this._deepEqual(d, r)).length, 1, name);
             }
         }
     }
@@ -993,17 +982,16 @@ class TestState {
             }
             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, this.serviceProvider),
+                    fileUri: c.fileUri ?? 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, '/')}`, 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: [] });
+            (0, workspaceEditTestUtils_1.verifyWorkspaceEdit)((0, workspaceEditUtils_1.convertToWorkspaceEdit)(this.program.fileSystem, { edits: expected.changes, fileOperations: [] }), actual ?? { documentChanges: [] });
         }
     }
     verifyTypeVerifierResults(packageName, ignoreUnknownTypesFromImports, verboseOutput, expected) {
@@ -1129,7 +1117,6 @@ class TestState {
         return this.getFileContent(fileName).slice(pos, end);
     }
     verifyCompletionItem(expected, actual) {
-        var _a, _b, _c;
         assert_1.default.strictEqual(actual.label, expected.label);
         assert_1.default.strictEqual(actual.detail, expected.detail);
         assert_1.default.strictEqual(actual.kind, expected.kind);
@@ -1137,10 +1124,10 @@ class TestState {
         this._verifyEdit(actual.textEdit, expected.textEdit);
         this._verifyEdits(actual.additionalTextEdits, expected.additionalTextEdits);
         if (expected.detailDescription !== undefined) {
-            assert_1.default.strictEqual((_a = actual.labelDetails) === null || _a === void 0 ? void 0 : _a.description, expected.detailDescription);
+            assert_1.default.strictEqual(actual.labelDetails?.description, expected.detailDescription);
         }
         if (expected.commitCharacters !== undefined) {
-            expect(expected.commitCharacters.sort()).toEqual((_c = (_b = actual.commitCharacters) === null || _b === void 0 ? void 0 : _b.sort()) !== null && _c !== void 0 ? _c : []);
+            expect(expected.commitCharacters.sort()).toEqual(actual.commitCharacters?.sort() ?? []);
         }
     }
     _convertGlobalOptionsToConfigOptions(projectRoot, mountPaths) {
@@ -1176,12 +1163,11 @@ class TestState {
     }
     _getParserOutput(fileName) {
         const file = this.program.getBoundSourceFile(uri_1.Uri.file(fileName, this.serviceProvider));
-        return file === null || file === void 0 ? void 0 : file.getParseResults();
+        return file?.getParseResults();
     }
     _getTextRangeCollection(fileName) {
-        var _a;
         if (this.files.includes(fileName)) {
-            const tokenizerOutput = (_a = this._getParserOutput(fileName)) === null || _a === void 0 ? void 0 : _a.tokenizerOutput;
+            const tokenizerOutput = this._getParserOutput(fileName)?.tokenizerOutput;
             if (tokenizerOutput) {
                 return tokenizerOutput.lines;
             }
@@ -1201,12 +1187,11 @@ class TestState {
         // blank for now
     }
     _editScriptAndUpdateMarkers(fileName, editStart, editEnd, newText) {
-        var _a, _b;
         let fileContent = this.getFileContent(fileName);
         fileContent = fileContent.slice(0, editStart) + newText + fileContent.slice(editEnd);
         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;
+        const newVersion = (this.program.getSourceFile(uri)?.getClientVersion() ?? -1) + 1;
         this.program.setFileOpened(uri, newVersion, fileContent);
         for (const marker of this.testData.markers) {
             if (marker.fileName === fileName) {
@@ -1419,8 +1404,8 @@ class TestState {
         }
     }
     _verifyEdits(actual, expected) {
-        actual = actual !== null && actual !== void 0 ? actual : [];
-        expected = expected !== null && expected !== void 0 ? expected : [];
+        actual = actual ?? [];
+        expected = expected ?? [];
         let extra = expected.slice(0);
         let left = actual.slice(0);
         for (const item of actual) {