cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(compiler-cli): diagnostics file paths relative to cwd, not tsconfig (#19748)

Browse Source 
PR Close #19748
This commit is contained in:
Alex Eagle
2017-10-16 12:31:25 -04:00
committed by Tobias Bosch
parent c0cc6eeca1
commit 56774dfb79
6 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/compiler-cli/src/main.ts
View File

@ -28,15 +28,15 @@ export function main(
let {project, rootNames, options, errors: configErrors, watch, emitFlags} =
config || readNgcCommandLineAndConfiguration(args);
if (configErrors.length) {
return reportErrorsAndExit(options, configErrors, consoleError);
return reportErrorsAndExit(configErrors, consoleError);
}
if (watch) {
const result = watchMode(project, options, consoleError);
return reportErrorsAndExit({}, result.firstCompileResult, consoleError);
return reportErrorsAndExit(result.firstCompileResult, consoleError);
}
const {diagnostics: compileDiags} = performCompilation(
{rootNames, options, emitFlags, emitCallback: createEmitCallback(options)});
return reportErrorsAndExit(options, compileDiags, consoleError);
return reportErrorsAndExit(compileDiags, consoleError);
}
function createEmitCallback(options: api.CompilerOptions): api.TsEmitCallback|undefined {
@ -128,11 +128,10 @@ export function readCommandLineAndConfiguration(
}
function reportErrorsAndExit(
options: api.CompilerOptions, allDiagnostics: Diagnostics,
consoleError: (s: string) => void = console.error): number {
allDiagnostics: Diagnostics, consoleError: (s: string) => void = console.error): number {
const errorsAndWarnings = filterErrorsAndWarnings(allDiagnostics);
if (errorsAndWarnings.length) {
consoleError(formatDiagnostics(options, errorsAndWarnings));
consoleError(formatDiagnostics(errorsAndWarnings));
}
return exitCodeFromResult(allDiagnostics);
}
@ -140,7 +139,7 @@ function reportErrorsAndExit(
export function watchMode(
project: string, options: api.CompilerOptions, consoleError: (s: string) => void) {
return performWatchCompilation(createPerformWatchHost(project, diagnostics => {
consoleError(formatDiagnostics(options, diagnostics));
consoleError(formatDiagnostics(diagnostics));
}, options, options => createEmitCallback(options)));
}