Skip to content

Commit 499bed5

Browse files
committed
Better reference usage detection
1 parent 6bd298b commit 499bed5

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/services/codefixes/fixUnusedIdentifier.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ namespace ts.codefix {
181181

182182
function deleteAssignments(changes: textChanges.ChangeTracker, sourceFile: SourceFile, token: Identifier, checker: TypeChecker) {
183183
FindAllReferences.Core.eachSymbolReferenceInFile(token, checker, sourceFile, (ref: Node) => {
184-
if (ref.parent.kind === SyntaxKind.PropertyAccessExpression) ref = ref.parent;
185-
if (ref.parent.kind === SyntaxKind.BinaryExpression && ref.parent.parent.kind === SyntaxKind.ExpressionStatement) {
184+
if (isPropertyAccessExpression(ref.parent) && ref.parent.name === ref) ref = ref.parent;
185+
if (isBinaryExpression(ref.parent) && isExpressionStatement(ref.parent.parent) && ref.parent.left === ref) {
186186
changes.delete(sourceFile, ref.parent.parent);
187187
}
188188
});
@@ -201,7 +201,7 @@ namespace ts.codefix {
201201
function tryDeleteParameter(changes: textChanges.ChangeTracker, sourceFile: SourceFile, p: ParameterDeclaration, checker: TypeChecker, sourceFiles: ReadonlyArray<SourceFile>, isFixAll: boolean): void {
202202
if (mayDeleteParameter(p, checker, isFixAll)) {
203203
if (p.modifiers && p.modifiers.length > 0
204-
&& (!isIdentifier(p.name) || FindAllReferences.Core.isSymbolReferencedInFile(p.name, checker, sourceFile))) {
204+
&& (!isIdentifier(p.name) || FindAllReferences.Core.isSymbolReferencedInFile(p.name, checker, sourceFile))) {
205205
p.modifiers.forEach(modifier => {
206206
changes.deleteModifier(sourceFile, modifier);
207207
});

src/services/findAllReferences.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,9 @@ namespace ts.FindAllReferences.Core {
839839
}
840840

841841
export function eachSymbolReferenceInFile<T>(definition: Identifier, checker: TypeChecker, sourceFile: SourceFile, cb: (token: Identifier) => T): T | undefined {
842-
const symbol = checker.getSymbolAtLocation(definition);
842+
const symbol = isParameterPropertyDeclaration(definition.parent)
843+
? first(checker.getSymbolsOfParameterPropertyDeclaration(definition.parent, definition.text))
844+
: checker.getSymbolAtLocation(definition);
843845
if (!symbol) return undefined;
844846
for (const token of getPossibleSymbolReferenceNodes(sourceFile, symbol.name)) {
845847
if (!isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText) continue;

0 commit comments

Comments
 (0)