feat(36231): Improve message for "Remove declaration for: ..." (#36283)

a-tarasyuk · DanielRosenwasser · commit 0dd4c9cebe14 · 2020-01-18T13:28:19.000-08:00
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -4928,7 +4928,7 @@
         "category": "Message",
         "code": 90003
     },
-    "Remove declaration for: '{0}'": {
+    "Remove unused declaration for: '{0}'": {
         "category": "Message",
         "code": 90004
     },
diff --git a/src/services/codefixes/fixUnusedIdentifier.ts b/src/services/codefixes/fixUnusedIdentifier.ts
@@ -56,7 +56,7 @@ namespace ts.codefix {
                     tryDeleteDeclaration(sourceFile, token, t, checker, sourceFiles, /*isFixAll*/ false));
                 if (deletion.length) {
                     const name = isComputedPropertyName(token.parent) ? token.parent : token;
-                    result.push(createDeleteFix(deletion, [Diagnostics.Remove_declaration_for_Colon_0, name.getText(sourceFile)]));
+                    result.push(createDeleteFix(deletion, [Diagnostics.Remove_unused_declaration_for_Colon_0, name.getText(sourceFile)]));
                 }
             }
 
diff --git a/tests/cases/fourslash/codeFixClassPropertyInitialization.ts b/tests/cases/fourslash/codeFixClassPropertyInitialization.ts
@@ -56,5 +56,5 @@ verify.codeFixAvailable([
     ...fixes("j", "A", { noInitializer: true }),
     ...fixes("k", "AT"),
     ...fixes("l", "Foo"),
-    { description: "Remove declaration for: 'c'" },
+    { description: "Remove unused declaration for: 'c'" },
 ]);
