From 970aac6458fe1dfe30d41b34fa4690a05e29f483 Mon Sep 17 00:00:00 2001
From: Yui T <yuisu@microsoft.com>
Date: Tue, 18 Nov 2014 16:32:18 -0800
Subject: [PATCH] Address code review

---
 src/compiler/emitter.ts       | 2 +-
 src/compiler/tsc.ts           | 2 +-
 src/compiler/types.ts         | 2 +-
 src/harness/harness.ts        | 2 +-
 src/harness/projectsRunner.ts | 2 +-
 src/services/services.ts      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 80780606281..81f44c27cc6 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -3564,7 +3564,7 @@ module ts {
 
         return {
             emitResultStatus,
-            errors: diagnostics,
+            diagnostics,
             sourceMaps: sourceMapDataList
         };
     }
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
index 58e2ac0db06..79972c7a891 100644
--- a/src/compiler/tsc.ts
+++ b/src/compiler/tsc.ts
@@ -368,7 +368,7 @@ module ts {
             else {
                 var emitStart = new Date().getTime();
                 var emitOutput = checker.invokeEmitter();
-                var emitErrors = emitOutput.errors;
+                var emitErrors = emitOutput.diagnostics;
                 exitStatus = emitOutput.emitResultStatus;
                 var reportStart = new Date().getTime();
                 errors = concatenate(errors, emitErrors);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 6c176bb9552..a5f838b121e 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -700,7 +700,7 @@ module ts {
 
     export interface EmitResult {
         emitResultStatus: EmitReturnStatus;
-        errors: Diagnostic[];
+        diagnostics: Diagnostic[];
         sourceMaps: SourceMapData[];  // Array of sourceMapData if compiler emitted sourcemaps
     }
 
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index 8f49e5ff769..5b6db22e1db 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -810,7 +810,7 @@ module Harness {
                 }
 
                 var errors: HarnessDiagnostic[] = [];
-                program.getDiagnostics().concat(checker.getDiagnostics()).concat(emitResult ? emitResult.errors : []).forEach(err => {
+                program.getDiagnostics().concat(checker.getDiagnostics()).concat(emitResult ? emitResult.diagnostics : []).forEach(err => {
                     // TODO: new compiler formats errors after this point to add . and newlines so we'll just do it manually for now
                     errors.push(getMinimalDiagnostic(err));
                 });
diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
index 034f4e463c9..e402c7c6803 100644
--- a/src/harness/projectsRunner.ts
+++ b/src/harness/projectsRunner.ts
@@ -132,7 +132,7 @@ class ProjectRunner extends RunnerBase {
                 var checker = program.getTypeChecker(/*fullTypeCheck*/ true);
                 errors = checker.getDiagnostics();
                 var emitResult = checker.invokeEmitter();
-                errors = ts.concatenate(errors, emitResult.errors);
+                errors = ts.concatenate(errors, emitResult.diagnostics);
                 sourceMapData = emitResult.sourceMaps;
 
                 // Clean up source map data that will be used in baselining
diff --git a/src/services/services.ts b/src/services/services.ts
index 13f364c6e8a..14533a95a49 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2291,7 +2291,7 @@ module ts {
                 // Get emitter-diagnostics requires calling TypeChecker.emitFiles so we have to define CompilerHost.writer which does nothing because emitFiles function has side effects defined by CompilerHost.writer
                 var savedWriter = writer;
                 writer = (filename: string, data: string, writeByteOrderMark: boolean) => { };
-                allDiagnostics = allDiagnostics.concat(checker.invokeEmitter(targetSourceFile).errors);
+                allDiagnostics = allDiagnostics.concat(checker.invokeEmitter(targetSourceFile).diagnostics);
                 writer = savedWriter;
             }
             return allDiagnostics