Skip to content

Refactor findAllReferences. Now supports renamed exports and imports. #14001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
16 commits merged into from
Apr 14, 2017
Merged

Refactor findAllReferences. Now supports renamed exports and imports. #14001

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
42a832a
Refactor findAllReferences. Now supports renamed exports and imports.
Jan 26, 2017
d99a46e
Better handle additional re-export cases
Feb 13, 2017
151023c
Fix and consolidate tsx rename tests
Feb 16, 2017
aac3d80
Merge branch 'master' into refactor_findallrefs
Mar 1, 2017
ec558b8
Merge branch 'master' into refactor_findallrefs
Mar 17, 2017
94f6839
Factor out FindAllReferences.Core and use Definition/Entry to allow f…
Mar 17, 2017
03e0238
Don't need isInString to be a property
Mar 17, 2017
4c71862
Nope, need 'isInString'
Mar 17, 2017
5bcb8fa
Don't need types to handle string literals
Mar 21, 2017
7739a88
getReferencesInContainer: Take sourceFile as parameter
Mar 27, 2017
aa1c860
Merge branch 'master' into refactor_findallrefs
Mar 27, 2017
cf6c24c
Respond to minor PR comments
Mar 27, 2017
2dd23fa
Lint
Mar 27, 2017
28a3604
Fix #14346
Mar 27, 2017
eb09c11
Call the cancellationToken once per SourceFile, instead of calling it…
Mar 28, 2017
c7d51a3
Merge branch 'master' into refactor_findallrefs
Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Nope, need 'isInString'
  • Loading branch information
Andy Hanson committed Mar 17, 2017
commit 4c71862388673c1a048078bfebc90428c99325d4
20 changes: 12 additions & 8 deletions src/services/findAllReferences.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,18 @@ namespace ts.FindAllReferences {
| { type: "string"; node: ts.StringLiteral };

export type Entry = NodeEntry | SpanEntry;
export interface NodeEntry { type: "node"; node: Node; }
export interface NodeEntry {
type: "node";
node: Node;
isInString?: true;
}
interface SpanEntry {
type: "span";
fileName: string;
textSpan: TextSpan;
}
export function nodeEntry(node: ts.Node): NodeEntry {
return { type: "node", node };
export function nodeEntry(node: ts.Node, isInString?: true): NodeEntry {
return { type: "node", node, isInString };
}

export interface Options {
Expand Down Expand Up @@ -163,13 +167,13 @@ namespace ts.FindAllReferences {
return { textSpan: entry.textSpan, fileName: entry.fileName, isWriteAccess: false, isDefinition: false };
}

const { node } = entry;
const { node, isInString } = entry;
return {
fileName: node.getSourceFile().fileName,
textSpan: getTextSpan(node),
isWriteAccess: isWriteAccess(node),
isDefinition: isDeclarationName(node) || isLiteralComputedPropertyDeclarationName(node),
isInString: node.kind === ts.SyntaxKind.StringLiteral ? true : undefined
isInString
};
}

Expand Down Expand Up @@ -211,13 +215,13 @@ namespace ts.FindAllReferences {
return { fileName, span: { textSpan, kind: HighlightSpanKind.reference } };
}

const { node } = entry;
const { node, isInString } = entry;
const fileName = entry.node.getSourceFile().fileName;
const writeAccess = isWriteAccess(node);
const span: HighlightSpan = {
textSpan: getTextSpan(node),
kind: writeAccess ? HighlightSpanKind.writtenReference : HighlightSpanKind.reference,
isInString: node.kind === ts.SyntaxKind.StringLiteral ? true : undefined
isInString
};
return { fileName, span };
}
Expand Down Expand Up @@ -1355,7 +1359,7 @@ namespace ts.FindAllReferences.Core {

const type = getStringLiteralTypeForNode(<StringLiteral>node, checker);
if (type === searchType) {
references.push(nodeEntry(node));
references.push(nodeEntry(node, /*isInString*/true));
}
}
}
Expand Down