@zzzen/pyright-internal 1.1.254

package/dist/server.js

@@ -0,0 +1,232 @@
+"use strict";
+/*
+ * server.ts
+ *
+ * Implements pyright language server.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PyrightServer = void 0;
+const vscode_languageserver_1 = require("vscode-languageserver");
+const importResolver_1 = require("./analyzer/importResolver");
+const pythonPathUtils_1 = require("./analyzer/pythonPathUtils");
+const backgroundAnalysis_1 = require("./backgroundAnalysis");
+const commandController_1 = require("./commands/commandController");
+const cancellationUtils_1 = require("./common/cancellationUtils");
+const console_1 = require("./common/console");
+const core_1 = require("./common/core");
+const fileBasedCancellationUtils_1 = require("./common/fileBasedCancellationUtils");
+const fullAccessHost_1 = require("./common/fullAccessHost");
+const pathUtils_1 = require("./common/pathUtils");
+const realFileSystem_1 = require("./common/realFileSystem");
+const languageServerBase_1 = require("./languageServerBase");
+const codeActionProvider_1 = require("./languageService/codeActionProvider");
+const workspaceMap_1 = require("./workspaceMap");
+const maxAnalysisTimeInForeground = { openFilesTimeInMs: 50, noOpenFilesTimeInMs: 200 };
+class PyrightServer extends languageServerBase_1.LanguageServerBase {
+    constructor(connection) {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const version = require('../package.json').version || '';
+        // When executed from CLI command (pyright-langserver), __rootDirectory is
+        // already defined. When executed from VSCode extension, rootDirectory should
+        // be __dirname.
+        const rootDirectory = global.__rootDirectory || __dirname;
+        const console = new console_1.ConsoleWithLogLevel(connection.console);
+        const workspaceMap = new workspaceMap_1.WorkspaceMap();
+        const fileWatcherProvider = new realFileSystem_1.WorkspaceFileWatcherProvider();
+        const fileSystem = (0, realFileSystem_1.createFromRealFileSystem)(console, fileWatcherProvider);
+        super({
+            productName: 'Pyright',
+            rootDirectory,
+            version,
+            workspaceMap,
+            fileSystem: fileSystem,
+            fileWatcherProvider,
+            cancellationProvider: new fileBasedCancellationUtils_1.FileBasedCancellationProvider('bg'),
+            maxAnalysisTimeInForeground,
+            supportedCodeActions: [vscode_languageserver_1.CodeActionKind.QuickFix, vscode_languageserver_1.CodeActionKind.SourceOrganizeImports],
+        }, connection, console);
+        this._controller = new commandController_1.CommandController(this);
+    }
+    async getSettings(workspace) {
+        const serverSettings = {
+            watchForSourceChanges: true,
+            watchForLibraryChanges: true,
+            watchForConfigChanges: true,
+            openFilesOnly: true,
+            useLibraryCodeForTypes: false,
+            disableLanguageServices: false,
+            disableOrganizeImports: false,
+            typeCheckingMode: 'basic',
+            diagnosticSeverityOverrides: {},
+            logLevel: console_1.LogLevel.Info,
+            autoImportCompletions: true,
+        };
+        try {
+            const pythonSection = await this.getConfiguration(workspace.rootUri, 'python');
+            if (pythonSection) {
+                const pythonPath = pythonSection.pythonPath;
+                if (pythonPath && (0, core_1.isString)(pythonPath) && !(0, pythonPathUtils_1.isPythonBinary)(pythonPath)) {
+                    serverSettings.pythonPath = (0, pathUtils_1.resolvePaths)(workspace.rootPath, this.expandPathVariables(workspace.rootPath, pythonPath));
+                }
+                const venvPath = pythonSection.venvPath;
+                if (venvPath && (0, core_1.isString)(venvPath)) {
+                    serverSettings.venvPath = (0, pathUtils_1.resolvePaths)(workspace.rootPath, this.expandPathVariables(workspace.rootPath, venvPath));
+                }
+            }
+            const pythonAnalysisSection = await this.getConfiguration(workspace.rootUri, 'python.analysis');
+            if (pythonAnalysisSection) {
+                const typeshedPaths = pythonAnalysisSection.typeshedPaths;
+                if (typeshedPaths && Array.isArray(typeshedPaths) && typeshedPaths.length > 0) {
+                    const typeshedPath = typeshedPaths[0];
+                    if (typeshedPath && (0, core_1.isString)(typeshedPath)) {
+                        serverSettings.typeshedPath = (0, pathUtils_1.resolvePaths)(workspace.rootPath, this.expandPathVariables(workspace.rootPath, typeshedPath));
+                    }
+                }
+                const stubPath = pythonAnalysisSection.stubPath;
+                if (stubPath && (0, core_1.isString)(stubPath)) {
+                    serverSettings.stubPath = (0, pathUtils_1.resolvePaths)(workspace.rootPath, this.expandPathVariables(workspace.rootPath, stubPath));
+                }
+                const diagnosticSeverityOverrides = pythonAnalysisSection.diagnosticSeverityOverrides;
+                if (diagnosticSeverityOverrides) {
+                    for (const [name, value] of Object.entries(diagnosticSeverityOverrides)) {
+                        const ruleName = this.getDiagnosticRuleName(name);
+                        const severity = this.getSeverityOverrides(value);
+                        if (ruleName && severity) {
+                            serverSettings.diagnosticSeverityOverrides[ruleName] = severity;
+                        }
+                    }
+                }
+                if (pythonAnalysisSection.diagnosticMode !== undefined) {
+                    serverSettings.openFilesOnly = this.isOpenFilesOnly(pythonAnalysisSection.diagnosticMode);
+                }
+                else if (pythonAnalysisSection.openFilesOnly !== undefined) {
+                    serverSettings.openFilesOnly = !!pythonAnalysisSection.openFilesOnly;
+                }
+                if (pythonAnalysisSection.useLibraryCodeForTypes !== undefined) {
+                    serverSettings.useLibraryCodeForTypes = !!pythonAnalysisSection.useLibraryCodeForTypes;
+                }
+                serverSettings.logLevel = this.convertLogLevel(pythonAnalysisSection.logLevel);
+                serverSettings.autoSearchPaths = !!pythonAnalysisSection.autoSearchPaths;
+                const extraPaths = pythonAnalysisSection.extraPaths;
+                if (extraPaths && Array.isArray(extraPaths) && extraPaths.length > 0) {
+                    serverSettings.extraPaths = extraPaths
+                        .filter((p) => p && (0, core_1.isString)(p))
+                        .map((p) => (0, pathUtils_1.resolvePaths)(workspace.rootPath, this.expandPathVariables(workspace.rootPath, p)));
+                }
+                if (pythonAnalysisSection.typeCheckingMode !== undefined) {
+                    serverSettings.typeCheckingMode = pythonAnalysisSection.typeCheckingMode;
+                }
+                if (pythonAnalysisSection.autoImportCompletions !== undefined) {
+                    serverSettings.autoImportCompletions = pythonAnalysisSection.autoImportCompletions;
+                }
+                if (serverSettings.logLevel === console_1.LogLevel.Log &&
+                    pythonAnalysisSection.logTypeEvaluationTime !== undefined) {
+                    serverSettings.logTypeEvaluationTime = pythonAnalysisSection.logTypeEvaluationTime;
+                }
+                if (pythonAnalysisSection.typeEvaluationTimeThreshold !== undefined) {
+                    serverSettings.typeEvaluationTimeThreshold = pythonAnalysisSection.typeEvaluationTimeThreshold;
+                }
+            }
+            else {
+                serverSettings.autoSearchPaths = true;
+            }
+            const pyrightSection = await this.getConfiguration(workspace.rootUri, 'pyright');
+            if (pyrightSection) {
+                if (pyrightSection.openFilesOnly !== undefined) {
+                    serverSettings.openFilesOnly = !!pyrightSection.openFilesOnly;
+                }
+                if (pyrightSection.useLibraryCodeForTypes !== undefined) {
+                    serverSettings.useLibraryCodeForTypes = !!pyrightSection.useLibraryCodeForTypes;
+                }
+                serverSettings.disableLanguageServices = !!pyrightSection.disableLanguageServices;
+                serverSettings.disableOrganizeImports = !!pyrightSection.disableOrganizeImports;
+                const typeCheckingMode = pyrightSection.typeCheckingMode;
+                if (typeCheckingMode && (0, core_1.isString)(typeCheckingMode)) {
+                    serverSettings.typeCheckingMode = typeCheckingMode;
+                }
+            }
+        }
+        catch (error) {
+            this.console.error(`Error reading settings: ${error}`);
+        }
+        return serverSettings;
+    }
+    createBackgroundAnalysis() {
+        if ((0, core_1.isDebugMode)() || !(0, cancellationUtils_1.getCancellationFolderName)()) {
+            // Don't do background analysis if we're in debug mode or an old client
+            // is used where cancellation is not supported.
+            return undefined;
+        }
+        return new backgroundAnalysis_1.BackgroundAnalysis(this.console);
+    }
+    createHost() {
+        return new fullAccessHost_1.FullAccessHost(this.fs);
+    }
+    createImportResolver(fs, options, host) {
+        const importResolver = new importResolver_1.ImportResolver(fs, options, host);
+        // In case there was cached information in the file system related to
+        // import resolution, invalidate it now.
+        importResolver.invalidateCache();
+        return importResolver;
+    }
+    executeCommand(params, token) {
+        return this._controller.execute(params, token);
+    }
+    isLongRunningCommand(command) {
+        return this._controller.isLongRunningCommand(command);
+    }
+    async executeCodeAction(params, token) {
+        this.recordUserInteractionTime();
+        const filePath = this._uriParser.decodeTextDocumentUri(params.textDocument.uri);
+        const workspace = await this.getWorkspaceForFile(filePath);
+        return codeActionProvider_1.CodeActionProvider.getCodeActionsForPosition(workspace, filePath, params.range, token);
+    }
+    createProgressReporter() {
+        // The old progress notifications are kept for backwards compatibility with
+        // clients that do not support work done progress.
+        let workDoneProgress;
+        return {
+            isEnabled: (data) => true,
+            begin: () => {
+                if (this.client.hasWindowProgressCapability) {
+                    workDoneProgress = this._connection.window.createWorkDoneProgress();
+                    workDoneProgress
+                        .then((progress) => {
+                        progress.begin('');
+                    })
+                        .ignoreErrors();
+                }
+                else {
+                    this._connection.sendNotification('pyright/beginProgress');
+                }
+            },
+            report: (message) => {
+                if (workDoneProgress) {
+                    workDoneProgress
+                        .then((progress) => {
+                        progress.report(message);
+                    })
+                        .ignoreErrors();
+                }
+                else {
+                    this._connection.sendNotification('pyright/reportProgress', message);
+                }
+            },
+            end: () => {
+                if (workDoneProgress) {
+                    workDoneProgress
+                        .then((progress) => {
+                        progress.done();
+                    })
+                        .ignoreErrors();
+                    workDoneProgress = undefined;
+                }
+                else {
+                    this._connection.sendNotification('pyright/endProgress');
+                }
+            },
+        };
+    }
+}
+exports.PyrightServer = PyrightServer;
+//# sourceMappingURL=server.js.map

package/dist/server.js.map

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

package/dist/tests/chainedSourceFiles.test.d.ts

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

package/dist/tests/chainedSourceFiles.test.js

@@ -0,0 +1,153 @@
+"use strict";
+/*
+ * chainedSourceFiles.test.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ *
+ * Unit tests for tokenizer ipython mode
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 vscode_jsonrpc_1 = require("vscode-jsonrpc");
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const service_1 = require("../analyzer/service");
+const configOptions_1 = require("../common/configOptions");
+const console_1 = require("../common/console");
+const pathUtils_1 = require("../common/pathUtils");
+const positionUtils_1 = require("../common/positionUtils");
+const fourSlashParser_1 = require("./harness/fourslash/fourSlashParser");
+const testAccessHost_1 = require("./harness/testAccessHost");
+const host = __importStar(require("./harness/testHost"));
+const factory_1 = require("./harness/vfs/factory");
+const vfs = __importStar(require("./harness/vfs/filesystem"));
+test('check chained files', async () => {
+    var _a, _b, _c;
+    const code = `
+// @filename: test1.py
+//// def foo1(): pass
+
+// @filename: test2.py
+//// def foo2(): pass
+
+// @filename: test3.py
+//// def foo3(): pass
+
+// @filename: test4.py
+//// [|foo/*marker*/|]
+    `;
+    const basePath = (0, pathUtils_1.normalizeSlashes)('/');
+    const { data, service } = createServiceWithChainedSourceFiles(basePath, code);
+    const marker = data.markerPositions.get('marker');
+    const parseResult = service.getParseResult(marker.fileName);
+    const result = await service.getCompletionsForPosition(marker.fileName, (0, positionUtils_1.convertOffsetToPosition)(marker.position, parseResult.tokenizerOutput.lines), basePath, {
+        format: vscode_languageserver_types_1.MarkupKind.Markdown,
+        lazyEdit: false,
+        snippet: false,
+        autoImport: false,
+    }, undefined, vscode_jsonrpc_1.CancellationToken.None);
+    (0, assert_1.default)((_a = result === null || result === void 0 ? void 0 : result.completionList) === null || _a === void 0 ? void 0 : _a.items.some((i) => i.label === 'foo1'));
+    (0, assert_1.default)((_b = result === null || result === void 0 ? void 0 : result.completionList) === null || _b === void 0 ? void 0 : _b.items.some((i) => i.label === 'foo2'));
+    (0, assert_1.default)((_c = result === null || result === void 0 ? void 0 : result.completionList) === null || _c === void 0 ? void 0 : _c.items.some((i) => i.label === 'foo3'));
+});
+test('modify chained files', async () => {
+    var _a, _b, _c;
+    const code = `
+// @filename: test1.py
+//// def foo1(): pass
+
+// @filename: test2.py
+//// [|/*delete*/|]
+//// def foo2(): pass
+
+// @filename: test3.py
+//// def foo3(): pass
+
+// @filename: test4.py
+//// [|foo/*marker*/|]
+    `;
+    const basePath = (0, pathUtils_1.normalizeSlashes)('/');
+    const { data, service } = createServiceWithChainedSourceFiles(basePath, code);
+    // Make sure files are all realized.
+    const marker = data.markerPositions.get('marker');
+    const parseResult = service.getParseResult(marker.fileName);
+    // Close file in the middle of the chain
+    service.setFileClosed(data.markerPositions.get('delete').fileName);
+    const result = await service.getCompletionsForPosition(marker.fileName, (0, positionUtils_1.convertOffsetToPosition)(marker.position, parseResult.tokenizerOutput.lines), basePath, {
+        format: vscode_languageserver_types_1.MarkupKind.Markdown,
+        lazyEdit: false,
+        snippet: false,
+        autoImport: false,
+    }, undefined, vscode_jsonrpc_1.CancellationToken.None);
+    (0, assert_1.default)(result);
+    (0, assert_1.default)(!((_a = result.completionList) === null || _a === void 0 ? void 0 : _a.items.some((i) => i.label === 'foo1')));
+    (0, assert_1.default)(!((_b = result.completionList) === null || _b === void 0 ? void 0 : _b.items.some((i) => i.label === 'foo2')));
+    (0, assert_1.default)((_c = result.completionList) === null || _c === void 0 ? void 0 : _c.items.some((i) => i.label === 'foo3'));
+});
+test('modify chained files', async () => {
+    const code = `
+// @filename: test1.py
+//// [|/*changed*/|]
+//// def foo1(): pass
+
+// @filename: test2.py
+//// def foo2(): pass
+
+// @filename: test3.py
+//// def foo3(): pass
+
+// @filename: test4.py
+//// [|/*marker*/foo1()|]
+    `;
+    const basePath = (0, pathUtils_1.normalizeSlashes)('/');
+    const { data, service } = createServiceWithChainedSourceFiles(basePath, code);
+    const marker = data.markerPositions.get('marker');
+    const range = data.ranges.find((r) => r.marker === marker);
+    const parseResults = service.getParseResult(marker.fileName);
+    analyze(service.test_program);
+    // Initially, there should be no error.
+    const initialDiags = await service.getDiagnosticsForRange(marker.fileName, (0, positionUtils_1.convertOffsetsToRange)(range.pos, range.end, parseResults.tokenizerOutput.lines), vscode_jsonrpc_1.CancellationToken.None);
+    assert_1.default.strictEqual(initialDiags.length, 0);
+    // Change test1 content
+    service.updateOpenFileContents(data.markerPositions.get('changed').fileName, 2, [{ text: 'def foo5(): pass' }]);
+    analyze(service.test_program);
+    const finalDiags = await service.getDiagnosticsForRange(marker.fileName, (0, positionUtils_1.convertOffsetsToRange)(range.pos, range.end, parseResults.tokenizerOutput.lines), vscode_jsonrpc_1.CancellationToken.None);
+    assert_1.default.strictEqual(finalDiags.length, 1);
+});
+function createServiceWithChainedSourceFiles(basePath, code) {
+    const service = new service_1.AnalyzerService('test service', (0, factory_1.createFromFileSystem)(host.HOST, /*ignoreCase*/ false, { cwd: basePath }), new console_1.NullConsole(), () => new testAccessHost_1.TestAccessHost(vfs.MODULE_PATH, [factory_1.libFolder, factory_1.distlibFolder]), service_1.AnalyzerService.createImportResolver, new configOptions_1.ConfigOptions(basePath));
+    const data = (0, fourSlashParser_1.parseTestData)(basePath, code, '');
+    let chainedFilePath;
+    for (const file of data.files) {
+        service.setFileOpened(file.fileName, 1, file.content, false, chainedFilePath);
+        chainedFilePath = file.fileName;
+    }
+    return { data, service };
+}
+function analyze(program) {
+    while (program.analyze()) {
+        // Process all queued items
+    }
+}
+//# sourceMappingURL=chainedSourceFiles.test.js.map

package/dist/tests/chainedSourceFiles.test.js.map

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

package/dist/tests/checker.test.d.ts

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