@zzzen/pyright-internal 1.2.0-dev.20230827 → 1.2.0-dev.20230910

package/dist/languageService/completionProvider.js

@@ -28,7 +28,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CompletionMap = exports.CompletionProvider = exports.dictionaryKeyDetail = exports.autoImportDetail = void 0;
+exports.CompletionMap = exports.CompletionProvider = exports.indexValueDetail = exports.autoImportDetail = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const AnalyzerNodeInfo = __importStar(require("../analyzer/analyzerNodeInfo"));
 const declaration_1 = require("../analyzer/declaration");
@@ -61,6 +61,7 @@ const autoImporter_1 = require("./autoImporter");
 const completionProviderUtils_1 = require("./completionProviderUtils");
 const documentSymbolCollector_1 = require("./documentSymbolCollector");
 const tooltipUtils_1 = require("./tooltipUtils");
+const localize_1 = require("../localization/localize");
 var Keywords;
 (function (Keywords) {
     const base = [
@@ -145,8 +146,8 @@ var SortCategory;
     // An auto-import symbol.
     SortCategory[SortCategory["AutoImport"] = 12] = "AutoImport";
 })(SortCategory || (SortCategory = {}));
-exports.autoImportDetail = 'Auto-import';
-exports.dictionaryKeyDetail = 'Dictionary key';
+exports.autoImportDetail = localize_1.Localizer.Completion.autoImportDetail();
+exports.indexValueDetail = localize_1.Localizer.Completion.indexValueDetail();
 // We'll use a somewhat-arbitrary cutoff value here to determine
 // whether it's sufficiently similar.
 const similarityLimit = 0.25;
@@ -405,6 +406,10 @@ class CompletionProvider {
         };
         return vscode_languageserver_1.TextEdit.replace(range, text);
     }
+    shouldProcessDeclaration(declaration) {
+        // By default, we allow all symbol/decl to be included in the completion.
+        return true;
+    }
     addSymbol(name, symbol, priorWord, completionMap, detail) {
         var _a, _b, _c, _d;
         // Make sure we don't crash due to OOM.
@@ -416,6 +421,9 @@ class CompletionProvider {
                 primaryDecl = declarations[declarations.length - 1];
             }
         }
+        if (!this.shouldProcessDeclaration(primaryDecl)) {
+            return;
+        }
         primaryDecl = primaryDecl
             ? (_a = this.evaluator.resolveAliasDeclaration(primaryDecl, /* resolveLocalNames */ true)) !== null && _a !== void 0 ? _a : primaryDecl
             : undefined;
@@ -444,7 +452,7 @@ class CompletionProvider {
                 // Can't resolve. so bail out.
                 return;
             }
