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

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

@@ -1,31 +1,31 @@
 import { CancellationToken, Hover, MarkupKind } from 'vscode-languageserver';
-import { SourceMapper } from '../analyzer/sourceMapper';
-import { TypeEvaluator } from '../analyzer/typeEvaluatorTypes';
-import { SignatureDisplayType } from '../common/configOptions';
-import { Position, Range } from '../common/textRange';
-import { ParseResults } from '../parser/parser';
-export interface HoverTextPart {
-    python?: boolean;
-    text: string;
-}
-export interface HoverResults {
-    parts: HoverTextPart[];
-    lastKnownModule?: string;
-    range: Range;
-}
+import { ProgramView } from '../common/extensibility';
+import { Position } from '../common/textRange';
 export declare class HoverProvider {
-    static getHoverForPosition(sourceMapper: SourceMapper, parseResults: ParseResults, position: Position, format: MarkupKind, evaluator: TypeEvaluator, functionSignatureDisplay: SignatureDisplayType, token: CancellationToken): HoverResults | undefined;
-    private static _addResultsForDeclaration;
-    private static _tryAddPartsForTypedDictKey;
-    private static _addInitOrNewMethodInsteadIfCallNode;
-    private static _getTypeText;
-    private static _getTypesText;
-    private static _bindFunctionToClassOrObject;
-    private static _getType;
-    private static _limitOverloadBasedOnCall;
-    private static _addDocumentationPart;
-    private static _addDocumentationPartForType;
-    private static _addDocumentationResultsPart;
-    private static _addResultsPart;
+    private _program;
+    private _filePath;
+    private _position;
+    private _format;
+    private _supportTelemetry;
+    private _token;
+    private readonly _parseResults;
+    private readonly _sourceMapper;
+    constructor(_program: ProgramView, _filePath: string, _position: Position, _format: MarkupKind, _supportTelemetry: boolean, _token: CancellationToken);
+    getHover(): Hover | undefined;
+    private get _evaluator();
+    private get _functionSignatureDisplay();
+    private _getHoverResult;
+    private _addResultsForDeclaration;
+    private _tryAddPartsForTypedDictKey;
+    private _addInitOrNewMethodInsteadIfCallNode;
+    private _getTypeText;
+    private _getTypesText;
+    private _bindFunctionToClassOrObject;
+    private _getType;
+    private _limitOverloadBasedOnCall;
+    private _addDocumentationPart;
+    private _addDocumentationPartForType;
+    private _addDocumentationResultsPart;
+    private _addResultsPart;
+    private _convertHoverResults;
 }
-export declare function convertHoverResults(format: MarkupKind, hoverResults: HoverResults | undefined, includeHash?: boolean): Hover | undefined;

package/dist/languageService/hoverProvider.js

@@ -29,12 +29,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertHoverResults = exports.HoverProvider = void 0;
+exports.HoverProvider = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const docStringConversion_1 = require("../analyzer/docStringConversion");
 const ParseTreeUtils = __importStar(require("../analyzer/parseTreeUtils"));
-const types_1 = require("../analyzer/types");
 const typeUtils_1 = require("../analyzer/typeUtils");
+const types_1 = require("../analyzer/types");
 const cancellationUtils_1 = require("../common/cancellationUtils");
 const debug_1 = require("../common/debug");
 const extensibility_1 = require("../common/extensibility");
