From 6b3cfc70080fa8a1f86fe774ec0c6e50bf032c97 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Fri, 24 Nov 2017 22:02:48 -0800 Subject: [PATCH] Fix #19959 and #19958: Remove un-localizable messages (#20019) * Fix #19959 and #19958: Remove un-localizable messages * Update message * Update diagnostic messages --- src/compiler/diagnosticMessages.json | 10 +--------- src/services/codefixes/importFixes.ts | 8 +------- ...mpletionsImport_default_alreadyExistedWithRename.ts | 2 +- .../fourslash/completionsImport_default_anonymous.ts | 2 +- .../completionsImport_default_didNotExistBefore.ts | 2 +- .../fourslash/completionsImport_fromAmbientModule.ts | 2 +- .../completionsImport_multipleWithSameName.ts | 2 +- .../completionsImport_named_namespaceImportExists.ts | 2 +- tests/cases/fourslash/completionsImport_ofAlias.ts | 2 +- .../completionsImport_ofAlias_preferShortPath.ts | 2 +- tests/cases/fourslash/completionsImport_require.ts | 4 ++-- 11 files changed, 12 insertions(+), 26 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 09319589da..cd65bf945f 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -3766,7 +3766,7 @@ "category": "Error", "code": 90010 }, - "Import '{0}' from \"{1}\".": { + "Import '{0}' from module \"{1}\".": { "category": "Message", "code": 90013 }, @@ -3886,13 +3886,5 @@ "Install '{0}'": { "category": "Message", "code": 95014 - }, - "Import '{0}' = require(\"{1}\").": { - "category": "Message", - "code": 95015 - }, - "Import * as '{0}' from \"{1}\".": { - "category": "Message", - "code": 95016 } } diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts index ec56a08656..dae997fc2e 100644 --- a/src/services/codefixes/importFixes.ts +++ b/src/services/codefixes/importFixes.ts @@ -276,17 +276,11 @@ namespace ts.codefix { } }); - const actionFormat = kind === ImportKind.Equals - ? Diagnostics.Import_0_require_1 - : kind === ImportKind.Namespace - ? Diagnostics.Import_Asterisk_as_0_from_1 - : Diagnostics.Import_0_from_1; - // if this file doesn't have any import statements, insert an import statement and then insert a new line // between the only import statement and user code. Otherwise just insert the statement because chances // are there are already a new line seperating code and import statements. return createCodeAction( - actionFormat, + Diagnostics.Import_0_from_module_1, [symbolName, moduleSpecifierWithoutQuotes], changes, "NewImport", diff --git a/tests/cases/fourslash/completionsImport_default_alreadyExistedWithRename.ts b/tests/cases/fourslash/completionsImport_default_alreadyExistedWithRename.ts index d8cb53167f..c8908ab2eb 100644 --- a/tests/cases/fourslash/completionsImport_default_alreadyExistedWithRename.ts +++ b/tests/cases/fourslash/completionsImport_default_alreadyExistedWithRename.ts @@ -16,7 +16,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "function foo(): vo verify.applyCodeActionFromCompletion("", { name: "foo", source: "/a", - description: `Import 'foo' from "./a".`, + description: `Import 'foo' from module "./a".`, // TODO: GH#18445 newFileContent: `import f_o_o from "./a"; import foo from "./a";\r diff --git a/tests/cases/fourslash/completionsImport_default_anonymous.ts b/tests/cases/fourslash/completionsImport_default_anonymous.ts index 4be0184d9f..297567d1c1 100644 --- a/tests/cases/fourslash/completionsImport_default_anonymous.ts +++ b/tests/cases/fourslash/completionsImport_default_anonymous.ts @@ -21,7 +21,7 @@ verify.completionListContains({ name: "fooBar", source: "/src/foo-bar" }, "(prop verify.applyCodeActionFromCompletion("1", { name: "fooBar", source: "/src/foo-bar", - description: `Import 'fooBar' from "./foo-bar".`, + description: `Import 'fooBar' from module "./foo-bar".`, // TODO: GH#18445 newFileContent: `import fooBar from "./foo-bar";\r \r diff --git a/tests/cases/fourslash/completionsImport_default_didNotExistBefore.ts b/tests/cases/fourslash/completionsImport_default_didNotExistBefore.ts index a4f943f68e..dcdffc1090 100644 --- a/tests/cases/fourslash/completionsImport_default_didNotExistBefore.ts +++ b/tests/cases/fourslash/completionsImport_default_didNotExistBefore.ts @@ -17,7 +17,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "function foo(): vo verify.applyCodeActionFromCompletion("", { name: "foo", source: "/a", - description: `Import 'foo' from "./a".`, + description: `Import 'foo' from module "./a".`, // TODO: GH#18445 newFileContent: `import foo from "./a";\r \r diff --git a/tests/cases/fourslash/completionsImport_fromAmbientModule.ts b/tests/cases/fourslash/completionsImport_fromAmbientModule.ts index 05e7601c69..3b202ee33d 100644 --- a/tests/cases/fourslash/completionsImport_fromAmbientModule.ts +++ b/tests/cases/fourslash/completionsImport_fromAmbientModule.ts @@ -11,7 +11,7 @@ verify.applyCodeActionFromCompletion("", { name: "x", source: "m", - description: `Import 'x' from "m".`, + description: `Import 'x' from module "m".`, // TODO: GH#18445 newFileContent: `import { x } from "m";\r \r diff --git a/tests/cases/fourslash/completionsImport_multipleWithSameName.ts b/tests/cases/fourslash/completionsImport_multipleWithSameName.ts index 81a054e3d2..50f20d60bf 100644 --- a/tests/cases/fourslash/completionsImport_multipleWithSameName.ts +++ b/tests/cases/fourslash/completionsImport_multipleWithSameName.ts @@ -22,7 +22,7 @@ verify.completionListContains({ name: "foo", source: "/b" }, "const foo: 1", "", verify.applyCodeActionFromCompletion("", { name: "foo", source: "/b", - description: `Import 'foo' from "./b".`, + description: `Import 'foo' from module "./b".`, // TODO: GH#18445 newFileContent: `import { foo } from "./b";\r \r diff --git a/tests/cases/fourslash/completionsImport_named_namespaceImportExists.ts b/tests/cases/fourslash/completionsImport_named_namespaceImportExists.ts index 17b909b48e..4f547259ee 100644 --- a/tests/cases/fourslash/completionsImport_named_namespaceImportExists.ts +++ b/tests/cases/fourslash/completionsImport_named_namespaceImportExists.ts @@ -16,7 +16,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "function foo(): vo verify.applyCodeActionFromCompletion("", { name: "foo", source: "/a", - description: `Import 'foo' from "./a".`, + description: `Import 'foo' from module "./a".`, // TODO: GH#18445 newFileContent: `import * as a from "./a"; import { foo } from "./a";\r diff --git a/tests/cases/fourslash/completionsImport_ofAlias.ts b/tests/cases/fourslash/completionsImport_ofAlias.ts index cb4f1255a3..1eb730df84 100644 --- a/tests/cases/fourslash/completionsImport_ofAlias.ts +++ b/tests/cases/fourslash/completionsImport_ofAlias.ts @@ -28,7 +28,7 @@ verify.not.completionListContains({ name: "foo", source: "/a_reexport_2" }, unde verify.applyCodeActionFromCompletion("", { name: "foo", source: "/a", - description: `Import 'foo' from "./a".`, + description: `Import 'foo' from module "./a".`, // TODO: GH#18445 newFileContent: `import { foo } from "./a";\r \r diff --git a/tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts b/tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts index a1eba5981d..fae8a4abf5 100644 --- a/tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts +++ b/tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts @@ -23,7 +23,7 @@ verify.not.completionListContains({ name: "foo", source: "/foo/index" }, undefin verify.applyCodeActionFromCompletion("", { name: "foo", source: "/foo/lib/foo", - description: `Import 'foo' from "./foo".`, + description: `Import 'foo' from module "./foo".`, // TODO: GH#18445 newFileContent: `import { foo } from "./foo";\r \r diff --git a/tests/cases/fourslash/completionsImport_require.ts b/tests/cases/fourslash/completionsImport_require.ts index 8ec750d2c4..2913bac27b 100644 --- a/tests/cases/fourslash/completionsImport_require.ts +++ b/tests/cases/fourslash/completionsImport_require.ts @@ -22,7 +22,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "const foo: 0", "", verify.applyCodeActionFromCompletion("b", { name: "foo", source: "/a", - description: `Import 'foo' from "./a".`, + description: `Import 'foo' from module "./a".`, // TODO: GH#18445 newFileContent: `import { foo } from "./a";\r \r @@ -39,7 +39,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "const foo: 0", "", verify.applyCodeActionFromCompletion("c", { name: "foo", source: "/a", - description: `Import 'foo' from "./a".`, + description: `Import 'foo' from module "./a".`, // TODO: GH#18445 newFileContent: `import { foo } from "./a";\r \r