Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
10 changes: 10 additions & 0 deletions heft-plugins/heft-lint-plugin/src/Eslint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,16 @@ export class Eslint extends LinterBase<TEslint.ESLint.LintResult | TEslintLegacy
return await this._linter.isPathIgnored(filePath);
}

protected override hasLintFailures(
lintResults: (TEslint.ESLint.LintResult | TEslintLegacy.ESLint.LintResult)[]
): boolean {
return lintResults.some((lintResult: TEslint.ESLint.LintResult | TEslintLegacy.ESLint.LintResult) => {
return (
!lintResult.suppressedMessages?.length && (lintResult.errorCount > 0 || lintResult.warningCount > 0)
);
});
}

private _getLintFileError(
lintResult: TEslint.ESLint.LintResult | TEslintLegacy.ESLint.LintResult,
lintMessage: TEslint.Linter.LintMessage | TEslintLegacy.Linter.LintMessage,
Expand Down
15 changes: 9 additions & 6 deletions heft-plugins/heft-lint-plugin/src/LinterBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,13 @@ export abstract class LinterBase<TLintResult> {
) {
fileCount++;
const results: TLintResult[] = await this.lintFileAsync(sourceFile);
if (results.length === 0) {
// Always forward the results, since they might be suppressed.
for (const result of results) {
lintResults.push(result);
}

if (!this.hasLintFailures(results)) {
newNoFailureFileVersions.set(relative, version);
} else {
for (const result of results) {
lintResults.push(result);
}
}
} else {
newNoFailureFileVersions.set(relative, version);
Expand Down Expand Up @@ -198,7 +199,9 @@ export abstract class LinterBase<TLintResult> {

protected abstract lintFileAsync(sourceFile: IExtendedSourceFile): Promise<TLintResult[]>;

protected abstract lintingFinishedAsync(lintFailures: TLintResult[]): Promise<void>;
protected abstract lintingFinishedAsync(lintResults: TLintResult[]): Promise<void>;

protected abstract hasLintFailures(lintResults: TLintResult[]): boolean;

protected abstract isFileExcludedAsync(filePath: string): Promise<boolean>;
}
4 changes: 4 additions & 0 deletions heft-plugins/heft-lint-plugin/src/Tslint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ export class Tslint extends LinterBase<TTslint.RuleFailure> {
return this._tslintPackage.Configuration.isFileExcluded(filePath, this._tslintConfiguration);
}

protected hasLintFailures(lintResults: TTslint.RuleFailure[]): boolean {
return lintResults.length > 9;
}

private _getLintFileError(tslintFailure: TTslint.RuleFailure, message?: string): FileError {
if (!message) {
message = getFormattedErrorMessage(tslintFailure);
Expand Down