Skip to content

Commit 0dd4c9c

Browse files
a-tarasyukDanielRosenwasser
authored andcommitted
feat(36231): Improve message for "Remove declaration for: ..." (#36283)
1 parent 50adabe commit 0dd4c9c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+49
-49
lines changed

src/compiler/diagnosticMessages.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4928,7 +4928,7 @@
49284928
"category": "Message",
49294929
"code": 90003
49304930
},
4931-
"Remove declaration for: '{0}'": {
4931+
"Remove unused declaration for: '{0}'": {
49324932
"category": "Message",
49334933
"code": 90004
49344934
},

src/services/codefixes/fixUnusedIdentifier.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ namespace ts.codefix {
5656
tryDeleteDeclaration(sourceFile, token, t, checker, sourceFiles, /*isFixAll*/ false));
5757
if (deletion.length) {
5858
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)]));
6060
}
6161
}
6262

tests/cases/fourslash/codeFixClassPropertyInitialization.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ verify.codeFixAvailable([
5656
...fixes("j", "A", { noInitializer: true }),
5757
...fixes("k", "AT"),
5858
...fixes("l", "Foo"),
59-
{ description: "Remove declaration for: 'c'" },
59+
{ description: "Remove unused declaration for: 'c'" },
6060
]);

tests/cases/fourslash/codeFixSpellingPrivatePropertyName.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ verify.codeFixAvailable([
1111
{ description: "Change spelling to '#foo'" },
1212
{ description: "Declare property 'foo'" },
1313
{ description: "Add index signature for property 'foo'" },
14-
{ description: "Remove declaration for: '#foo'" },
14+
{ description: "Remove unused declaration for: '#foo'" },
1515
]);
1616