@@ -44,22 +44,44 @@ const textRange_1 = require("../common/textRange");
 const parseNodes_1 = require("../parser/parseNodes");
 const tooltipUtils_1 = require("./tooltipUtils");
 class HoverProvider {
-    static getHoverForPosition(sourceMapper, parseResults, position, format, evaluator, functionSignatureDisplay, token) {
+    constructor(_program, _filePath, _position, _format, _supportTelemetry, _token) {
+        this._program = _program;
+        this._filePath = _filePath;
+        this._position = _position;
+        this._format = _format;
+        this._supportTelemetry = _supportTelemetry;
+        this._token = _token;
+        this._parseResults = this._program.getParseResults(this._filePath);
+        this._sourceMapper = this._program.getSourceMapper(this._filePath, this._token, /* mapCompiled */ true);
+    }
+    getHover() {
+        return this._convertHoverResults(this._getHoverResult());
+    }
+    get _evaluator() {
+        return this._program.evaluator;
+    }
+    get _functionSignatureDisplay() {
+        return this._program.configOptions.functionSignatureDisplay;
+    }
+    _getHoverResult() {
         var _a;
-        (0, cancellationUtils_1.throwIfCancellationRequested)(token);
-        const offset = (0, positionUtils_1.convertPositionToOffset)(position, parseResults.tokenizerOutput.lines);
+        (0, cancellationUtils_1.throwIfCancellationRequested)(this._token);
+        if (!this._parseResults) {
+            return undefined;
+        }
+        const offset = (0, positionUtils_1.convertPositionToOffset)(this._position, this._parseResults.tokenizerOutput.lines);
         if (offset === undefined) {
             return undefined;
         }
-        const node = ParseTreeUtils.findNodeByOffset(parseResults.parseTree, offset);
+        const node = ParseTreeUtils.findNodeByOffset(this._parseResults.parseTree, offset);
         if (node === undefined) {
             return undefined;
         }
         const results = {
             parts: [],
             range: {
-                start: (0, positionUtils_1.convertOffsetToPosition)(node.start, parseResults.tokenizerOutput.lines),
-                end: (0, positionUtils_1.convertOffsetToPosition)(textRange_1.TextRange.getEnd(node), parseResults.tokenizerOutput.lines),
+                start: (0, positionUtils_1.convertOffsetToPosition)(node.start, this._parseResults.tokenizerOutput.lines),
+                end: (0, positionUtils_1.convertOffsetToPosition)(textRange_1.TextRange.getEnd(node), this._parseResults.tokenizerOutput.lines),
             },
         };
         if (node.nodeType === 38 /* Name */) {
@@ -67,11 +89,11 @@ class HoverProvider {
             let declarations = extensibility_1.Extensions.getProgramExtensions(node)
                 .map((e) => {
                 var _a;
-                return ((_a = e.declarationProviderExtension) === null || _a === void 0 ? void 0 : _a.tryGetDeclarations(evaluator, node, extensibility_1.DeclarationUseCase.Definition, token)) || [];
+                return ((_a = e.declarationProviderExtension) === null || _a === void 0 ? void 0 : _a.tryGetDeclarations(this._evaluator, node, offset, extensibility_1.DeclarationUseCase.Definition, this._token)) || [];
             })
                 .flat();
             if (declarations.length === 0) {
-                declarations = evaluator.getDeclarationsForNameNode(node);
+                declarations = this._evaluator.getDeclarationsForNameNode(node);
             }
             if (declarations && declarations.length > 0) {
                 // In most cases, it's best to treat the first declaration as the
@@ -92,7 +114,7 @@ class HoverProvider {
                     // Slots cannot have docstrings, so pick the secondary.
                     primaryDeclaration = declarations[1];
                 }
-                this._addResultsForDeclaration(format, sourceMapper, results.parts, primaryDeclaration, node, evaluator, functionSignatureDisplay, token);
+                this._addResultsForDeclaration(results.parts, primaryDeclaration, node);
                 // Add the lastKnownModule for this declaration. We'll use this
                 // in telemetry for hover.
                 results.lastKnownModule = primaryDeclaration.moduleName;
@@ -103,7 +125,7 @@ class HoverProvider {
                 // is a directory (a namespace package), and we don't want to provide any hover
                 // information in that case.
                 if (results.parts.length === 0) {
-                    const type = this._getType(evaluator, node);
+                    const type = this._getType(node);
                     let typeText;
                     if ((0, types_1.isModule)(type)) {
                         // Handle modules specially because submodules aren't associated with
@@ -118,38 +140,36 @@ class HoverProvider {
                             isProperty = true;
                             label = 'property';
                         }
-                        typeText = (0, tooltipUtils_1.getToolTipForType)(type, label, node.value, evaluator, isProperty, functionSignatureDisplay);
+                        typeText = (0, tooltipUtils_1.getToolTipForType)(type, label, node.value, this._evaluator, isProperty, this._functionSignatureDisplay);
                     }
                     this._addResultsPart(results.parts, typeText, /* python */ true);
-                    this._addDocumentationPart(format, sourceMapper, results.parts, node, evaluator, 
-                    /* resolvedDecl */ undefined);
+                    this._addDocumentationPart(results.parts, node, /* resolvedDecl */ undefined);
                 }
             }
         }
         else if (node.nodeType === 49 /* String */) {
-            const type = (_a = evaluator.getExpectedType(node)) === null || _a === void 0 ? void 0 : _a.type;
+            const type = (_a = this._evaluator.getExpectedType(node)) === null || _a === void 0 ? void 0 : _a.type;
             if (type !== undefined) {
-                this._tryAddPartsForTypedDictKey(format, sourceMapper, evaluator, node, type, results.parts);
+                this._tryAddPartsForTypedDictKey(node, type, results.parts);
             }
         }
         return results.parts.length > 0 ? results : undefined;
     }
-    static _addResultsForDeclaration(format, sourceMapper, parts, declaration, node, evaluator, functionSignatureDisplay, token) {
+    _addResultsForDeclaration(parts, declaration, node) {
         var _a, _b;
-        const resolvedDecl = evaluator.resolveAliasDeclaration(declaration, /* resolveLocalNames */ true);
+        const resolvedDecl = this._evaluator.resolveAliasDeclaration(declaration, /* resolveLocalNames */ true);
         if (!resolvedDecl) {
-            this._addResultsPart(parts, `(import) ` + node.value + this._getTypeText(node, evaluator), 
-            /* python */ true);
+            this._addResultsPart(parts, `(import) ` + node.value + this._getTypeText(node), /* python */ true);
             return;
         }
         switch (resolvedDecl.type) {
             case 0 /* Intrinsic */: {
-                this._addResultsPart(parts, node.value + this._getTypeText(node, evaluator), /* python */ true);
-                this._addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl);
+                this._addResultsPart(parts, node.value + this._getTypeText(node), /* python */ true);
+                this._addDocumentationPart(parts, node, resolvedDecl);
                 break;
             }
             case 1 /* Variable */: {
-                let label = resolvedDecl.isConstant || evaluator.isFinalVariableDeclaration(resolvedDecl)
+                let label = resolvedDecl.isConstant || this._evaluator.isFinalVariableDeclaration(resolvedDecl)
                     ? 'constant'
                     : 'variable';
                 // If the named node is an aliased import symbol, we can't call
@@ -174,12 +194,12 @@ class HoverProvider {
                 }
                 // Determine if this identifier is a type alias. If so, expand
                 // the type alias when printing the type information.
-                let type = this._getType(evaluator, typeNode);
+                let type = this._getType(typeNode);
                 // We may have more type information in the alternativeTypeNode. Use that if it's better.
                 if ((0, types_1.isUnknown)(type) &&
                     resolvedDecl.alternativeTypeNode &&
                     (0, parseNodes_1.isExpressionNode)(resolvedDecl.alternativeTypeNode)) {
-                    const inferredType = this._getType(evaluator, resolvedDecl.alternativeTypeNode);
+                    const inferredType = this._getType(resolvedDecl.alternativeTypeNode);
                     if (!(0, types_1.isUnknown)(inferredType)) {
                         type = inferredType;
                         typeNode = resolvedDecl.alternativeTypeNode;
@@ -201,89 +221,90 @@ class HoverProvider {
                     }
                 }
                 let typeText;
-                const varType = this._getType(evaluator, typeNode);
+                const varType = this._getType(typeNode);
                 // Handle the case where type is a function and was assigned to a variable.
                 if (varType.category === 5 /* Function */ ||
                     varType.category === 6 /* OverloadedFunction */) {
-                    typeText = (0, tooltipUtils_1.getToolTipForType)(type, label, node.value, evaluator, 
-                    /* isProperty */ false, functionSignatureDisplay);
+                    typeText = (0, tooltipUtils_1.getToolTipForType)(type, label, node.value, this._evaluator, 
+                    /* isProperty */ false, this._functionSignatureDisplay);
                 }
                 else {
-                    typeText = typeVarName || node.value + this._getTypeText(typeNode, evaluator, expandTypeAlias);
+                    typeText = typeVarName || node.value + this._getTypeText(typeNode, expandTypeAlias);
                     typeText = `(${label}) ` + typeText;
                 }
                 this._addResultsPart(parts, typeText, /* python */ true);
-                this._addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl);
+                this._addDocumentationPart(parts, node, resolvedDecl);
                 break;
             }
             case 2 /* Parameter */: {
                 if (resolvedDecl.inferredName && resolvedDecl.inferredTypeNodes) {
-                    this._addResultsPart(parts, '(parameter) ' +
-                        resolvedDecl.inferredName +
-                        this._getTypesText(resolvedDecl.inferredTypeNodes, evaluator), 
+                    this._addResultsPart(parts, '(parameter) ' + resolvedDecl.inferredName + this._getTypesText(resolvedDecl.inferredTypeNodes), 
                     /* python */ true);
                 }
                 else {
-                    this._addResultsPart(parts, '(parameter) ' + node.value + this._getTypeText(node, evaluator), 
+                    this._addResultsPart(parts, '(parameter) ' + node.value + this._getTypeText(node), 
                     /* python */ true);
                 }
                 if (resolvedDecl.docString) {
                     this._addResultsPart(parts, resolvedDecl.docString);
                 }
-                this._addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl);
+                this._addDocumentationPart(parts, node, resolvedDecl);
                 break;
             }
             case 3 /* TypeParameter */: {
-                this._addResultsPart(parts, '(type parameter) ' + node.value + this._getTypeText(node, evaluator), 
+                this._addResultsPart(parts, '(type parameter) ' + node.value + this._getTypeText(node), 
                 /* python */ true);
-                this._addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl);
+                this._addDocumentationPart(parts, node, resolvedDecl);
                 break;
             }
             case 6 /* Class */:
             case 7 /* SpecialBuiltInClass */: {
                 const nameNode = resolvedDecl.type === 6 /* Class */ ? resolvedDecl.node.name : node;
-                if (this._addInitOrNewMethodInsteadIfCallNode(format, node, evaluator, parts, sourceMapper, resolvedDecl, functionSignatureDisplay)) {
+                if (this._addInitOrNewMethodInsteadIfCallNode(node, parts, resolvedDecl)) {
                     return;
                 }
                 this._addResultsPart(parts, '(class) ' + nameNode.value, /* python */ true);
-                this._addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl);
+                this._addDocumentationPart(parts, node, resolvedDecl);
                 break;
             }
             case 5 /* Function */: {
                 let label = 'function';
                 let isProperty = false;
                 if (resolvedDecl.isMethod) {
-                    const declaredType = (_b = evaluator.getTypeForDeclaration(resolvedDecl)) === null || _b === void 0 ? void 0 : _b.type;
+                    const declaredType = (_b = this._evaluator.getTypeForDeclaration(resolvedDecl)) === null || _b === void 0 ? void 0 : _b.type;
                     isProperty = !!declaredType && (0, typeUtils_1.isMaybeDescriptorInstance)(declaredType, /* requireSetter */ false);
                     label = isProperty ? 'property' : 'method';
                 }
-                let type = this._getType(evaluator, node);
+                let type = this._getType(node);
                 const resolvedType = extensibility_1.Extensions.getProgramExtensions(resolvedDecl.node)
-                    .map((e) => { var _a; return (_a = e.typeProviderExtension) === null || _a === void 0 ? void 0 : _a.tryGetFunctionNodeType(resolvedDecl.node, evaluator, token); })
-                    .find((t) => !!t) || this._getType(evaluator, resolvedDecl.node.name);
+                    .map((e) => {
+                    var _a;
+                    return (_a = e.typeProviderExtension) === null || _a === void 0 ? void 0 : _a.tryGetFunctionNodeType(resolvedDecl.node, this._evaluator, this._token);
+                })
+                    .find((t) => !!t) || this._getType(resolvedDecl.node.name);
                 type = (0, types_1.isAnyOrUnknown)(type) ? resolvedType : type;
-                const signatureString = (0, tooltipUtils_1.getToolTipForType)(type, label, node.value, evaluator, isProperty, functionSignatureDisplay);
+                const signatureString = (0, tooltipUtils_1.getToolTipForType)(type, label, node.value, this._evaluator, isProperty, this._functionSignatureDisplay);
                 this._addResultsPart(parts, signatureString, /* python */ true);
-                this._addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl);
+                this._addDocumentationPart(parts, node, resolvedDecl);
                 break;
             }
             case 8 /* Alias */: {
                 // First the 'module' header.
                 this._addResultsPart(parts, '(module) ' + node.value, /* python */ true);
-                this._addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl);
+                this._addDocumentationPart(parts, node, resolvedDecl);
                 break;
             }
             case 4 /* TypeAlias */: {
-                const typeText = node.value + this._getTypeText(node, evaluator, /* expandTypeAlias */ true);
+                const typeText = node.value + this._getTypeText(node, /* expandTypeAlias */ true);
                 this._addResultsPart(parts, `(type alias) ${typeText}`, /* python */ true);
-                this._addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl);
+                this._addDocumentationPart(parts, node, resolvedDecl);
                 break;
             }
             default:
                 (0, debug_1.assertNever)(resolvedDecl);
         }
     }
-    static _tryAddPartsForTypedDictKey(format, sourceMapper, evaluator, node, type, parts) {
+    _tryAddPartsForTypedDictKey(node, type, parts) {
         // If the expected type is a TypedDict and the current node is a key entry then we can provide a tooltip
         // with the type of the TypedDict key and its docstring, if available.
         (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
@@ -297,7 +318,7 @@ class HoverProvider {
                         parts.push({ text: '\n\n---\n' });
                     }
                     // e.g. (key) name: str
-                    const text = '(key) ' + node.value + ': ' + evaluator.printType(entry.valueType);
+                    const text = '(key) ' + node.value + ': ' + this._evaluator.printType(entry.valueType);
                     this._addResultsPart(parts, text, /* python */ true);
                     const declarations = (_b = subtype.details.fields.get(node.value)) === null || _b === void 0 ? void 0 : _b.getDeclarations();
                     if (declarations !== undefined && (declarations === null || declarations === void 0 ? void 0 : declarations.length) !== 0) {
@@ -306,14 +327,14 @@ class HoverProvider {
                         // than one declaration for a TypedDict key variable.
                         const declaration = declarations[0];
                         if (declaration.type === 1 /* Variable */ && declaration.docString !== undefined) {
-                            this._addDocumentationPartForType(format, sourceMapper, parts, subtype, declaration, evaluator);
+                            this._addDocumentationPartForType(parts, subtype, declaration);
                         }
                     }
                 }
             }
         });
     }
-    static _addInitOrNewMethodInsteadIfCallNode(format, node, evaluator, parts, sourceMapper, declaration, functionSignatureDisplay) {
+    _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
@@ -335,11 +356,11 @@ class HoverProvider {
             return false;
         }
         // Get the init method for this class.
-        const classType = this._getType(evaluator, node);
+        const classType = this._getType(node);
         if (!(0, types_1.isInstantiableClass)(classType)) {
             return false;
         }
-        const instanceType = this._getType(evaluator, callLeftNode.parent);
+        const instanceType = this._getType(callLeftNode.parent);
         if (!(0, types_1.isClassInstance)(instanceType)) {
             return false;
         }
@@ -348,9 +369,9 @@ class HoverProvider {
         // 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 = evaluator.getTypeOfMember(initMember);
+            const functionType = this._evaluator.getTypeOfMember(initMember);
             if ((0, types_1.isFunction)(functionType) || (0, types_1.isOverloadedFunction)(functionType)) {
-                methodType = this._bindFunctionToClassOrObject(evaluator, node, instanceType, 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 (),
@@ -361,52 +382,52 @@ class HoverProvider {
                 (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 = evaluator.getTypeOfMember(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(evaluator, node, instanceType, newMemberType, 
+                    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, evaluator, functionSignatureDisplay), 
+            this._addResultsPart(parts, (0, tooltipUtils_1.getConstructorTooltip)(node.value, methodType, this._evaluator, this._functionSignatureDisplay), 
             /* python */ true);
-            const addedDoc = this._addDocumentationPartForType(format, sourceMapper, parts, methodType, declaration, evaluator);
+            const addedDoc = this._addDocumentationPartForType(parts, methodType, declaration);
             if (!addedDoc) {
-                this._addDocumentationPartForType(format, sourceMapper, parts, classType, declaration, evaluator);
+                this._addDocumentationPartForType(parts, classType, declaration);
             }
             return true;
         }
         return false;
     }
-    static _getTypeText(node, evaluator, expandTypeAlias = false) {
-        const type = this._getType(evaluator, node);
-        return ': ' + evaluator.printType(type, { expandTypeAlias });
+    _getTypeText(node, expandTypeAlias = false) {
+        const type = this._getType(node);
+        return ': ' + this._evaluator.printType(type, { expandTypeAlias });
     }
-    static _getTypesText(nodes, evaluator, expandTypeAlias = false) {
-        const type = (0, tooltipUtils_1.combineExpressionTypes)(nodes, evaluator);
-        return ': ' + evaluator.printType(type, { expandTypeAlias });
+    _getTypesText(nodes, expandTypeAlias = false) {
+        const type = (0, tooltipUtils_1.combineExpressionTypes)(nodes, this._evaluator);
+        return ': ' + this._evaluator.printType(type, { expandTypeAlias });
     }
-    static _bindFunctionToClassOrObject(evaluator, node, baseType, memberType, treatConstructorAsClassMember) {
-        const methodType = evaluator.bindFunctionToClassOrObject(baseType, memberType, 
+    _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(evaluator, methodType, node);
+        return this._limitOverloadBasedOnCall(methodType, node);
     }
-    static _getType(evaluator, node) {
+    _getType(node) {
         var _a;
         // It does common work necessary for hover for a type we got
         // from raw type evaluator.
-        const type = (_a = evaluator.getType(node)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
-        return this._limitOverloadBasedOnCall(evaluator, type, node);
+        const type = (_a = this._evaluator.getType(node)) !== null && _a !== void 0 ? _a : types_1.UnknownType.create();
+        return this._limitOverloadBasedOnCall(type, node);
     }
-    static _limitOverloadBasedOnCall(evaluator, 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.
@@ -417,7 +438,7 @@ class HoverProvider {
         if (!callNode) {
             return type;
         }
-        const callTypeResult = evaluator.getTypeResult(callNode);
+        const callTypeResult = this._evaluator.getTypeResult(callNode);
         if (!callTypeResult ||
             !callTypeResult.overloadsUsedForCall ||
             callTypeResult.overloadsUsedForCall.length === 0) {
@@ -428,76 +449,77 @@ class HoverProvider {
         }
         return types_1.OverloadedFunctionType.create(callTypeResult.overloadsUsedForCall);
     }
-    static _addDocumentationPart(format, sourceMapper, parts, node, evaluator, resolvedDecl) {
-        const type = this._getType(evaluator, node);
-        this._addDocumentationPartForType(format, sourceMapper, parts, type, resolvedDecl, evaluator, node.value);
+    _addDocumentationPart(parts, node, resolvedDecl) {
+        const type = this._getType(node);
+        this._addDocumentationPartForType(parts, type, resolvedDecl, node.value);
     }
-    static _addDocumentationPartForType(format, sourceMapper, parts, type, resolvedDecl, evaluator, name) {
-        const docString = (0, tooltipUtils_1.getDocumentationPartsForTypeAndDecl)(sourceMapper, type, resolvedDecl, evaluator, { name });
+    _addDocumentationPartForType(parts, type, resolvedDecl, name) {
+        const docString = (0, tooltipUtils_1.getDocumentationPartsForTypeAndDecl)(this._sourceMapper, type, resolvedDecl, this._evaluator, {
+            name,
+        });
         if (docString) {
-            this._addDocumentationResultsPart(format, parts, docString);
+            this._addDocumentationResultsPart(parts, docString);
             return true;
         }
         return false;
     }
-    static _addDocumentationResultsPart(format, parts, docString) {
+    _addDocumentationResultsPart(parts, docString) {
         if (docString) {
-            if (format === vscode_languageserver_1.MarkupKind.Markdown) {
+            if (this._format === vscode_languageserver_1.MarkupKind.Markdown) {
                 const markDown = (0, docStringConversion_1.convertDocStringToMarkdown)(docString);
                 if (parts.length > 0 && markDown.length > 0) {
                     parts.push({ text: '---\n' });
                 }
                 this._addResultsPart(parts, markDown);
             }
-            else if (format === vscode_languageserver_1.MarkupKind.PlainText) {
+            else if (this._format === vscode_languageserver_1.MarkupKind.PlainText) {
                 this._addResultsPart(parts, (0, docStringConversion_1.convertDocStringToPlainText)(docString));
             }
             else {
-                (0, debug_1.fail)(`Unsupported markup type: ${format}`);
+                (0, debug_1.fail)(`Unsupported markup type: ${this._format}`);
             }
         }
     }
-    static _addResultsPart(parts, text, python = false) {
+    _addResultsPart(parts, text, python = false) {
         parts.push({
             python,
             text,
         });
     }
-}
-exports.HoverProvider = HoverProvider;
-function convertHoverResults(format, hoverResults, includeHash) {
-    if (!hoverResults) {
-        return undefined;
-    }
-    let markupString = hoverResults.parts
-        .map((part) => {
-        if (part.python) {
-            if (format === vscode_languageserver_1.MarkupKind.Markdown) {
-                return '```python\n' + part.text + '\n```\n';
-            }
-            else if (format === vscode_languageserver_1.MarkupKind.PlainText) {
-                return part.text + '\n\n';
-            }
-            else {
-                (0, debug_1.fail)(`Unsupported markup type: ${format}`);
+    _convertHoverResults(hoverResults) {
+        if (!hoverResults) {
+            return undefined;
+        }
+        let markupString = hoverResults.parts
+            .map((part) => {
+            if (part.python) {
+                if (this._format === vscode_languageserver_1.MarkupKind.Markdown) {
+                    return '```python\n' + part.text + '\n```\n';
+                }
+                else if (this._format === vscode_languageserver_1.MarkupKind.PlainText) {
+                    return part.text + '\n\n';
+                }
+                else {
+                    (0, debug_1.fail)(`Unsupported markup type: ${this._format}`);
+                }
             }
+            return part.text;
+        })
+            .join('')
+            .trimEnd();
+        // If we have a lastKnownModule in the hover results, stick in a comment with
+        // the hashed module name. This is used by the other side to send telemetry.
+        if (hoverResults.lastKnownModule && this._format === vscode_languageserver_1.MarkupKind.Markdown && this._supportTelemetry) {
+            markupString += `\n<!--moduleHash:${(0, stringUtils_1.hashString)(hoverResults.lastKnownModule)}-->`;
         }
-        return part.text;
-    })
-        .join('')
-        .trimEnd();
-    // If we have a lastKnownModule in the hover results, stick in a comment with
-    // the hashed module name. This is used by the other side to send telemetry.
-    if (hoverResults.lastKnownModule && format === vscode_languageserver_1.MarkupKind.Markdown && includeHash) {
-        markupString += `\n<!--moduleHash:${(0, stringUtils_1.hashString)(hoverResults.lastKnownModule)}-->`;
+        return {
+            contents: {
+                kind: this._format,
+                value: markupString,
+            },
+            range: hoverResults.range,
+        };
     }
-    return {
-        contents: {
-            kind: format,
-            value: markupString,
-        },
-        range: hoverResults.range,
-    };
 }
-exports.convertHoverResults = convertHoverResults;
+exports.HoverProvider = HoverProvider;
 //# sourceMappingURL=hoverProvider.js.map