@zzzen/pyright-internal 1.1.254

package/dist/languageService/importAdder.js

@@ -0,0 +1,296 @@
+"use strict";
+/*
+ * importAdder.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ *
+ * Provides code that figures out imports needed for symbols
+ * used in the given range and apply them later.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImportAdder = void 0;
+const analyzerNodeInfo_1 = require("../analyzer/analyzerNodeInfo");
+const declaration_1 = require("../analyzer/declaration");
+const declarationUtils_1 = require("../analyzer/declarationUtils");
+const importStatementUtils_1 = require("../analyzer/importStatementUtils");
+const parseTreeUtils_1 = require("../analyzer/parseTreeUtils");
+const parseTreeWalker_1 = require("../analyzer/parseTreeWalker");
+const scopeUtils_1 = require("../analyzer/scopeUtils");
+const cancellationUtils_1 = require("../common/cancellationUtils");
+const collectionUtils_1 = require("../common/collectionUtils");
+const pathUtils_1 = require("../common/pathUtils");
+const positionUtils_1 = require("../common/positionUtils");
+const textRange_1 = require("../common/textRange");
+class ImportAdder {
+    constructor(_configOptions, _importResolver, _evaluator) {
+        this._configOptions = _configOptions;
+        this._importResolver = _importResolver;
+        this._evaluator = _evaluator;
+    }
+    collectImportsForSymbolsUsed(parseResults, range, token) {
+        const collector = new NameCollector(this._evaluator, parseResults, range, token);
+        collector.walk(parseResults.parseTree);
+        return {
+            containsUnreferenceableSymbols: collector.containsUnreferenceableSymbols,
+            declarations: collector.declsForSymbols,
+        };
+    }
+    applyImports(result, parseResults, insertionPosition, token) {
+        var _a;
+        (0, cancellationUtils_1.throwIfCancellationRequested)(token);
+        const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseResults.parseTree).filePath;
+        const importStatements = (0, importStatementUtils_1.getTopLevelImports)(parseResults.parseTree);
+        const execEnv = this._configOptions.findExecEnvironment(filePath);
+        const importNameInfo = [];
+        for (const decl of (_a = result.declarations.keys()) !== null && _a !== void 0 ? _a : []) {
+            const importInfo = this._getImportInfo(decl, filePath);
+            if (!importInfo) {
+                continue;
+            }
+            const moduleAndType = this._importResolver.getModuleNameForImport(importInfo.filePath, execEnv);
+            if (!moduleAndType.moduleName) {
+                if (!importInfo.nameInfo.name) {
+                    continue;
+                }
+                // module can't be addressed by absolute path in "from import" statement.
+                // ex) namespace package at [workspace root] or [workspace root]\__init__.py(i)
+                // use relative path
+                moduleAndType.moduleName = (0, importStatementUtils_1.getRelativeModuleName)(this._importResolver.fileSystem, filePath, importInfo.filePath);
+            }
+            (0, collectionUtils_1.addIfUnique)(importNameInfo, { module: moduleAndType, name: importInfo.nameInfo.name, alias: importInfo.nameInfo.alias }, (a, b) => this._areSame(a, b));
+        }
+        const edits = [];
+        const newNameInfo = [];
+        for (const moduleAndInfo of (0, collectionUtils_1.createMapFromItems)(importNameInfo, (i) => i.module.moduleName)) {
+            if (!this._tryProcessExistingImports(moduleAndInfo, importStatements, parseResults, edits)) {
+                (0, collectionUtils_1.appendArray)(newNameInfo, moduleAndInfo[1]);
+                continue;
+            }
+        }
+        edits.push(...(0, importStatementUtils_1.getTextEditsForAutoImportInsertions)(newNameInfo, importStatements, parseResults, (0, positionUtils_1.convertOffsetToPosition)(insertionPosition, parseResults.tokenizerOutput.lines)));
+        return edits;
+    }
+    _tryProcessExistingImports(moduleAndInfo, importStatements, parseResults, edits) {
+        for (const kindAndImports of (0, collectionUtils_1.createMapFromItems)(importStatements.orderedImports.filter((i) => i.moduleName === moduleAndInfo[0]), (i) => (i.node.nodeType === 20 /* Import */ ? 'import' : 'importFrom'))) {
+            if (kindAndImports[0] === 'importFrom') {
+                // We can't merge to "from module import *" statement.
+                const imported = kindAndImports[1].filter((i) => i.node.nodeType === 22 /* ImportFrom */ && !i.node.isWildcardImport);
+                if (imported.length === 0) {
+                    // No regular from import statement.
+                    continue;
+                }
+                // get name info that don't exist in any of existing import statements.
+                const info = moduleAndInfo[1].filter((m) => !imported.some((n) => n.node.nodeType === 22 /* ImportFrom */ &&
+                    n.node.imports.some((i) => { var _a; return i.name.value === m.name && ((_a = i.alias) === null || _a === void 0 ? void 0 : _a.value) === m.alias; })));
+                (0, collectionUtils_1.appendArray)(edits, (0, importStatementUtils_1.getTextEditsForAutoImportSymbolAddition)(info, imported[0], parseResults));
+                return true;
+            }
+            if (kindAndImports[0] === 'import') {
+                // import statement already exists. skip those module info.
+                (0, collectionUtils_1.removeArrayElements)(moduleAndInfo[1], (i) => !i.name && kindAndImports[1].some((n) => { var _a, _b; return i.alias === ((_b = (_a = n.subnode) === null || _a === void 0 ? void 0 : _a.alias) === null || _b === void 0 ? void 0 : _b.value); }));
+                continue;
+            }
+        }
+        return false;
+    }
+    _getImportInfo(decl, destFilePath) {
+        var _a, _b;
+        if ((0, declaration_1.isAliasDeclaration)(decl)) {
+            if (!decl.node) {
+                // This is synthesized decl for implicit module case such as "import a.b"
+                return { filePath: decl.path, nameInfo: {} };
+            }
+            if (decl.node.nodeType === 21 /* ImportAs */) {
+                const importDecl = this._evaluator.getDeclarationsForNameNode(decl.node.module.nameParts[decl.node.module.nameParts.length - 1]);
+                if (!importDecl || importDecl.length === 0) {
+                    // We have no idea where it came from.
+                    // ex) from unknown import unknown
+                    return undefined;
+                }
+                return {
+                    filePath: importDecl[0].path,
+                    nameInfo: { alias: decl.usesLocalName ? (_a = decl.node.alias) === null || _a === void 0 ? void 0 : _a.value : undefined },
+                };
+            }
+            if (decl.node.nodeType === 23 /* ImportFromAs */) {
+                let path = decl.path;
+                if (!path) {
+                    // Check submodule case with no __init__
+                    if (decl.submoduleFallback) {
+                        path = (0, pathUtils_1.getDirectoryPath)(decl.submoduleFallback.path);
+                    }
+                }
+                if (!path) {
+                    // We have no idea where it came from.
+                    // ex) from unknown import unknown
+                    return undefined;
+                }
+                if (path === destFilePath && !decl.usesLocalName && !decl.submoduleFallback) {
+                    // Don't create import for the symbol (not module) defined in the current file
+                    // unless alias is used.
+                    //
+                    // We don't check insertion point since we don't create type alias for decl defined later
+                    // anyway. but in future, we could consider either rewrite or creating type alias for symbols
+                    // defined after insertion point.
+                    return undefined;
+                }
+                return {
+                    filePath: path,
+                    nameInfo: {
+                        name: decl.symbolName,
+                        alias: decl.usesLocalName ? (_b = decl.node.alias) === null || _b === void 0 ? void 0 : _b.value : undefined,
+                    },
+                };
+            }
+            if (decl.node.nodeType === 22 /* ImportFrom */) {
+                return {
+                    filePath: decl.path,
+                    nameInfo: { name: decl.symbolName },
+                };
+            }
+        }
+        if ((0, declaration_1.isVariableDeclaration)(decl) || (0, declaration_1.isFunctionDeclaration)(decl) || (0, declaration_1.isClassDeclaration)(decl)) {
+            const name = (0, declarationUtils_1.getNameFromDeclaration)(decl);
+            if (!name) {
+                return undefined;
+            }
+            return {
+                filePath: decl.path,
+                nameInfo: { name },
+            };
+        }
+        return undefined;
+    }
+    _areSame(a, b) {
+        return (a.alias === b.alias &&
+            a.name === b.name &&
+            a.module.importType === b.module.importType &&
+            a.module.isLocalTypingsFile === b.module.isLocalTypingsFile &&
+            a.module.moduleName === b.module.moduleName);
+    }
+}
+exports.ImportAdder = ImportAdder;
+class NameCollector extends parseTreeWalker_1.ParseTreeWalker {
+    constructor(_evaluator, _parseResults, _range, _token) {
+        super();
+        this._evaluator = _evaluator;
+        this._parseResults = _parseResults;
+        this._range = _range;
+        this._token = _token;
+        // Hold onto names that we need to move imports.
+        this.declsForSymbols = new Map();
+        this.containsUnreferenceableSymbols = false;
+        this._filePath = (0, analyzerNodeInfo_1.getFileInfo)(this._parseResults.parseTree).filePath;
+        // For now, we assume the given range is at right boundary such as statement, statements, expression or expressions.
+        // In future, we might consider validating the range and adjusting it to the right boundary if needed.
+    }
+    walk(node) {
+        if (!textRange_1.TextRange.overlapsRange(this._range, node)) {
+            return;
+        }
+        super.walk(node);
+    }
+    visitModuleName(node) {
+        // We only care about references to module symbols. not decls.
+        return false;
+    }
+    visitName(name) {
+        (0, cancellationUtils_1.throwIfCancellationRequested)(this._token);
+        // We process dotted name as a whole rather than
+        // process each part of dotted name.
+        if (!(0, parseTreeUtils_1.isLastNameOfDottedName)(name)) {
+            return false;
+        }
+        const dottedName = (0, parseTreeUtils_1.getDottedName)((0, parseTreeUtils_1.getDottedNameWithGivenNodeAsLastName)(name));
+        if (!dottedName) {
+            // Not dotted name
+            // ex) foo().[var]
+            return false;
+        }
+        // See whether the first dotted name bound to symbols defined in current file.
+        const firstName = dottedName[0];
+        const firstNameDecls = this._getDeclarationsInModule(firstName);
+        if (!firstNameDecls || firstNameDecls.length === 0) {
+            return false;
+        }
+        // Simple case.
+        // ex) import os
+        //     [os]
+        if (dottedName.length === 1) {
+            this._handleName(firstName, firstNameDecls);
+            return false;
+        }
+        for (const firstNameDecl of firstNameDecls) {
+            if (!(0, declaration_1.isAliasDeclaration)(firstNameDecl) || firstNameDecl.node.nodeType !== 21 /* ImportAs */) {
+                // decls we have is for symbols defined in current module.
+                // ex) [foo]()
+                this._handleName(firstName, [firstNameDecl]);
+                continue;
+            }
+            // Import with alias
+            // ex) import json.encoder as j
+            if (firstNameDecl.usesLocalName) {
+                this._handleName(firstName, [firstNameDecl]);
+                continue;
+            }
+            // Special casing import statement with sub module ex) import a.[b]
+            // It is complex for import a.[b] case since decl for [b] doesn't exist. so
+            // when binding a.[b].foo(), we don't get decl for "import a.[b]", we need to
+            // do some tree walk to find import a.[b] and synthesize decl for it.
+            this._handleImplicitImports(firstNameDecl, dottedName, 1);
+        }
+        return false;
+    }
+    _getDeclarationsInModule(name) {
+        var _a;
+        return (_a = this._evaluator.getDeclarationsForNameNode(name)) === null || _a === void 0 ? void 0 : _a.filter((d) => (0, declarationUtils_1.isDefinedInFile)(d, this._filePath));
+    }
+    _handleImplicitImports(aliasDecl, dottedName, nameIndex) {
+        if (dottedName.length === nameIndex) {
+            return;
+        }
+        if (!aliasDecl.implicitImports) {
+            this._handleName(dottedName[nameIndex - 1], [(0, declarationUtils_1.createSynthesizedAliasDeclaration)(aliasDecl.path)]);
+            return;
+        }
+        const implicitImportDecl = aliasDecl.implicitImports.get(dottedName[nameIndex].value);
+        if (!implicitImportDecl) {
+            this._handleName(dottedName[nameIndex - 1], [(0, declarationUtils_1.createSynthesizedAliasDeclaration)(aliasDecl.path)]);
+            return;
+        }
+        this._handleImplicitImports(implicitImportDecl, dottedName, nameIndex + 1);
+    }
+    _handleName(name, decls) {
+        for (const decl of decls) {
+            if (decl.node && textRange_1.TextRange.containsRange(this._range, decl.node)) {
+                // Make sure our range doesn't already contain them.
+                continue;
+            }
+            if ((0, declaration_1.isParameterDeclaration)(decl)) {
+                // Parameter is not referenceable from import statement.
+                this.containsUnreferenceableSymbols = true;
+                continue;
+            }
+            if ((0, declaration_1.isVariableDeclaration)(decl) || (0, declaration_1.isFunctionDeclaration)(decl) || (0, declaration_1.isClassDeclaration)(decl)) {
+                // For now, we will allow private variable to be referenced by import
+                // so that user can fix it up once import is added.
+                // We only support top level variables.
+                const scope = (0, scopeUtils_1.getScopeForNode)(name);
+                if (!scope) {
+                    this.containsUnreferenceableSymbols = true;
+                    continue;
+                }
+                const result = scope.lookUpSymbolRecursive(name.value);
+                if (!result || result.scope.type !== 3 /* Module */) {
+                    this.containsUnreferenceableSymbols = true;
+                    continue;
+                }
+            }
+            this._addName(decl, name);
+        }
+    }
+    _addName(decl, name) {
+        (0, collectionUtils_1.getOrAdd)(this.declsForSymbols, decl, () => []).push(name);
+    }
+}
+//# sourceMappingURL=importAdder.js.map