diff --git a/tests/cases/fourslash/codeFixSpellingPrivatePropertyName.ts b/tests/cases/fourslash/codeFixSpellingPrivatePropertyName.ts
@@ -11,7 +11,7 @@ verify.codeFixAvailable([
     { description: "Change spelling to '#foo'" },
     { description: "Declare property 'foo'" },
     { description: "Add index signature for property 'foo'" },
-    { description: "Remove declaration for: '#foo'" },
+    { description: "Remove unused declaration for: '#foo'" },
 ]);
 
 verify.codeFix({
diff --git a/tests/cases/fourslash/codeFixUnusedIdentifier_delete_templateTag.ts b/tests/cases/fourslash/codeFixUnusedIdentifier_delete_templateTag.ts
@@ -13,7 +13,7 @@
 goTo.file("/first.js");
 verify.codeFix({
     index: 0,
-    description: "Remove declaration for: 'T'",
+    description: "Remove unused declaration for: 'T'",
     newFileContent:
 `/**
  * Doc
@@ -33,7 +33,7 @@ function first(p) { return p; }`,
 
 goTo.file("/second.js");
 verify.codeFix({
-    description: "Remove declaration for: 'U'",
+    description: "Remove unused declaration for: 'U'",
     index: 0,
     newFileContent:
 `/**
diff --git a/tests/cases/fourslash/codeFixUnusedIdentifier_parameter_modifier.ts b/tests/cases/fourslash/codeFixUnusedIdentifier_parameter_modifier.ts
@@ -11,7 +11,7 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'arg'",
+    description: "Remove unused declaration for: 'arg'",
     newFileContent:
 `export class Example {
     prop: any;
diff --git a/tests/cases/fourslash/codeFixUnusedIdentifier_parameter_modifier_and_arg.ts b/tests/cases/fourslash/codeFixUnusedIdentifier_parameter_modifier_and_arg.ts
@@ -9,7 +9,7 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'arg'",
+    description: "Remove unused declaration for: 'arg'",
     newFileContent:
 `export class Example {
     constructor() {
diff --git a/tests/cases/fourslash/codeFixUnusedIdentifier_suggestion.ts b/tests/cases/fourslash/codeFixUnusedIdentifier_suggestion.ts
@@ -28,7 +28,7 @@ verify.getSuggestionDiagnostics([
 verify.codeFixAvailable(
     [
         "Infer parameter types from usage",
-        "Remove declaration for: 'p'",
+        "Remove unused declaration for: 'p'",
         "Prefix 'p' with an underscore",
-        "Remove declaration for: 'x'"
+        "Remove unused declaration for: 'x'"
     ].map(description => ({ description })));
diff --git a/tests/cases/fourslash/unusedMethodInClass1.ts b/tests/cases/fourslash/unusedMethodInClass1.ts
@@ -7,6 +7,6 @@
 ////}
 
 verify.codeFix({
-    description: `Remove declaration for: 'function1'`,
+    description: `Remove unused declaration for: 'function1'`,
     newFileContent: "class greeter {\n}",
 });
diff --git a/tests/cases/fourslash/unusedMethodInClass2.ts b/tests/cases/fourslash/unusedMethodInClass2.ts
@@ -9,7 +9,7 @@
 ////}
 
 verify.codeFix({
-    description: `Remove declaration for: 'function1'`,
+    description: `Remove unused declaration for: 'function1'`,
     newFileContent: `class greeter {
     public function2() {
     }
diff --git a/tests/cases/fourslash/unusedMethodInClass3.ts b/tests/cases/fourslash/unusedMethodInClass3.ts
@@ -7,6 +7,6 @@
 ////}
 
 verify.codeFix({
-    description: `Remove declaration for: 'function1'`,
+    description: `Remove unused declaration for: 'function1'`,
     newFileContent: "class greeter {\n}",
 });
diff --git a/tests/cases/fourslash/unusedMethodInClass4.ts b/tests/cases/fourslash/unusedMethodInClass4.ts
@@ -9,7 +9,7 @@
 ////}
 
 verify.codeFix({
-    description: `Remove declaration for: 'function1'`,
+    description: `Remove unused declaration for: 'function1'`,
     newRangeContent: `public function2(){
     }
 `,
diff --git a/tests/cases/fourslash/unusedMethodInClass5.ts b/tests/cases/fourslash/unusedMethodInClass5.ts
@@ -6,6 +6,6 @@
 ////}
 
 verify.codeFix({
-    description: `Remove declaration for: '["string"]'`,
+    description: `Remove unused declaration for: '["string"]'`,
     newFileContent: "class C {\n}",
 });
diff --git a/tests/cases/fourslash/unusedMethodInClass6.ts b/tests/cases/fourslash/unusedMethodInClass6.ts
@@ -6,6 +6,6 @@
 ////}
 
 verify.codeFix({
-    description: `Remove declaration for: '"string"'`,
+    description: `Remove unused declaration for: '"string"'`,
     newFileContent: "class C {\n}",
 });
diff --git a/tests/cases/fourslash/unusedNamespaceInNamespace.ts b/tests/cases/fourslash/unusedNamespaceInNamespace.ts
@@ -7,7 +7,7 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'B'",
+    description: "Remove unused declaration for: 'B'",
     newFileContent: `namespace A {
 }`,
 });
diff --git a/tests/cases/fourslash/unusedParameterInFunction1.ts b/tests/cases/fourslash/unusedParameterInFunction1.ts
@@ -5,7 +5,7 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'x'",
+    description: "Remove unused declaration for: 'x'",
     index: 0,
     newRangeContent: "greeter()",
 });
diff --git a/tests/cases/fourslash/unusedParameterInFunction2.ts b/tests/cases/fourslash/unusedParameterInFunction2.ts
@@ -6,7 +6,7 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'y'",
+    description: "Remove unused declaration for: 'y'",
     index: 0,
     newRangeContent: "greeter(x)",
 });
diff --git a/tests/cases/fourslash/unusedParameterInLambda1.ts b/tests/cases/fourslash/unusedParameterInLambda1.ts
@@ -5,7 +5,7 @@
 ////[|/*~a*/(/*~b*/x/*~c*/:/*~d*/number/*~e*/)/*~f*/ => /*~g*/{/*~h*/}/*~i*/|]
 
 verify.codeFix({
-    description: "Remove declaration for: 'x'",
+    description: "Remove unused declaration for: 'x'",
     index: 0,
     newRangeContent: "/*~a*/(/*~e*/)/*~f*/ => /*~g*/{/*~h*/}/*~i*/",
 });
diff --git a/tests/cases/fourslash/unusedParameterInLambda2.ts b/tests/cases/fourslash/unusedParameterInLambda2.ts
@@ -5,7 +5,7 @@
 ////[|/*~a*/x/*~b*/ /*~c*/=>/*~d*/ {/*~e*/}/*~f*/|]
 
 verify.codeFix({
-    description: "Remove declaration for: 'x'",
+    description: "Remove unused declaration for: 'x'",
     index: 0,
     newRangeContent: "/*~a*/()/*~b*/ /*~c*/=>/*~d*/ {/*~e*/}/*~f*/",
 });
diff --git a/tests/cases/fourslash/unusedParameterInLambda3.ts b/tests/cases/fourslash/unusedParameterInLambda3.ts
@@ -6,7 +6,7 @@
 
 // In a perfect world, /*~c*/ would probably be retained, rather than /*~e*/.
 verify.codeFix({
-    description: "Remove declaration for: 'y'",
+    description: "Remove unused declaration for: 'y'",
     index: 0,
     newRangeContent: "/*~a*/(/*~b*/x/*~e*/)/*~f*/ => /*~g*/x/*~h*/",
 });
diff --git a/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts b/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts
@@ -7,7 +7,7 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'hw'",
+    description: "Remove unused declaration for: 'hw'",
     newFileContent: `namespace greeter {
     export type nw = "No" | "Way";
 }`,
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass2.ts b/tests/cases/fourslash/unusedTypeParametersInClass2.ts
@@ -6,7 +6,7 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'Y'",
+    description: "Remove unused declaration for: 'Y'",
     index: 0,
     newRangeContent: "class greeter<X> ",
 });
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass3.ts b/tests/cases/fourslash/unusedTypeParametersInClass3.ts
@@ -8,7 +8,7 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'Y'",
+    description: "Remove unused declaration for: 'Y'",
     index: 0,
     newRangeContent: "class greeter<X, Z> ",
 });
