Skip to content

Commit dfb4054

Browse files
sidharthv96sidharthv96
authored
fix: ES6 Modules => ES Modules in error messages (microsoft#46378)
* fix: ES6 Modules => ES Modules in error messages * chore: Rename test file names * chore: Rename function names
1 parent 6a75689 commit dfb4054

File tree

43 files changed

+57
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+57
-57
lines changed

‎src/compiler/diagnosticMessages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6216,7 +6216,7 @@
62166216
"code": 18003
62176217
},
62186218

6219-
"File is a CommonJS module; it may be converted to an ES6 module.": {
6219+
"File is a CommonJS module; it may be converted to an ES module.": {
62206220
"category": "Suggestion",
62216221
"code": 80001
62226222
},
@@ -6465,7 +6465,7 @@
64656465
"category": "Message",
64666466
"code": 95016
64676467
},
6468-
"Convert to ES6 module": {
6468+
"Convert to ES module": {
64696469
"category": "Message",
64706470
"code": 95017
64716471
},

‎src/services/codefixes/convertToEs6Module.ts renamed to ‎src/services/codefixes/convertToEsModule.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
/* @internal */
22
namespace ts.codefix {
33
registerCodeFix({
4-
errorCodes: [Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module.code],
4+
errorCodes: [Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module.code],
55
getCodeActions(context) {
66
const { sourceFile, program, preferences } = context;
77
const changes = textChanges.ChangeTracker.with(context, changes => {
8-
const moduleExportsChangedToDefault = convertFileToEs6Module(sourceFile, program.getTypeChecker(), changes, getEmitScriptTarget(program.getCompilerOptions()), getQuotePreference(sourceFile, preferences));
8+
const moduleExportsChangedToDefault = convertFileToEsModule(sourceFile, program.getTypeChecker(), changes, getEmitScriptTarget(program.getCompilerOptions()), getQuotePreference(sourceFile, preferences));
99
if (moduleExportsChangedToDefault) {
1010
for (const importingFile of program.getSourceFiles()) {
1111
fixImportOfModuleExports(importingFile, sourceFile, changes, getQuotePreference(importingFile, preferences));
1212
}
1313
}
1414
});
1515
// No support for fix-all since this applies to the whole file at once anyway.
16-
return [createCodeFixActionWithoutFixAll("convertToEs6Module", changes, Diagnostics.Convert_to_ES6_module)];
16+
return [createCodeFixActionWithoutFixAll("convertToEsModule", changes, Diagnostics.Convert_to_ES_module)];
1717
},
1818
});
1919

@@ -39,7 +39,7 @@ namespace ts.codefix {
3939
}
4040

4141
/** @returns Whether we converted a `module.exports =` to a default export. */
42-
function convertFileToEs6Module(sourceFile: SourceFile, checker: TypeChecker, changes: textChanges.ChangeTracker, target: ScriptTarget, quotePreference: QuotePreference): ModuleExportsChanged {
42+
function convertFileToEsModule(sourceFile: SourceFile, checker: TypeChecker, changes: textChanges.ChangeTracker, target: ScriptTarget, quotePreference: QuotePreference): ModuleExportsChanged {
4343
const identifiers: Identifiers = { original: collectFreeIdentifiers(sourceFile), additional: new Set() };
4444
const exports = collectExportRenames(sourceFile, checker, identifiers);
4545
convertExportsAccesses(sourceFile, exports, changes);
@@ -210,7 +210,7 @@ namespace ts.codefix {
210210
// `const a = require("b").c` --> `import { c as a } from "./b";
211211
return convertedImports([makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)]);
212212
default:
213-
return Debug.assertNever(name, `Convert to ES6 module got invalid syntax form ${(name as BindingName).kind}`);
213+
return Debug.assertNever(name, `Convert to ES module got invalid syntax form ${(name as BindingName).kind}`);
214214
}
215215
}
216216

@@ -430,7 +430,7 @@ namespace ts.codefix {
430430
case SyntaxKind.Identifier:
431431
return convertSingleIdentifierImport(name, moduleSpecifier, checker, identifiers, quotePreference);
432432
default:
433-
return Debug.assertNever(name, `Convert to ES6 module got invalid name kind ${(name as BindingName).kind}`);
433+
return Debug.assertNever(name, `Convert to ES module got invalid name kind ${(name as BindingName).kind}`);
434434
}
435435
}
436436

‎src/services/completions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1993,10 +1993,10 @@ namespace ts.Completions {
19931993
if (isNonContextualObjectLiteral) return false;
19941994
// If not already a module, must have modules enabled.
19951995
if (!preferences.includeCompletionsForModuleExports) return false;
1996-
// If already using ES6 modules, OK to continue using them.
1996+
// If already using ES modules, OK to continue using them.
19971997
if (sourceFile.externalModuleIndicator || sourceFile.commonJsModuleIndicator) return true;
19981998
// If module transpilation is enabled or we're targeting es6 or above, or not emitting, OK.
1999-
if (compilerOptionsIndicateEs6Modules(program.getCompilerOptions())) return true;
1999+
if (compilerOptionsIndicateEsModules(program.getCompilerOptions())) return true;
20002000
// If some file is using ES6 modules, assume that it's OK to add more.
20012001
return programContainsModules(program);
20022002
}

‎src/services/refactors/moveToNewFile.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ namespace ts.refactor {
138138
return [...prologueDirectives, ...toMove.all];
139139
}
140140

141-
const useEs6ModuleSyntax = !!oldFile.externalModuleIndicator;
141+
const useEsModuleSyntax = !!oldFile.externalModuleIndicator;
142142
const quotePreference = getQuotePreference(oldFile, preferences);
143-
const importsFromNewFile = createOldFileImportsFromNewFile(usage.oldFileImportsFromNewFile, newModuleName, useEs6ModuleSyntax, quotePreference);
143+
const importsFromNewFile = createOldFileImportsFromNewFile(usage.oldFileImportsFromNewFile, newModuleName, useEsModuleSyntax, quotePreference);
144144
if (importsFromNewFile) {
145145
insertImports(changes, oldFile, importsFromNewFile, /*blankLineBetween*/ true);
146146
}
@@ -149,8 +149,8 @@ namespace ts.refactor {
149149
deleteMovedStatements(oldFile, toMove.ranges, changes);
150150
updateImportsInOtherFiles(changes, program, oldFile, usage.movedSymbols, newModuleName);
151151

152-
const imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, useEs6ModuleSyntax, quotePreference);
153-
const body = addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEs6ModuleSyntax);
152+
const imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, useEsModuleSyntax, quotePreference);
153+
const body = addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEsModuleSyntax);
154154
if (imports.length && body.length) {
155155
return [
156156
...prologueDirectives,
@@ -429,7 +429,7 @@ namespace ts.refactor {
429429
newFileImportsFromOldFile: ReadonlySymbolSet,
430430
changes: textChanges.ChangeTracker,
431431
checker: TypeChecker,
432-
useEs6ModuleSyntax: boolean,
432+
useEsModuleSyntax: boolean,
433433
quotePreference: QuotePreference,
434434
): readonly SupportedImportStatement[] {
435435
const copiedOldImports: SupportedImportStatement[] = [];
@@ -454,7 +454,7 @@ namespace ts.refactor {
454454

455455
const top = getTopLevelDeclarationStatement(decl);
456456
if (markSeenTop(top)) {
457-
addExportToChanges(oldFile, top, name, changes, useEs6ModuleSyntax);
457+
addExportToChanges(oldFile, top, name, changes, useEsModuleSyntax);
458458
}
459459
if (hasSyntacticModifier(decl, ModifierFlags.Default)) {
460460
oldFileDefault = name;
@@ -465,7 +465,7 @@ namespace ts.refactor {
465465
}
466466
});
467467

468-
append(copiedOldImports, makeImportOrRequire(oldFileDefault, oldFileNamedImports, removeFileExtension(getBaseFileName(oldFile.fileName)), useEs6ModuleSyntax, quotePreference));
468+
append(copiedOldImports, makeImportOrRequire(oldFileDefault, oldFileNamedImports, removeFileExtension(getBaseFileName(oldFile.fileName)), useEsModuleSyntax, quotePreference));
469469
return copiedOldImports;
470470
}
471471

‎src/services/suggestionDiagnostics.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace ts {
1010

1111
if (!isCommonJSFile &&
1212
sourceFile.commonJsModuleIndicator &&
13-
(programContainsEs6Modules(program) || compilerOptionsIndicateEs6Modules(program.getCompilerOptions())) &&
13+
(programContainsEsModules(program) || compilerOptionsIndicateEsModules(program.getCompilerOptions())) &&
1414
containsTopLevelCommonjs(sourceFile)) {
15-
diags.push(createDiagnosticForNode(getErrorNodeFromCommonJsIndicator(sourceFile.commonJsModuleIndicator), Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module));
15+
diags.push(createDiagnosticForNode(getErrorNodeFromCommonJsIndicator(sourceFile.commonJsModuleIndicator), Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module));
1616
}
1717

1818
const isJsFile = isSourceFileJS(sourceFile);
@@ -66,7 +66,7 @@ namespace ts {
6666
}
6767
}
6868

69-
// convertToEs6Module only works on top-level, so don't trigger it if commonjs code only appears in nested scopes.
69+
// convertToEsModule only works on top-level, so don't trigger it if commonjs code only appears in nested scopes.
7070
function containsTopLevelCommonjs(sourceFile: SourceFile): boolean {
7171
return sourceFile.statements.some(statement => {
7272
switch (statement.kind) {

‎src/services/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"codefixes/annotateWithTypeFromJSDoc.ts",
6262
"codefixes/convertFunctionToEs6Class.ts",
6363
"codefixes/convertToAsyncFunction.ts",
64-
"codefixes/convertToEs6Module.ts",
64+
"codefixes/convertToEsModule.ts",
6565
"codefixes/correctQualifiedNameToIndexedAccessType.ts",
6666
"codefixes/convertToTypeOnlyExport.ts",
6767
"codefixes/convertToTypeOnlyImport.ts",

‎src/services/utilities.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1897,10 +1897,10 @@ namespace ts {
18971897
export function programContainsModules(program: Program): boolean {
18981898
return program.getSourceFiles().some(s => !s.isDeclarationFile && !program.isSourceFileFromExternalLibrary(s) && !!(s.externalModuleIndicator || s.commonJsModuleIndicator));
18991899
}
1900-
export function programContainsEs6Modules(program: Program): boolean {
1900+
export function programContainsEsModules(program: Program): boolean {
19011901
return program.getSourceFiles().some(s => !s.isDeclarationFile && !program.isSourceFileFromExternalLibrary(s) && !!s.externalModuleIndicator);
19021902
}
1903-
export function compilerOptionsIndicateEs6Modules(compilerOptions: CompilerOptions): boolean {
1903+
export function compilerOptionsIndicateEsModules(compilerOptions: CompilerOptions): boolean {
19041904
return !!compilerOptions.module || getEmitScriptTarget(compilerOptions) >= ScriptTarget.ES2015 || !!compilerOptions.noEmit;
19051905
}
19061906

‎tests/cases/fourslash/refactorConvertToEs6Module_exportEqualsClass.ts renamed to ‎tests/cases/fourslash/refactorConvertToEsModule_exportEqualsClass.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
////};
1313

1414
verify.codeFix({
15-
description: "Convert to ES6 module",
15+
description: "Convert to ES module",
1616
newFileContent:
1717
`import { x } from "./b";
1818
export default class C {

‎tests/cases/fourslash/refactorConvertToEs6Module_export_alias.ts renamed to ‎tests/cases/fourslash/refactorConvertToEsModule_export_alias.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
////module.exports = exportsAlias;
1010

1111
verify.codeFix({
12-
description: "Convert to ES6 module",
12+
description: "Convert to ES module",
1313
newFileContent: `
1414
export function f() {}
1515
`,

‎tests/cases/fourslash/refactorConvertToEs6Module_export_dotDefault.ts renamed to ‎tests/cases/fourslash/refactorConvertToEsModule_export_dotDefault.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
////exports.default;
1111

1212
verify.codeFix({
13-
description: "Convert to ES6 module",
13+
description: "Convert to ES module",
1414
newFileContent:
1515
`const _default = 0;
1616
export { _default as default };

0 commit comments

Comments
 (0)