@zzzen/pyright-internal 1.2.0-dev.20230507 → 1.2.0-dev.20230514

package/dist/languageService/documentSymbolProvider.d.ts

@@ -1,37 +1,15 @@
-import { CancellationToken, CompletionItemKind, DocumentSymbol, SymbolInformation, SymbolKind } from 'vscode-languageserver';
-import { AnalyzerFileInfo, ImportLookup } from '../analyzer/analyzerFileInfo';
-import { AliasDeclaration } from '../analyzer/declaration';
-import { Range } from '../common/textRange';
-import { ParseResults } from '../parser/parser';
-export interface IndexAliasData {
-    readonly originalName: string;
-    readonly modulePath: string;
-    readonly kind: SymbolKind;
-    readonly itemKind?: CompletionItemKind | undefined;
-}
-export interface IndexSymbolData {
-    readonly name: string;
-    readonly externallyVisible: boolean;
-    readonly kind: SymbolKind;
-    readonly itemKind?: CompletionItemKind | undefined;
-    readonly alias?: IndexAliasData | undefined;
-    readonly range?: Range | undefined;
-    readonly selectionRange?: Range | undefined;
-    readonly children?: IndexSymbolData[] | undefined;
-}
-export interface IndexResults {
-    readonly privateOrProtected: boolean;
-    readonly symbols: IndexSymbolData[];
-}
-export interface IndexOptions {
-    indexingForAutoImportMode: boolean;
-    includeAllSymbols?: boolean;
-}
-export declare type WorkspaceSymbolCallback = (symbols: SymbolInformation[]) => void;
-export declare function getIndexAliasData(importLookup: ImportLookup, declaration: AliasDeclaration): IndexAliasData | undefined;
-export declare function convertToFlatSymbols(documentUri: string, symbolList: DocumentSymbol[]): SymbolInformation[];
+import { CancellationToken, DocumentSymbol, SymbolInformation } from 'vscode-languageserver';
+import { IndexSymbolData } from './symbolIndexer';
+import { ProgramView } from '../common/extensibility';
+export declare function convertToFlatSymbols(program: ProgramView, filePath: string, symbolList: DocumentSymbol[]): SymbolInformation[];
 export declare class DocumentSymbolProvider {
-    static getSymbolsForDocument(fileInfo: AnalyzerFileInfo | undefined, indexResults: IndexResults | undefined, parseResults: ParseResults | undefined, filePath: string, query: string, token: CancellationToken): SymbolInformation[];
-    static addHierarchicalSymbolsForDocument(fileInfo: AnalyzerFileInfo | undefined, indexResults: IndexResults | undefined, parseResults: ParseResults | undefined, symbolList: DocumentSymbol[], token: CancellationToken): void;
-    static indexSymbols(fileInfo: AnalyzerFileInfo, parseResults: ParseResults, options: IndexOptions, token: CancellationToken): IndexSymbolData[];
+    protected readonly program: ProgramView;
+    protected readonly filePath: string;
+    private readonly _supportHierarchicalDocumentSymbol;
+    private readonly _token;
+    private _parseResults;
+    constructor(program: ProgramView, filePath: string, _supportHierarchicalDocumentSymbol: boolean, _token: CancellationToken);
+    getSymbols(): DocumentSymbol[] | SymbolInformation[];
+    protected getHierarchicalSymbols(): DocumentSymbol[];
+    protected appendDocumentSymbolsRecursive(indexSymbolData: IndexSymbolData[] | undefined, symbolList: DocumentSymbol[]): void;
 }

package/dist/languageService/documentSymbolProvider.js

@@ -8,296 +8,84 @@
  * Logic that enumerates all of the symbols within a specified
  * source file document.
  */
-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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DocumentSymbolProvider = exports.convertToFlatSymbols = exports.getIndexAliasData = void 0;
+exports.DocumentSymbolProvider = exports.convertToFlatSymbols = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
-const vscode_uri_1 = require("vscode-uri");
-const AnalyzerNodeInfo = __importStar(require("../analyzer/analyzerNodeInfo"));
-const declarationUtils_1 = require("../analyzer/declarationUtils");
-const symbolUtils_1 = require("../analyzer/symbolUtils");
-const typeUtils_1 = require("../analyzer/typeUtils");
 const cancellationUtils_1 = require("../common/cancellationUtils");
