Skip to content

Commit 6b3cfc7

Browse files
authored
Fix #19959 and #19958: Remove un-localizable messages (#20019)
* Fix #19959 and #19958: Remove un-localizable messages * Update message * Update diagnostic messages
1 parent 568e52d commit 6b3cfc7

11 files changed

+12
-26
lines changed

src/compiler/diagnosticMessages.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3766,7 +3766,7 @@
37663766
"category": "Error",
37673767
"code": 90010
37683768
},
3769-
"Import '{0}' from \"{1}\".": {
3769+
"Import '{0}' from module \"{1}\".": {
37703770
"category": "Message",
37713771
"code": 90013
37723772
},
@@ -3886,13 +3886,5 @@
38863886
"Install '{0}'": {
38873887
"category": "Message",
38883888
"code": 95014
3889-
},
3890-
"Import '{0}' = require(\"{1}\").": {
3891-
"category": "Message",
3892-
"code": 95015
3893-
},
3894-
"Import * as '{0}' from \"{1}\".": {
3895-
"category": "Message",
3896-
"code": 95016
38973889
}
38983890
}

src/services/codefixes/importFixes.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -276,17 +276,11 @@ namespace ts.codefix {
276276
}
277277
});
278278

279-
const actionFormat = kind === ImportKind.Equals
280-
? Diagnostics.Import_0_require_1
281-
: kind === ImportKind.Namespace
282-
? Diagnostics.Import_Asterisk_as_0_from_1
283-
: Diagnostics.Import_0_from_1;
284-
285279
// if this file doesn't have any import statements, insert an import statement and then insert a new line
286280
// between the only import statement and user code. Otherwise just insert the statement because chances
287281
// are there are already a new line seperating code and import statements.
288282
return createCodeAction(
289-
actionFormat,
283+
Diagnostics.Import_0_from_module_1,
290284
[symbolName, moduleSpecifierWithoutQuotes],
291285
changes,
292286
"NewImport",

tests/cases/fourslash/completionsImport_default_alreadyExistedWithRename.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "function foo(): vo
1616
verify.applyCodeActionFromCompletion("", {
1717
name: "foo",
1818
source: "/a",
19-
description: `Import 'foo' from "./a".`,
19+
description: `Import 'foo' from module "./a".`,
2020
// TODO: GH#18445
2121
newFileContent: `import f_o_o from "./a";
2222
import foo from "./a";\r

tests/cases/fourslash/completionsImport_default_anonymous.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ verify.completionListContains({ name: "fooBar", source: "/src/foo-bar" }, "(prop
2121
verify.applyCodeActionFromCompletion("1", {
2222
name: "fooBar",
2323
source: "/src/foo-bar",
24-
description: `Import 'fooBar' from "./foo-bar".`,
24+
description: `Import 'fooBar' from module "./foo-bar".`,
2525
// TODO: GH#18445
2626
newFileContent: `import fooBar from "./foo-bar";\r
2727
\r

tests/cases/fourslash/completionsImport_default_didNotExistBefore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "function foo(): vo
1717
verify.applyCodeActionFromCompletion("", {
1818
name: "foo",
1919
source: "/a",
20-
description: `Import 'foo' from "./a".`,
20+
description: `Import 'foo' from module "./a".`,
2121
// TODO: GH#18445
2222
newFileContent: `import foo from "./a";\r
2323
\r

tests/cases/fourslash/completionsImport_fromAmbientModule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
verify.applyCodeActionFromCompletion("", {
1212
name: "x",
1313
source: "m",
14-
description: `Import 'x' from "m".`,
14+
description: `Import 'x' from module "m".`,
1515
// TODO: GH#18445
1616
newFileContent: `import { x } from "m";\r
1717
\r

tests/cases/fourslash/completionsImport_multipleWithSameName.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ verify.completionListContains({ name: "foo", source: "/b" }, "const foo: 1", "",
2222
verify.applyCodeActionFromCompletion("", {
2323
name: "foo",
2424
source: "/b",
25-
description: `Import 'foo' from "./b".`,
25+
description: `Import 'foo' from module "./b".`,
2626
// TODO: GH#18445
2727
newFileContent: `import { foo } from "./b";\r
2828
\r

tests/cases/fourslash/completionsImport_named_namespaceImportExists.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "function foo(): vo
1616
verify.applyCodeActionFromCompletion("", {
1717
name: "foo",
1818
source: "/a",
19-
description: `Import 'foo' from "./a".`,
19+
description: `Import 'foo' from module "./a".`,
2020
// TODO: GH#18445
2121
newFileContent: `import * as a from "./a";
2222
import { foo } from "./a";\r

tests/cases/fourslash/completionsImport_ofAlias.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ verify.not.completionListContains({ name: "foo", source: "/a_reexport_2" }, unde
2828
verify.applyCodeActionFromCompletion("", {
2929
name: "foo",
3030
source: "/a",
31-
description: `Import 'foo' from "./a".`,
31+
description: `Import 'foo' from module "./a".`,
3232
// TODO: GH#18445
3333
newFileContent: `import { foo } from "./a";\r
3434
\r

tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ verify.not.completionListContains({ name: "foo", source: "/foo/index" }, undefin
2323
verify.applyCodeActionFromCompletion("", {
2424
name: "foo",
2525
source: "/foo/lib/foo",
26-
description: `Import 'foo' from "./foo".`,
26+
description: `Import 'foo' from module "./foo".`,
2727
// TODO: GH#18445
2828
newFileContent: `import { foo } from "./foo";\r
2929
\r

0 commit comments

Comments
 (0)