Rever change to EmitOutput.diagnostics

mhegazy · mhegazy · commit 353998a6bd79 · 2016-02-18T12:06:17.000-08:00
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -389,7 +389,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 
         return {
             emitSkipped,
-            declarationDiagnostics: emitterDiagnostics.getDiagnostics(),
+            diagnostics: emitterDiagnostics.getDiagnostics(),
             sourceMaps: sourceMapDataList
         };
 
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -956,7 +956,7 @@ namespace ts {
             let declarationDiagnostics: Diagnostic[] = [];
 
             if (options.noEmit) {
-                return { declarationDiagnostics, sourceMaps: undefined, emitSkipped: true };
+                return { diagnostics: declarationDiagnostics, sourceMaps: undefined, emitSkipped: true };
             }
 
             // If the noEmitOnError flag is set, then check if we have any errors so far.  If so,
@@ -973,7 +973,7 @@ namespace ts {
                 }
 
                 if (diagnostics.length > 0 || declarationDiagnostics.length > 0) {
-                    return { declarationDiagnostics, sourceMaps: undefined, emitSkipped: true };
+                    return { diagnostics, sourceMaps: undefined, emitSkipped: true };
                 }
             }
 
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -592,7 +592,7 @@ namespace ts {
 
             // Otherwise, emit and report any errors we ran into.
             const emitOutput = program.emit();
-            diagnostics = diagnostics.concat(emitOutput.declarationDiagnostics);
+            diagnostics = diagnostics.concat(emitOutput.diagnostics);
 
             reportDiagnostics(sortAndDeduplicateDiagnostics(diagnostics), compilerHost);
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1680,7 +1680,8 @@ namespace ts {
 
     export interface EmitResult {
         emitSkipped: boolean;
-        /* @internal */ declarationDiagnostics: Diagnostic[];
+        /** Contains declaration emit diagnostics */
+        diagnostics: Diagnostic[];
         /* @internal */ sourceMaps: SourceMapData[];  // Array of sourceMapData if compiler emitted sourcemaps
     }
 
diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
@@ -127,7 +127,7 @@ class ProjectRunner extends RunnerBase {
             let errors = ts.getPreEmitDiagnostics(program);
 
             const emitResult = program.emit();
-            errors = ts.concatenate(errors, emitResult.declarationDiagnostics);
+            errors = ts.concatenate(errors, emitResult.diagnostics);
             const sourceMapData = emitResult.sourceMaps;
 
             // Clean up source map data that will be used in baselining

Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,7 @@ namespace ts {`
`956`	`956`	`let declarationDiagnostics: Diagnostic[] = [];`
`957`	`957`
`958`	`958`	`if (options.noEmit) {`
`959`		`- return { declarationDiagnostics, sourceMaps: undefined, emitSkipped: true };`
	`959`	`+ return { diagnostics: declarationDiagnostics, sourceMaps: undefined, emitSkipped: true };`
`960`	`960`	`}`
`961`	`961`
`962`	`962`	`// If the noEmitOnError flag is set, then check if we have any errors so far. If so,`
`@@ -973,7 +973,7 @@ namespace ts {`
`973`	`973`	`}`
`974`	`974`
`975`	`975`	`if (diagnostics.length > 0 \|\| declarationDiagnostics.length > 0) {`
`976`		`- return { declarationDiagnostics, sourceMaps: undefined, emitSkipped: true };`
	`976`	`+ return { diagnostics, sourceMaps: undefined, emitSkipped: true };`
`977`	`977`	`}`
`978`	`978`	`}`
`979`	`979`
Original file line number	Diff line number	Diff line change
`@@ -1680,7 +1680,8 @@ namespace ts {`
`1680`	`1680`
`1681`	`1681`	`export interface EmitResult {`
`1682`	`1682`	`emitSkipped: boolean;`
`1683`		`- /* @internal */ declarationDiagnostics: Diagnostic[];`
	`1683`	`+ /** Contains declaration emit diagnostics */`
	`1684`	`+ diagnostics: Diagnostic[];`
`1684`	`1685`	`/* @internal */ sourceMaps: SourceMapData[]; // Array of sourceMapData if compiler emitted sourcemaps`
`1685`	`1686`	`}`
`1686`	`1687`