diff --git a/tests/cases/fourslash/unusedTypeParametersInFunction2.ts b/tests/cases/fourslash/unusedTypeParametersInFunction2.ts
@@ -4,7 +4,7 @@
 //// [|function f1<X, Y>(a: X) {a}|]
 
 verify.codeFix({
-    description: "Remove declaration for: 'Y'",
+    description: "Remove unused declaration for: 'Y'",
     index: 0,
     newRangeContent: "function f1<X>(a: X) {a}",
 });
diff --git a/tests/cases/fourslash/unusedTypeParametersInFunction3.ts b/tests/cases/fourslash/unusedTypeParametersInFunction3.ts
@@ -4,7 +4,7 @@
 //// [|function f1<X, Y, Z>(a: X) {a;var b:Z;b}|]
 
 verify.codeFix({
-    description: "Remove declaration for: 'Y'",
+    description: "Remove unused declaration for: 'Y'",
     index: 0,
     newRangeContent: "function f1<X, Z>(a: X) {a;var b:Z;b}",
 });
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda2.ts b/tests/cases/fourslash/unusedTypeParametersInLambda2.ts
@@ -7,7 +7,7 @@
 //// }
 
 verify.codeFix({
-    description: "Remove declaration for: 'U'",
+    description: "Remove unused declaration for: 'U'",
     index: 0,
     newRangeContent: "new <T>(a: T): void;",
 });
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda3.ts b/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
@@ -8,7 +8,7 @@
 //// }
 
 verify.codeFix({
-    description: "Remove declaration for: 'K'",
+    description: "Remove unused declaration for: 'K'",
     index: 0,
     newRangeContent: "new <T, U>(a: T): A<U>;",
 });
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda4.ts b/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
@@ -8,6 +8,6 @@
 
 verify.codeFix({
     index: 0,
-    description: "Remove declaration for: 'U'",
+    description: "Remove unused declaration for: 'U'",
     newRangeContent: "var y: new <T>(a:T)=>void;",
 });
