@zzzen/pyright-internal 1.2.0-dev.20230416 → 1.2.0-dev.20230423

package/dist/languageService/callHierarchyProvider.js

@@ -77,12 +77,16 @@ class CallHierarchyProvider {
         (0, cancellationUtils_1.throwIfCancellationRequested)(token);
         // Find the parse node root corresponding to the function or class.
         let parseRoot;
-        if (declaration.type === 5 /* Function */) {
-            parseRoot = declaration.node;
+        const resolvedDecl = evaluator.resolveAliasDeclaration(declaration, /* resolveLocalNames */ true);
+        if (!resolvedDecl) {
+            return undefined;
+        }
+        if (resolvedDecl.type === 5 /* Function */) {
+            parseRoot = resolvedDecl.node;
         }
-        else if (declaration.type === 6 /* Class */) {
+        else if (resolvedDecl.type === 6 /* Class */) {
             // Look up the __init__ method for this class.
-            const classType = (_a = evaluator.getTypeForDeclaration(declaration)) === null || _a === void 0 ? void 0 : _a.type;
+            const classType = (_a = evaluator.getTypeForDeclaration(resolvedDecl)) === null || _a === void 0 ? void 0 : _a.type;
             if (classType && (0, types_1.isInstantiableClass)(classType)) {
                 // Don't perform a recursive search of parent classes in this
                 // case because we don't want to find an inherited __init__
@@ -131,6 +135,9 @@ class CallHierarchyProvider {
             }
         }
         let symbolName;
+        // Although the LSP specification requires a URI, we are using a file path
+        // here because it is converted to the proper URI in LanguageServerBase.
+        // This simplifies our code and ensures compatibility with the LSP specification.
         let callItemUri;
         if (targetDecl.type === 8 /* Alias */) {
             symbolName = referencesResult.nodeAtOffset.value;
@@ -212,6 +219,7 @@ class FindOutgoingCallTreeWalker extends parseTreeWalker_1.ParseTreeWalker {
         return true;
     }
     _addOutgoingCallForDeclaration(nameNode, declaration) {
+        var _a;
         const resolvedDecl = this._evaluator.resolveAliasDeclaration(declaration, /* resolveLocalNames */ true);
         if (!resolvedDecl) {
             return;
@@ -236,6 +244,11 @@ class FindOutgoingCallTreeWalker extends parseTreeWalker_1.ParseTreeWalker {
             };
             this._outgoingCalls.push(outgoingCall);
         }
+        if (outgoingCall && outgoingCall.to.name !== nameNode.value) {
+            // If both the function and its alias are called in the same function,
+            // the name of the call item will be the resolved declaration name, not the alias.
+            outgoingCall.to.name = (_a = DeclarationUtils.getNameFromDeclaration(resolvedDecl)) !== null && _a !== void 0 ? _a : nameNode.value;
+        }
         const fromRange = (0, positionUtils_1.convertOffsetsToRange)(nameNode.start, nameNode.start + nameNode.length, this._parseResults.tokenizerOutput.lines);
         outgoingCall.fromRanges.push(fromRange);
     }

package/dist/languageService/callHierarchyProvider.js.map

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

package/dist/languageService/completionProvider.js

@@ -37,6 +37,7 @@ const docStringConversion_1 = require("../analyzer/docStringConversion");
 const parameterUtils_1 = require("../analyzer/parameterUtils");
 const ParseTreeUtils = __importStar(require("../analyzer/parseTreeUtils"));
 const parseTreeUtils_1 = require("../analyzer/parseTreeUtils");
+const pythonPathUtils_1 = require("../analyzer/pythonPathUtils");
 const scopeUtils_1 = require("../analyzer/scopeUtils");
 const sourceMapper_1 = require("../analyzer/sourceMapper");
 const SymbolNameUtils = __importStar(require("../analyzer/symbolNameUtils"));
@@ -51,6 +52,7 @@ const collectionUtils_1 = require("../common/collectionUtils");
 const debug = __importStar(require("../common/debug"));
 const debug_1 = require("../common/debug");
 const lspUtils_1 = require("../common/lspUtils");
+const pathUtils_1 = require("../common/pathUtils");
 const positionUtils_1 = require("../common/positionUtils");
 const pythonVersion_1 = require("../common/pythonVersion");
 const StringUtils = __importStar(require("../common/stringUtils"));
@@ -62,6 +64,7 @@ const parseNodes_1 = require("../parser/parseNodes");
 const autoImporter_1 = require("./autoImporter");
 const completionProviderUtils_1 = require("./completionProviderUtils");
 const documentSymbolCollector_1 = require("./documentSymbolCollector");
+const importAdder_1 = require("./importAdder");
 const tooltipUtils_1 = require("./tooltipUtils");
 var Keywords;
 (function (Keywords) {
@@ -822,6 +825,8 @@ class CompletionProvider {
         }
         const staticmethod = (_a = decorators === null || decorators === void 0 ? void 0 : decorators.some((d) => this._checkDecorator(d, 'staticmethod'))) !== null && _a !== void 0 ? _a : false;
         const classmethod = (_b = decorators === null || decorators === void 0 ? void 0 : decorators.some((d) => this._checkDecorator(d, 'classmethod'))) !== null && _b !== void 0 ? _b : false;
+        const fallbackPath = (0, pythonPathUtils_1.getTypeShedFallbackPath)(this._importResolver.fileSystem);
+        const typingFilePath = fallbackPath ? (0, pathUtils_1.combinePaths)(fallbackPath, 'stdlib/typing.pyi') : undefined;
         const appendMember = (map, member, name) => {
             if (!(0, types_1.isInstantiableClass)(member.classType) ||
                 member.classType.details === classResults.classType.details ||
@@ -868,22 +873,28 @@ class CompletionProvider {
             if (!funcType || !funcType.details.declaration) {
                 return;
             }
-            const methodSignature = this._printMethodSignature(classResults.classType, funcType);
+            const importAdder = new importAdder_1.ImportAdder(this._configOptions, this._importResolver, this._evaluator);
+            const result = this._printMethodSignature(importAdder, classResults.classType, funcType, typingFilePath);
             let text;
             if ((0, sourceMapper_1.isStubFile)(this._filePath)) {
-                text = `${methodSignature}: ...`;
+                text = `${result.methodSignature}: ...`;
             }
             else {
                 const methodBody = this._printOverriddenMethodBody(classResults.classType, isDeclaredStaticMethod, isProperty, decl);
-                text = `${methodSignature}:\n${methodBody}`;
+                text = `${result.methodSignature}:\n${methodBody}`;
             }
             const textEdit = this._createReplaceEdits(priorWord, partialName, text);
+            // This will add new import statements, but for now, it won't add new
+            // `TypeVar` statement such as TypeVar, TypeVarTuple, ParamSpec even if
+            // the overridden method uses them.
+            const additionalTextEdits = importAdder.applyImports(result.importData, this._filePath, this._parseResults, this._parseResults.parseTree.length, "absolute" /* Absolute */, this._cancellationToken);
             this._addSymbol(name, symbol, partialName.value, map, {
                 // method signature already contains ()
                 funcParensDisabled: true,
                 edits: {
                     format: this._options.snippet ? vscode_languageserver_1.InsertTextFormat.Snippet : undefined,
                     textEdit,
+                    additionalTextEdits,
                 },
             });
         };
@@ -907,14 +918,14 @@ class CompletionProvider {
         };
         return vscode_languageserver_1.TextEdit.replace(range, text);
     }
-    _printMethodSignature(classType, funcType) {
-        const decl = funcType.details.declaration;
+    _printMethodSignature(importAdder, classType, funcType, typingFilePath) {
+        const declaration = funcType.details.declaration;
         let ellipsisForDefault;
         if ((0, sourceMapper_1.isStubFile)(this._filePath)) {
             // In stubs, always use "...".
             ellipsisForDefault = true;
         }
-        else if (classType.details.moduleName === decl.moduleName) {
+        else if (classType.details.moduleName === declaration.moduleName) {
             // In the same file, always print the full default.
             ellipsisForDefault = false;
         }
@@ -933,6 +944,7 @@ class CompletionProvider {
                 ? mainType
                 : fallbackType;
         };
+        const importData = createImportData(importAdder, funcType, declaration, typingFilePath, (t) => this._sourceMapper.findClassDeclarationsByType(this._filePath, t), this._cancellationToken);
         const paramList = funcType.details.parameters.map((param, index) => {
             let paramString = '';
             if (param.category === 1 /* VarArgList */) {
@@ -944,8 +956,6 @@ class CompletionProvider {
             if (param.name) {
                 paramString += param.name;
             }
-            // Currently, we don't automatically add import if the type used in the annotation is not imported
-            // in current file.
             if (param.typeAnnotation) {
                 const originalType = funcType.details.parameters[index].type;
                 const typeToPrint = getTypeToPrint(types_1.FunctionType.getEffectiveParameterType(funcType, index), originalType);
@@ -982,12 +992,111 @@ class CompletionProvider {
         if (strReturnType) {
             methodSignature += ' -> ' + strReturnType;
         }
-        return methodSignature;
+        return { methodSignature, importData };
+        function createImportData(importAdder, funcType, declaration, typingFilePath, declarationGetter, token) {
+            var _a, _b;
+            // Handle regular case. In this case, we can get import info from
+            // import used in the file where the function is declared.
+            const ranges = [];
+            (0, collectionUtils_1.addIfNotNull)(ranges, textRange_2.TextRange.combine(declaration.node.parameters));
+            (0, collectionUtils_1.addIfNotNull)(ranges, declaration.node.returnTypeAnnotation);
+            (0, collectionUtils_1.addIfNotNull)(ranges, declaration.node.functionAnnotationComment);
+            const moduleNode = ParseTreeUtils.getModuleNode(declaration.node);
+            const importData = importAdder.collectImportsForSymbolsUsed(moduleNode, ranges, token);
+            // Handle special case where function has type arguments. In this case,
+            // we can't use the file the function is declared in because it doesn't
+            // have those type arguments. It just has the type vars.
+            // We could walk the mro to discover imports for the type arguments, but
+            // for now, instead, this creates import statement out of type arguments itself.
+            const effectiveTypes = [];
+            funcType.details.parameters.forEach((param, index) => {
+                if (!param.typeAnnotation) {
+                    return;
+                }
+                const originalType = funcType.details.parameters[index].type;
+                if (!(0, types_1.isTypeVar)(originalType)) {
+                    return;
+                }
+                const effectiveType = types_1.FunctionType.getEffectiveParameterType(funcType, index);
+                effectiveTypes.push([effectiveType, param.typeAnnotation]);
+            });
+            const node = declaration.node;
+            const originalType = funcType.details.declaredReturnType;
+            if (originalType &&
+                (0, types_1.isTypeVar)(originalType) &&
+                (node.returnTypeAnnotation || ((_a = node.functionAnnotationComment) === null || _a === void 0 ? void 0 : _a.returnTypeAnnotation))) {
+                effectiveTypes.push([
+                    types_1.FunctionType.getSpecializedReturnType(funcType),
+                    (_b = node.returnTypeAnnotation) !== null && _b !== void 0 ? _b : node.functionAnnotationComment.returnTypeAnnotation,
+                ]);
+            }
+            const visited = new Set();
+            const addImport = (t, n) => {
+                var _a, _b;
+                if (visited.has(t)) {
+                    return;
+                }
+                visited.add(t);
+                // We need to special case `Any` since we can't get decl from `Any`.
+                if ((0, types_1.isAny)(t)) {
+                    if (!typingFilePath) {
+                        return;
+                    }
+                    importAdder.addImportInfo({ filePath: typingFilePath, nameInfo: { name: 'Any' } }, importData);
+                }
+                if (!(0, types_1.isClass)(t)) {
+                    return;
+                }
+                // We need to special case `List`, `Dict` and `Tuple` since user might have
+                // used typing.List or typing.Dict in the code, but we internally already
+                // converted them to built-in `list` and `dict`.
+                // We could avoid doing this if class type holds onto decl it was created from
+                // if it is not synthesized like func type.
+                if (typingFilePath && types_1.ClassType.isBuiltIn(t)) {
+                    const name = (_a = t.aliasName) !== null && _a !== void 0 ? _a : t.details.name;
+                    if (t.details.moduleName === 'typing' && name) {
+                        importAdder.addImportInfo({
+                            filePath: typingFilePath,
+                            nameInfo: { name },
+                        }, importData);
+                    }
+                    else if (t.details.moduleName === 'builtins' && t.aliasName) {
+                        importAdder.addImportInfo({
+                            filePath: typingFilePath,
+                            nameInfo: { name },
+                        }, importData);
+                    }
+                }
+                else {
+                    const decls = declarationGetter(t);
+                    if (decls.length === 0) {
+                        return;
+                    }
+                    importAdder.addDeclaration(decls[0], n, importData);
+                }
+                if (t.isTypeArgumentExplicit) {
+                    (_b = t.typeArguments) === null || _b === void 0 ? void 0 : _b.forEach((ta) => {
+                        addImport(ta, n);
+                        (0, typeUtils_1.doForEachSubtype)(ta, (subtype) => {
+                            addImport(subtype, n);
+                        });
+                    });
+                }
+            };
+            effectiveTypes.forEach(([t, n]) => {
+                addImport(t, n);
+                (0, typeUtils_1.doForEachSubtype)(t, (subtype) => {
+                    addImport(subtype, n);
+                });
+            });
+            return importData;
+        }
         function getReturnTypeStr(evaluator, funcType, printFlags) {
+            var _a;
             const originalType = funcType.details.declaredReturnType;
             const typeToPrint = getTypeToPrint(types_1.FunctionType.getSpecializedReturnType(funcType), originalType);
             const node = funcType.details.declaration.node;
-            if (!node.returnTypeAnnotation && !node.functionAnnotationComment) {
+            if (!node.returnTypeAnnotation && !((_a = node.functionAnnotationComment) === null || _a === void 0 ? void 0 : _a.returnTypeAnnotation)) {
                 return undefined;
             }
             if (typeToPrint && isTypeUsableForPrint(typeToPrint, originalType)) {