package/dist/languageService/importAdder.js.map

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

package/dist/languageService/importSorter.d.ts

@@ -0,0 +1,15 @@
+import { CancellationToken } from 'vscode-languageserver';
+import { TextEditAction } from '../common/editAction';
+import { ParseResults } from '../parser/parser';
+export declare class ImportSorter {
+    private _parseResults;
+    private _cancellationToken;
+    constructor(_parseResults: ParseResults, _cancellationToken: CancellationToken);
+    sort(): TextEditAction[];
+    private _getPrimaryReplacementRange;
+    private _addSecondaryReplacementRanges;
+    private _generateSortedImportText;
+    private _formatImportNode;
+    private _formatImportFromNode;
+    private _compareSymbols;
+}

package/dist/languageService/importSorter.js

@@ -0,0 +1,152 @@
+"use strict";
+/*
+ * importSorter.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ * Author: Eric Traut
+ *
+ * Provides code that sorts and formats import statements within a
+ * python source file.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImportSorter = void 0;
+const importStatementUtils_1 = require("../analyzer/importStatementUtils");
+const cancellationUtils_1 = require("../common/cancellationUtils");
+const positionUtils_1 = require("../common/positionUtils");
+const textRange_1 = require("../common/textRange");
+// We choose a line length that matches the default for the popular
+// "black" formatter used in many Python projects.
+const _maxLineLength = 88;
+class ImportSorter {
+    constructor(_parseResults, _cancellationToken) {
+        this._parseResults = _parseResults;
+        this._cancellationToken = _cancellationToken;
+    }
+    sort() {
+        (0, cancellationUtils_1.throwIfCancellationRequested)(this._cancellationToken);
+        const actions = [];
+        const importStatements = (0, importStatementUtils_1.getTopLevelImports)(this._parseResults.parseTree);
+        const sortedStatements = importStatements.orderedImports
+            .map((s) => s)
+            .sort((a, b) => {
+            return (0, importStatementUtils_1.compareImportStatements)(a, b);
+        });
+        if (sortedStatements.length === 0) {
+            // Nothing to do.
+            return [];
+        }
+        const primaryRange = this._getPrimaryReplacementRange(importStatements.orderedImports);
+        actions.push({
+            range: primaryRange,
+            replacementText: this._generateSortedImportText(sortedStatements),
+        });
+        this._addSecondaryReplacementRanges(importStatements.orderedImports, actions);
+        return actions;
+    }
+    // Determines the text range for the existing primary block of import statements.
+    // If there are other blocks of import statements separated by other statements,
+    // we'll ignore these other blocks for now.
+    _getPrimaryReplacementRange(statements) {
+        let statementLimit = statements.findIndex((s) => s.followsNonImportStatement);
+        if (statementLimit < 0) {
+            statementLimit = statements.length;
+        }
+        const lastStatement = statements[statementLimit - 1].node;
+        return {
+            start: (0, positionUtils_1.convertOffsetToPosition)(statements[0].node.start, this._parseResults.tokenizerOutput.lines),
+            end: (0, positionUtils_1.convertOffsetToPosition)(textRange_1.TextRange.getEnd(lastStatement), this._parseResults.tokenizerOutput.lines),
+        };
+    }
+    // If import statements are separated by other statements, we will remove the old
+    // secondary blocks.
+    _addSecondaryReplacementRanges(statements, actions) {
+        let secondaryBlockStart = statements.findIndex((s) => s.followsNonImportStatement);
+        if (secondaryBlockStart < 0) {
+            return;
+        }
+        while (true) {
+            let secondaryBlockLimit = statements.findIndex((s, index) => index > secondaryBlockStart && s.followsNonImportStatement);
+            if (secondaryBlockLimit < 0) {
+                secondaryBlockLimit = statements.length;
+            }
+            actions.push({
+                range: {
+                    start: (0, positionUtils_1.convertOffsetToPosition)(statements[secondaryBlockStart].node.start, this._parseResults.tokenizerOutput.lines),
+                    end: (0, positionUtils_1.convertOffsetToPosition)(textRange_1.TextRange.getEnd(statements[secondaryBlockLimit - 1].node), this._parseResults.tokenizerOutput.lines),
+                },
+                replacementText: '',
+            });
+            secondaryBlockStart = secondaryBlockLimit;
+            if (secondaryBlockStart >= statements.length) {
+                break;
+            }
+        }
+    }
+    _generateSortedImportText(sortedStatements) {
+        let importText = '';
+        let prevImportGroup = (0, importStatementUtils_1.getImportGroup)(sortedStatements[0]);
+        for (const statement of sortedStatements) {
+            // Insert a blank space between import type groups.
+            const curImportType = (0, importStatementUtils_1.getImportGroup)(statement);
+            if (prevImportGroup !== curImportType) {
+                importText += this._parseResults.tokenizerOutput.predominantEndOfLineSequence;
+                prevImportGroup = curImportType;
+            }
+            let importLine;
+            if (statement.node.nodeType === 20 /* Import */) {
+                importLine = this._formatImportNode(statement.subnode, statement.moduleName);
+            }
+            else {
+                importLine = this._formatImportFromNode(statement.node, statement.moduleName);
+            }
+            // If this isn't the last statement, add a newline.
+            if (statement !== sortedStatements[sortedStatements.length - 1]) {
+                importLine += this._parseResults.tokenizerOutput.predominantEndOfLineSequence;
+            }
+            importText += importLine;
+        }
+        return importText;
+    }
+    _formatImportNode(subnode, moduleName) {
+        let importText = `import ${moduleName}`;
+        if (subnode.alias) {
+            importText += ` as ${subnode.alias.value}`;
+        }
+        return importText;
+    }
+    _formatImportFromNode(node, moduleName) {
+        const symbols = node.imports
+            .sort((a, b) => this._compareSymbols(a, b))
+            .map((symbol) => {
+            let symbolText = symbol.name.value;
+            if (symbol.alias) {
+                symbolText += ` as ${symbol.alias.value}`;
+            }
+            return symbolText;
+        });
+        let cumulativeText = `from ${moduleName} import `;
+        if (node.isWildcardImport) {
+            return cumulativeText + '*';
+        }
+        const symbolText = symbols.join(', ');
+        if (cumulativeText.length + symbolText.length <= _maxLineLength) {
+            return cumulativeText + symbolText;
+        }
+        // We need to split across multiple lines with parens.
+        cumulativeText += '(' + this._parseResults.tokenizerOutput.predominantEndOfLineSequence;
+        for (const symbol of symbols) {
+            cumulativeText +=
+                this._parseResults.tokenizerOutput.predominantTabSequence +
+                    symbol +
+                    ',' +
+                    this._parseResults.tokenizerOutput.predominantEndOfLineSequence;
+        }
+        cumulativeText += ')';
+        return cumulativeText;
+    }
+    _compareSymbols(a, b) {
+        return a.name.value < b.name.value ? -1 : 1;
+    }
+}
+exports.ImportSorter = ImportSorter;
+//# sourceMappingURL=importSorter.js.map

package/dist/languageService/importSorter.js.map

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

package/dist/languageService/indentationUtils.d.ts

@@ -0,0 +1,4 @@
+import { TextRange } from '../common/textRange';
+import { ParseResults } from '../parser/parser';
+export declare function getIndentation(parseResults: ParseResults, offset: number, preferDedent?: boolean): number;
+export declare function reindentSpan(parseResults: ParseResults, span: TextRange, indentation: number, indentFirstToken?: boolean): string;