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

package/dist/languageService/definitionProvider.js

@@ -30,13 +30,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefinitionProvider = exports.DefinitionFilter = void 0;
+exports.TypeDefinitionProvider = exports.DefinitionProvider = exports.DefinitionFilter = void 0;
 const analyzerNodeInfo_1 = require("../analyzer/analyzerNodeInfo");
 const declaration_1 = require("../analyzer/declaration");
 const ParseTreeUtils = __importStar(require("../analyzer/parseTreeUtils"));
 const sourceMapper_1 = require("../analyzer/sourceMapper");
-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 collectionUtils_1 = require("../common/collectionUtils");
 const core_1 = require("../common/core");
@@ -49,104 +49,58 @@ var DefinitionFilter;
     DefinitionFilter["PreferSource"] = "preferSource";
     DefinitionFilter["PreferStubs"] = "preferStubs";
 })(DefinitionFilter = exports.DefinitionFilter || (exports.DefinitionFilter = {}));
-class DefinitionProvider {
-    static getDefinitionsForPosition(sourceMapper, parseResults, position, filter, evaluator, token) {
-        (0, cancellationUtils_1.throwIfCancellationRequested)(token);
-        const offset = (0, positionUtils_1.convertPositionToOffset)(position, parseResults.tokenizerOutput.lines);
-        if (offset === undefined) {
-            return undefined;
-        }
-        const node = ParseTreeUtils.findNodeByOffset(parseResults.parseTree, offset);
-        if (node === undefined) {
-            return undefined;
-        }
-        return DefinitionProvider.getDefinitionsForNode(sourceMapper, node, filter, evaluator, token);
+class DefinitionProviderBase {
+    constructor(sourceMapper, evaluator, node, offset, _filter, token) {
+        this.sourceMapper = sourceMapper;
+        this.evaluator = evaluator;
+        this.node = node;
+        this.offset = offset;
+        this._filter = _filter;
+        this.token = token;
     }
-    static getDefinitionsForNode(sourceMapper, node, filter, evaluator, token) {
+    getDefinitionsForNode(node, offset) {
+        (0, cancellationUtils_1.throwIfCancellationRequested)(this.token);
         const definitions = [];
         // Let extensions have a try first.
         extensibility_1.Extensions.getProgramExtensions(node).forEach((e) => {
             if (e.declarationProviderExtension) {
-                const declarations = e.declarationProviderExtension.tryGetDeclarations(evaluator, node, extensibility_1.DeclarationUseCase.Definition, token);
-                DefinitionProvider._resolveDeclarations(declarations, evaluator, definitions, sourceMapper);
+                const declarations = e.declarationProviderExtension.tryGetDeclarations(this.evaluator, node, offset, extensibility_1.DeclarationUseCase.Definition, this.token);
+                this.resolveDeclarations(declarations, definitions);
             }
         });
         // There should be only one 'definition', so only if extensions failed should we try again.
         if (definitions.length === 0) {
             if (node.nodeType === 38 /* Name */) {
-                const declarations = evaluator.getDeclarationsForNameNode(node);
-                DefinitionProvider._resolveDeclarations(declarations, evaluator, definitions, sourceMapper);
+                const declarations = this.evaluator.getDeclarationsForNameNode(node);
+                this.resolveDeclarations(declarations, definitions);
             }
             else if (node.nodeType === 49 /* String */) {
-                const declarations = evaluator.getDeclarationsForStringNode(node);
-                DefinitionProvider._resolveDeclarations(declarations, evaluator, definitions, sourceMapper);
+                const declarations = this.evaluator.getDeclarationsForStringNode(node);
+                this.resolveDeclarations(declarations, definitions);
             }
         }
         if (definitions.length === 0) {
             return undefined;
         }
-        if (filter === DefinitionFilter.All) {
+        if (this._filter === DefinitionFilter.All) {
             return definitions;
         }
         // If go-to-declaration is supported, attempt to only show only pyi files in go-to-declaration
         // and none in go-to-definition, unless filtering would produce an empty list.
-        const preferStubs = filter === DefinitionFilter.PreferStubs;
+        const preferStubs = this._filter === DefinitionFilter.PreferStubs;
         const wantedFile = (v) => preferStubs === (0, sourceMapper_1.isStubFile)(v.path);
         if (definitions.find(wantedFile)) {
             return definitions.filter(wantedFile);
         }
         return definitions;
     }
-    static getTypeDefinitionsForPosition(sourceMapper, parseResults, position, evaluator, filePath, token) {
-        var _a;
-        (0, cancellationUtils_1.throwIfCancellationRequested)(token);
-        const offset = (0, positionUtils_1.convertPositionToOffset)(position, parseResults.tokenizerOutput.lines);
-        if (offset === undefined) {
-            return undefined;
-        }
-        const node = ParseTreeUtils.findNodeByOffset(parseResults.parseTree, offset);
-        if (node === undefined) {
-            return undefined;
-        }
-        const definitions = [];
-        if (node.nodeType === 38 /* Name */) {
-            const type = evaluator.getType(node);
-            if (type) {
-                let declarations = [];
-                (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
-                    if ((subtype === null || subtype === void 0 ? void 0 : subtype.category) === 7 /* Class */) {
-                        (0, collectionUtils_1.appendArray)(declarations, sourceMapper.findClassDeclarationsByType(filePath, subtype));
-                    }
-                });
-                // Fall back to Go To Definition if the type can't be found (ex. Go To Type Definition
-                // was executed on a type name)
-                if (declarations.length === 0) {
-                    declarations = (_a = evaluator.getDeclarationsForNameNode(node)) !== null && _a !== void 0 ? _a : [];
-                }
-                DefinitionProvider._resolveDeclarations(declarations, evaluator, definitions, sourceMapper);
-            }
-        }
-        else if (node.nodeType === 49 /* String */) {
-            const declarations = evaluator.getDeclarationsForStringNode(node);
-            DefinitionProvider._resolveDeclarations(declarations, evaluator, definitions, sourceMapper);
-        }
-        if (definitions.length === 0) {
-            return undefined;
-        }
-        return definitions;
-    }
-    static _getDeclarationsForNameNode(node, evaluator) {
-        var _a;
-        // Fall back to the evaluator if no extension handled it.
-        return (_a = evaluator.getDeclarationsForNameNode(node)) !== null && _a !== void 0 ? _a : [];
-    }
-    static _resolveDeclarations(declarations, evaluator, definitions, sourceMapper) {
+    resolveDeclarations(declarations, definitions) {
         if (declarations) {
             declarations.forEach((decl) => {
                 var _a;
-                let resolvedDecl = evaluator.resolveAliasDeclaration(decl, 
-                /* resolveLocalNames */ true, 
-                /* allowExternallyHiddenAccess */ true);
+                let resolvedDecl = this.evaluator.resolveAliasDeclaration(decl, /* resolveLocalNames */ true, {
+                    allowExternallyHiddenAccess: true,
+                });
                 if (resolvedDecl && resolvedDecl.path) {
                     // If the decl is an unresolved import, skip it.
                     if (resolvedDecl.type === 8 /* Alias */ && resolvedDecl.isUnresolved) {
@@ -161,18 +115,18 @@ class DefinitionProvider {
                         resolvedDecl.submoduleFallback.path) {
                         resolvedDecl = resolvedDecl.submoduleFallback;
                     }
-                    this._addIfUnique(definitions, {
+                    _addIfUnique(definitions, {
                         path: resolvedDecl.path,
                         range: resolvedDecl.range,
                     });
                     if ((0, declaration_1.isFunctionDeclaration)(resolvedDecl)) {
                         // Handle overloaded function case
-                        const functionType = (_a = evaluator.getTypeForDeclaration(resolvedDecl)) === null || _a === void 0 ? void 0 : _a.type;
+                        const functionType = (_a = this.evaluator.getTypeForDeclaration(resolvedDecl)) === null || _a === void 0 ? void 0 : _a.type;
                         if (functionType && (0, types_1.isOverloadedFunction)(functionType)) {
                             for (const overloadDecl of functionType.overloads
                                 .map((o) => o.details.declaration)
                                 .filter(core_1.isDefined)) {
-                                this._addIfUnique(definitions, {
+                                _addIfUnique(definitions, {
                                     path: overloadDecl.path,
                                     range: overloadDecl.range,
                                 });
@@ -182,17 +136,17 @@ class DefinitionProvider {
                     if ((0, sourceMapper_1.isStubFile)(resolvedDecl.path)) {
                         if (resolvedDecl.type === 8 /* Alias */) {
                             // Add matching source module
-                            sourceMapper
+                            this.sourceMapper
                                 .findModules(resolvedDecl.path)
                                 .map((m) => { var _a; return (_a = (0, analyzerNodeInfo_1.getFileInfo)(m)) === null || _a === void 0 ? void 0 : _a.filePath; })
                                 .filter(core_1.isDefined)
-                                .forEach((f) => this._addIfUnique(definitions, this._createModuleEntry(f)));
+                                .forEach((f) => _addIfUnique(definitions, _createModuleEntry(f)));
                         }
                         else {
-                            const implDecls = sourceMapper.findDeclarations(resolvedDecl);
+                            const implDecls = this.sourceMapper.findDeclarations(resolvedDecl);
                             for (const implDecl of implDecls) {
                                 if (implDecl && implDecl.path) {
-                                    this._addIfUnique(definitions, {
+                                    _addIfUnique(definitions, {
                                         path: implDecl.path,
                                         range: implDecl.range,
                                     });
@@ -204,23 +158,94 @@ class DefinitionProvider {
             });
         }
     }
-    static _createModuleEntry(filePath) {
-        return {
-            path: filePath,
-            range: {
-                start: { line: 0, character: 0 },
-                end: { line: 0, character: 0 },
-            },
-        };
+}
+class DefinitionProvider extends DefinitionProviderBase {
+    constructor(program, filePath, position, filter, token) {
+        const sourceMapper = program.getSourceMapper(filePath, token);
+        const parseResults = program.getParseResults(filePath);
+        const { node, offset } = _tryGetNode(parseResults, position);
+        super(sourceMapper, program.evaluator, node, offset, filter, token);
+    }
+    static getDefinitionsForNode(sourceMapper, evaluator, node, offset, token) {
+        const provider = new DefinitionProviderBase(sourceMapper, evaluator, node, offset, DefinitionFilter.All, token);
+        return provider.getDefinitionsForNode(node, offset);
+    }
+    getDefinitions() {
+        if (this.node === undefined) {
+            return undefined;
+        }
+        return this.getDefinitionsForNode(this.node, this.offset);
+    }
+}
+exports.DefinitionProvider = DefinitionProvider;
+class TypeDefinitionProvider extends DefinitionProviderBase {
+    constructor(program, filePath, position, token) {
+        const sourceMapper = program.getSourceMapper(filePath, token, /*mapCompiled*/ false, /*preferStubs*/ true);
+        const parseResults = program.getParseResults(filePath);
+        const { node, offset } = _tryGetNode(parseResults, position);
+        super(sourceMapper, program.evaluator, node, offset, DefinitionFilter.All, token);
+        this._filePath = filePath;
     }
-    static _addIfUnique(definitions, itemToAdd) {
-        for (const def of definitions) {
-            if (def.path === itemToAdd.path && (0, textRange_1.rangesAreEqual)(def.range, itemToAdd.range)) {
-                return;
+    getDefinitions() {
+        var _a;
+        (0, cancellationUtils_1.throwIfCancellationRequested)(this.token);
+        if (this.node === undefined) {
+            return undefined;
+        }
+        const definitions = [];
+        if (this.node.nodeType === 38 /* Name */) {
+            const type = this.evaluator.getType(this.node);
+            if (type) {
+                let declarations = [];
+                (0, typeUtils_1.doForEachSubtype)(type, (subtype) => {
+                    if ((subtype === null || subtype === void 0 ? void 0 : subtype.category) === 7 /* Class */) {
+                        (0, collectionUtils_1.appendArray)(declarations, this.sourceMapper.findClassDeclarationsByType(this._filePath, subtype));
+                    }
+                });
+                // Fall back to Go To Definition if the type can't be found (ex. Go To Type Definition
+                // was executed on a type name)
+                if (declarations.length === 0) {
+                    declarations = (_a = this.evaluator.getDeclarationsForNameNode(this.node)) !== null && _a !== void 0 ? _a : [];
+                }
+                this.resolveDeclarations(declarations, definitions);
             }
         }
-        definitions.push(itemToAdd);
+        else if (this.node.nodeType === 49 /* String */) {
+            const declarations = this.evaluator.getDeclarationsForStringNode(this.node);
+            this.resolveDeclarations(declarations, definitions);
+        }
+        if (definitions.length === 0) {
+            return undefined;
+        }
+        return definitions;
     }
 }
-exports.DefinitionProvider = DefinitionProvider;
+exports.TypeDefinitionProvider = TypeDefinitionProvider;
+function _tryGetNode(parseResults, position) {
+    if (!parseResults) {
+        return { node: undefined, offset: 0 };
+    }
+    const offset = (0, positionUtils_1.convertPositionToOffset)(position, parseResults.tokenizerOutput.lines);
+    if (offset === undefined) {
+        return { node: undefined, offset: 0 };
+    }
+    return { node: ParseTreeUtils.findNodeByOffset(parseResults.parseTree, offset), offset };
+}
+function _createModuleEntry(filePath) {
+    return {
+        path: filePath,
+        range: {
+            start: { line: 0, character: 0 },
+            end: { line: 0, character: 0 },
+        },
+    };
+}
+function _addIfUnique(definitions, itemToAdd) {
+    for (const def of definitions) {
+        if (def.path === itemToAdd.path && (0, textRange_1.rangesAreEqual)(def.range, itemToAdd.range)) {
+            return;
+        }
+    }
+    definitions.push(itemToAdd);
+}
 //# sourceMappingURL=definitionProvider.js.map

package/dist/languageService/definitionProvider.js.map

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

package/dist/languageService/documentHighlightProvider.d.ts

@@ -1,7 +1,12 @@
 import { CancellationToken, DocumentHighlight } from 'vscode-languageserver';
-import { TypeEvaluator } from '../analyzer/typeEvaluatorTypes';
+import { ProgramView } from '../common/extensibility';
 import { Position } from '../common/textRange';
-import { ParseResults } from '../parser/parser';
 export declare class DocumentHighlightProvider {
-    static getDocumentHighlight(parseResults: ParseResults, position: Position, evaluator: TypeEvaluator, token: CancellationToken): DocumentHighlight[] | undefined;
+    private _program;
+    private _filePath;
+    private _position;
+    private _token;
+    private readonly _parseResults;
+    constructor(_program: ProgramView, _filePath: string, _position: Position, _token: CancellationToken);
+    getDocumentHighlight(): DocumentHighlight[] | undefined;
 }

package/dist/languageService/documentHighlightProvider.js

@@ -36,26 +36,37 @@ const positionUtils_1 = require("../common/positionUtils");
 const textRange_1 = require("../common/textRange");
 const documentSymbolCollector_1 = require("./documentSymbolCollector");
 class DocumentHighlightProvider {
-    static getDocumentHighlight(parseResults, position, evaluator, token) {
-        (0, cancellationUtils_1.throwIfCancellationRequested)(token);
-        const offset = (0, positionUtils_1.convertPositionToOffset)(position, parseResults.tokenizerOutput.lines);
+    constructor(_program, _filePath, _position, _token) {
+        this._program = _program;
+        this._filePath = _filePath;
+        this._position = _position;
+        this._token = _token;
+        this._parseResults = this._program.getParseResults(this._filePath);
+    }
+    getDocumentHighlight() {
+        (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;
         }
         if (node.nodeType !== 38 /* Name */) {
             return undefined;
         }
-        const results = documentSymbolCollector_1.DocumentSymbolCollector.collectFromNode(node, evaluator, token, parseResults.parseTree, 
+        const results = documentSymbolCollector_1.DocumentSymbolCollector.collectFromNode(this._program, node, this._token, this._parseResults.parseTree, 
         /* treatModuleInImportAndFromImportSame */ true);
+        const lines = this._parseResults.tokenizerOutput.lines;
         return results.map((r) => ({
             kind: r.node.nodeType === 38 /* Name */ && ParseTreeUtils.isWriteAccess(r.node)
                 ? vscode_languageserver_1.DocumentHighlightKind.Write
                 : vscode_languageserver_1.DocumentHighlightKind.Read,
-            range: (0, positionUtils_1.convertOffsetsToRange)(r.range.start, textRange_1.TextRange.getEnd(r.range), parseResults.tokenizerOutput.lines),
+            range: (0, positionUtils_1.convertOffsetsToRange)(r.range.start, textRange_1.TextRange.getEnd(r.range), lines),
         }));
     }
 }

package/dist/languageService/documentHighlightProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"documentHighlightProvider.js","sourceRoot":"","sources":["../../../src/languageService/documentHighlightProvider.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;;;;;;;;;;;;;;;;;;;AAEH,iEAAoG;AAEpG,2EAA6D;AAE7D,mEAA2E;AAC3E,2DAAyF;AACzF,mDAA0D;AAG1D,uEAAoE;AAEpE,MAAa,yBAAyB;IAClC,MAAM,CAAC,oBAAoB,CACvB,YAA0B,EAC1B,QAAkB,EAClB,SAAwB,EACxB,KAAwB;QAExB,IAAA,gDAA4B,EAAC,KAAK,CAAC,CAAC;QAEpC,MAAM,MAAM,GAAG,IAAA,uCAAuB,EAAC,QAAQ,EAAE,YAAY,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACrF,IAAI,MAAM,KAAK,SAAS,EAAE;YACtB,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,IAAI,GAAG,cAAc,CAAC,gBAAgB,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC7E,IAAI,IAAI,KAAK,SAAS,EAAE;YACpB,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,IAAI,CAAC,QAAQ,kBAAuB,EAAE;YACtC,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,OAAO,GAAG,iDAAuB,CAAC,eAAe,CACnD,IAAI,EACJ,SAAS,EACT,KAAK,EACL,YAAY,CAAC,SAAS;QACtB,0CAA0C,CAAC,IAAI,CAClD,CAAC;QAEF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACvB,IAAI,EACA,CAAC,CAAC,IAAI,CAAC,QAAQ,kBAAuB,IAAI,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC1E,CAAC,CAAC,6CAAqB,CAAC,KAAK;gBAC7B,CAAC,CAAC,6CAAqB,CAAC,IAAI;YACpC,KAAK,EAAE,IAAA,qCAAqB,EAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,qBAAS,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,eAAe,CAAC,KAAK,CAAC;SAC7G,CAAC,CAAC,CAAC;IACR,CAAC;CACJ;AAvCD,8DAuCC"}
+{"version":3,"file":"documentHighlightProvider.js","sourceRoot":"","sources":["../../../src/languageService/documentHighlightProvider.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;;;;;;;;;;;;;;;;;;;AAEH,iEAAoG;AAEpG,2EAA6D;AAC7D,mEAA2E;AAE3E,2DAAyF;AACzF,mDAA0D;AAG1D,uEAAoE;AAEpE,MAAa,yBAAyB;IAGlC,YACY,QAAqB,EACrB,SAAiB,EACjB,SAAmB,EACnB,MAAyB;QAHzB,aAAQ,GAAR,QAAQ,CAAa;QACrB,cAAS,GAAT,SAAS,CAAQ;QACjB,cAAS,GAAT,SAAS,CAAU;QACnB,WAAM,GAAN,MAAM,CAAmB;QAEjC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvE,CAAC;IAED,oBAAoB;QAChB,IAAA,gDAA4B,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,MAAM,GAAG,IAAA,uCAAuB,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACjG,IAAI,MAAM,KAAK,SAAS,EAAE;YACtB,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,IAAI,GAAG,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACnF,IAAI,IAAI,KAAK,SAAS,EAAE;YACpB,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,IAAI,CAAC,QAAQ,kBAAuB,EAAE;YACtC,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,OAAO,GAAG,iDAAuB,CAAC,eAAe,CACnD,IAAI,CAAC,QAAQ,EACb,IAAI,EACJ,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,aAAa,CAAC,SAAS;QAC5B,0CAA0C,CAAC,IAAI,CAClD,CAAC;QAEF,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,KAAK,CAAC;QACvD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACvB,IAAI,EACA,CAAC,CAAC,IAAI,CAAC,QAAQ,kBAAuB,IAAI,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC1E,CAAC,CAAC,6CAAqB,CAAC,KAAK;gBAC7B,CAAC,CAAC,6CAAqB,CAAC,IAAI;YACpC,KAAK,EAAE,IAAA,qCAAqB,EAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,qBAAS,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;SAChF,CAAC,CAAC,CAAC;IACR,CAAC;CACJ;AAjDD,8DAiDC"}

package/dist/languageService/documentSymbolCollector.d.ts

@@ -1,9 +1,7 @@
 import { CancellationToken } from 'vscode-languageserver';
 import { Declaration } from '../analyzer/declaration';
 import { ParseTreeWalker } from '../analyzer/parseTreeWalker';
-import { SourceFile } from '../analyzer/sourceFile';
-import { SourceMapper } from '../analyzer/sourceMapper';
-import { TypeEvaluator } from '../analyzer/typeEvaluatorTypes';
+import { ProgramView, SourceFile } from '../common/extensibility';
 import { TextRange } from '../common/textRange';
 import { NameNode, ParseNode, StringListNode, StringNode } from '../parser/parseNodes';
 export declare type CollectionResult = {
@@ -15,25 +13,26 @@ export declare enum DocumentSymbolCollectorUseCase {
     Reference = 1
 }
 export declare class DocumentSymbolCollector extends ParseTreeWalker {
+    private _program;
     private _declarations;
-    private _evaluator;
     private _cancellationToken;
     private _startingNode;
     private _treatModuleInImportAndFromImportSame;
     private _skipUnreachableCode;
     private _useCase;
-    static collectFromNode(node: NameNode, evaluator: TypeEvaluator, cancellationToken: CancellationToken, startingNode?: ParseNode, treatModuleInImportAndFromImportSame?: boolean, skipUnreachableCode?: boolean, useCase?: DocumentSymbolCollectorUseCase): CollectionResult[];
-    static getDeclarationsForNode(node: NameNode, evaluator: TypeEvaluator, resolveLocalName: boolean, useCase: DocumentSymbolCollectorUseCase, token: CancellationToken, sourceMapper?: SourceMapper, implicitlyImportedBy?: SourceFile[]): Declaration[];
     private _results;
     private _dunderAllNameNodes;
     private _initFunction;
     private _symbolNames;
-    constructor(symbolNames: string[], _declarations: Declaration[], _evaluator: TypeEvaluator, _cancellationToken: CancellationToken, _startingNode: ParseNode, _treatModuleInImportAndFromImportSame?: boolean, _skipUnreachableCode?: boolean, _useCase?: DocumentSymbolCollectorUseCase);
+    constructor(_program: ProgramView, symbolNames: string[], _declarations: Declaration[], _cancellationToken: CancellationToken, _startingNode: ParseNode, _treatModuleInImportAndFromImportSame?: boolean, _skipUnreachableCode?: boolean, _useCase?: DocumentSymbolCollectorUseCase);
+    static collectFromNode(program: ProgramView, node: NameNode, cancellationToken: CancellationToken, startingNode?: ParseNode, treatModuleInImportAndFromImportSame?: boolean, skipUnreachableCode?: boolean, useCase?: DocumentSymbolCollectorUseCase): CollectionResult[];
+    static getDeclarationsForNode(program: ProgramView, node: NameNode, resolveLocalName: boolean, useCase: DocumentSymbolCollectorUseCase, token: CancellationToken, implicitlyImportedBy?: SourceFile[]): Declaration[];
     collect(): CollectionResult[];
     walk(node: ParseNode): void;
     visitName(node: NameNode): boolean;
     visitStringList(node: StringListNode): boolean;
     visitString(node: StringNode): boolean;
+    private get _evaluator();
     private _addResult;
     private _isDeclarationAllowed;
     private _resultsContainsDeclaration;

package/dist/languageService/documentSymbolCollector.js

@@ -32,8 +32,8 @@ exports.DocumentSymbolCollector = exports.DocumentSymbolCollectorUseCase = void
 const AnalyzerNodeInfo = __importStar(require("../analyzer/analyzerNodeInfo"));
 const declaration_1 = require("../analyzer/declaration");
 const declarationUtils_1 = require("../analyzer/declarationUtils");
-const parseTreeUtils_1 = require("../analyzer/parseTreeUtils");
 const ParseTreeUtils = __importStar(require("../analyzer/parseTreeUtils"));
+const parseTreeUtils_1 = require("../analyzer/parseTreeUtils");
 const parseTreeWalker_1 = require("../analyzer/parseTreeWalker");
 const ScopeUtils = __importStar(require("../analyzer/scopeUtils"));
 const sourceMapper_1 = require("../analyzer/sourceMapper");
@@ -51,10 +51,10 @@ var DocumentSymbolCollectorUseCase;
 // This walker looks for symbols that are semantically equivalent
 // to the requested symbol.
 class DocumentSymbolCollector extends parseTreeWalker_1.ParseTreeWalker {
-    constructor(symbolNames, _declarations, _evaluator, _cancellationToken, _startingNode, _treatModuleInImportAndFromImportSame = false, _skipUnreachableCode = true, _useCase = DocumentSymbolCollectorUseCase.Reference) {
+    constructor(_program, symbolNames, _declarations, _cancellationToken, _startingNode, _treatModuleInImportAndFromImportSame = false, _skipUnreachableCode = true, _useCase = DocumentSymbolCollectorUseCase.Reference) {
         super();
+        this._program = _program;
         this._declarations = _declarations;
-        this._evaluator = _evaluator;
         this._cancellationToken = _cancellationToken;
         this._startingNode = _startingNode;
         this._treatModuleInImportAndFromImportSame = _treatModuleInImportAndFromImportSame;
@@ -80,22 +80,27 @@ class DocumentSymbolCollector extends parseTreeWalker_1.ParseTreeWalker {
             }
         }
     }
-    static collectFromNode(node, evaluator, cancellationToken, startingNode, treatModuleInImportAndFromImportSame = false, skipUnreachableCode = true, useCase = DocumentSymbolCollectorUseCase.Reference) {
-        const declarations = this.getDeclarationsForNode(node, evaluator, 
+    static collectFromNode(program, node, cancellationToken, startingNode, treatModuleInImportAndFromImportSame = false, skipUnreachableCode = true, useCase = DocumentSymbolCollectorUseCase.Reference) {
+        const declarations = this.getDeclarationsForNode(program, node, 
         /* resolveLocalName */ true, useCase, cancellationToken);
         startingNode = startingNode !== null && startingNode !== void 0 ? startingNode : (0, parseTreeUtils_1.getModuleNode)(node);
         if (!startingNode) {
             return [];
         }
-        const collector = new DocumentSymbolCollector([node.value], declarations, evaluator, cancellationToken, startingNode, treatModuleInImportAndFromImportSame, skipUnreachableCode, useCase);
+        const collector = new DocumentSymbolCollector(program, [node.value], declarations, cancellationToken, startingNode, treatModuleInImportAndFromImportSame, skipUnreachableCode, useCase);
         return collector.collect();
     }
-    static getDeclarationsForNode(node, evaluator, resolveLocalName, useCase, token, sourceMapper, implicitlyImportedBy) {
+    static getDeclarationsForNode(program, node, resolveLocalName, useCase, token, implicitlyImportedBy) {
         (0, cancellationUtils_1.throwIfCancellationRequested)(token);
+        const evaluator = program.evaluator;
+        if (!evaluator) {
+            return [];
+        }
         const declarations = this._getDeclarationsForNode(node, useCase, evaluator, token, 
         /* skipUnreachableCode */ false);
         // Add declarations from chained source files
-        let builtinsScope = AnalyzerNodeInfo.getFileInfo(node).builtinsScope;
+        const fileInfo = AnalyzerNodeInfo.getFileInfo(node);
+        let builtinsScope = fileInfo.builtinsScope;
         while (builtinsScope && builtinsScope.type === 3 /* Module */) {
             const symbol = builtinsScope === null || builtinsScope === void 0 ? void 0 : builtinsScope.lookUpSymbol(node.value);
             if (symbol) {
@@ -106,7 +111,7 @@ class DocumentSymbolCollector extends parseTreeWalker_1.ParseTreeWalker {
         // Add declarations from files that implicitly import the target file.
         implicitlyImportedBy === null || implicitlyImportedBy === void 0 ? void 0 : implicitlyImportedBy.forEach((implicitImport) => {
             var _a;
-            const parseTree = (_a = implicitImport.getParseResults()) === null || _a === void 0 ? void 0 : _a.parseTree;
+            const parseTree = (_a = program.getParseResults(implicitImport.getFilePath())) === null || _a === void 0 ? void 0 : _a.parseTree;
             if (parseTree) {
                 const scope = AnalyzerNodeInfo.getScope(parseTree);
                 const symbol = scope === null || scope === void 0 ? void 0 : scope.lookUpSymbol(node.value);
@@ -116,6 +121,7 @@ class DocumentSymbolCollector extends parseTreeWalker_1.ParseTreeWalker {
             }
         });
         const resolvedDeclarations = [];
+        const sourceMapper = program.getSourceMapper(fileInfo.filePath, token);
         declarations.forEach((decl) => {
             const resolvedDecl = evaluator.resolveAliasDeclaration(decl, resolveLocalName);
             if (resolvedDecl) {
@@ -180,6 +186,9 @@ class DocumentSymbolCollector extends parseTreeWalker_1.ParseTreeWalker {
         }
         return false;
     }
+    get _evaluator() {
+        return this._program.evaluator;
+    }
     _addResult(node) {
         const range = node.nodeType === 38 /* Name */ ? node : (0, parseTreeUtils_1.getStringNodeValueRange)(node);
         this._results.push({ node, range });
@@ -193,7 +202,8 @@ class DocumentSymbolCollector extends parseTreeWalker_1.ParseTreeWalker {
         const match = this._declarations.find((decl) => (0, declarationUtils_1.areDeclarationsSame)(decl, resolvedDecl, this._treatModuleInImportAndFromImportSame, 
         /* skipRangeForAliases */ true));
         if (match) {
-            // Special case for __init__ being one of our symbol names and we have a classname as the other.
+            // Special case for __init__ being one of our symbol names and we
+            // have a class name as the other.
             if (this._initFunction) {
                 // If this is a method, must be an __init__ reference.
                 if (match.type === 5 /* Function */) {
@@ -332,7 +342,7 @@ class DocumentSymbolCollector extends parseTreeWalker_1.ParseTreeWalker {
             const declUseCase = useCase === DocumentSymbolCollectorUseCase.Rename
                 ? extensibility_1.DeclarationUseCase.Rename
                 : extensibility_1.DeclarationUseCase.References;
-            const extras = (_a = e.declarationProviderExtension) === null || _a === void 0 ? void 0 : _a.tryGetDeclarations(evaluator, node, declUseCase, token);
+            const extras = (_a = e.declarationProviderExtension) === null || _a === void 0 ? void 0 : _a.tryGetDeclarations(evaluator, node, node.start, declUseCase, token);
             if (extras && extras.length > 0) {
                 result.push(...extras);
             }