microsoft/pyright
1
1
Fork 0
mirror of https://github.com/microsoft/pyright.git synced 2024-09-11 16:06:39 +03:00
Code Issues Projects Releases Wiki Activity

Fixed regression in find references functionality.

Browse Source
This commit is contained in:
Eric Traut 2019-10-19 19:47:53 -07:00
parent c721a96bbe
commit e7d4749077
3 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/analyzer/program.ts
View File

@ -30,7 +30,6 @@ import { ImportResolver } from './importResolver';
import { ImportResult, ImportType } from './importResult';
import { Scope } from './scope';
import { SourceFile } from './sourceFile';
import { SymbolTable } from './symbol';
import { TypeStubWriter } from './typeStubWriter';
const _maxImportDepth = 256;
@ -868,7 +867,7 @@ export class Program {
}
const referencesResult = sourceFileInfo.sourceFile.getReferencesForPosition(
position, includeDeclaration);
position, includeDeclaration, this._lookUpImport);
if (!referencesResult) {
return undefined;
@ -886,7 +885,7 @@ export class Program {
}
curSourceFileInfo.sourceFile.addReferences(referencesResult,
includeDeclaration);
includeDeclaration, this._lookUpImport);
}
}
}
@ -999,7 +998,7 @@ export class Program {
}
const referencesResult = sourceFileInfo.sourceFile.getReferencesForPosition(
position, true);
position, true, this._lookUpImport);
if (!referencesResult) {
return undefined;
@ -1016,7 +1015,8 @@ export class Program {
});
}
curSourceFileInfo.sourceFile.addReferences(referencesResult, true);
curSourceFileInfo.sourceFile.addReferences(referencesResult,
true, this._lookUpImport);
}
}
}

12
server/src/analyzer/sourceFile.ts
View File

@ -529,8 +529,8 @@ export class SourceFile {
this._parseResults, position, importLookup);
}
getReferencesForPosition(position: DiagnosticTextPosition, includeDeclaration: boolean):
ReferencesResult | undefined {
getReferencesForPosition(position: DiagnosticTextPosition, includeDeclaration: boolean,
importLookup: ImportLookup): ReferencesResult | undefined {
// If we have no completed analysis job, there's nothing to do.
if (!this._parseResults) {
@ -538,17 +538,19 @@ export class SourceFile {
}
return ReferencesProvider.getReferencesForPosition(
this._parseResults, this._filePath, position, includeDeclaration);
this._parseResults, this._filePath, position, includeDeclaration, importLookup);
}
addReferences(referencesResult: ReferencesResult, includeDeclaration: boolean): void {
addReferences(referencesResult: ReferencesResult, includeDeclaration: boolean,
importLookup: ImportLookup): void {
// If we have no completed analysis job, there's nothing to do.
if (!this._parseResults) {
return;
}
ReferencesProvider.addReferences(
this._parseResults, this._filePath, referencesResult, includeDeclaration);
this._parseResults, this._filePath, referencesResult, includeDeclaration, importLookup);
}
addSymbolsForDocument(symbolList: SymbolInformation[], importLookup: ImportLookup,

44
server/src/languageService/referencesProvider.ts
View File

@ -8,11 +8,11 @@
* by a location within a file.
*/
import { ImportLookup } from '../analyzer/analyzerFileInfo';
import { Declaration, DeclarationType } from '../analyzer/declaration';
import * as DeclarationUtils from '../analyzer/declarationUtils';
import * as ParseTreeUtils from '../analyzer/parseTreeUtils';
import { ParseTreeWalker } from '../analyzer/parseTreeWalker';
import { Symbol } from '../analyzer/symbol';
import { DiagnosticTextPosition, DocumentTextRange } from '../common/diagnostic';
import { convertOffsetToPosition, convertPositionToOffset } from '../common/positionUtils';
import { TextRange } from '../common/textRange';
@ -31,15 +31,18 @@ class FindReferencesTreeWalker extends ParseTreeWalker {
private _filePath: string;
private _referencesResult: ReferencesResult;
private _includeDeclaration: boolean;
private _importLookup: ImportLookup;
constructor(parseResults: ParseResults, filePath: string,
referencesResult: ReferencesResult, includeDeclaration: boolean) {
referencesResult: ReferencesResult, includeDeclaration: boolean,
importLookup: ImportLookup) {
super();
this._parseResults = parseResults;
this._filePath = filePath;
this._referencesResult = referencesResult;
this._includeDeclaration = includeDeclaration;
this._importLookup = importLookup;
}
findReferences() {
@ -69,14 +72,22 @@ class FindReferencesTreeWalker extends ParseTreeWalker {
}
private _resultsContainsDeclaration(declaration: Declaration) {
const resolvedDecl = DeclarationUtils.resolveAliasDeclaration(declaration, this._importLookup);
if (!resolvedDecl) {
return false;
}
// The reference results declarations are already resolved, so we don't
// need to call resolveAliasDeclaration on them.
return this._referencesResult.declarations.some(decl =>
DeclarationUtils.areDeclarationsSame(decl, declaration));
DeclarationUtils.areDeclarationsSame(decl, resolvedDecl));
}
}
export class ReferencesProvider {
static getReferencesForPosition(parseResults: ParseResults, filePath: string,
position: DiagnosticTextPosition, includeDeclaration: boolean):
position: DiagnosticTextPosition, includeDeclaration: boolean,
importLookup: ImportLookup):
ReferencesResult | undefined {
const offset = convertPositionToOffset(position, parseResults.tokenizerOutput.lines);
@ -94,12 +105,24 @@ export class ReferencesProvider {
}
const declarations = DeclarationUtils.getDeclarationsForNameNode(node);
if (!declarations || declarations.length === 0) {
if (!declarations) {
return undefined;
}
const resolvedDeclarations: Declaration[] = [];
declarations.forEach(decl => {
const resovledDecl = DeclarationUtils.resolveAliasDeclaration(decl, importLookup);
if (resovledDecl) {
resolvedDeclarations.push(resovledDecl);
}
});
if (resolvedDeclarations.length === 0) {
return undefined;
}
// Is this a type that potentially requires a global search?
const symbolDeclType = declarations[0].type;
const symbolDeclType = resolvedDeclarations[0].type;
// Parameters are local to a scope, so they don't require a global search.
const requiresGlobalSearch = symbolDeclType !== DeclarationType.Parameter;
@ -107,22 +130,23 @@ export class ReferencesProvider {
const results: ReferencesResult = {
requiresGlobalSearch,
nodeAtOffset: node,
declarations,
declarations: resolvedDeclarations,
locations: []
};
const refTreeWalker = new FindReferencesTreeWalker(parseResults,
filePath, results, includeDeclaration);
filePath, results, includeDeclaration, importLookup);
refTreeWalker.findReferences();
return results;
}
static addReferences(parseResults: ParseResults, filePath: string,
referencesResult: ReferencesResult, includeDeclaration: boolean): void {
referencesResult: ReferencesResult, includeDeclaration: boolean,
importLookup: ImportLookup): void {
const refTreeWalker = new FindReferencesTreeWalker(parseResults,
filePath, referencesResult, includeDeclaration);
filePath, referencesResult, includeDeclaration, importLookup);
refTreeWalker.findReferences();
}
}