microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 16:38:05 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Make import fix for default import mention that it's a default import (#26105)

Browse Source
This commit is contained in:
Andy 2018-07-31 17:28:35 -07:00 committed by GitHub
parent 1599ee2805
commit f326b4b7cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/diagnosticMessages.json
View File

@ -4296,6 +4296,14 @@
"category": "Message",
"code": 90031
},
"Import default '{0}' from module \"{1}\"": {
"category": "Message",
"code": 90032
},
"Add default import '{0}' to existing import declaration from \"{1}\"": {
"category": "Message",
"code": 90033
},
"Convert function to an ES2015 class": {
"category": "Message",
"code": 95001

4
src/services/codefixes/importFixes.ts
View File

@ -465,14 +465,14 @@ namespace ts.codefix {
const { importClause, importKind } = fix;
doAddExistingFix(changes, sourceFile, importClause, importKind === ImportKind.Default ? symbolName : undefined, importKind === ImportKind.Named ? [symbolName] : emptyArray);
const moduleSpecifierWithoutQuotes = stripQuotes(importClause.parent.moduleSpecifier.getText());
return [Diagnostics.Add_0_to_existing_import_declaration_from_1, symbolName, moduleSpecifierWithoutQuotes];
return [importKind === ImportKind.Default ? Diagnostics.Add_default_import_0_to_existing_import_declaration_from_1 : Diagnostics.Add_0_to_existing_import_declaration_from_1, symbolName, moduleSpecifierWithoutQuotes]; // you too!
}
case ImportFixKind.AddNew: {
const { importKind, moduleSpecifier } = fix;
addNewImports(changes, sourceFile, moduleSpecifier, quotePreference, importKind === ImportKind.Default ? { defaultImport: symbolName, namedImports: emptyArray, namespaceLikeImport: undefined }
: importKind === ImportKind.Named ? { defaultImport: undefined, namedImports: [symbolName], namespaceLikeImport: undefined }
: { defaultImport: undefined, namedImports: emptyArray, namespaceLikeImport: { importKind, name: symbolName } });
return [Diagnostics.Import_0_from_module_1, symbolName, moduleSpecifier];
return [importKind === ImportKind.Default ? Diagnostics.Import_default_0_from_module_1 : Diagnostics.Import_0_from_module_1, symbolName, moduleSpecifier];
}
default:
return Debug.assertNever(fix);

2
tests/cases/fourslash/completionsImport_default_addToNamedImports.ts
View File

@ -17,7 +17,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "function foo(): vo
verify.applyCodeActionFromCompletion("", {
name: "foo",
source: "/a",
description: `Add 'foo' to existing import declaration from "./a"`,
description: `Add default import 'foo' to existing import declaration from "./a"`,
newFileContent: `import foo, { x } from "./a";
f;`,
});

2
tests/cases/fourslash/completionsImport_default_addToNamespaceImport.ts
View File

@ -16,7 +16,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "function foo(): vo
verify.applyCodeActionFromCompletion("", {
name: "foo",
source: "/a",
description: `Add 'foo' to existing import declaration from "./a"`,
description: `Add default import 'foo' to existing import declaration from "./a"`,
newFileContent: `import foo, * as a from "./a";
f;`,
});

2
tests/cases/fourslash/completionsImport_default_alreadyExistedWithRename.ts
View File

@ -16,7 +16,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "function foo(): vo
verify.applyCodeActionFromCompletion("", {
name: "foo",
source: "/a",
description: `Import 'foo' from module "./a"`,
description: `Import default 'foo' from module "./a"`,
newFileContent: `import f_o_o from "./a";
import foo from "./a";
f;`,

2
tests/cases/fourslash/completionsImport_default_anonymous.ts
View File

@ -19,7 +19,7 @@ verify.completions(
verify.applyCodeActionFromCompletion("1", {
name: "fooBar",
source: "/src/foo-bar",
description: `Import 'fooBar' from module "./foo-bar"`,
description: `Import default 'fooBar' from module "./foo-bar"`,
newFileContent: `import fooBar from "./foo-bar";
def

2
tests/cases/fourslash/completionsImport_default_didNotExistBefore.ts
View File

@ -17,7 +17,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "function foo(): vo
verify.applyCodeActionFromCompletion("", {
name: "foo",
source: "/a",
description: `Import 'foo' from module "./a"`,
description: `Import default 'foo' from module "./a"`,
newFileContent: `import foo from "./a";
f;`,

2
tests/cases/fourslash/completionsImport_default_exportDefaultIdentifier.ts
View File

@ -20,7 +20,7 @@ verify.completionListContains({ name: "foo", source: "/a" }, "(alias) const foo:
verify.applyCodeActionFromCompletion("", {
name: "foo",
source: "/a",
description: `Import 'foo' from module "./a"`,
description: `Import default 'foo' from module "./a"`,
newFileContent: `import foo from "./a";
f;`,

2
tests/cases/fourslash/completionsImport_default_fromMergedDeclarations.ts
View File

@ -24,7 +24,7 @@ verify.completionListContains({ name: "M", source: "m" }, "class M", "", "class"
verify.applyCodeActionFromCompletion("", {
name: "M",
source: "m",
description: `Import 'M' from module "m"`,
description: `Import default 'M' from module "m"`,
newFileContent: `import M from "m";
`,