diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index e9ae0131b05..d21a923a87b 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -6216,7 +6216,7 @@ "code": 18003 }, - "File is a CommonJS module; it may be converted to an ES6 module.": { + "File is a CommonJS module; it may be converted to an ES module.": { "category": "Suggestion", "code": 80001 }, @@ -6465,7 +6465,7 @@ "category": "Message", "code": 95016 }, - "Convert to ES6 module": { + "Convert to ES module": { "category": "Message", "code": 95017 }, diff --git a/src/services/codefixes/convertToEs6Module.ts b/src/services/codefixes/convertToEsModule.ts similarity index 96% rename from src/services/codefixes/convertToEs6Module.ts rename to src/services/codefixes/convertToEsModule.ts index 94f6dfe2495..e9f29c80de7 100644 --- a/src/services/codefixes/convertToEs6Module.ts +++ b/src/services/codefixes/convertToEsModule.ts @@ -1,11 +1,11 @@ /* @internal */ namespace ts.codefix { registerCodeFix({ - errorCodes: [Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module.code], + errorCodes: [Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module.code], getCodeActions(context) { const { sourceFile, program, preferences } = context; const changes = textChanges.ChangeTracker.with(context, changes => { - const moduleExportsChangedToDefault = convertFileToEs6Module(sourceFile, program.getTypeChecker(), changes, getEmitScriptTarget(program.getCompilerOptions()), getQuotePreference(sourceFile, preferences)); + const moduleExportsChangedToDefault = convertFileToEsModule(sourceFile, program.getTypeChecker(), changes, getEmitScriptTarget(program.getCompilerOptions()), getQuotePreference(sourceFile, preferences)); if (moduleExportsChangedToDefault) { for (const importingFile of program.getSourceFiles()) { fixImportOfModuleExports(importingFile, sourceFile, changes, getQuotePreference(importingFile, preferences)); @@ -13,7 +13,7 @@ namespace ts.codefix { } }); // No support for fix-all since this applies to the whole file at once anyway. - return [createCodeFixActionWithoutFixAll("convertToEs6Module", changes, Diagnostics.Convert_to_ES6_module)]; + return [createCodeFixActionWithoutFixAll("convertToEsModule", changes, Diagnostics.Convert_to_ES_module)]; }, }); @@ -39,7 +39,7 @@ namespace ts.codefix { } /** @returns Whether we converted a `module.exports =` to a default export. */ - function convertFileToEs6Module(sourceFile: SourceFile, checker: TypeChecker, changes: textChanges.ChangeTracker, target: ScriptTarget, quotePreference: QuotePreference): ModuleExportsChanged { + function convertFileToEsModule(sourceFile: SourceFile, checker: TypeChecker, changes: textChanges.ChangeTracker, target: ScriptTarget, quotePreference: QuotePreference): ModuleExportsChanged { const identifiers: Identifiers = { original: collectFreeIdentifiers(sourceFile), additional: new Set() }; const exports = collectExportRenames(sourceFile, checker, identifiers); convertExportsAccesses(sourceFile, exports, changes); @@ -210,7 +210,7 @@ namespace ts.codefix { // `const a = require("b").c` --> `import { c as a } from "./b"; return convertedImports([makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)]); default: - return Debug.assertNever(name, `Convert to ES6 module got invalid syntax form ${(name as BindingName).kind}`); + return Debug.assertNever(name, `Convert to ES module got invalid syntax form ${(name as BindingName).kind}`); } } @@ -430,7 +430,7 @@ namespace ts.codefix { case SyntaxKind.Identifier: return convertSingleIdentifierImport(name, moduleSpecifier, checker, identifiers, quotePreference); default: - return Debug.assertNever(name, `Convert to ES6 module got invalid name kind ${(name as BindingName).kind}`); + return Debug.assertNever(name, `Convert to ES module got invalid name kind ${(name as BindingName).kind}`); } } diff --git a/src/services/completions.ts b/src/services/completions.ts index e76f60ba507..40053d2e873 100644 --- a/src/services/completions.ts +++ b/src/services/completions.ts @@ -1993,10 +1993,10 @@ namespace ts.Completions { if (isNonContextualObjectLiteral) return false; // If not already a module, must have modules enabled. if (!preferences.includeCompletionsForModuleExports) return false; - // If already using ES6 modules, OK to continue using them. + // If already using ES modules, OK to continue using them. if (sourceFile.externalModuleIndicator || sourceFile.commonJsModuleIndicator) return true; // If module transpilation is enabled or we're targeting es6 or above, or not emitting, OK. - if (compilerOptionsIndicateEs6Modules(program.getCompilerOptions())) return true; + if (compilerOptionsIndicateEsModules(program.getCompilerOptions())) return true; // If some file is using ES6 modules, assume that it's OK to add more. return programContainsModules(program); } diff --git a/src/services/refactors/moveToNewFile.ts b/src/services/refactors/moveToNewFile.ts index 9e204bb383f..271a08b20f4 100644 --- a/src/services/refactors/moveToNewFile.ts +++ b/src/services/refactors/moveToNewFile.ts @@ -138,9 +138,9 @@ namespace ts.refactor { return [...prologueDirectives, ...toMove.all]; } - const useEs6ModuleSyntax = !!oldFile.externalModuleIndicator; + const useEsModuleSyntax = !!oldFile.externalModuleIndicator; const quotePreference = getQuotePreference(oldFile, preferences); - const importsFromNewFile = createOldFileImportsFromNewFile(usage.oldFileImportsFromNewFile, newModuleName, useEs6ModuleSyntax, quotePreference); + const importsFromNewFile = createOldFileImportsFromNewFile(usage.oldFileImportsFromNewFile, newModuleName, useEsModuleSyntax, quotePreference); if (importsFromNewFile) { insertImports(changes, oldFile, importsFromNewFile, /*blankLineBetween*/ true); } @@ -149,8 +149,8 @@ namespace ts.refactor { deleteMovedStatements(oldFile, toMove.ranges, changes); updateImportsInOtherFiles(changes, program, oldFile, usage.movedSymbols, newModuleName); - const imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, useEs6ModuleSyntax, quotePreference); - const body = addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEs6ModuleSyntax); + const imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, useEsModuleSyntax, quotePreference); + const body = addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEsModuleSyntax); if (imports.length && body.length) { return [ ...prologueDirectives, @@ -429,7 +429,7 @@ namespace ts.refactor { newFileImportsFromOldFile: ReadonlySymbolSet, changes: textChanges.ChangeTracker, checker: TypeChecker, - useEs6ModuleSyntax: boolean, + useEsModuleSyntax: boolean, quotePreference: QuotePreference, ): readonly SupportedImportStatement[] { const copiedOldImports: SupportedImportStatement[] = []; @@ -454,7 +454,7 @@ namespace ts.refactor { const top = getTopLevelDeclarationStatement(decl); if (markSeenTop(top)) { - addExportToChanges(oldFile, top, name, changes, useEs6ModuleSyntax); + addExportToChanges(oldFile, top, name, changes, useEsModuleSyntax); } if (hasSyntacticModifier(decl, ModifierFlags.Default)) { oldFileDefault = name; @@ -465,7 +465,7 @@ namespace ts.refactor { } }); - append(copiedOldImports, makeImportOrRequire(oldFileDefault, oldFileNamedImports, removeFileExtension(getBaseFileName(oldFile.fileName)), useEs6ModuleSyntax, quotePreference)); + append(copiedOldImports, makeImportOrRequire(oldFileDefault, oldFileNamedImports, removeFileExtension(getBaseFileName(oldFile.fileName)), useEsModuleSyntax, quotePreference)); return copiedOldImports; } diff --git a/src/services/suggestionDiagnostics.ts b/src/services/suggestionDiagnostics.ts index 1ca10245c72..314d4d485b8 100644 --- a/src/services/suggestionDiagnostics.ts +++ b/src/services/suggestionDiagnostics.ts @@ -10,9 +10,9 @@ namespace ts { if (!isCommonJSFile && sourceFile.commonJsModuleIndicator && - (programContainsEs6Modules(program) || compilerOptionsIndicateEs6Modules(program.getCompilerOptions())) && + (programContainsEsModules(program) || compilerOptionsIndicateEsModules(program.getCompilerOptions())) && containsTopLevelCommonjs(sourceFile)) { - diags.push(createDiagnosticForNode(getErrorNodeFromCommonJsIndicator(sourceFile.commonJsModuleIndicator), Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module)); + diags.push(createDiagnosticForNode(getErrorNodeFromCommonJsIndicator(sourceFile.commonJsModuleIndicator), Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module)); } const isJsFile = isSourceFileJS(sourceFile); @@ -66,7 +66,7 @@ namespace ts { } } - // convertToEs6Module only works on top-level, so don't trigger it if commonjs code only appears in nested scopes. + // convertToEsModule only works on top-level, so don't trigger it if commonjs code only appears in nested scopes. function containsTopLevelCommonjs(sourceFile: SourceFile): boolean { return sourceFile.statements.some(statement => { switch (statement.kind) { diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json index 1e0934804ed..d2119947f8f 100644 --- a/src/services/tsconfig.json +++ b/src/services/tsconfig.json @@ -61,7 +61,7 @@ "codefixes/annotateWithTypeFromJSDoc.ts", "codefixes/convertFunctionToEs6Class.ts", "codefixes/convertToAsyncFunction.ts", - "codefixes/convertToEs6Module.ts", + "codefixes/convertToEsModule.ts", "codefixes/correctQualifiedNameToIndexedAccessType.ts", "codefixes/convertToTypeOnlyExport.ts", "codefixes/convertToTypeOnlyImport.ts", diff --git a/src/services/utilities.ts b/src/services/utilities.ts index 965ae736d05..5414814bd2e 100644 --- a/src/services/utilities.ts +++ b/src/services/utilities.ts @@ -1897,10 +1897,10 @@ namespace ts { export function programContainsModules(program: Program): boolean { return program.getSourceFiles().some(s => !s.isDeclarationFile && !program.isSourceFileFromExternalLibrary(s) && !!(s.externalModuleIndicator || s.commonJsModuleIndicator)); } - export function programContainsEs6Modules(program: Program): boolean { + export function programContainsEsModules(program: Program): boolean { return program.getSourceFiles().some(s => !s.isDeclarationFile && !program.isSourceFileFromExternalLibrary(s) && !!s.externalModuleIndicator); } - export function compilerOptionsIndicateEs6Modules(compilerOptions: CompilerOptions): boolean { + export function compilerOptionsIndicateEsModules(compilerOptions: CompilerOptions): boolean { return !!compilerOptions.module || getEmitScriptTarget(compilerOptions) >= ScriptTarget.ES2015 || !!compilerOptions.noEmit; } diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_exportEqualsClass.ts b/tests/cases/fourslash/refactorConvertToEsModule_exportEqualsClass.ts similarity index 87% rename from tests/cases/fourslash/refactorConvertToEs6Module_exportEqualsClass.ts rename to tests/cases/fourslash/refactorConvertToEsModule_exportEqualsClass.ts index 2abff8c95df..b7613fe01e6 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_exportEqualsClass.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_exportEqualsClass.ts @@ -12,7 +12,7 @@ ////}; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import { x } from "./b"; export default class C { diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_alias.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_alias.ts similarity index 86% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_alias.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_alias.ts index 56fe9d0808c..4df276bb9a3 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_alias.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_alias.ts @@ -9,7 +9,7 @@ ////module.exports = exportsAlias; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: ` export function f() {} `, diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_dotDefault.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_dotDefault.ts similarity index 88% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_dotDefault.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_dotDefault.ts index 8bd74041dec..09b5f1fad07 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_dotDefault.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_dotDefault.ts @@ -10,7 +10,7 @@ ////exports.default; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `const _default = 0; export { _default as default }; diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_invalidName.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_invalidName.ts similarity index 88% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_invalidName.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_invalidName.ts index bec40f756ad..be9aff92c53 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_invalidName.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_invalidName.ts @@ -10,7 +10,7 @@ ////exports.async = 1; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `const _class = 0; export { _class as class }; diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_moduleDotExports.ts similarity index 92% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_moduleDotExports.ts index e88e3e2f173..1a38ba745d5 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_moduleDotExports.ts @@ -13,7 +13,7 @@ // See also `refactorConvertToEs6Module_export_moduleDotExportsEqualsRequire.ts` verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `export default function() {} export default function f() {} diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExportsEqualsRequire.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_moduleDotExportsEqualsRequire.ts similarity index 96% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExportsEqualsRequire.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_moduleDotExportsEqualsRequire.ts index 8dd77f06e1d..97b559c61d4 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExportsEqualsRequire.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_moduleDotExportsEqualsRequire.ts @@ -31,7 +31,7 @@ goTo.file("/z.js"); verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `export * from "./a"; export { default } from "./b"; diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports_changesImports.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_moduleDotExports_changesImports.ts similarity index 86% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports_changesImports.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_moduleDotExports_changesImports.ts index ddc6a77721e..2d598c54d88 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_moduleDotExports_changesImports.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_moduleDotExports_changesImports.ts @@ -13,7 +13,7 @@ ////const a = require("./a"); verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: { "/a.js": "export default 0;", "/b.ts": 'import a from "./a";', diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_named.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_named.ts similarity index 88% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_named.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_named.ts index 481281a47a4..d8b0769eeaa 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_named.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_named.ts @@ -14,11 +14,11 @@ const [r0, r1, r2] = test.ranges(); verify.getSuggestionDiagnostics([ - { message: "File is a CommonJS module; it may be converted to an ES6 module.", code: 80001, range: r0 }, + { message: "File is a CommonJS module; it may be converted to an ES module.", code: 80001, range: r0 }, ]); verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `export function f() {} export class C {} diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_namedClassExpression.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_namedClassExpression.ts similarity index 86% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_namedClassExpression.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_namedClassExpression.ts index e1cb86e8d68..8847ff61068 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_namedClassExpression.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_namedClassExpression.ts @@ -8,7 +8,7 @@ ////exports.D = class D { static instance = new D(); } verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `export const C = class E { static instance = new E(); } export class D { static instance = new D(); }`, diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_namedFunctionExpression.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_namedFunctionExpression.ts similarity index 87% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_namedFunctionExpression.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_namedFunctionExpression.ts index c4468a1a189..0144912fb56 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_namedFunctionExpression.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_namedFunctionExpression.ts @@ -8,7 +8,7 @@ ////exports.h = function h() { h(); } verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `export const f = function g() { g(); } export function h() { h(); }`, diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_object.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_object.ts similarity index 86% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_object.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_object.ts index 664796b1172..20e643a298b 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_object.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_object.ts @@ -16,7 +16,7 @@ ////const a = require("./a.js"); verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `export const x = 0; export function f() { } diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_object_shorthand.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_object_shorthand.ts similarity index 87% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_object_shorthand.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_object_shorthand.ts index 62588f6a531..b82f8230d5f 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_object_shorthand.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_object_shorthand.ts @@ -10,7 +10,7 @@ ////module.exports = { f }; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `function f() {} export default { f };`, diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_export_referenced.ts b/tests/cases/fourslash/refactorConvertToEsModule_export_referenced.ts similarity index 91% rename from tests/cases/fourslash/refactorConvertToEs6Module_export_referenced.ts rename to tests/cases/fourslash/refactorConvertToEsModule_export_referenced.ts index 7a5b94b0a98..4f16770d989 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_export_referenced.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_export_referenced.ts @@ -17,7 +17,7 @@ ////} verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `export const x = 0; x; diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_expressionToDeclaration.ts b/tests/cases/fourslash/refactorConvertToEsModule_expressionToDeclaration.ts similarity index 90% rename from tests/cases/fourslash/refactorConvertToEs6Module_expressionToDeclaration.ts rename to tests/cases/fourslash/refactorConvertToEsModule_expressionToDeclaration.ts index 73dcff28285..bda1c079b9d 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_expressionToDeclaration.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_expressionToDeclaration.ts @@ -10,7 +10,7 @@ ////exports.C = class C extends D { m() {} } verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `var C = {}; console.log(C); diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_arrayBindingPattern.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_arrayBindingPattern.ts similarity index 85% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_arrayBindingPattern.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_arrayBindingPattern.ts index f373f00dfe7..2784905fe1e 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_arrayBindingPattern.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_arrayBindingPattern.ts @@ -8,7 +8,7 @@ ////x; y; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import _x from "x"; const [x, y] = _x; x; y;`, diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_es6DefaultImport.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_es6DefaultImport.ts similarity index 86% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_es6DefaultImport.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_es6DefaultImport.ts index 9fe26a24010..54d0f4d46cd 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_es6DefaultImport.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_es6DefaultImport.ts @@ -10,7 +10,7 @@ ////y(); verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import x from 'x'; x(); diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_includeDefaultUses.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_includeDefaultUses.ts similarity index 84% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_includeDefaultUses.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_includeDefaultUses.ts index a75854595f3..77f21f10e24 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_includeDefaultUses.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_includeDefaultUses.ts @@ -9,7 +9,7 @@ ////x.y; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import x, { y } from "x"; x(); diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleUniqueIdentifiers.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_multipleUniqueIdentifiers.ts similarity index 89% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_multipleUniqueIdentifiers.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_multipleUniqueIdentifiers.ts index faf8ec5eb69..fcfb23c5ed1 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleUniqueIdentifiers.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_multipleUniqueIdentifiers.ts @@ -10,7 +10,7 @@ ////x; a; b; c; d; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import x from "x"; import _x from "x"; diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleVariableDeclarations.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_multipleVariableDeclarations.ts similarity index 88% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_multipleVariableDeclarations.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_multipleVariableDeclarations.ts index 33f31299f8b..e3695bd59ed 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_multipleVariableDeclarations.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_multipleVariableDeclarations.ts @@ -10,7 +10,7 @@ ////x; y; z; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import x from "x"; const y = 0; diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_nameFromModuleSpecifier.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_nameFromModuleSpecifier.ts similarity index 89% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_nameFromModuleSpecifier.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_nameFromModuleSpecifier.ts index 3427e62fb9c..e12264c8667 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_nameFromModuleSpecifier.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_nameFromModuleSpecifier.ts @@ -9,7 +9,7 @@ ////const [] = require("1a"); verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import aB from "a-b"; const [] = aB; diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_complex.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_objectBindingPattern_complex.ts similarity index 85% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_complex.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_objectBindingPattern_complex.ts index 74071ba55fb..320b433df3b 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_complex.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_objectBindingPattern_complex.ts @@ -8,7 +8,7 @@ ////a; b; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import x from "x"; const { x: { a, b } } = x; diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_plain.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_objectBindingPattern_plain.ts similarity index 84% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_plain.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_objectBindingPattern_plain.ts index 31b9cb41f62..a26b8e4fc08 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_objectBindingPattern_plain.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_objectBindingPattern_plain.ts @@ -8,7 +8,7 @@ ////x; z; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import { x, y as z } from "x"; x; z;`, diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_onlyNamedImports.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_onlyNamedImports.ts similarity index 82% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_onlyNamedImports.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_onlyNamedImports.ts index 2b40e1ade36..3b8575d6f47 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_onlyNamedImports.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_onlyNamedImports.ts @@ -8,7 +8,7 @@ ////x.y; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import { y } from "x"; y;`, diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_propertyAccess.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_propertyAccess.ts similarity index 90% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_propertyAccess.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_propertyAccess.ts index dea48380597..9ff80563c76 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_propertyAccess.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_propertyAccess.ts @@ -12,7 +12,7 @@ ////x; a; b; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import x from "x"; import { c as a } from "b"; diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_shadowing.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_shadowing.ts similarity index 85% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_shadowing.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_shadowing.ts index f506f970085..e2becf8b8d0 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_shadowing.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_shadowing.ts @@ -9,7 +9,7 @@ ////mod.x(x); verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import { x as _x } from "mod"; const x = 0; diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_import_sideEffect.ts b/tests/cases/fourslash/refactorConvertToEsModule_import_sideEffect.ts similarity index 84% rename from tests/cases/fourslash/refactorConvertToEs6Module_import_sideEffect.ts rename to tests/cases/fourslash/refactorConvertToEsModule_import_sideEffect.ts index e8023ac414a..d252f28ae9b 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_import_sideEffect.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_import_sideEffect.ts @@ -9,6 +9,6 @@ ////require("foo"); verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: 'import "foo";', }); diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_inCommonJsFile.ts b/tests/cases/fourslash/refactorConvertToEsModule_inCommonJsFile.ts similarity index 91% rename from tests/cases/fourslash/refactorConvertToEs6Module_inCommonJsFile.ts rename to tests/cases/fourslash/refactorConvertToEsModule_inCommonJsFile.ts index d56bdc303fb..bd739e59dca 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_inCommonJsFile.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_inCommonJsFile.ts @@ -26,6 +26,6 @@ verify.codeFixAvailable([]); goTo.file("/d.js"); verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: 'export default 0;', }); \ No newline at end of file diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_missingInitializer.ts b/tests/cases/fourslash/refactorConvertToEsModule_missingInitializer.ts similarity index 82% rename from tests/cases/fourslash/refactorConvertToEs6Module_missingInitializer.ts rename to tests/cases/fourslash/refactorConvertToEsModule_missingInitializer.ts index 90a256c2480..b6ee4fda681 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_missingInitializer.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_missingInitializer.ts @@ -8,7 +8,7 @@ ////let x; x; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import "m"; let x; x;` diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_module_node12.ts b/tests/cases/fourslash/refactorConvertToEsModule_module_node12.ts similarity index 100% rename from tests/cases/fourslash/refactorConvertToEs6Module_module_node12.ts rename to tests/cases/fourslash/refactorConvertToEsModule_module_node12.ts diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_module_nodenext.ts b/tests/cases/fourslash/refactorConvertToEsModule_module_nodenext.ts similarity index 100% rename from tests/cases/fourslash/refactorConvertToEs6Module_module_nodenext.ts rename to tests/cases/fourslash/refactorConvertToEsModule_module_nodenext.ts diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_notAtTopLevel.ts b/tests/cases/fourslash/refactorConvertToEsModule_notAtTopLevel.ts similarity index 100% rename from tests/cases/fourslash/refactorConvertToEs6Module_notAtTopLevel.ts rename to tests/cases/fourslash/refactorConvertToEsModule_notAtTopLevel.ts diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_notInCommonjsProject.ts b/tests/cases/fourslash/refactorConvertToEsModule_notInCommonjsProject.ts similarity index 100% rename from tests/cases/fourslash/refactorConvertToEs6Module_notInCommonjsProject.ts rename to tests/cases/fourslash/refactorConvertToEsModule_notInCommonjsProject.ts diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_notInCommonjsProject_yesIfSomeEs6Module.ts b/tests/cases/fourslash/refactorConvertToEsModule_notInCommonjsProject_yesIfSomeEsModule.ts similarity index 83% rename from tests/cases/fourslash/refactorConvertToEs6Module_notInCommonjsProject_yesIfSomeEs6Module.ts rename to tests/cases/fourslash/refactorConvertToEsModule_notInCommonjsProject_yesIfSomeEsModule.ts index 491b61a0bc2..5bc9502b0f2 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_notInCommonjsProject_yesIfSomeEs6Module.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_notInCommonjsProject_yesIfSomeEsModule.ts @@ -9,6 +9,6 @@ ////export const y = 0; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: "export const x = 0;", }); diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_preserveQuotes.ts b/tests/cases/fourslash/refactorConvertToEsModule_preserveQuotes.ts similarity index 82% rename from tests/cases/fourslash/refactorConvertToEs6Module_preserveQuotes.ts rename to tests/cases/fourslash/refactorConvertToEsModule_preserveQuotes.ts index d8c48d0e971..2ed5c156123 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_preserveQuotes.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_preserveQuotes.ts @@ -7,6 +7,6 @@ ////const a = require('a'); a; verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: "import a from 'a'; a;", }); diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_renameWithinTransformedExports.ts b/tests/cases/fourslash/refactorConvertToEsModule_renameWithinTransformedExports.ts similarity index 94% rename from tests/cases/fourslash/refactorConvertToEs6Module_renameWithinTransformedExports.ts rename to tests/cases/fourslash/refactorConvertToEsModule_renameWithinTransformedExports.ts index 5908aedd002..528c982292e 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_renameWithinTransformedExports.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_renameWithinTransformedExports.ts @@ -24,7 +24,7 @@ verify.codeFix({ index: 2, - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `import { defer } from "q"; diff --git a/tests/cases/fourslash/refactorConvertToEs6Module_unexported_uninitialized_var.ts b/tests/cases/fourslash/refactorConvertToEsModule_unexported_uninitialized_var.ts similarity index 89% rename from tests/cases/fourslash/refactorConvertToEs6Module_unexported_uninitialized_var.ts rename to tests/cases/fourslash/refactorConvertToEsModule_unexported_uninitialized_var.ts index e9cbaafee58..5f7f791e70d 100644 --- a/tests/cases/fourslash/refactorConvertToEs6Module_unexported_uninitialized_var.ts +++ b/tests/cases/fourslash/refactorConvertToEsModule_unexported_uninitialized_var.ts @@ -10,12 +10,12 @@ ////console.log(privateUnrelated); verify.getSuggestionDiagnostics([{ - message: "File is a CommonJS module; it may be converted to an ES6 module.", + message: "File is a CommonJS module; it may be converted to an ES module.", code: 80001, }]); verify.codeFix({ - description: "Convert to ES6 module", + description: "Convert to ES module", newFileContent: `var privateUnrelated; export function f() {}