From be47a145c0e0677bff198b33d5503c1fd8b68d9b Mon Sep 17 00:00:00 2001 From: Adi Dahiya Date: Thu, 28 Feb 2019 21:26:08 -0500 Subject: [PATCH] Fix regression in CheckstyleFormatter backwards compatibility (#4561) --- src/formatters/checkstyleFormatter.ts | 8 ++++++-- src/language/formatter/abstractFormatter.ts | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/formatters/checkstyleFormatter.ts b/src/formatters/checkstyleFormatter.ts index ce5746f8948..5b687910bc4 100644 --- a/src/formatters/checkstyleFormatter.ts +++ b/src/formatters/checkstyleFormatter.ts @@ -38,8 +38,8 @@ export class Formatter extends AbstractFormatter { }; /* tslint:enable:object-literal-sort-keys */ - public format(failures: RuleFailure[], _fixes: RuleFailure[], fileNames: string[]): string { - const groupedFailures: { [k: string]: RuleFailure[] } = {}; + public format(failures: RuleFailure[], _fixes?: RuleFailure[], fileNames?: string[]): string { + const groupedFailures: { [fileName: string]: RuleFailure[] } = {}; for (const failure of failures) { const fileName = failure.getFileName(); if (groupedFailures[fileName] !== undefined) { @@ -49,6 +49,10 @@ export class Formatter extends AbstractFormatter { } } + if (fileNames === undefined) { + fileNames = Object.keys(groupedFailures); + } + const formattedFiles = fileNames.map(fileName => { const formattedFailures = groupedFailures[fileName] !== undefined diff --git a/src/language/formatter/abstractFormatter.ts b/src/language/formatter/abstractFormatter.ts index 69529774d27..2a6ff3f7e78 100644 --- a/src/language/formatter/abstractFormatter.ts +++ b/src/language/formatter/abstractFormatter.ts @@ -23,8 +23,8 @@ export abstract class AbstractFormatter implements IFormatter { public static metadata: IFormatterMetadata; public abstract format( failures: RuleFailure[], - fixes: RuleFailure[], - fileNames: string[], + fixes?: RuleFailure[], + fileNames?: string[], ): string; protected sortFailures(failures: RuleFailure[]): RuleFailure[] {