maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #20373 from amcasey/PropertyUnderscore

Browse source 
Don't offer to prepend an underscore to the name of an unused private property
This commit is contained in:
Andrew Casey 2017-11-30 13:08:26 -08:00 committed by GitHub
commit 8f1cdc9b0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/services/codefixes/fixUnusedIdentifier.ts
View file

@ -18,7 +18,7 @@ namespace ts.codefix {
switch (token.kind) { switch (token.kind) {
case ts.SyntaxKind.Identifier: case ts.SyntaxKind.Identifier:
return deleteIdentifierOrPrefixWithUnderscore(<Identifier>token); return deleteIdentifierOrPrefixWithUnderscore(<Identifier>token, context.errorCode);
case SyntaxKind.PropertyDeclaration: case SyntaxKind.PropertyDeclaration:
case SyntaxKind.NamespaceImport: case SyntaxKind.NamespaceImport:
@ -54,7 +54,7 @@ namespace ts.codefix {
}; };
} }
function deleteIdentifierOrPrefixWithUnderscore(identifier: Identifier): CodeAction[] | undefined { function deleteIdentifierOrPrefixWithUnderscore(identifier: Identifier, errorCode: number): CodeAction[] | undefined {
const parent = identifier.parent; const parent = identifier.parent;
switch (parent.kind) { switch (parent.kind) {
case ts.SyntaxKind.VariableDeclaration: case ts.SyntaxKind.VariableDeclaration:
@ -76,8 +76,10 @@ namespace ts.codefix {
case ts.SyntaxKind.Parameter: case ts.SyntaxKind.Parameter:
const functionDeclaration = <FunctionDeclaration>parent.parent; const functionDeclaration = <FunctionDeclaration>parent.parent;
return [functionDeclaration.parameters.length === 1 ? deleteNode(parent) : deleteNodeInList(parent), const deleteAction = functionDeclaration.parameters.length === 1 ? deleteNode(parent) : deleteNodeInList(parent);
prefixIdentifierWithUnderscore(identifier)]; return errorCode === Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code
? [deleteAction]
: [deleteAction, prefixIdentifierWithUnderscore(identifier)];
// handle case where 'import a = A;' // handle case where 'import a = A;'
case SyntaxKind.ImportEqualsDeclaration: case SyntaxKind.ImportEqualsDeclaration:

6
tests/cases/fourslash/unusedParameterInConstructor1AddUnderscore.ts
View file

@ -1,12 +1,12 @@
/// <reference path='fourslash.ts' /> /// <reference path='fourslash.ts' />
// @noUnusedLocals: true // @noUnusedParameters: true
//// class C1 { //// class C1 {
//// [|constructor(private p1: string, public p2: boolean, public p3: any, p5) |] { p5; } //// [|constructor(p1: string, public p2: boolean, public p3: any, p5) |] { p5; }
//// } //// }
verify.codeFix({ verify.codeFix({
description: "Prefix 'p1' with an underscore.", description: "Prefix 'p1' with an underscore.",
index: 1, index: 1,
newRangeContent: "constructor(private _p1: string, public p2: boolean, public p3: any, p5)", newRangeContent: "constructor(_p1: string, public p2: boolean, public p3: any, p5)",
}); });