@@ -138,9 +138,9 @@ namespace ts.refactor {
138
138
return [ ...prologueDirectives , ...toMove . all ] ;
139
139
}
140
140
141
- const useEs6ModuleSyntax = ! ! oldFile . externalModuleIndicator ;
141
+ const useEsModuleSyntax = ! ! oldFile . externalModuleIndicator ;
142
142
const quotePreference = getQuotePreference ( oldFile , preferences ) ;
143
- const importsFromNewFile = createOldFileImportsFromNewFile ( usage . oldFileImportsFromNewFile , newModuleName , useEs6ModuleSyntax , quotePreference ) ;
143
+ const importsFromNewFile = createOldFileImportsFromNewFile ( usage . oldFileImportsFromNewFile , newModuleName , useEsModuleSyntax , quotePreference ) ;
144
144
if ( importsFromNewFile ) {
145
145
insertImports ( changes , oldFile , importsFromNewFile , /*blankLineBetween*/ true ) ;
146
146
}
@@ -149,8 +149,8 @@ namespace ts.refactor {
149
149
deleteMovedStatements ( oldFile , toMove . ranges , changes ) ;
150
150
updateImportsInOtherFiles ( changes , program , oldFile , usage . movedSymbols , newModuleName ) ;
151
151
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 ) ;
154
154
if ( imports . length && body . length ) {
155
155
return [
156
156
...prologueDirectives ,
@@ -429,7 +429,7 @@ namespace ts.refactor {
429
429
newFileImportsFromOldFile : ReadonlySymbolSet ,
430
430
changes : textChanges . ChangeTracker ,
431
431
checker : TypeChecker ,
432
- useEs6ModuleSyntax : boolean ,
432
+ useEsModuleSyntax : boolean ,
433
433
quotePreference : QuotePreference ,
434
434
) : readonly SupportedImportStatement [ ] {
435
435
const copiedOldImports : SupportedImportStatement [ ] = [ ] ;
@@ -454,7 +454,7 @@ namespace ts.refactor {
454
454
455
455
const top = getTopLevelDeclarationStatement ( decl ) ;
456
456
if ( markSeenTop ( top ) ) {
457
- addExportToChanges ( oldFile , top , name , changes , useEs6ModuleSyntax ) ;
457
+ addExportToChanges ( oldFile , top , name , changes , useEsModuleSyntax ) ;
458
458
}
459
459
if ( hasSyntacticModifier ( decl , ModifierFlags . Default ) ) {
460
460
oldFileDefault = name ;
@@ -465,7 +465,7 @@ namespace ts.refactor {
465
465
}
466
466
} ) ;
467
467
468
- append ( copiedOldImports , makeImportOrRequire ( oldFileDefault , oldFileNamedImports , removeFileExtension ( getBaseFileName ( oldFile . fileName ) ) , useEs6ModuleSyntax , quotePreference ) ) ;
468
+ append ( copiedOldImports , makeImportOrRequire ( oldFileDefault , oldFileNamedImports , removeFileExtension ( getBaseFileName ( oldFile . fileName ) ) , useEsModuleSyntax , quotePreference ) ) ;
469
469
return copiedOldImports ;
470
470
}
471
471
0 commit comments