-            const typeDetail = (0, completionProviderUtils_1.getTypeDetail)(this.evaluator, primaryDecl, type, name, detail, this.configOptions.functionSignatureDisplay);
+            const typeDetail = (0, completionProviderUtils_1.getTypeDetail)(this.evaluator, type, primaryDecl, name, detail, this.configOptions.functionSignatureDisplay);
             const documentation = (0, tooltipUtils_1.getDocumentationPartsForTypeAndDecl)(this.sourceMapper, type, primaryDecl, this.evaluator, {
                 name,
                 symbol,
@@ -471,7 +479,7 @@ class CompletionProvider {
                 ((_c = primaryDecl.node.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 3 /* Assignment */) {
                 itemKind = vscode_languageserver_1.CompletionItemKind.EnumMember;
             }
-            this._addNameToCompletions((_d = detail.autoImportAlias) !== null && _d !== void 0 ? _d : name, itemKind, priorWord, completionMap, {
+            this.addNameToCompletions((_d = detail.autoImportAlias) !== null && _d !== void 0 ? _d : name, itemKind, priorWord, completionMap, {
                 autoImportText,
                 extraCommitChars: detail.extraCommitChars,
                 funcParensDisabled: detail.funcParensDisabled,
@@ -483,7 +491,7 @@ class CompletionProvider {
             const synthesizedType = symbol.getSynthesizedType();
             if (synthesizedType) {
                 const itemKind = this._convertTypeToItemKind(synthesizedType);
-                this._addNameToCompletions(name, itemKind, priorWord, completionMap, {
+                this.addNameToCompletions(name, itemKind, priorWord, completionMap, {
                     extraCommitChars: detail.extraCommitChars,
                     funcParensDisabled: detail.funcParensDisabled,
                     edits: detail.edits,
@@ -572,7 +580,7 @@ class CompletionProvider {
                 });
             }
             else {
-                this._addNameToCompletions((_a = result.alias) !== null && _a !== void 0 ? _a : result.name, (_b = result.kind) !== null && _b !== void 0 ? _b : vscode_languageserver_1.CompletionItemKind.Module, priorWord, completionMap, {
+                this.addNameToCompletions((_a = result.alias) !== null && _a !== void 0 ? _a : result.name, (_b = result.kind) !== null && _b !== void 0 ? _b : vscode_languageserver_1.CompletionItemKind.Module, priorWord, completionMap, {
                     extraCommitChars: true,
                     autoImportText: this._getAutoImportText(result.name, result.source, result.alias),
                     edits: {
@@ -589,6 +597,132 @@ class CompletionProvider {
     addExtraCommitChar(item) {
         // extra commit char is not supported.
     }
+    addNameToCompletions(name, itemKind, filter, completionMap, detail) {
+        var _a, _b, _c, _d;
+        // Auto importer already filtered out unnecessary ones. No need to do it again.
+        const similarity = (detail === null || detail === void 0 ? void 0 : detail.autoImportText) ? true : StringUtils.isPatternInSymbol(filter, name);
+        if (!similarity) {
+            return;
+        }
+        if (completionMap.has(name, CompletionMap.matchKindAndImportText, itemKind, (_a = detail === null || detail === void 0 ? void 0 : detail.autoImportText) === null || _a === void 0 ? void 0 : _a.importText)) {
+            return;
+        }
+        const completionItem = vscode_languageserver_1.CompletionItem.create(name);
+        completionItem.kind = itemKind;
+        if (detail === null || detail === void 0 ? void 0 : detail.extraCommitChars) {
+            this.addExtraCommitChar(completionItem);
+        }
+        const completionItemData = {
+            workspacePath: this._workspacePath,
+            filePath: this.filePath,
+            position: this.position,
+        };
+        if ((detail === null || detail === void 0 ? void 0 : detail.funcParensDisabled) || !this.options.snippet) {
+            completionItemData.funcParensDisabled = true;
+        }
+        if (detail === null || detail === void 0 ? void 0 : detail.modulePath) {
+            completionItemData.modulePath = detail.modulePath;
+        }
+        completionItem.data = (0, lspUtils_1.toLSPAny)(completionItemData);
+        if ((detail === null || detail === void 0 ? void 0 : detail.sortText) || (detail === null || detail === void 0 ? void 0 : detail.itemDetail)) {
+            completionItem.sortText = detail.sortText;
+            completionItem.detail = detail.itemDetail;
+        }
+        else if (detail === null || detail === void 0 ? void 0 : detail.autoImportText) {
+            // Force auto-import entries to the end.
+            completionItem.sortText = this._makeSortText(SortCategory.AutoImport, `${name}.${this._formatInteger(detail.autoImportText.source.length, 2)}.${detail.autoImportText.source}`, detail.autoImportText.importText);
+            completionItemData.autoImportText = detail.autoImportText.importText;
+            completionItem.detail = exports.autoImportDetail;
+            if (detail.autoImportText.source) {
+                completionItem.labelDetails = { description: detail.autoImportText.source };
+            }
+        }
+        else if (itemKind === vscode_languageserver_1.CompletionItemKind.EnumMember) {
+            // Handle enum members separately so they are sorted above other symbols.
+            completionItem.sortText = this._makeSortText(SortCategory.EnumMember, name);
+        }
+        else if (SymbolNameUtils.isDunderName(name)) {
+            // Force dunder-named symbols to appear after all other symbols.
+            completionItem.sortText = this._makeSortText(SortCategory.DunderSymbol, name);
+        }
+        else if (filter === '' && SymbolNameUtils.isPrivateOrProtectedName(name)) {
+            // Distinguish between normal and private symbols only if there is
+            // currently no filter text. Once we get a single character to filter
+            // upon, we'll no longer differentiate.
+            completionItem.sortText = this._makeSortText(SortCategory.PrivateSymbol, name);
+        }
+        else {
+            completionItem.sortText = this._makeSortText(SortCategory.NormalSymbol, name);
+        }
+        completionItemData.symbolLabel = name;
+        if (this.options.format === vscode_languageserver_1.MarkupKind.Markdown) {
+            let markdownString = '';
+            if (detail === null || detail === void 0 ? void 0 : detail.autoImportText) {
+                markdownString += detail.autoImportText.importText;
+                if (detail.typeDetail || detail.documentation) {
+                    // Micro perf optimization to not create new string from trimEnd.
+                    markdownString += '\n\n';
+                }
+            }
+            if (detail === null || detail === void 0 ? void 0 : detail.typeDetail) {
+                markdownString += '```python\n' + detail.typeDetail + '\n```\n';
+            }
+            if (detail === null || detail === void 0 ? void 0 : detail.documentation) {
+                markdownString += '---\n';
+                markdownString += (0, docStringConversion_1.convertDocStringToMarkdown)(detail.documentation);
+            }
+            markdownString = markdownString.trimEnd();
+            if (markdownString) {
+                completionItem.documentation = {
+                    kind: vscode_languageserver_1.MarkupKind.Markdown,
+                    value: markdownString,
+                };
+            }
+        }
+        else if (this.options.format === vscode_languageserver_1.MarkupKind.PlainText) {
+            let plainTextString = '';
+            if (detail === null || detail === void 0 ? void 0 : detail.autoImportText) {
+                plainTextString += detail.autoImportText.importText;
+                if (detail.typeDetail || detail.documentation) {
+                    // Micro perf optimization to not create new string from trimEnd.
+                    plainTextString += '\n\n';
+                }
+            }
+            if (detail === null || detail === void 0 ? void 0 : detail.typeDetail) {
+                plainTextString += detail.typeDetail + '\n';
+            }
+            if (detail === null || detail === void 0 ? void 0 : detail.documentation) {
+                plainTextString += '\n' + (0, docStringConversion_1.convertDocStringToPlainText)(detail.documentation);
+            }
+            plainTextString = plainTextString.trimEnd();
+            if (plainTextString) {
+                completionItem.documentation = {
+                    kind: vscode_languageserver_1.MarkupKind.PlainText,
+                    value: plainTextString,
+                };
+            }
+        }
+        else {
+            (0, debug_1.fail)(`Unsupported markup type: ${this.options.format}`);
+        }
+        if ((_b = detail === null || detail === void 0 ? void 0 : detail.edits) === null || _b === void 0 ? void 0 : _b.format) {
+            completionItem.insertTextFormat = detail.edits.format;
+        }
+        if ((_c = detail === null || detail === void 0 ? void 0 : detail.edits) === null || _c === void 0 ? void 0 : _c.textEdit) {
+            completionItem.textEdit = detail.edits.textEdit;
+        }
+        if ((_d = detail === null || detail === void 0 ? void 0 : detail.edits) === null || _d === void 0 ? void 0 : _d.additionalTextEdits) {
+            completionItem.additionalTextEdits = (0, workspaceEditUtils_1.convertToTextEdits)(detail.edits.additionalTextEdits);
+            // This is for auto import entries from indices which skip symbols.
+            if (this._itemToResolve) {
+                const data = (0, lspUtils_1.fromLSPAny)(this._itemToResolve.data);
+                if (data.autoImportText === completionItemData.autoImportText) {
+                    this._itemToResolve.additionalTextEdits = completionItem.additionalTextEdits;
+                }
+            }
+        }
+        completionMap.set(completionItem);
+    }
     get _fileContents() {
         var _a, _b;
         return (_b = (_a = this.parseResults) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : '';
@@ -1037,7 +1171,7 @@ class CompletionProvider {
                 enforcePythonSyntax: true,
                 expandTypeAlias: false,
             });
-            this._addNameToCompletions(text, vscode_languageserver_1.CompletionItemKind.Reference, priorWord, completionMap, {
+            this.addNameToCompletions(text, vscode_languageserver_1.CompletionItemKind.Reference, priorWord, completionMap, {
                 sortText: this._makeSortText(SortCategory.LikelyKeyword, text),
             });
             return;
@@ -1074,7 +1208,7 @@ class CompletionProvider {
                 2 /* DoNotLimitStringLength */
             : 2 /* DoNotLimitStringLength */;
         const text = `${ParseTreeUtils.printExpression(declWithTypeAnnotations[declWithTypeAnnotations.length - 1].typeAnnotationNode, printFlags)}`;
-        this._addNameToCompletions(text, vscode_languageserver_1.CompletionItemKind.Reference, priorWord, completionMap, {
+        this.addNameToCompletions(text, vscode_languageserver_1.CompletionItemKind.Reference, priorWord, completionMap, {
             sortText: this._makeSortText(SortCategory.LikelyKeyword, text),
         });
     }
@@ -1326,7 +1460,7 @@ class CompletionProvider {
             if (types_1.ClassType.isBuiltIn(v, 'str')) {
                 const value = (0, typePrinter_1.printLiteralValue)(v, quoteValue.quoteCharacter);
                 if (quoteValue.stringValue === undefined) {
-                    this._addNameToCompletions(value, vscode_languageserver_1.CompletionItemKind.Constant, priorWord, completionMap, {
+                    this.addNameToCompletions(value, vscode_languageserver_1.CompletionItemKind.Constant, priorWord, completionMap, {
                         sortText: this._makeSortText(SortCategory.LiteralValue, v.literalValue),
                     });
                 }
@@ -1518,7 +1652,7 @@ class CompletionProvider {
                 : undefined;
         if (nodeForExpectedType) {
             const expectedTypeResult = this.evaluator.getExpectedType(nodeForExpectedType);
-            if (expectedTypeResult && (0, typeUtils_1.isLiteralTypeOrUnion)(expectedTypeResult.type)) {
+            if (expectedTypeResult && (0, typeUtils_1.containsLiteralType)(expectedTypeResult.type)) {
                 this._addLiteralValuesForTargetType(expectedTypeResult.type, priorWord, priorText, postText, completionMap);
                 return true;
             }
@@ -1569,12 +1703,12 @@ class CompletionProvider {
                 keyFound = true;
                 if (stringLiteral) {
                     const keyWithoutQuote = key.substr(1, key.length - 2);
-                    this._addStringLiteralToCompletions(keyWithoutQuote, quoteInfo, postText, completionMap, exports.dictionaryKeyDetail);
+                    this._addStringLiteralToCompletions(keyWithoutQuote, quoteInfo, postText, completionMap, exports.indexValueDetail);
                 }
                 else {
-                    this._addNameToCompletions(key, vscode_languageserver_1.CompletionItemKind.Constant, priorWord, completionMap, {
+                    this.addNameToCompletions(key, vscode_languageserver_1.CompletionItemKind.Constant, priorWord, completionMap, {
                         sortText: this._makeSortText(SortCategory.LiteralValue, key),
-                        itemDetail: exports.dictionaryKeyDetail,
+                        itemDetail: exports.indexValueDetail,
                     });
                 }
             }
@@ -1587,7 +1721,7 @@ class CompletionProvider {
         const supportedOperators = [2 /* Assign */, 12 /* Equals */, 28 /* NotEquals */];
         if (comparison.nodeType === 7 /* BinaryOperation */ && supportedOperators.includes(comparison.operator)) {
             const type = this.evaluator.getType(comparison.leftExpression);
-            if (type && (0, typeUtils_1.isLiteralTypeOrUnion)(type)) {
+            if (type && (0, typeUtils_1.containsLiteralType)(type)) {
                 this._addLiteralValuesForTargetType(type, priorWord, priorText, postText, completionMap);
                 return true;
             }
@@ -1597,7 +1731,7 @@ class CompletionProvider {
         if (assignmentExpression.nodeType === 4 /* AssignmentExpression */ &&
             assignmentExpression.rightExpression === parentAndChild.child) {
             const type = this.evaluator.getType(assignmentExpression.name);
-            if (type && (0, typeUtils_1.isLiteralTypeOrUnion)(type)) {
+            if (type && (0, typeUtils_1.containsLiteralType)(type)) {
                 this._addLiteralValuesForTargetType(type, priorWord, priorText, postText, completionMap);
                 return true;
             }
@@ -1612,7 +1746,7 @@ class CompletionProvider {
             caseNode.suite === parentAndChild.child &&
             ((_c = caseNode.parent) === null || _c === void 0 ? void 0 : _c.nodeType) === 63 /* Match */) {
             const type = this.evaluator.getType(caseNode.parent.subjectExpression);
-            if (type && (0, typeUtils_1.isLiteralTypeOrUnion)(type)) {
+            if (type && (0, typeUtils_1.containsLiteralType)(type)) {
                 this._addLiteralValuesForTargetType(type, priorWord, priorText, postText, completionMap);
                 return true;
             }
@@ -1627,7 +1761,7 @@ class CompletionProvider {
             ((_e = patternLiteral.parent.parent) === null || _e === void 0 ? void 0 : _e.nodeType) === 64 /* Case */ &&
             ((_f = patternLiteral.parent.parent.parent) === null || _f === void 0 ? void 0 : _f.nodeType) === 63 /* Match */) {
             const type = this.evaluator.getType(patternLiteral.parent.parent.parent.subjectExpression);
-            if (type && (0, typeUtils_1.isLiteralTypeOrUnion)(type)) {
+            if (type && (0, typeUtils_1.containsLiteralType)(type)) {
                 this._addLiteralValuesForTargetType(type, priorWord, priorText, postText, completionMap);
                 return true;
             }
@@ -1766,37 +1900,38 @@ class CompletionProvider {
         return this._tryAddTypedDictKeys(baseType, [], priorWord, priorText, postText, completionMap);
     }
     _addStringLiteralToCompletions(value, quoteInfo, postText, completionMap, detail) {
-        if (StringUtils.isPatternInSymbol(quoteInfo.filterText || '', value)) {
-            const valueWithQuotes = `${quoteInfo.quoteCharacter}${value}${quoteInfo.quoteCharacter}`;
-            if (completionMap.has(valueWithQuotes)) {
-                return;
-            }
-            const completionItem = vscode_languageserver_1.CompletionItem.create(valueWithQuotes);
-            completionItem.kind = vscode_languageserver_1.CompletionItemKind.Constant;
-            completionItem.sortText = this._makeSortText(SortCategory.LiteralValue, valueWithQuotes);
-            let rangeStartCol = this.position.character;
-            if (quoteInfo.stringValue !== undefined) {
-                rangeStartCol -= quoteInfo.stringValue.length + 1;
-            }
-            else if (quoteInfo.priorWord) {
-                rangeStartCol -= quoteInfo.priorWord.length;
-            }
-            // If the text after the insertion point is the closing quote,
-            // replace it.
-            let rangeEndCol = this.position.character;
-            if (postText !== undefined) {
-                if (postText.startsWith(quoteInfo.quoteCharacter)) {
-                    rangeEndCol++;
-                }
+        if (!StringUtils.isPatternInSymbol(quoteInfo.filterText || '', value)) {
+            return;
+        }
+        const valueWithQuotes = `${quoteInfo.quoteCharacter}${value}${quoteInfo.quoteCharacter}`;
+        if (completionMap.has(valueWithQuotes)) {
+            return;
+        }
+        const completionItem = vscode_languageserver_1.CompletionItem.create(valueWithQuotes);
+        completionItem.kind = vscode_languageserver_1.CompletionItemKind.Constant;
+        completionItem.sortText = this._makeSortText(SortCategory.LiteralValue, valueWithQuotes);
+        let rangeStartCol = this.position.character;
+        if (quoteInfo.stringValue !== undefined) {
+            rangeStartCol -= quoteInfo.stringValue.length + 1;
+        }
+        else if (quoteInfo.priorWord) {
+            rangeStartCol -= quoteInfo.priorWord.length;
+        }
+        // If the text after the insertion point is the closing quote,
+        // replace it.
+        let rangeEndCol = this.position.character;
+        if (postText !== undefined) {
+            if (postText.startsWith(quoteInfo.quoteCharacter)) {
+                rangeEndCol++;
             }
-            const range = {
-                start: { line: this.position.line, character: rangeStartCol },
-                end: { line: this.position.line, character: rangeEndCol },
-            };
-            completionItem.textEdit = vscode_languageserver_1.TextEdit.replace(range, valueWithQuotes);
-            completionItem.detail = detail;
-            completionMap.set(completionItem);
         }
+        const range = {
+            start: { line: this.position.line, character: rangeStartCol },
+            end: { line: this.position.line, character: rangeEndCol },
+        };
+        completionItem.textEdit = vscode_languageserver_1.TextEdit.replace(range, valueWithQuotes);
+        completionItem.detail = detail;
+        completionMap.set(completionItem);
     }
     _getImportFromCompletions(importFromNode, priorWord) {
         var _a;
@@ -1814,6 +1949,8 @@ class CompletionProvider {
         const resolvedPath = importInfo.resolvedPaths.length > 0 ? importInfo.resolvedPaths[importInfo.resolvedPaths.length - 1] : '';
         const parseResults = this.program.getParseResults(resolvedPath);
         if (!parseResults) {
+            // Add the implicit imports.
+            this._addImplicitImportsToCompletion(importInfo, importFromNode, priorWord, completionMap);
             return completionMap;
         }
         const symbolTable = (_a = AnalyzerNodeInfo.getScope(parseResults.parseTree)) === null || _a === void 0 ? void 0 : _a.symbolTable;
@@ -1828,14 +1965,17 @@ class CompletionProvider {
         /* isInImport */ true, 
         /* boundObject */ undefined, completionMap);
         // Add the implicit imports.
+        this._addImplicitImportsToCompletion(importInfo, importFromNode, priorWord, completionMap);
+        return completionMap;
+    }
+    _addImplicitImportsToCompletion(importInfo, importFromNode, priorWord, completionMap) {
         importInfo.implicitImports.forEach((implImport) => {
             if (!importFromNode.imports.find((imp) => imp.name.value === implImport.name)) {
-                this._addNameToCompletions(implImport.name, vscode_languageserver_1.CompletionItemKind.Module, priorWord, completionMap, {
+                this.addNameToCompletions(implImport.name, vscode_languageserver_1.CompletionItemKind.Module, priorWord, completionMap, {
                     modulePath: implImport.path,
                 });
             }
         });
-        return completionMap;
     }
     _findMatchingKeywords(keywordList, partialMatch) {
         return keywordList.filter((keyword) => {
@@ -1991,132 +2131,6 @@ class CompletionProvider {
             importText,
         };
     }
-    _addNameToCompletions(name, itemKind, filter, completionMap, detail) {
-        var _a, _b, _c, _d;
-        // Auto importer already filtered out unnecessary ones. No need to do it again.
-        const similarity = (detail === null || detail === void 0 ? void 0 : detail.autoImportText) ? true : StringUtils.isPatternInSymbol(filter, name);
-        if (!similarity) {
-            return;
-        }
-        if (completionMap.has(name, CompletionMap.matchKindAndImportText, itemKind, (_a = detail === null || detail === void 0 ? void 0 : detail.autoImportText) === null || _a === void 0 ? void 0 : _a.importText)) {
-            return;
-        }
-        const completionItem = vscode_languageserver_1.CompletionItem.create(name);
-        completionItem.kind = itemKind;
-        if (detail === null || detail === void 0 ? void 0 : detail.extraCommitChars) {
-            this.addExtraCommitChar(completionItem);
-        }
-        const completionItemData = {
-            workspacePath: this._workspacePath,
-            filePath: this.filePath,
-            position: this.position,
-        };
-        if ((detail === null || detail === void 0 ? void 0 : detail.funcParensDisabled) || !this.options.snippet) {
-            completionItemData.funcParensDisabled = true;
-        }
-        if (detail === null || detail === void 0 ? void 0 : detail.modulePath) {
-            completionItemData.modulePath = detail.modulePath;
-        }
-        completionItem.data = (0, lspUtils_1.toLSPAny)(completionItemData);
-        if ((detail === null || detail === void 0 ? void 0 : detail.sortText) || (detail === null || detail === void 0 ? void 0 : detail.itemDetail)) {
-            completionItem.sortText = detail.sortText;
-            completionItem.detail = detail.itemDetail;
-        }
-        else if (detail === null || detail === void 0 ? void 0 : detail.autoImportText) {
-            // Force auto-import entries to the end.
-            completionItem.sortText = this._makeSortText(SortCategory.AutoImport, `${name}.${this._formatInteger(detail.autoImportText.source.length, 2)}.${detail.autoImportText.source}`, detail.autoImportText.importText);
-            completionItemData.autoImportText = detail.autoImportText.importText;
-            completionItem.detail = exports.autoImportDetail;
-            if (detail.autoImportText.source) {
-                completionItem.labelDetails = { description: detail.autoImportText.source };
-            }
-        }
-        else if (itemKind === vscode_languageserver_1.CompletionItemKind.EnumMember) {
-            // Handle enum members separately so they are sorted above other symbols.
-            completionItem.sortText = this._makeSortText(SortCategory.EnumMember, name);
-        }
-        else if (SymbolNameUtils.isDunderName(name)) {
-            // Force dunder-named symbols to appear after all other symbols.
-            completionItem.sortText = this._makeSortText(SortCategory.DunderSymbol, name);
-        }
-        else if (filter === '' && SymbolNameUtils.isPrivateOrProtectedName(name)) {
-            // Distinguish between normal and private symbols only if there is
-            // currently no filter text. Once we get a single character to filter
-            // upon, we'll no longer differentiate.
-            completionItem.sortText = this._makeSortText(SortCategory.PrivateSymbol, name);
-        }
-        else {
-            completionItem.sortText = this._makeSortText(SortCategory.NormalSymbol, name);
-        }
-        completionItemData.symbolLabel = name;
-        if (this.options.format === vscode_languageserver_1.MarkupKind.Markdown) {
-            let markdownString = '';
-            if (detail === null || detail === void 0 ? void 0 : detail.autoImportText) {
-                markdownString += detail.autoImportText.importText;
-                if (detail.typeDetail || detail.documentation) {
-                    // Micro perf optimization to not create new string from trimEnd.
-                    markdownString += '\n\n';
-                }
-            }
-            if (detail === null || detail === void 0 ? void 0 : detail.typeDetail) {
-                markdownString += '```python\n' + detail.typeDetail + '\n```\n';
-            }
-            if (detail === null || detail === void 0 ? void 0 : detail.documentation) {
-                markdownString += '---\n';
-                markdownString += (0, docStringConversion_1.convertDocStringToMarkdown)(detail.documentation);
-            }
-            markdownString = markdownString.trimEnd();
-            if (markdownString) {
-                completionItem.documentation = {
-                    kind: vscode_languageserver_1.MarkupKind.Markdown,
-                    value: markdownString,
-                };
-            }
-        }
-        else if (this.options.format === vscode_languageserver_1.MarkupKind.PlainText) {
-            let plainTextString = '';
-            if (detail === null || detail === void 0 ? void 0 : detail.autoImportText) {
-                plainTextString += detail.autoImportText.importText;
-                if (detail.typeDetail || detail.documentation) {
-                    // Micro perf optimization to not create new string from trimEnd.
-                    plainTextString += '\n\n';
-                }
-            }
-            if (detail === null || detail === void 0 ? void 0 : detail.typeDetail) {
-                plainTextString += detail.typeDetail + '\n';
-            }
-            if (detail === null || detail === void 0 ? void 0 : detail.documentation) {
-                plainTextString += '\n' + (0, docStringConversion_1.convertDocStringToPlainText)(detail.documentation);
-            }
-            plainTextString = plainTextString.trimEnd();
-            if (plainTextString) {
-                completionItem.documentation = {
-                    kind: vscode_languageserver_1.MarkupKind.PlainText,
-                    value: plainTextString,
-                };
-            }
-        }
-        else {
-            (0, debug_1.fail)(`Unsupported markup type: ${this.options.format}`);
-        }
-        if ((_b = detail === null || detail === void 0 ? void 0 : detail.edits) === null || _b === void 0 ? void 0 : _b.format) {
-            completionItem.insertTextFormat = detail.edits.format;
-        }
-        if ((_c = detail === null || detail === void 0 ? void 0 : detail.edits) === null || _c === void 0 ? void 0 : _c.textEdit) {
-            completionItem.textEdit = detail.edits.textEdit;
-        }
-        if ((_d = detail === null || detail === void 0 ? void 0 : detail.edits) === null || _d === void 0 ? void 0 : _d.additionalTextEdits) {
-            completionItem.additionalTextEdits = (0, workspaceEditUtils_1.convertToTextEdits)(detail.edits.additionalTextEdits);
-            // This is for auto import entries from indices which skip symbols.
-            if (this._itemToResolve) {
-                const data = (0, lspUtils_1.fromLSPAny)(this._itemToResolve.data);
-                if (data.autoImportText === completionItemData.autoImportText) {
-                    this._itemToResolve.additionalTextEdits = completionItem.additionalTextEdits;
-                }
-            }
-        }
-        completionMap.set(completionItem);
-    }
     _getRecentListIndex(name, autoImportText) {
         return CompletionProvider._mostRecentCompletions.findIndex((item) => item.label === name && item.autoImportText === autoImportText);
     }
@@ -2235,7 +2249,7 @@ class CompletionProvider {
             completionMap.set(completionItem);
         }
         completions.forEach((modulePath, completionName) => {
-            this._addNameToCompletions(completionName, vscode_languageserver_1.CompletionItemKind.Module, '', completionMap, {
+            this.addNameToCompletions(completionName, vscode_languageserver_1.CompletionItemKind.Module, '', completionMap, {
                 sortText: this._makeSortText(SortCategory.ImportModuleName, completionName),
                 modulePath,
             });