diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c80fbcdd8d..5ee9fa4ab3 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -81,11 +81,11 @@ module ts { getTypeCount: () => typeCount, isUndefinedSymbol: symbol => symbol === undefinedSymbol, isArgumentsSymbol: symbol => symbol === argumentsSymbol, + emitFiles: invokeEmitter, getDiagnostics, getDeclarationDiagnostics, getGlobalDiagnostics, checkProgram, - invokeEmitter, getParentOfSymbol, getNarrowedTypeOfSymbol, getDeclaredTypeOfSymbol, diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 79972c7a89..9bb2db719f 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -367,7 +367,7 @@ module ts { } else { var emitStart = new Date().getTime(); - var emitOutput = checker.invokeEmitter(); + var emitOutput = checker.emitFiles(); var emitErrors = emitOutput.diagnostics; exitStatus = emitOutput.emitResultStatus; var reportStart = new Date().getTime(); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 0188067f10..c396499f54 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -738,7 +738,7 @@ module ts { getSymbolCount(): number; getTypeCount(): number; checkProgram(): void; - invokeEmitter(targetSourceFile?: SourceFile): EmitResult; + emitFiles(targetSourceFile?: SourceFile): EmitResult; getParentOfSymbol(symbol: Symbol): Symbol; getNarrowedTypeOfSymbol(symbol: Symbol, node: Node): Type; getDeclaredTypeOfSymbol(symbol: Symbol): Type; diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 88fb3639d1..05e65f5648 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -2223,7 +2223,7 @@ module FourSlash { if (errs.length > 0) { throw new Error('Error compiling ' + fileName + ': ' + errs.map(e => e.messageText).join('\r\n')); } - checker.invokeEmitter(); + checker.emitFiles(); result = result || ''; // Might have an empty fourslash file // Compile and execute the test diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 0ce9ee1643..1a5938d2be 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -806,7 +806,7 @@ module Harness { // only emit if there weren't parse errors var emitResult: ts.EmitResult; if (!isEmitBlocked) { - emitResult = checker.invokeEmitter(); + emitResult = checker.emitFiles(); } var errors: HarnessDiagnostic[] = []; diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index 44cd3a6d95..4734232d28 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -132,7 +132,7 @@ class ProjectRunner extends RunnerBase { if (!errors.length) { var checker = program.getTypeChecker(/*fullTypeCheck*/ true); errors = checker.getDiagnostics(); - var emitResult = checker.invokeEmitter(); + var emitResult = checker.emitFiles(); errors = ts.concatenate(errors, emitResult.diagnostics); sourceMapData = emitResult.sourceMaps; diff --git a/src/services/services.ts b/src/services/services.ts index cf5ca07132..2ef21f01dd 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -4625,7 +4625,7 @@ module ts { // Perform semantic and force a type check before emit to ensure that all symbols are updated // EmitFiles will report if there is an error from TypeChecker and Emitter // Depend whether we will have to emit into a single file or not either emit only selected file in the project, emit all files into a single file - var emitFilesResult = getFullTypeCheckChecker().invokeEmitter(targetSourceFile); + var emitFilesResult = getFullTypeCheckChecker().emitFiles(targetSourceFile); emitOutput.emitOutputStatus = emitFilesResult.emitResultStatus; // Reset writer back to undefined to make sure that we produce an error message if CompilerHost.writeFile method is called when we are not in getEmitOutput