@zzzen/pyright-internal 1.2.0-dev.20260628 → 1.2.0-dev.20260712

package/dist/tests/typeServer/notebook.typeServer.test.js

@@ -0,0 +1,315 @@
+"use strict";
+/*
+ * notebook.typeServer.test.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ *
+ * Tests for the type server's notebook cell-chain maintenance (NotebookUriMapper +
+ * createNotebookData / openNotebookCellChain / updateNotebookStructure).
+ *
+ * This is a Pyright-native port of Pylance's `notebook.common.ts`. It exercises only the
+ * cell-chain core functions against a real AnalyzerService; it does not drive the notebook
+ * document handler (which just sequences calls to these same functions).
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
+const service_1 = require("../../analyzer/service");
+const sourceFile_1 = require("../../analyzer/sourceFile");
+const commandLineOptions_1 = require("../../common/commandLineOptions");
+const console_1 = require("../../common/console");
+const pathUtils_1 = require("../../common/pathUtils");
+const serviceKeys_1 = require("../../common/serviceKeys");
+const serviceProviderExtensions_1 = require("../../common/serviceProviderExtensions");
+const uri_1 = require("../../common/uri/uri");
+const pyrightFileSystem_1 = require("../../pyrightFileSystem");
+const notebookCellChain_1 = require("../../typeServer/notebookCellChain");
+const notebookUriMapper_1 = require("../../typeServer/notebookUriMapper");
+const workspaceFactory_1 = require("../../workspaceFactory");
+const host = __importStar(require("../harness/testHost"));
+const factory_1 = require("../harness/vfs/factory");
+describe('updateNotebookStructure Tests (typeServer mode)', () => {
+    const testFileSystem = (0, factory_1.createFromFileSystem)(host.HOST, /* ignoreCase */ false, {
+        cwd: (0, pathUtils_1.normalizeSlashes)('/'),
+    });
+    const fileSystem = new pyrightFileSystem_1.PyrightFileSystem(testFileSystem);
+    const serviceProvider = (0, serviceProviderExtensions_1.createServiceProvider)(testFileSystem, fileSystem);
+    let uriMapper;
+    let analyzerService;
+    let workspace;
+    const notebookUriString = 'file:///notebook.ipynb';
+    const notebookUri = uri_1.Uri.parse(notebookUriString, serviceProvider);
+    beforeEach(() => {
+        uriMapper = new notebookUriMapper_1.NotebookUriMapper(serviceProvider.get(serviceKeys_1.ServiceKeys.caseSensitivityDetector));
+        analyzerService = new service_1.AnalyzerService('name', serviceProvider, {
+            console: new console_1.NullConsole(),
+            shouldRunAnalysis: () => true,
+        });
+        // Don't run analysis automatically.
+        const options = new commandLineOptions_1.CommandLineOptions((0, pathUtils_1.normalizeSlashes)('/src'), false);
+        options.languageServerSettings.enableAmbientAnalysis = false;
+        analyzerService.setOptions(options);
+        workspace = {
+            workspaceName: 'name',
+            rootUri: uri_1.Uri.file('/src', serviceProvider),
+            kinds: [workspaceFactory_1.WellKnownWorkspaceKinds.Regular],
+            service: analyzerService,
+            disableLanguageServices: false,
+            disableOrganizeImports: false,
+            disableWorkspaceSymbol: false,
+            isInitialized: (0, workspaceFactory_1.createInitStatus)(),
+            searchPathsToWatch: [],
+            disableTaggedHints: false,
+        };
+    });
+    afterEach(() => {
+        analyzerService.dispose();
+    });
+    test('delete cell', () => {
+        const nd = _setupWorkspace(notebookUriString, [
+            _createCellUri('one'),
+            _createCellUri('two'),
+            _createCellUri('three'),
+        ]);
+        const structure = {
+            array: { start: 1, deleteCount: 1 },
+            didOpen: undefined,
+            didClose: [{ uri: _createCellUri('two') }],
+        };
+        _applyChange(notebookUriString, structure);
+        (0, notebookCellChain_1.updateNotebookStructure)(structure, nd, uriMapper, workspace);
+        _verifyUris(nd.mappedCellUris, [_createCellFilePath('one'), _createCellFilePath('three')]);
+        expect(analyzerService.hasSourceFile(_createCellFilePath('two'))).toBe(false);
+    });
+    test('delete top cell', () => {
+        const nd = _setupWorkspace(notebookUriString, [
+            _createCellUri('one'),
+            _createCellUri('two'),
+            _createCellUri('three'),
+        ]);
+        const structure = {
+            array: { start: 0, deleteCount: 1 },
+            didOpen: undefined,
+            didClose: [{ uri: _createCellUri('one') }],
+        };
+        _applyChange(notebookUriString, structure);
+        (0, notebookCellChain_1.updateNotebookStructure)(structure, nd, uriMapper, workspace);
+        _verifyUris(nd.mappedCellUris, [_createCellFilePath('two'), _createCellFilePath('three')]);
+        expect(analyzerService.hasSourceFile(_createCellFilePath('one'))).toBe(false);
+    });
+    test('insert cell', () => {
+        const nd = _setupWorkspace(notebookUriString, [_createCellUri('one'), _createCellUri('two')]);
+        const structure = {
+            array: {
+                cells: [{ kind: vscode_languageserver_protocol_1.NotebookCellKind.Code, document: _createCellUri('new') }],
+                start: 1,
+                deleteCount: 0,
+            },
+            didOpen: [{ uri: _createCellUri('new'), languageId: 'python', version: 1, text: '' }],
+            didClose: undefined,
+        };
+        _applyChange(notebookUriString, structure);
+        (0, notebookCellChain_1.updateNotebookStructure)(structure, nd, uriMapper, workspace);
+        _verifyUris(nd.mappedCellUris, [
+            _createCellFilePath('one'),
+            _createCellFilePath('new'),
+            _createCellFilePath('two'),
+        ]);
+        expect(analyzerService.hasSourceFile(_createCellFilePath('new'))).toBe(true);
+        expect(analyzerService.getChainedUri(_createCellFilePath('new'))?.equals(_createCellFilePath('one'))).toBe(true);
+    });
+    test('reorder cell', () => {
+        const nd = _setupWorkspace(notebookUriString, [
+            _createCellUri('one'),
+            _createCellUri('two'),
+            _createCellUri('three'),
+        ]);
+        const structure = {
+            array: {
+                cells: [
+                    { kind: vscode_languageserver_protocol_1.NotebookCellKind.Code, document: _createCellUri('three') },
+                    { kind: vscode_languageserver_protocol_1.NotebookCellKind.Code, document: _createCellUri('two') },
+                ],
+                start: 1,
+                deleteCount: 2,
+            },
+            didOpen: undefined,
+            didClose: undefined,
+        };
+        _applyChange(notebookUriString, structure);
+        (0, notebookCellChain_1.updateNotebookStructure)(structure, nd, uriMapper, workspace);
+        _verifyUris(nd.mappedCellUris, [
+            _createCellFilePath('one'),
+            _createCellFilePath('three'),
+            _createCellFilePath('two'),
+        ]);
+        expect(analyzerService.getChainedUri(_createCellFilePath('two'))?.equals(_createCellFilePath('three'))).toBe(true);
+        expect(analyzerService.getChainedUri(_createCellFilePath('three'))?.equals(_createCellFilePath('one'))).toBe(true);
+    });
+    test('repair if duplicate cell detected', () => {
+        const nd = _setupWorkspace(notebookUriString, [_createCellUri('one'), _createCellUri('two')]);
+        const structure = {
+            array: {
+                cells: [{ kind: vscode_languageserver_protocol_1.NotebookCellKind.Code, document: _createCellUri('one') }],
+                start: 2,
+                deleteCount: 0,
+            },
+            didOpen: [{ uri: _createCellUri('one'), languageId: 'python', version: 1, text: '' }],
+            didClose: undefined,
+        };
+        _applyChange(notebookUriString, structure);
+        // Should not throw; instead it should repair the chain by removing the duplicate.
+        expect(() => (0, notebookCellChain_1.updateNotebookStructure)(structure, nd, uriMapper, workspace)).not.toThrow();
+        // The duplicate entry should have been removed, leaving only the original two cells.
+        _verifyUris(nd.mappedCellUris, [_createCellFilePath('one'), _createCellFilePath('two')]);
+    });
+    test('delete last cell', () => {
+        const nd = _setupWorkspace(notebookUriString, [
+            _createCellUri('one'),
+            _createCellUri('two'),
+            _createCellUri('three'),
+        ]);
+        const structure = {
+            array: { start: 2, deleteCount: 1 },
+            didOpen: undefined,
+            didClose: [{ uri: _createCellUri('three') }],
+        };
+        _applyChange(notebookUriString, structure);
+        (0, notebookCellChain_1.updateNotebookStructure)(structure, nd, uriMapper, workspace);
+        _verifyUris(nd.mappedCellUris, [_createCellFilePath('one'), _createCellFilePath('two')]);
+        expect(analyzerService.hasSourceFile(_createCellFilePath('three'))).toBe(false);
+        // The chain should remain intact after the last cell is deleted: prefix → one → two
+        expect(analyzerService.getChainedUri(_createCellFilePath('two'))?.equals(_createCellFilePath('one'))).toBe(true);
+        expect(analyzerService.getChainedUri(_createCellFilePath('one'))?.equals(nd.prefixCellUri)).toBe(true);
+    });
+    test('delete and create cells', () => {
+        const nd = _setupWorkspace(notebookUriString, [_createCellUri('one')]);
+        const structure = {
+            array: {
+                cells: [{ kind: vscode_languageserver_protocol_1.NotebookCellKind.Code, document: _createCellUri('new') }],
+                start: 0,
+                deleteCount: 1,
+            },
+            didOpen: [{ uri: _createCellUri('new'), languageId: 'python', version: 1, text: '' }],
+            didClose: [{ uri: _createCellUri('one') }],
+        };
+        _applyChange(notebookUriString, structure);
+        (0, notebookCellChain_1.updateNotebookStructure)(structure, nd, uriMapper, workspace);
+        _verifyUris(nd.mappedCellUris, [_createCellFilePath('new')]);
+        expect(analyzerService.hasSourceFile(_createCellFilePath('new'))).toBe(true);
+        expect(analyzerService.getChainedUri(_createCellFilePath('new'))?.equals(nd.prefixCellUri)).toBe(true);
+    });
+    test('unused symbol in chained source file', () => {
+        _setupWorkspace(notebookUriString, [_createCellUri('one'), _createCellUri('two'), _createCellUri('three')]);
+        const source1 = workspace.service.test_program.getBoundSourceFileInfo(_createCellFilePath('one'));
+        const source2 = workspace.service.test_program.getBoundSourceFileInfo(_createCellFilePath('two'));
+        const source3 = workspace.service.test_program.getBoundSourceFileInfo(_createCellFilePath('three'));
+        // Since we created the workspace for tests, some flags that would be set when
+        // workspace.getSettings is called are not set. Manually set them here.
+        source1.isTracked = true;
+        source2.isTracked = true;
+        source3.isTracked = true;
+        _updateCellContent('one', 'import os');
+        expect(source1.sourceFile
+            .getDiagnostics(workspace.service.getConfigOptions())
+            ?.some((d) => d.category === 3 /* DiagnosticCategory.UnusedCode */)).toBe(true);
+        _updateCellContent('two', 'os');
+        expect(source1.sourceFile
+            .getDiagnostics(workspace.service.getConfigOptions())
+            ?.some((d) => d.category === 3 /* DiagnosticCategory.UnusedCode */)).toBe(false);
+        _updateCellContent('one', 'import os\nimport sys');
+        expect(source1.sourceFile
+            .getDiagnostics(workspace.service.getConfigOptions())
+            ?.some((d) => d.category === 3 /* DiagnosticCategory.UnusedCode */)).toBe(true);
+        _updateCellContent('three', 'sys');
+        expect(source1.sourceFile
+            .getDiagnostics(workspace.service.getConfigOptions())
+            ?.some((d) => d.category === 3 /* DiagnosticCategory.UnusedCode */)).toBe(false);
+        _updateCellContent('two', '');
+        expect(source1.sourceFile
+            .getDiagnostics(workspace.service.getConfigOptions())
+            ?.some((d) => d.category === 3 /* DiagnosticCategory.UnusedCode */)).toBe(true);
+    });
+    function _updateCellContent(cellName, text) {
+        const filePath = _createCellFilePath(cellName);
+        const source = workspace.service.test_program.getBoundSourceFileInfo(filePath);
+        workspace.service.updateOpenFileContents(filePath, (source.sourceFile.getClientVersion() ?? 0) + 1, text, sourceFile_1.IPythonMode.CellDocs);
+        while (workspace.service.test_program.analyze())
+            ;
+    }
+    function _setupWorkspace(notebookUri, cellFileUris) {
+        const cells = cellFileUris.map((uri) => vscode_languageserver_protocol_1.TextDocumentItem.create(uri, 'python', 1, ''));
+        const params = {
+            notebookDocument: {
+                notebookType: 'jupyter-notebook',
+                uri: notebookUri,
+                version: 1,
+                cells: cells.map((cell) => ({ kind: vscode_languageserver_protocol_1.NotebookCellKind.Code, document: cell.uri })),
+            },
+            cellTextDocuments: cells,
+        };
+        const notebookPath = uriMapper.parseNotebookOpen(params);
+        const notebookData = (0, notebookCellChain_1.createNotebookData)(notebookPath, cells, uriMapper, serviceProvider.get(serviceKeys_1.ServiceKeys.caseSensitivityDetector));
+        (0, notebookCellChain_1.openNotebookCellChain)(cells, notebookData, uriMapper, workspace);
+        return notebookData;
+    }
+    function _applyChange(notebookUri, structure) {
+        const params = {
+            notebookDocument: {
+                uri: notebookUri,
+                version: 2,
+            },
+            change: {
+                cells: {
+                    structure,
+                },
+            },
+        };
+        uriMapper.parseNotebookChange(params);
+    }
+    function _createCellUri(cell) {
+        return `vscode-notebook-cell:notebook.ipynb#${cell}`;
+    }
+    function _createCellFilePath(cell) {
+        return notebookUri.addExtension('.py').withFragment(cell);
+    }
+    function _verifyUris(actual, expected) {
+        expect(actual.length).toBe(expected.length);
+        for (let i = 0; i < actual.length; i++) {
+            expect(actual[i].equals(expected[i])).toBe(true);
+        }
+    }
+});
+//# sourceMappingURL=notebook.typeServer.test.js.map

