From 5a8e345008b409b2af6cf7248196be41b0b19210 Mon Sep 17 00:00:00 2001 From: Alex Eyers-Taylor Date: Fri, 10 Oct 2025 13:06:10 +0100 Subject: [PATCH] Fix linitng issues. --- lib/analyze-action.js | 4 +++- lib/init-action.js | 6 +++++- src/analyze.test.ts | 1 - src/analyze.ts | 14 ++++++++------ src/diff-informed-analysis-utils.test.ts | 7 ++++--- src/diff-informed-analysis-utils.ts | 6 +++--- src/init-action.ts | 16 ++++++++++------ src/overlay-database-utils.ts | 5 ++++- 8 files changed, 37 insertions(+), 22 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index ae343d471..06b857bbd 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -93637,7 +93637,9 @@ async function setupDiffInformedQueryRun(logger) { ); return void 0; } - const fileCount = new Set(diffRanges.filter((r) => r.path).map((r) => r.path)).size; + const fileCount = new Set( + diffRanges.filter((r) => r.path).map((r) => r.path) + ).size; logger.info( `Using precomputed diff ranges (${diffRanges.length} ranges across ${fileCount} files).` ); diff --git a/lib/init-action.js b/lib/init-action.js index 0ee306912..056562fbb 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -90986,7 +90986,11 @@ async function run() { logger }); await checkInstallPython311(config.languages, codeql); - prDiffChangedFiles = await computeAndPersistDiffRanges(codeql, features, logger); + prDiffChangedFiles = await computeAndPersistDiffRanges( + codeql, + features, + logger + ); } catch (unwrappedError) { const error2 = wrapError(unwrappedError); core13.setFailed(error2.message); diff --git a/src/analyze.test.ts b/src/analyze.test.ts index afc736817..b6880b43d 100644 --- a/src/analyze.test.ts +++ b/src/analyze.test.ts @@ -129,7 +129,6 @@ test("status report fields", async (t) => { }); }); - test("resolveQuerySuiteAlias", (t) => { // default query suite names should resolve to something language-specific ending in `.qls`. for (const suite of defaultSuites) { diff --git a/src/analyze.ts b/src/analyze.ts index a9daa8234..1a5da2f1b 100644 --- a/src/analyze.ts +++ b/src/analyze.ts @@ -14,7 +14,10 @@ import { type CodeQL } from "./codeql"; import * as configUtils from "./config-utils"; import { getJavaTempDependencyDir } from "./dependency-caching"; import { addDiagnostic, makeDiagnostic } from "./diagnostics"; -import { DiffThunkRange, readDiffRangesJsonFile } from "./diff-informed-analysis-utils"; +import { + DiffThunkRange, + readDiffRangesJsonFile, +} from "./diff-informed-analysis-utils"; import { EnvVar } from "./environment"; import { FeatureEnablement, Feature } from "./feature-flags"; import { KnownLanguage, Language } from "./languages"; @@ -303,12 +306,14 @@ export async function setupDiffInformedQueryRun( return undefined; } - const fileCount = new Set(diffRanges.filter((r) => r.path).map((r) => r.path)).size; + const fileCount = new Set( + diffRanges.filter((r) => r.path).map((r) => r.path), + ).size; logger.info( `Using precomputed diff ranges (${diffRanges.length} ranges across ${fileCount} files).`, ); - const packDir = writeDiffRangeDataExtensionPack(logger, diffRanges); + const packDir = writeDiffRangeDataExtensionPack(logger, diffRanges); if (packDir === undefined) { logger.warning( "Cannot create diff range extension pack for diff-informed queries; " + @@ -324,8 +329,6 @@ export async function setupDiffInformedQueryRun( ); } - - /** * Create an extension pack in the temporary directory that contains the file * line ranges that were added or modified in the pull request. @@ -406,7 +409,6 @@ extensions: `Wrote pr-diff-range extension pack to ${extensionFilePath}:\n${extensionContents}`, ); - return diffRangeDir; } diff --git a/src/diff-informed-analysis-utils.test.ts b/src/diff-informed-analysis-utils.test.ts index 99115aa31..a67b714b1 100644 --- a/src/diff-informed-analysis-utils.test.ts +++ b/src/diff-informed-analysis-utils.test.ts @@ -4,7 +4,10 @@ import * as sinon from "sinon"; import * as actionsUtil from "./actions-util"; import type { PullRequestBranches } from "./actions-util"; import * as apiClient from "./api-client"; -import { shouldPerformDiffInformedAnalysis } from "./diff-informed-analysis-utils"; +import { + shouldPerformDiffInformedAnalysis, + exportedForTesting as diffExportedForTesting, +} from "./diff-informed-analysis-utils"; import { Feature, Features } from "./feature-flags"; import { getRunnerLogger } from "./logging"; import { parseRepositoryNwo } from "./repository"; @@ -187,8 +190,6 @@ test( // --------------------------------------------------------------------------- // Tests for getDiffRanges (moved from analyze.test.ts after extraction) // --------------------------------------------------------------------------- -import { exportedForTesting as diffExportedForTesting } from "./diff-informed-analysis-utils"; - function runGetDiffRanges(changes: number, patch: string[] | undefined): any { sinon .stub(actionsUtil, "getRequiredInput") diff --git a/src/diff-informed-analysis-utils.ts b/src/diff-informed-analysis-utils.ts index f0cf8670e..9395f4e31 100644 --- a/src/diff-informed-analysis-utils.ts +++ b/src/diff-informed-analysis-utils.ts @@ -1,15 +1,15 @@ import * as fs from "fs"; import * as path from "path"; -import * as actionsUtil from "./actions-util"; import type { PullRequestBranches } from "./actions-util"; +import * as actionsUtil from "./actions-util"; +import { getRequiredInput } from "./actions-util"; import { getGitHubVersion, getApiClient } from "./api-client"; import type { CodeQL } from "./codeql"; import { Feature, FeatureEnablement } from "./feature-flags"; import { Logger } from "./logging"; -import { GitHubVariant, satisfiesGHESVersion } from "./util"; import { getRepositoryNwoFromEnv } from "./repository"; -import { getRequiredInput } from "./actions-util"; +import { GitHubVariant, satisfiesGHESVersion } from "./util"; /** * This interface is an abbreviated version of the file diff object returned by diff --git a/src/init-action.ts b/src/init-action.ts index d96c7ab52..a481d2891 100644 --- a/src/init-action.ts +++ b/src/init-action.ts @@ -33,6 +33,11 @@ import { logUnwrittenDiagnostics, makeDiagnostic, } from "./diagnostics"; +import { + getPullRequestEditedDiffRanges, + writeDiffRangesJsonFile, + getDiffInformedAnalysisBranches, +} from "./diff-informed-analysis-utils"; import { EnvVar } from "./environment"; import { Feature, Features } from "./feature-flags"; import { loadPropertiesFromApi } from "./feature-flags/properties"; @@ -66,11 +71,6 @@ import { ZstdAvailability } from "./tar"; import { ToolsDownloadStatusReport } from "./tools-download"; import { ToolsFeature } from "./tools-features"; import { getCombinedTracerConfig } from "./tracer-config"; -import { - getPullRequestEditedDiffRanges, - writeDiffRangesJsonFile, - getDiffInformedAnalysisBranches, -} from "./diff-informed-analysis-utils"; import { checkDiskUsage, checkForTimeout, @@ -343,7 +343,11 @@ async function run() { await checkInstallPython311(config.languages, codeql); - prDiffChangedFiles = await computeAndPersistDiffRanges(codeql, features, logger); + prDiffChangedFiles = await computeAndPersistDiffRanges( + codeql, + features, + logger, + ); } catch (unwrappedError) { const error = wrapError(unwrappedError); core.setFailed(error.message); diff --git a/src/overlay-database-utils.ts b/src/overlay-database-utils.ts index 51f0f3f00..b4a894a12 100644 --- a/src/overlay-database-utils.ts +++ b/src/overlay-database-utils.ts @@ -133,7 +133,10 @@ export async function writeOverlayChangesFile( for (const f of prDiffChangedFiles) { if (!existing.has(f)) { // Only include if file still exists (added/modified) — skip deleted files that might appear in diff. - if (overlayFileOids[f] !== undefined || fs.existsSync(path.join(sourceRoot, f))) { + if ( + overlayFileOids[f] !== undefined || + fs.existsSync(path.join(sourceRoot, f)) + ) { existing.add(f); changedFiles.push(f); extraAddedCount++;