diff --git a/tests/cases/fourslash/unusedTypeParametersInMethod2.ts b/tests/cases/fourslash/unusedTypeParametersInMethod2.ts
@@ -7,6 +7,6 @@
 
 verify.codeFix({
     index: 0,
-    description: "Remove declaration for: 'T'",
+    description: "Remove unused declaration for: 'T'",
     newRangeContent: "f1<U>(a: U)",
 });
diff --git a/tests/cases/fourslash/unusedTypeParametersInMethods1.ts b/tests/cases/fourslash/unusedTypeParametersInMethods1.ts
@@ -7,6 +7,6 @@
 
 verify.codeFix({
     index: 0,
-    description: "Remove declaration for: 'Y'",
+    description: "Remove unused declaration for: 'Y'",
     newRangeContent: "public f1<X, Z>(a: X)",
 });
diff --git a/tests/cases/fourslash/unusedVariableInBlocks.ts b/tests/cases/fourslash/unusedVariableInBlocks.ts
@@ -10,7 +10,7 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'x'",
+    description: "Remove unused declaration for: 'x'",
     newRangeContent: `let x = 10;
     {
     }
diff --git a/tests/cases/fourslash/unusedVariableInClass1.ts b/tests/cases/fourslash/unusedVariableInClass1.ts
@@ -6,6 +6,6 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'greeting'",
+    description: "Remove unused declaration for: 'greeting'",
     newRangeContent: "",
 });
diff --git a/tests/cases/fourslash/unusedVariableInClass2.ts b/tests/cases/fourslash/unusedVariableInClass2.ts
@@ -7,7 +7,7 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'greeting'",
+    description: "Remove unused declaration for: 'greeting'",
     index: 0,
     newRangeContent: "public greeting1;\n",
 });
diff --git a/tests/cases/fourslash/unusedVariableInClass3.ts b/tests/cases/fourslash/unusedVariableInClass3.ts
@@ -6,6 +6,6 @@
 ////|]}
 
 verify.codeFix({
-    description: "Remove declaration for: 'X'",
+    description: "Remove unused declaration for: 'X'",
     newRangeContent: "\n",
 });
diff --git a/tests/cases/fourslash/unusedVariableInForLoop1FS.ts b/tests/cases/fourslash/unusedVariableInForLoop1FS.ts
@@ -8,6 +8,6 @@
 //// }
 
 verify.codeFix({
-    description: "Remove declaration for: 'i'",
+    description: "Remove unused declaration for: 'i'",
     newRangeContent: "for(; ;) ",
 });
diff --git a/tests/cases/fourslash/unusedVariableInForLoop2FS.ts b/tests/cases/fourslash/unusedVariableInForLoop2FS.ts
@@ -8,6 +8,6 @@
 //// }
 
 verify.codeFix({
-    description: "Remove declaration for: 'j'",
+    description: "Remove unused declaration for: 'j'",
     newRangeContent: "for(var i = 0; ;i++)",
 });
diff --git a/tests/cases/fourslash/unusedVariableInForLoop3FS.ts b/tests/cases/fourslash/unusedVariableInForLoop3FS.ts
@@ -8,6 +8,6 @@
 //// }
 
 verify.codeFix({
-    description: "Remove declaration for: 'j'",
+    description: "Remove unused declaration for: 'j'",
     newRangeContent: "for(var i = 0, k=0; ;i++, k++)",
 });
diff --git a/tests/cases/fourslash/unusedVariableInForLoop4FS.ts b/tests/cases/fourslash/unusedVariableInForLoop4FS.ts
@@ -8,6 +8,6 @@
 //// }
 
 verify.codeFix({
-    description: "Remove declaration for: 'i'",
+    description: "Remove unused declaration for: 'i'",
     newRangeContent: "for(var j= 0, k=0; ;j++, k++) ",
 });
diff --git a/tests/cases/fourslash/unusedVariableInForLoop6FS.ts b/tests/cases/fourslash/unusedVariableInForLoop6FS.ts
@@ -8,7 +8,7 @@
 //// }
 
 verify.codeFix({
-    description: "Remove declaration for: 'elem'",
+    description: "Remove unused declaration for: 'elem'",
     index: 0,
     newRangeContent: "const {} of",
 });
diff --git a/tests/cases/fourslash/unusedVariableInForLoop7FS.ts b/tests/cases/fourslash/unusedVariableInForLoop7FS.ts
@@ -10,7 +10,7 @@
 ////
 
 verify.codeFix({
-    description: "Remove declaration for: 'x'",
+    description: "Remove unused declaration for: 'x'",
     newRangeContent: `{
     for (const elem of ["a", "b", "c"]) {
         elem;
diff --git a/tests/cases/fourslash/unusedVariableInModule1.ts b/tests/cases/fourslash/unusedVariableInModule1.ts
@@ -7,6 +7,6 @@
 //// export var y: string;|]
 
 verify.codeFix({
-    description: "Remove declaration for: 'x'",
+    description: "Remove unused declaration for: 'x'",
     newRangeContent: "export var y: string;",
 });
diff --git a/tests/cases/fourslash/unusedVariableInModule2.ts b/tests/cases/fourslash/unusedVariableInModule2.ts
@@ -8,6 +8,6 @@
 //// export var y: string;
 
 verify.codeFix({
-    description: "Remove declaration for: 'x'",
+    description: "Remove unused declaration for: 'x'",
     newRangeContent: "var z: number;",
 });
diff --git a/tests/cases/fourslash/unusedVariableInModule3.ts b/tests/cases/fourslash/unusedVariableInModule3.ts
@@ -7,6 +7,6 @@
 //// export var y: string;|]
 
 verify.codeFix({
-    description: "Remove declaration for: 'x'",
+    description: "Remove unused declaration for: 'x'",
     newRangeContent: "export var y: string;",
 });
diff --git a/tests/cases/fourslash/unusedVariableInModule4.ts b/tests/cases/fourslash/unusedVariableInModule4.ts
@@ -8,7 +8,7 @@
 //// export var y: string;
 
 verify.codeFix({
-    description: "Remove declaration for: 'm'",
+    description: "Remove unused declaration for: 'm'",
     index: 0,
     newRangeContent: `var x = function f1() {}`,
 });
diff --git a/tests/cases/fourslash/unusedVariableInNamespace1.ts b/tests/cases/fourslash/unusedVariableInNamespace1.ts
@@ -6,6 +6,6 @@
 ////}
 
 verify.codeFix({
-    description: "Remove declaration for: 'a'",
+    description: "Remove unused declaration for: 'a'",
     newRangeContent: "",
 });
diff --git a/tests/cases/fourslash/unusedVariableInNamespace2.ts b/tests/cases/fourslash/unusedVariableInNamespace2.ts
diff --git a/tests/cases/fourslash/unusedVariableInNamespace3.ts b/tests/cases/fourslash/unusedVariableInNamespace3.ts

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ namespace ts.codefix {`
`56`	`56`	`tryDeleteDeclaration(sourceFile, token, t, checker, sourceFiles, /isFixAll/ false));`
`57`	`57`	`if (deletion.length) {`
`58`	`58`	`const name = isComputedPropertyName(token.parent) ? token.parent : token;`
`59`		`- result.push(createDeleteFix(deletion, [Diagnostics.Remove_declaration_for_Colon_0, name.getText(sourceFile)]));`
	`59`	`+ result.push(createDeleteFix(deletion, [Diagnostics.Remove_unused_declaration_for_Colon_0, name.getText(sourceFile)]));`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`////}`
`10`	`10`
`11`	`11`	`verify.codeFix({`
`12`		- description: `Remove declaration for: 'function1'`,
	`12`	+ description: `Remove unused declaration for: 'function1'`,
`13`	`13`	newFileContent: `class greeter {
`14`	`14`	`public function2() {`
`15`	`15`	`}`