-const positionUtils_1 = require("../common/positionUtils");
-const StringUtils = __importStar(require("../common/stringUtils"));
-const autoImporter_1 = require("./autoImporter");
-function getIndexAliasData(importLookup, declaration) {
-    var _a;
-    if (!declaration.symbolName) {
-        return undefined;
-    }
-    const resolvedInfo = (0, declarationUtils_1.resolveAliasDeclaration)(importLookup, declaration, {
-        resolveLocalNames: true,
-        allowExternallyHiddenAccess: false,
-        skipFileNeededCheck: false,
-    });
-    if (!resolvedInfo || !resolvedInfo.declaration) {
-        return undefined;
-    }
-    if (resolvedInfo.isPrivate) {
-        return undefined;
-    }
-    const nameValue = (0, declarationUtils_1.getNameFromDeclaration)(resolvedInfo.declaration);
-    if (!nameValue || resolvedInfo.declaration.path.length <= 0) {
-        return undefined;
-    }
-    const symbolKind = (_a = getSymbolKind(nameValue, resolvedInfo.declaration)) !== null && _a !== void 0 ? _a : vscode_languageserver_1.SymbolKind.Module;
-    return {
-        originalName: nameValue,
-        modulePath: resolvedInfo.declaration.path,
-        kind: symbolKind,
-        itemKind: (0, autoImporter_1.convertSymbolKindToCompletionItemKind)(symbolKind),
-    };
-}
-exports.getIndexAliasData = getIndexAliasData;
-function convertToFlatSymbols(documentUri, symbolList) {
+const symbolIndexer_1 = require("./symbolIndexer");
+const analyzerNodeInfo_1 = require("../analyzer/analyzerNodeInfo");
+const pathUtils_1 = require("../common/pathUtils");
+function convertToFlatSymbols(program, filePath, symbolList) {
     const flatSymbols = [];
+    const documentUri = (0, pathUtils_1.convertPathToUri)(program.fileSystem, filePath);
     for (const symbol of symbolList) {
-        appendToFlatSymbolsRecursive(flatSymbols, documentUri, symbol);
+        _appendToFlatSymbolsRecursive(flatSymbols, documentUri, symbol);
     }
     return flatSymbols;
 }
 exports.convertToFlatSymbols = convertToFlatSymbols;
 class DocumentSymbolProvider {
-    static getSymbolsForDocument(fileInfo, indexResults, parseResults, filePath, query, token) {
-        var _a;
+    constructor(program, filePath, _supportHierarchicalDocumentSymbol, _token) {
+        this.program = program;
+        this.filePath = filePath;
+        this._supportHierarchicalDocumentSymbol = _supportHierarchicalDocumentSymbol;
+        this._token = _token;
+        this._parseResults = this.program.getParseResults(this.filePath);
+    }
+    getSymbols() {
+        if (!this._parseResults) {
+            return [];
+        }
+        const symbolList = this.getHierarchicalSymbols();
+        if (this._supportHierarchicalDocumentSymbol) {
+            return symbolList;
+        }
+        return convertToFlatSymbols(this.program, this.filePath, symbolList);
+    }
+    getHierarchicalSymbols() {
         const symbolList = [];
-        if (!indexResults && !parseResults) {
+        const parseResults = this.program.getParseResults(this.filePath);
+        if (!parseResults) {
             return symbolList;
         }
-        const indexSymbolData = (_a = indexResults === null || indexResults === void 0 ? void 0 : indexResults.symbols) !== null && _a !== void 0 ? _a : DocumentSymbolProvider.indexSymbols(fileInfo, parseResults, { indexingForAutoImportMode: false }, token);
-        appendWorkspaceSymbolsRecursive(indexSymbolData, filePath, query, '', symbolList, token);
+        const fileInfo = (0, analyzerNodeInfo_1.getFileInfo)(parseResults.parseTree);
+        if (!fileInfo) {
+            return symbolList;
+        }
+        const indexSymbolData = symbolIndexer_1.SymbolIndexer.indexSymbols(fileInfo, parseResults, this._token);
+        this.appendDocumentSymbolsRecursive(indexSymbolData, symbolList);
         return symbolList;
     }
-    static addHierarchicalSymbolsForDocument(fileInfo, indexResults, parseResults, symbolList, token) {
-        var _a;
-        if (!indexResults && !parseResults) {
+    appendDocumentSymbolsRecursive(indexSymbolData, symbolList) {
+        (0, cancellationUtils_1.throwIfCancellationRequested)(this._token);
+        if (!indexSymbolData) {
             return;
         }
-        const indexSymbolData = (_a = indexResults === null || indexResults === void 0 ? void 0 : indexResults.symbols) !== null && _a !== void 0 ? _a : DocumentSymbolProvider.indexSymbols(fileInfo, parseResults, { indexingForAutoImportMode: false }, token);
-        appendDocumentSymbolsRecursive(indexSymbolData, symbolList, token);
-    }
-    static indexSymbols(fileInfo, parseResults, options, token) {
-        // Here are the rule of what symbols are indexed for a file.
-        // 1. If it is a stub file, we index every public symbols defined by "https://www.python.org/dev/peps/pep-0484/#stub-files"
-        // 2. If it is a py file and it is py.typed package, we index public symbols
-        //    defined by "https://github.com/microsoft/pyright/blob/main/docs/typed-libraries.md#library-interface"
-        // 3. If it is a py file and it is not py.typed package, we index only symbols that appear in
-        //    __all__ to make sure we don't include too many symbols in the index.
-        const indexSymbolData = [];
-        collectSymbolIndexData(fileInfo, parseResults, parseResults.parseTree, options, indexSymbolData, token);
-        return indexSymbolData;
-    }
-}
-exports.DocumentSymbolProvider = DocumentSymbolProvider;
-function getSymbolKind(name, declaration, evaluator) {
-    var _a;
-    let symbolKind;
-    switch (declaration.type) {
-        case 6 /* Class */:
-        case 7 /* SpecialBuiltInClass */:
-            symbolKind = vscode_languageserver_1.SymbolKind.Class;
-            break;
-        case 5 /* Function */:
-            if (declaration.isMethod) {
-                const declType = (_a = evaluator === null || evaluator === void 0 ? void 0 : evaluator.getTypeForDeclaration(declaration)) === null || _a === void 0 ? void 0 : _a.type;
-                if (declType && (0, typeUtils_1.isMaybeDescriptorInstance)(declType, /* requireSetter */ false)) {
-                    symbolKind = vscode_languageserver_1.SymbolKind.Property;
-                }
-                else {
-                    symbolKind = vscode_languageserver_1.SymbolKind.Method;
-                }
-            }
-            else {
-                symbolKind = vscode_languageserver_1.SymbolKind.Function;
-            }
-            break;
-        case 8 /* Alias */:
-            symbolKind = vscode_languageserver_1.SymbolKind.Module;
-            break;
-        case 2 /* Parameter */:
-            if (name === 'self' || name === 'cls' || name === '_') {
-                return;
+        for (const symbolData of indexSymbolData) {
+            if (symbolData.alias) {
+                continue;
             }
-            symbolKind = vscode_languageserver_1.SymbolKind.Variable;
-            break;
-        case 3 /* TypeParameter */:
-            symbolKind = vscode_languageserver_1.SymbolKind.TypeParameter;
-            break;
-        case 1 /* Variable */:
-            if (name === '_') {
-                return;
+            // It's possible for a name to be '' under certain error
+            // conditions (such as a decorator with no associated function
+            // or class).
+            if (!symbolData.name) {
+                continue;
             }
-            symbolKind = declaration.isConstant || declaration.isFinal ? vscode_languageserver_1.SymbolKind.Constant : vscode_languageserver_1.SymbolKind.Variable;
-            break;
-        default:
-            symbolKind = vscode_languageserver_1.SymbolKind.Variable;
-            break;
-    }
-    return symbolKind;
-}
-function appendWorkspaceSymbolsRecursive(indexSymbolData, filePath, query, container, symbolList, token) {
-    (0, cancellationUtils_1.throwIfCancellationRequested)(token);
-    if (!indexSymbolData) {
-        return;
-    }
-    for (const symbolData of indexSymbolData) {
-        if (symbolData.alias) {
-            continue;
-        }
-        if (StringUtils.isPatternInSymbol(query, symbolData.name)) {
-            const location = {
-                uri: vscode_uri_1.URI.file(filePath).toString(),
-                range: symbolData.selectionRange,
-            };
+            const children = [];
+            this.appendDocumentSymbolsRecursive(symbolData.children, children);
             const symbolInfo = {
                 name: symbolData.name,
                 kind: symbolData.kind,
-                location,
+                range: symbolData.range,
+                selectionRange: symbolData.selectionRange,
+                children: children,
             };
-            if (container.length) {
-                symbolInfo.containerName = container;
-            }
             symbolList.push(symbolInfo);
         }
-        appendWorkspaceSymbolsRecursive(symbolData.children, filePath, query, getContainerName(container, symbolData.name), symbolList, token);
-    }
-    function getContainerName(container, name) {
-        if (container.length > 0) {
-            return `${container}.${name}`;
-        }
-        return name;
     }
 }
-function appendDocumentSymbolsRecursive(indexSymbolData, symbolList, token) {
-    (0, cancellationUtils_1.throwIfCancellationRequested)(token);
-    if (!indexSymbolData) {
-        return;
-    }
-    for (const symbolData of indexSymbolData) {
-        if (symbolData.alias) {
-            continue;
-        }
-        // It's possible for a name to be '' under certain error
-        // conditions (such as a decorator with no associated function
-        // or class).
-        if (!symbolData.name) {
-            continue;
-        }
-        const children = [];
-        appendDocumentSymbolsRecursive(symbolData.children, children, token);
-        const symbolInfo = {
-            name: symbolData.name,
-            kind: symbolData.kind,
-            range: symbolData.range,
-            selectionRange: symbolData.selectionRange,
-            children: children,
-        };
-        symbolList.push(symbolInfo);
-    }
-}
-function collectSymbolIndexData(fileInfo, parseResults, node, options, indexSymbolData, token) {
-    (0, cancellationUtils_1.throwIfCancellationRequested)(token);
-    const scope = AnalyzerNodeInfo.getScope(node);
-    if (!scope) {
-        return;
-    }
-    const symbolTable = scope.symbolTable;
-    symbolTable.forEach((symbol, name) => {
-        if (symbol.isIgnoredForProtocolMatch()) {
-            return;
-        }
-        // If we are not py.typed package, symbol must exist in __all__ for auto import mode.
-        if (options.indexingForAutoImportMode &&
-            !options.includeAllSymbols &&
-            !fileInfo.isStubFile &&
-            !fileInfo.isInPyTypedPackage &&
-            !symbol.isInDunderAll()) {
-            return;
-        }
-        // Prefer declarations with a defined type.
-        let declaration = (0, symbolUtils_1.getLastTypedDeclaredForSymbol)(symbol);
-        // Fall back to declarations without a type.
-        if (!declaration && symbol.hasDeclarations()) {
-            declaration = symbol.getDeclarations()[0];
-        }
-        if (!declaration) {
-            return;
-        }
-        if (8 /* Alias */ === declaration.type) {
-            if (!options.indexingForAutoImportMode) {
-                // We don't include import alias for workspace files.
-                return;
-            }
-            if (!declaration.loadSymbolsFromPath || declaration.path.length <= 0) {
-                // If alias doesn't have a path to the original file, we can't do dedup
-                // so ignore those aliases.
-                // ex) asyncio.futures, asyncio.base_futures.futures and many will dedup
-                //     to asyncio.futures
-                return;
-            }
-        }
-        // We rely on ExternallyHidden flag to determine what
-        // symbols should be public (included in the index)
-        collectSymbolIndexDataForName(fileInfo, parseResults, declaration, options, (0, symbolUtils_1.isVisibleExternally)(symbol), name, indexSymbolData, token);
-    });
-}
-function collectSymbolIndexDataForName(fileInfo, parseResults, declaration, options, externallyVisible, name, indexSymbolData, token) {
-    if (options.indexingForAutoImportMode && !externallyVisible) {
-        return;
-    }
-    const symbolKind = getSymbolKind(name, declaration);
-    if (symbolKind === undefined) {
-        return;
-    }
-    const selectionRange = declaration.range;
-    let range = selectionRange;
-    const children = [];
-    if (declaration.type === 6 /* Class */ || declaration.type === 5 /* Function */) {
-        if (!options.indexingForAutoImportMode) {
-            collectSymbolIndexData(fileInfo, parseResults, declaration.node, options, children, token);
-        }
-        range = (0, positionUtils_1.convertOffsetsToRange)(declaration.node.start, declaration.node.start + declaration.node.length, parseResults.tokenizerOutput.lines);
-    }
-    let aliasData = undefined;
-    if (8 /* Alias */ === declaration.type) {
-        aliasData = getIndexAliasData(AnalyzerNodeInfo.getFileInfo(parseResults.parseTree).importLookup, declaration);
-        // If we can't create alias data for import alias, then don't include it in index.
-        if (!aliasData) {
-            return;
-        }
-    }
-    const data = {
-        name,
-        externallyVisible,
-        kind: symbolKind,
-        itemKind: (0, autoImporter_1.convertSymbolKindToCompletionItemKind)(symbolKind),
-        alias: aliasData,
-        range: options.indexingForAutoImportMode ? undefined : range,
-        selectionRange: options.indexingForAutoImportMode ? undefined : selectionRange,
-        children: options.indexingForAutoImportMode ? undefined : children,
-    };
-    indexSymbolData.push(data);
-}
-function appendToFlatSymbolsRecursive(flatSymbols, documentUri, symbol, parent) {
+exports.DocumentSymbolProvider = DocumentSymbolProvider;
+function _appendToFlatSymbolsRecursive(flatSymbols, documentUri, symbol, parent) {
     const flatSymbol = {
         name: symbol.name,
         kind: symbol.kind,
@@ -312,7 +100,7 @@ function appendToFlatSymbolsRecursive(flatSymbols, documentUri, symbol, parent)
     flatSymbols.push(flatSymbol);
     if (symbol.children) {
         for (const child of symbol.children) {
-            appendToFlatSymbolsRecursive(flatSymbols, documentUri, child, symbol);
+            _appendToFlatSymbolsRecursive(flatSymbols, documentUri, child, symbol);
         }
     }
 }

package/dist/languageService/documentSymbolProvider.js.map

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

package/dist/languageService/hoverProvider.d.ts

@@ -19,11 +19,9 @@ export declare class HoverProvider {
     private _addResultsForDeclaration;
     private _tryAddPartsForTypedDictKey;
     private _addInitOrNewMethodInsteadIfCallNode;
+    private _getType;
     private _getTypeText;
     private _getTypesText;
-    private _bindFunctionToClassOrObject;
-    private _getType;
-    private _limitOverloadBasedOnCall;
     private _addDocumentationPart;
     private _addDocumentationPartForType;
     private _addDocumentationResultsPart;

package/dist/languageService/hoverProvider.js

@@ -334,73 +334,26 @@ class HoverProvider {
         });
     }
     _addInitOrNewMethodInsteadIfCallNode(node, parts, declaration) {
-        var _a, _b;
-        // If the class is used as part of a call (i.e. it is being
-        // instantiated), include the constructor arguments within the
-        // hover text.
-        let callLeftNode = node;
-        // Allow the left to be a member access chain (e.g. a.b.c) if the
-        // node in question is the last item in the chain.
-        if (((_a = callLeftNode === null || callLeftNode === void 0 ? void 0 : callLeftNode.parent) === null || _a === void 0 ? void 0 : _a.nodeType) === 35 /* MemberAccess */ && node === callLeftNode.parent.memberName) {
-            callLeftNode = node.parent;
-            // Allow the left to be a generic class constructor (e.g. foo[int]())
-        }
-        else if (((_b = callLeftNode === null || callLeftNode === void 0 ? void 0 : callLeftNode.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 24 /* Index */) {
-            callLeftNode = node.parent;
-        }
-        if (!callLeftNode ||
-            !callLeftNode.parent ||
-            callLeftNode.parent.nodeType !== 9 /* Call */ ||
-            callLeftNode.parent.leftExpression !== callLeftNode) {
-            return false;
-        }
-        // Get the init method for this class.
-        const classType = this._getType(node);
-        if (!(0, types_1.isInstantiableClass)(classType)) {
-            return false;
-        }
-        const instanceType = this._getType(callLeftNode.parent);
-        if (!(0, types_1.isClassInstance)(instanceType)) {
+        const result = (0, tooltipUtils_1.getClassAndConstructorTypes)(node, this._evaluator);
+        if (!result) {
             return false;
         }
-        let methodType;
-        // Try to get the `__init__` method first because it typically has more type information than `__new__`.
-        // Don't exclude `object.__init__` since in the plain case we want to show Foo().
-        const initMember = (0, typeUtils_1.lookUpClassMember)(classType, '__init__', 8 /* SkipInstanceVariables */);
-        if (initMember) {
-            const functionType = this._evaluator.getTypeOfMember(initMember);
-            if ((0, types_1.isFunction)(functionType) || (0, types_1.isOverloadedFunction)(functionType)) {
-                methodType = this._bindFunctionToClassOrObject(node, instanceType, functionType);
-            }
-        }
-        // If there was no `__init__`, excluding `object` class `__init__`, or if `__init__` only had default params (*args: Any, **kwargs: Any) or no params (),
-        // see if we can find a better `__new__` method.
-        if (!methodType ||
-            (methodType &&
-                (0, types_1.isFunction)(methodType) &&
-                (types_1.FunctionType.hasDefaultParameters(methodType) || methodType.details.parameters.length === 0))) {
-            const newMember = (0, typeUtils_1.lookUpClassMember)(classType, '__new__', 4 /* SkipObjectBaseClass */ | 8 /* SkipInstanceVariables */);
-            if (newMember) {
-                const newMemberType = this._evaluator.getTypeOfMember(newMember);
-                // Prefer `__new__` if it doesn't have default params (*args: Any, **kwargs: Any) or no params ().
-                if ((0, types_1.isFunction)(newMemberType) || (0, types_1.isOverloadedFunction)(newMemberType)) {
-                    // Set `treatConstructorAsClassMember` to true to exclude `cls` as a parameter.
-                    methodType = this._bindFunctionToClassOrObject(node, instanceType, newMemberType, 
-                    /* treatConstructorAsClassMember */ true);
-                }
-            }
-        }
-        if (methodType && ((0, types_1.isFunction)(methodType) || (0, types_1.isOverloadedFunction)(methodType))) {
-            this._addResultsPart(parts, (0, tooltipUtils_1.getConstructorTooltip)(node.value, methodType, this._evaluator, this._functionSignatureDisplay), 
+        if (result.methodType && ((0, types_1.isFunction)(result.methodType) || (0, types_1.isOverloadedFunction)(result.methodType))) {
+            this._addResultsPart(parts, (0, tooltipUtils_1.getConstructorTooltip)(node.value, result.methodType, this._evaluator, this._functionSignatureDisplay), 
             /* python */ true);
-            const addedDoc = this._addDocumentationPartForType(parts, methodType, declaration);
+            const addedDoc = this._addDocumentationPartForType(parts, result.methodType, declaration);
             if (!addedDoc) {
-                this._addDocumentationPartForType(parts, classType, declaration);
+                this._addDocumentationPartForType(parts, result.classType, declaration);
             }
             return true;
         }
         return false;
     }
+    _getType(node) {
+        // It does common work necessary for hover for a type we got
+        // from raw type evaluator.
+        return (0, tooltipUtils_1.getTypeForToolTip)(this._evaluator, node);
+    }
     _getTypeText(node, expandTypeAlias = false) {
         const type = this._getType(node);
         return ': ' + this._evaluator.printType(type, { expandTypeAlias });
@@ -409,45 +362,6 @@ class HoverProvider {
         const type = (0, tooltipUtils_1.combineExpressionTypes)(nodes, this._evaluator);
         return ': ' + this._evaluator.printType(type, { expandTypeAlias });
     }
-    _bindFunctionToClassOrObject(node, baseType, memberType, treatConstructorAsClassMember) {
-        const methodType = this._evaluator.bindFunctionToClassOrObject(baseType, memberType, 
-        /* memberClass */ undefined, 
-        /* errorNode */ undefined, 
-        /* recursiveCount */ undefined, treatConstructorAsClassMember);
-        if (!methodType) {
-            return undefined;
-        }
-        return this._limitOverloadBasedOnCall(methodType, node);
-    }
-    _getType(node) {
-        var _a;
-        // It does common work necessary for hover for a type we got
-        // from raw type evaluator.
-        const type = (_a = this._evaluator.getType(node)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
-        return this._limitOverloadBasedOnCall(type, node);
-    }
-    _limitOverloadBasedOnCall(type, node) {
-        // If it's an overloaded function, see if it's part of a call expression.
-        // If so, we may be able to eliminate some of the overloads based on
-        // the overload resolution.
-        if (!(0, types_1.isOverloadedFunction)(type) || node.nodeType !== 38 /* Name */) {
-            return type;
-        }
-        const callNode = ParseTreeUtils.getCallForName(node);
-        if (!callNode) {
-            return type;
-        }
-        const callTypeResult = this._evaluator.getTypeResult(callNode);
-        if (!callTypeResult ||
-            !callTypeResult.overloadsUsedForCall ||
-            callTypeResult.overloadsUsedForCall.length === 0) {
-            return type;
-        }
-        if (callTypeResult.overloadsUsedForCall.length === 1) {
-            return callTypeResult.overloadsUsedForCall[0];
-        }
-        return types_1.OverloadedFunctionType.create(callTypeResult.overloadsUsedForCall);
-    }
     _addDocumentationPart(parts, node, resolvedDecl) {
         const type = this._getType(node);
         this._addDocumentationPartForType(parts, type, resolvedDecl, node.value);