Skip to content

Rever change to EmitOutput.diagnostics #7139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhegazy merged 1 commit into from
Feb 18, 2016
Merged

Rever change to EmitOutput.diagnostics #7139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/compiler/emitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge

return {
emitSkipped,
declarationDiagnostics: emitterDiagnostics.getDiagnostics(),
diagnostics: emitterDiagnostics.getDiagnostics(),
sourceMaps: sourceMapDataList
};

Expand Down
4 changes: 2 additions & 2 deletions src/compiler/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 };
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/compiler/tsc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 2 additions & 1 deletion src/compiler/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion src/harness/projectsRunner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down