From 333b8ff0280a98df264cacd7b93a30469c73d140 Mon Sep 17 00:00:00 2001 From: Andy Date: Tue, 1 May 2018 14:59:58 -0700 Subject: [PATCH] Fix typo: `||` should be parenthesized (#23811) --- src/services/codefixes/importFixes.ts | 2 +- .../completionsImport_defaultFalsePositive.ts | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tests/cases/fourslash/completionsImport_defaultFalsePositive.ts diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts index fa466eb8cb9..d863021ff92 100644 --- a/src/services/codefixes/importFixes.ts +++ b/src/services/codefixes/importFixes.ts @@ -114,7 +114,7 @@ namespace ts.codefix { } for (const exported of checker.getExportsOfModule(moduleSymbol)) { - if (exported.escapedName === InternalSymbolName.Default || exported.name === symbolName && skipAlias(exported, checker) === exportedSymbol) { + if ((exported.escapedName === InternalSymbolName.Default || exported.name === symbolName) && skipAlias(exported, checker) === exportedSymbol) { const isDefaultExport = checker.tryGetMemberInModuleExports(InternalSymbolName.Default, moduleSymbol) === exported; result.push({ moduleSymbol, importKind: isDefaultExport ? ImportKind.Default : ImportKind.Named }); } diff --git a/tests/cases/fourslash/completionsImport_defaultFalsePositive.ts b/tests/cases/fourslash/completionsImport_defaultFalsePositive.ts new file mode 100644 index 00000000000..b03631082a6 --- /dev/null +++ b/tests/cases/fourslash/completionsImport_defaultFalsePositive.ts @@ -0,0 +1,32 @@ +/// + +// @Filename: /node_modules/foo/index.ts +////export default function f(): void; + +// @Filename: /node_modules/bar/concat.d.ts +////export const concat = 0; + +// @Filename: /a.ts +////export {}; +////conca/**/ + +goTo.file("/a.ts"); + +verify.completions({ + at: "", + includes: [ + { name: "concat", source: "/node_modules/bar/concat", sourceDisplay: "bar/concat", text: "const concat: 0", kind: "const", hasAction: true }, + ], + preferences: { includeCompletionsForModuleExports: true }, +}); + +verify.applyCodeActionFromCompletion("", { + name: "concat", + source: "/node_modules/bar/concat", + description: `Import 'concat' from module "bar/concat"`, + newFileContent: +`import { concat } from "bar/concat"; + +export {}; +conca`, +});