1717
verify.codeFix({

tests/cases/fourslash/codeFixUnusedIdentifier_delete_templateTag.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
goTo.file("/first.js");
1414
verify.codeFix({
1515
index: 0,
16-
description: "Remove declaration for: 'T'",
16+
description: "Remove unused declaration for: 'T'",
1717
newFileContent:
1818
`/**
1919
* Doc
@@ -33,7 +33,7 @@ function first(p) { return p; }`,
3333

3434
goTo.file("/second.js");
3535
verify.codeFix({
36-
description: "Remove declaration for: 'U'",
36+
description: "Remove unused declaration for: 'U'",
3737
index: 0,
3838
newFileContent:
3939
`/**

tests/cases/fourslash/codeFixUnusedIdentifier_parameter_modifier.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
////}
1212

1313
verify.codeFix({
14-
description: "Remove declaration for: 'arg'",
14+
description: "Remove unused declaration for: 'arg'",
1515
newFileContent:
1616
`export class Example {
1717
prop: any;

tests/cases/fourslash/codeFixUnusedIdentifier_parameter_modifier_and_arg.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
////}
1010

1111
verify.codeFix({
12-
description: "Remove declaration for: 'arg'",
12+
description: "Remove unused declaration for: 'arg'",
1313
newFileContent:
1414
`export class Example {
1515
constructor() {

tests/cases/fourslash/codeFixUnusedIdentifier_suggestion.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ verify.getSuggestionDiagnostics([
2828
verify.codeFixAvailable(
2929
[
3030
"Infer parameter types from usage",
31-
"Remove declaration for: 'p'",
31+
"Remove unused declaration for: 'p'",
3232
"Prefix 'p' with an underscore",
33-
"Remove declaration for: 'x'"
33+
"Remove unused declaration for: 'x'"
3434
].map(description => ({ description })));

tests/cases/fourslash/unusedMethodInClass1.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
////}
88

99
verify.codeFix({
10-
description: `Remove declaration for: 'function1'`,
10+
description: `Remove unused declaration for: 'function1'`,
1111
newFileContent: "class greeter {\n}",
1212
});

tests/cases/fourslash/unusedMethodInClass2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
////}
1010

1111
verify.codeFix({
12-
description: `Remove declaration for: 'function1'`,
12+
description: `Remove unused declaration for: 'function1'`,
1313
newFileContent: `class greeter {
1414
public function2() {
1515
}

tests/cases/fourslash/unusedMethodInClass3.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
////}
88

99
verify.codeFix({
10-
description: `Remove declaration for: 'function1'`,
10+
description: `Remove unused declaration for: 'function1'`,
1111
newFileContent: "class greeter {\n}",
1212
});

tests/cases/fourslash/unusedMethodInClass4.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
////}
1010

1111
verify.codeFix({
12-
description: `Remove declaration for: 'function1'`,
12+
description: `Remove unused declaration for: 'function1'`,
1313
newRangeContent: `public function2(){
1414
}
1515
`,

tests/cases/fourslash/unusedMethodInClass5.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
////}
77

88
verify.codeFix({
9-
description: `Remove declaration for: '["string"]'`,
9+
description: `Remove unused declaration for: '["string"]'`,
1010
newFileContent: "class C {\n}",
1111
});

tests/cases/fourslash/unusedMethodInClass6.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
////}
77

88
verify.codeFix({
9-
description: `Remove declaration for: '"string"'`,
9+
description: `Remove unused declaration for: '"string"'`,
1010
newFileContent: "class C {\n}",
1111
});

tests/cases/fourslash/unusedNamespaceInNamespace.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
////}
88

99
verify.codeFix({
10-
description: "Remove declaration for: 'B'",
10+
description: "Remove unused declaration for: 'B'",
1111
newFileContent: `namespace A {
1212
}`,
1313
});

tests/cases/fourslash/unusedParameterInFunction1.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
////}
66

77
verify.codeFix({
8-
description: "Remove declaration for: 'x'",
8+
description: "Remove unused declaration for: 'x'",
99
index: 0,
1010
newRangeContent: "greeter()",
1111
});

tests/cases/fourslash/unusedParameterInFunction2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
////}
77

88
verify.codeFix({
9-
description: "Remove declaration for: 'y'",
9+
description: "Remove unused declaration for: 'y'",
1010
index: 0,
1111
newRangeContent: "greeter(x)",
1212
});

tests/cases/fourslash/unusedParameterInLambda1.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
////[|/*~a*/(/*~b*/x/*~c*/:/*~d*/number/*~e*/)/*~f*/ => /*~g*/{/*~h*/}/*~i*/|]
66

77
verify.codeFix({
8-
description: "Remove declaration for: 'x'",
8+
description: "Remove unused declaration for: 'x'",
99
index: 0,
1010
newRangeContent: "/*~a*/(/*~e*/)/*~f*/ => /*~g*/{/*~h*/}/*~i*/",
1111
});

tests/cases/fourslash/unusedParameterInLambda2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
////[|/*~a*/x/*~b*/ /*~c*/=>/*~d*/ {/*~e*/}/*~f*/|]
66

77
verify.codeFix({
8-
description: "Remove declaration for: 'x'",
8+
description: "Remove unused declaration for: 'x'",
99
index: 0,
1010
newRangeContent: "/*~a*/()/*~b*/ /*~c*/=>/*~d*/ {/*~e*/}/*~f*/",
1111
});

tests/cases/fourslash/unusedParameterInLambda3.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
// In a perfect world, /*~c*/ would probably be retained, rather than /*~e*/.
88
verify.codeFix({
9-
description: "Remove declaration for: 'y'",
9+
description: "Remove unused declaration for: 'y'",
1010
index: 0,
1111
newRangeContent: "/*~a*/(/*~b*/x/*~e*/)/*~f*/ => /*~g*/x/*~h*/",
1212
});

tests/cases/fourslash/unusedTypeAliasInNamespace1.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
////}
88

99
verify.codeFix({
10-
description: "Remove declaration for: 'hw'",
10+
description: "Remove unused declaration for: 'hw'",
1111
newFileContent: `namespace greeter {
1212
export type nw = "No" | "Way";
1313
}`,

tests/cases/fourslash/unusedTypeParametersInClass2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
////}
77

88
verify.codeFix({
9-
description: "Remove declaration for: 'Y'",
9+
description: "Remove unused declaration for: 'Y'",
1010
index: 0,
1111
newRangeContent: "class greeter<X> ",
1212
});

tests/cases/fourslash/unusedTypeParametersInClass3.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
////}
99

1010
verify.codeFix({
11-
description: "Remove declaration for: 'Y'",
11+
description: "Remove unused declaration for: 'Y'",
1212
index: 0,
1313
newRangeContent: "class greeter<X, Z> ",
1414
});

tests/cases/fourslash/unusedTypeParametersInFunction2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//// [|function f1<X, Y>(a: X) {a}|]
55

66
verify.codeFix({
7-
description: "Remove declaration for: 'Y'",
7+
description: "Remove unused declaration for: 'Y'",
88
index: 0,
99
newRangeContent: "function f1<X>(a: X) {a}",
1010
});

tests/cases/fourslash/unusedTypeParametersInFunction3.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//// [|function f1<X, Y, Z>(a: X) {a;var b:Z;b}|]
55

66
verify.codeFix({
7-
description: "Remove declaration for: 'Y'",
7+
description: "Remove unused declaration for: 'Y'",
88
index: 0,
99
newRangeContent: "function f1<X, Z>(a: X) {a;var b:Z;b}",
1010
});

tests/cases/fourslash/unusedTypeParametersInLambda2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//// }
88

99
verify.codeFix({
10-
description: "Remove declaration for: 'U'",
10+
description: "Remove unused declaration for: 'U'",
1111
index: 0,
1212
newRangeContent: "new <T>(a: T): void;",
1313
});

tests/cases/fourslash/unusedTypeParametersInLambda3.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//// }
99

1010
verify.codeFix({
11-
description: "Remove declaration for: 'K'",
11+
description: "Remove unused declaration for: 'K'",
1212
index: 0,
1313
newRangeContent: "new <T, U>(a: T): A<U>;",
1414
});

tests/cases/fourslash/unusedTypeParametersInLambda4.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88

99
verify.codeFix({
1010
index: 0,
11-
description: "Remove declaration for: 'U'",
11+
description: "Remove unused declaration for: 'U'",
1212
newRangeContent: "var y: new <T>(a:T)=>void;",
1313
});

tests/cases/fourslash/unusedTypeParametersInMethod2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77

88
verify.codeFix({
99
index: 0,
10-
description: "Remove declaration for: 'T'",
10+
description: "Remove unused declaration for: 'T'",
1111
newRangeContent: "f1<U>(a: U)",
1212
});

tests/cases/fourslash/unusedTypeParametersInMethods1.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77

88
verify.codeFix({
99
index: 0,
10-
description: "Remove declaration for: 'Y'",
10+
description: "Remove unused declaration for: 'Y'",
1111
newRangeContent: "public f1<X, Z>(a: X)",
1212
});

tests/cases/fourslash/unusedVariableInBlocks.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
////}
1111

1212
verify.codeFix({
13-
description: "Remove declaration for: 'x'",
13+
description: "Remove unused declaration for: 'x'",
1414
newRangeContent: `let x = 10;
1515
{
1616
}

tests/cases/fourslash/unusedVariableInClass1.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
////}
77

88
verify.codeFix({
9-
description: "Remove declaration for: 'greeting'",
9+
description: "Remove unused declaration for: 'greeting'",
1010
newRangeContent: "",
1111
});

tests/cases/fourslash/unusedVariableInClass2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
////}
88

99
verify.codeFix({
10-
description: "Remove declaration for: 'greeting'",
10+
description: "Remove unused declaration for: 'greeting'",
1111
index: 0,
1212
newRangeContent: "public greeting1;\n",
1313
});

tests/cases/fourslash/unusedVariableInClass3.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
////|]}
77

88
verify.codeFix({
9-
description: "Remove declaration for: 'X'",
9+
description: "Remove unused declaration for: 'X'",
1010
newRangeContent: "\n",
1111
});

tests/cases/fourslash/unusedVariableInForLoop1FS.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
//// }
99

1010
verify.codeFix({
11-
description: "Remove declaration for: 'i'",
11+
description: "Remove unused declaration for: 'i'",
1212
newRangeContent: "for(; ;) ",
1313
});

tests/cases/fourslash/unusedVariableInForLoop2FS.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
//// }
99

1010
verify.codeFix({
11-
description: "Remove declaration for: 'j'",
11+
description: "Remove unused declaration for: 'j'",
1212
newRangeContent: "for(var i = 0; ;i++)",
1313
});

tests/cases/fourslash/unusedVariableInForLoop3FS.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
//// }
99

1010
verify.codeFix({
11-
description: "Remove declaration for: 'j'",
11+
description: "Remove unused declaration for: 'j'",
1212
newRangeContent: "for(var i = 0, k=0; ;i++, k++)",
1313
});

tests/cases/fourslash/unusedVariableInForLoop4FS.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
//// }
99

1010
verify.codeFix({
11-
description: "Remove declaration for: 'i'",
11+
description: "Remove unused declaration for: 'i'",
1212
newRangeContent: "for(var j= 0, k=0; ;j++, k++) ",
1313
});

tests/cases/fourslash/unusedVariableInForLoop6FS.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//// }
99

1010
verify.codeFix({
11-
description: "Remove declaration for: 'elem'",
11+
description: "Remove unused declaration for: 'elem'",
1212
index: 0,
1313
newRangeContent: "const {} of",
1414
});

tests/cases/fourslash/unusedVariableInForLoop7FS.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
////
1111

1212
verify.codeFix({
13-
description: "Remove declaration for: 'x'",
13+
description: "Remove unused declaration for: 'x'",
1414
newRangeContent: `{
1515
for (const elem of ["a", "b", "c"]) {
1616
elem;

tests/cases/fourslash/unusedVariableInModule1.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
//// export var y: string;|]
88

99
verify.codeFix({
10-
description: "Remove declaration for: 'x'",
10+
description: "Remove unused declaration for: 'x'",
1111
newRangeContent: "export var y: string;",
1212
});

tests/cases/fourslash/unusedVariableInModule2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
//// export var y: string;
99

1010
verify.codeFix({
11-
description: "Remove declaration for: 'x'",
11+
description: "Remove unused declaration for: 'x'",
1212
newRangeContent: "var z: number;",
1313
});

tests/cases/fourslash/unusedVariableInModule3.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
//// export var y: string;|]
88

99
verify.codeFix({
10-
description: "Remove declaration for: 'x'",
10+
description: "Remove unused declaration for: 'x'",
1111
newRangeContent: "export var y: string;",
1212
});

tests/cases/fourslash/unusedVariableInModule4.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//// export var y: string;
99

1010
verify.codeFix({
11-
description: "Remove declaration for: 'm'",
11+
description: "Remove unused declaration for: 'm'",
1212
index: 0,
1313
newRangeContent: `var x = function f1() {}`,
1414
});

tests/cases/fourslash/unusedVariableInNamespace1.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
////}
77

88
verify.codeFix({
9-
description: "Remove declaration for: 'a'",
9+
description: "Remove unused declaration for: 'a'",
1010
newRangeContent: "",
1111
});

0 commit comments

Comments
 (0)