package/dist/tests/typeServer/notebook.typeServer.test.js.map

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

package/dist/tests/typeServer/typeServer.inProc.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/typeServer/typeServer.inProc.test.js

@@ -0,0 +1,234 @@
+"use strict";
+/*
+ * typeServer.inProc.test.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ *
+ * In-process protocol tests for the Pyright type server (TSP).
+ *
+ * These exercise the server-side request handlers end-to-end over a real JSON-RPC
+ * connection (in-memory streams), including the `_onGetType` conversion path
+ * (fromProtocolNode -> evaluate via the sync->async adapter -> ProtocolTypeFactory).
+ *
+ * Ported from Pylance's `typeServer.inProc.test.ts`. The Pylance round-trip tests that
+ * reconstruct a Pyright `Type` from the protocol `Type` depend on the client-side consumer
+ * stack (ExternalProgram / snapshotSync), which stays in Pylance, so they are intentionally
+ * not ported here. Instead these tests assert on the protocol-level responses.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = __importDefault(require("assert"));
+const typeServerProtocol_1 = require("../../typeServer/protocol/typeServerProtocol");
+const inProcTypeServerTestUtils_1 = require("./inProcTypeServerTestUtils");
+jest.setTimeout(120000);
+/** Extract the class name from a protocol Type, if it's a ClassType with a regular declaration. */
+function getClassTypeName(type) {
+    if (!type || type.kind !== 3 /* TypeServerProtocol.TypeKind.Class */) {
+        return undefined;
+    }
+    const classType = type;
+    if (classType.declaration.kind === 0 /* TypeServerProtocol.DeclarationKind.Regular */) {
+        return classType.declaration.name;
+    }
+    return undefined;
+}
+describe('TypeServer in-proc protocol', () => {
+    beforeAll(async () => {
+        await (0, inProcTypeServerTestUtils_1.initializeDependenciesForInProcTests)();
+    });
+    test('initialize + get supported protocol version + snapshot', async () => {
+        const code = `
+// @filename: main.py
+//// x = 1
+`;
+        await (0, inProcTypeServerTestUtils_1.withInProcTypeServer)(code, async (context) => {
+            const version = await context.sendRequest(typeServerProtocol_1.TypeServerProtocol.GetSupportedProtocolVersionRequest.type);
+            (0, assert_1.default)(version.length > 0);
+            const snapshot = await context.refreshSnapshot();
+            (0, assert_1.default)(snapshot >= 0);
+        });
+    });
+    test('resolveImport resolves a local module', async () => {
+        const code = `
+// @filename: main.py
+//// # /*src*/
+//// import foo
+//// x = foo.value
+// @filename: foo.py
+//// value = 1
+`;
+        await (0, inProcTypeServerTestUtils_1.withInProcTypeServer)(code, async (context) => {
+            const resolvedUri = await context.sendRequestWithSnapshot(typeServerProtocol_1.TypeServerProtocol.ResolveImportRequest.type, {
+                sourceUri: context.getFileUriForMarker('src').toString(),
+                moduleDescriptor: { leadingDots: 0, nameParts: ['foo'] },
+            });
+            (0, assert_1.default)(resolvedUri !== undefined);
+            (0, assert_1.default)(resolvedUri.endsWith('/src/foo.py'));
+        });
+    });
+    test('getPythonSearchPaths returns an array', async () => {
+        const code = `
+// @filename: main.py
+//// # /*src*/
+//// x = 1
+`;
+        await (0, inProcTypeServerTestUtils_1.withInProcTypeServer)(code, async (context) => {
+            const paths = await context.sendRequestWithSnapshot(typeServerProtocol_1.TypeServerProtocol.GetPythonSearchPathsRequest.type, {
+                fromUri: context.getFileUriForMarker('src').getDirectory().toString(),
+            });
+            (0, assert_1.default)(Array.isArray(paths));
+            (0, assert_1.default)(paths.every((p) => typeof p === 'string'));
+        });
+    });
+    test('resolveImport resolves a relative module', async () => {
+        const code = `
+// @filename: pkg/__init__.py
+////
+// @filename: pkg/main.py
+//// # /*src*/
+//// from . import foo
+//// x = foo.value
+// @filename: pkg/foo.py
+//// value = 1
+`;
+        await (0, inProcTypeServerTestUtils_1.withInProcTypeServer)(code, async (context) => {
+            const resolvedUri = await context.sendRequestWithSnapshot(typeServerProtocol_1.TypeServerProtocol.ResolveImportRequest.type, {
+                sourceUri: context.getFileUriForMarker('src').toString(),
+                moduleDescriptor: { leadingDots: 1, nameParts: ['foo'] },
+            });
+            (0, assert_1.default)(resolvedUri !== undefined);
+            (0, assert_1.default)(resolvedUri.endsWith('/src/pkg/foo.py'));
+        });
+    });
+    test('resolveImport resolves stdlib module from typeshed-fallback', async () => {
+        const code = `
+// @filename: main.py
+//// # /*src*/
+//// import typing
+//// x = typing.Any
+`;
+        await (0, inProcTypeServerTestUtils_1.withInProcTypeServer)(code, async (context) => {
+            const resolvedUri = await context.sendRequestWithSnapshot(typeServerProtocol_1.TypeServerProtocol.ResolveImportRequest.type, {
+                sourceUri: context.getFileUriForMarker('src').toString(),
+                moduleDescriptor: { leadingDots: 0, nameParts: ['typing'] },
+            });
+            (0, assert_1.default)(resolvedUri !== undefined);
+            // The exact URI scheme can vary depending on FS mapping; the key is that this came from typeshed.
+            (0, assert_1.default)(resolvedUri.includes('/typeshed-fallback/stdlib/typing.pyi'));
+        });
+    });
+    test('resolveImport resolves builtins module from typeshed-fallback', async () => {
+        const code = `
+// @filename: main.py
+//// # /*src*/
+//// import builtins
+//// x = builtins.int
+`;
+        await (0, inProcTypeServerTestUtils_1.withInProcTypeServer)(code, async (context) => {
+            const resolvedUri = await context.sendRequestWithSnapshot(typeServerProtocol_1.TypeServerProtocol.ResolveImportRequest.type, {
+                sourceUri: context.getFileUriForMarker('src').toString(),
+                moduleDescriptor: { leadingDots: 0, nameParts: ['builtins'] },
+            });
+            (0, assert_1.default)(resolvedUri !== undefined);
+            (0, assert_1.default)(resolvedUri.includes('/typeshed-fallback/stdlib/builtins.pyi'));
+        });
+    });
+    test('resolveImport resolves stdlib submodule from typeshed-fallback', async () => {
+        const code = `
+// @filename: main.py
+//// # /*src*/
+//// import collections.abc
+//// x = collections.abc.Iterable
+`;
+        await (0, inProcTypeServerTestUtils_1.withInProcTypeServer)(code, async (context) => {
+            const resolvedUri = await context.sendRequestWithSnapshot(typeServerProtocol_1.TypeServerProtocol.ResolveImportRequest.type, {
+                sourceUri: context.getFileUriForMarker('src').toString(),
+                moduleDescriptor: { leadingDots: 0, nameParts: ['collections', 'abc'] },
+            });
+            (0, assert_1.default)(resolvedUri !== undefined);
+            (0, assert_1.default)(resolvedUri.includes('/typeshed-fallback/stdlib/collections/abc.pyi'));
+        });
+    });
+    test('getComputedType returns a type for a node', async () => {
+        const code = `
+// @filename: main.py
+//// def takes_int(x: int) -> None:
+////     pass
+////
+//// [|/*arg*/__arg__|] = 1
+//// takes_int(__arg__)
+`;
+        await (0, inProcTypeServerTestUtils_1.withInProcTypeServer)(code, async (context) => {
+            await context.openFileForMarker('arg');
+            const arg = context.getNodeForMarker('arg');
+            await context.refreshSnapshot();
+            const type = await context.sendRequestWithSnapshot(typeServerProtocol_1.TypeServerProtocol.GetComputedTypeRequest.type, {
+                arg,
+            });
+            (0, assert_1.default)(type !== undefined);
+            (0, assert_1.default)(typeof type.id === 'number');
+            assert_1.default.strictEqual(type.kind, 3 /* TypeServerProtocol.TypeKind.Class */);
+            assert_1.default.strictEqual(getClassTypeName(type), 'int');
+        });
+    });
+    test('getExpectedType returns a type for a node', async () => {
+        const code = `
+// @filename: main.py
+//// class C:
+////     pass
+////
+//// x: C = [|/*expr*/C()|]
+`;
+        await (0, inProcTypeServerTestUtils_1.withInProcTypeServer)(code, async (context) => {
+            await context.openFileForMarker('expr');
+            const arg = context.getNodeForMarker('expr');
+            await context.refreshSnapshot();
+            const type = await context.sendRequestWithSnapshot(typeServerProtocol_1.TypeServerProtocol.GetExpectedTypeRequest.type, {
+                arg,
+            });
+            (0, assert_1.default)(type !== undefined);
+            (0, assert_1.default)(typeof type.id === 'number');
+            assert_1.default.strictEqual(type.kind, 3 /* TypeServerProtocol.TypeKind.Class */);
+            assert_1.default.strictEqual(getClassTypeName(type), 'C');
+        });
+    });
+    test('getDeclaredType returns a type for an annotated symbol', async () => {
+        const code = `
+// @filename: main.py
+//// [|/*decl*/__declared__|]: str = 'x'
+`;
+        await (0, inProcTypeServerTestUtils_1.withInProcTypeServer)(code, async (context) => {
+            await context.openFileForMarker('decl');
+            const arg = context.getNodeForMarker('decl');
+            await context.refreshSnapshot();
+            const type = await context.sendRequestWithSnapshot(typeServerProtocol_1.TypeServerProtocol.GetDeclaredTypeRequest.type, {
+                arg,
+            });
+            (0, assert_1.default)(type !== undefined);
+            (0, assert_1.default)(typeof type.id === 'number');
+            assert_1.default.strictEqual(type.kind, 3 /* TypeServerProtocol.TypeKind.Class */);
+            assert_1.default.strictEqual(getClassTypeName(type), 'str');
+        });
+    });
+    test('snapshotChanged notification is delivered', async () => {
+        const code = `
+// @filename: main.py
+//// [|/*open*/|]x = 1
+`;
+        await (0, inProcTypeServerTestUtils_1.withInProcTypeServer)(code, async (context) => {
+            const initialSnapshot = await context.refreshSnapshot();
+            const received = new Promise((resolve) => {
+                context.onNotification(typeServerProtocol_1.TypeServerProtocol.SnapshotChangedNotification.type, (params) => {
+                    resolve(params);
+                });
+            });
+            await context.openFileForMarker('open');
+            const params = await received;
+            (0, assert_1.default)(params.new > params.old);
+            (0, assert_1.default)(params.old >= initialSnapshot);
+        });
+    });
+});
+//# sourceMappingURL=typeServer.inProc.test.js.map

package/dist/tests/typeServer/typeServer.inProc.test.js.map

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

package/dist/tests/typeServer/typeServer.virtualFileRedirect.test.d.ts

@@ -0,0 +1 @@
+export {};