From 69085b3d523feb126131f1a9da5e639dcb237152 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jul 2026 13:13:25 +0000 Subject: [PATCH 1/2] Bump prettier from 3.8.4 to 3.9.3 in /extensions/ql-vscode Bumps [prettier](https://github.com/prettier/prettier) from 3.8.4 to 3.9.3. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.8.4...3.9.3) --- updated-dependencies: - dependency-name: prettier dependency-version: 3.9.3 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- extensions/ql-vscode/package-lock.json | 8 ++++---- extensions/ql-vscode/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index ecb6aeb4d5a..316aa80f4d2 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -124,7 +124,7 @@ "markdownlint-cli2-formatter-pretty": "^0.0.9", "npm-run-all": "^4.1.5", "patch-package": "^8.0.1", - "prettier": "^3.8.4", + "prettier": "^3.9.3", "storybook": "^10.4.6", "tar-stream": "^3.2.0", "through2": "^4.0.2", @@ -24994,9 +24994,9 @@ } }, "node_modules/prettier": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.4.tgz", - "integrity": "sha512-N2MylSdi48+5N/6S5j+maeHbUSIzzZ5uOcX5Hm4QpV8Dkb1HFjfAKTKX6yNPJQD9AhcT3ifHNB66tWTTJDi11Q==", + "version": "3.9.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.3.tgz", + "integrity": "sha512-HWmu+K+zvHNpaMfSnYeqdqrDbR16cuIXaPx8WoHaviQkDJh1/0BNtOZmHVQI5jc3wXv0H1yXc9wjvFdXh+n3hQ==", "dev": true, "license": "MIT", "bin": { diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 82cf2fedad5..3a1ef68a0c7 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -2182,7 +2182,7 @@ "markdownlint-cli2-formatter-pretty": "^0.0.9", "npm-run-all": "^4.1.5", "patch-package": "^8.0.1", - "prettier": "^3.8.4", + "prettier": "^3.9.3", "storybook": "^10.4.6", "tar-stream": "^3.2.0", "through2": "^4.0.2", From 45f4f5516403e70141f0b9911eb47c9f4720c4d1 Mon Sep 17 00:00:00 2001 From: Nick Rolfe Date: Fri, 10 Jul 2026 14:41:00 +0100 Subject: [PATCH 2/2] Reformat code with 'npm run format' after updating prettier --- .../ql-vscode/src/common/bqrs-cli-types.ts | 12 ++---------- .../src/common/bqrs-raw-results-mapper.ts | 4 ++-- .../ql-vscode/src/common/interface-types.ts | 10 +++------- .../src/common/logging/vscode/loggers.ts | 3 +-- .../ql-vscode/src/common/raw-result-types.ts | 3 +-- .../src/common/vscode/abstract-webview.ts | 3 +-- .../ql-vscode/src/databases/db-item-expansion.ts | 3 +-- .../ql-vscode/src/debugger/debug-session.ts | 6 +----- .../src/model-editor/extension-pack-picker.ts | 9 +++------ .../ql-vscode/src/model-editor/modeled-method.ts | 7 +------ .../src/query-history/store/query-history-dto.ts | 3 +-- extensions/ql-vscode/src/run-queries-shared.ts | 4 +--- .../variant-analysis/gh-api/variant-analysis.ts | 16 +++------------- .../variant-analysis/shared/analysis-result.ts | 3 +-- .../src/view/results/AlertTableHeader.tsx | 3 +-- .../cli-integration/debugger/debug-controller.ts | 3 +-- 16 files changed, 24 insertions(+), 68 deletions(-) diff --git a/extensions/ql-vscode/src/common/bqrs-cli-types.ts b/extensions/ql-vscode/src/common/bqrs-cli-types.ts index e9e726957e3..3f266545227 100644 --- a/extensions/ql-vscode/src/common/bqrs-cli-types.ts +++ b/extensions/ql-vscode/src/common/bqrs-cli-types.ts @@ -69,20 +69,12 @@ export interface BqrsWholeFileLocation { } export type BqrsUrlValue = - | BqrsWholeFileLocation - | BqrsLineColumnLocation - | string; + BqrsWholeFileLocation | BqrsLineColumnLocation | string; export type BqrsCellValue = BqrsEntityValue | number | string | boolean; export type BqrsKind = - | "String" - | "Float" - | "Integer" - | "Boolean" - | "Date" - | "Entity" - | "BigInt"; + "String" | "Float" | "Integer" | "Boolean" | "Date" | "Entity" | "BigInt"; interface BqrsColumn { name?: string; diff --git a/extensions/ql-vscode/src/common/bqrs-raw-results-mapper.ts b/extensions/ql-vscode/src/common/bqrs-raw-results-mapper.ts index ec6a7bf5ee4..bc97183c5ee 100644 --- a/extensions/ql-vscode/src/common/bqrs-raw-results-mapper.ts +++ b/extensions/ql-vscode/src/common/bqrs-raw-results-mapper.ts @@ -31,8 +31,8 @@ export function bqrsToResultSet( name: schema.name, totalRowCount: schema.rows, columns: schema.columns.map(mapColumn), - rows: chunk.tuples.map( - (tuple): Row => tuple.map((cell): CellValue => mapCellValue(cell)), + rows: chunk.tuples.map((tuple): Row => + tuple.map((cell): CellValue => mapCellValue(cell)), ), }; diff --git a/extensions/ql-vscode/src/common/interface-types.ts b/extensions/ql-vscode/src/common/interface-types.ts index 60d87cd7083..b2464c25beb 100644 --- a/extensions/ql-vscode/src/common/interface-types.ts +++ b/extensions/ql-vscode/src/common/interface-types.ts @@ -50,8 +50,7 @@ type InterpretedResultSet = { }; export type ResultSet = - | RawTableResultSet - | InterpretedResultSet; + RawTableResultSet | InterpretedResultSet; /** * Only ever show this many rows in a raw result table. @@ -365,9 +364,7 @@ interface UnhandledErrorMessage { } type CommonFromViewMessages = - | ViewLoadedMsg - | TelemetryMessage - | UnhandledErrorMessage; + ViewLoadedMsg | TelemetryMessage | UnhandledErrorMessage; /** * Message from the results view to signal a request to change the @@ -497,8 +494,7 @@ export interface SetPerformanceComparisonQueries { export type FromComparePerformanceViewMessage = CommonFromViewMessages; export type QueryCompareResult = - | RawQueryCompareResult - | InterpretedQueryCompareResult; + RawQueryCompareResult | InterpretedQueryCompareResult; /** * from is the set of rows that have changes in the "from" query. diff --git a/extensions/ql-vscode/src/common/logging/vscode/loggers.ts b/extensions/ql-vscode/src/common/logging/vscode/loggers.ts index eee921210c1..a9d28c9d98e 100644 --- a/extensions/ql-vscode/src/common/logging/vscode/loggers.ts +++ b/extensions/ql-vscode/src/common/logging/vscode/loggers.ts @@ -12,8 +12,7 @@ export const queryServerLogger = new OutputChannelLogger("CodeQL Query Server"); // Logger for messages from the query server for warming overlay-base cache. let queryServerForWarmingOverlayBaseCacheLogger: - | OutputChannelLogger - | undefined; + OutputChannelLogger | undefined; // construct queryServerForWarmingOverlayBaseCacheLogger lazily, as most users don't need it export function getQueryServerForWarmingOverlayBaseCacheLogger(): OutputChannelLogger { diff --git a/extensions/ql-vscode/src/common/raw-result-types.ts b/extensions/ql-vscode/src/common/raw-result-types.ts index 4b5a03e243d..8ecf16db23f 100644 --- a/extensions/ql-vscode/src/common/raw-result-types.ts +++ b/extensions/ql-vscode/src/common/raw-result-types.ts @@ -33,8 +33,7 @@ export type UrlValueLineColumnLocation = { }; export type UrlValueResolvable = - | UrlValueWholeFileLocation - | UrlValueLineColumnLocation; + UrlValueWholeFileLocation | UrlValueLineColumnLocation; export function isUrlValueResolvable( value: UrlValue, diff --git a/extensions/ql-vscode/src/common/vscode/abstract-webview.ts b/extensions/ql-vscode/src/common/vscode/abstract-webview.ts index 87c0583af1d..da306dc3f26 100644 --- a/extensions/ql-vscode/src/common/vscode/abstract-webview.ts +++ b/extensions/ql-vscode/src/common/vscode/abstract-webview.ts @@ -138,8 +138,7 @@ export abstract class AbstractWebview< } protected abstract getPanelConfig(): - | WebviewPanelConfig - | Promise; + WebviewPanelConfig | Promise; protected abstract onPanelDispose(): void; diff --git a/extensions/ql-vscode/src/databases/db-item-expansion.ts b/extensions/ql-vscode/src/databases/db-item-expansion.ts index 968d011d8a7..fb0ba258744 100644 --- a/extensions/ql-vscode/src/databases/db-item-expansion.ts +++ b/extensions/ql-vscode/src/databases/db-item-expansion.ts @@ -2,8 +2,7 @@ import type { DbItem } from "./db-item"; import { DbItemKind, flattenDbItems } from "./db-item"; export type ExpandedDbItem = - | RootRemoteExpandedDbItem - | RemoteUserDefinedListExpandedDbItem; + RootRemoteExpandedDbItem | RemoteUserDefinedListExpandedDbItem; export enum ExpandedDbItemKind { RootRemote = "rootRemote", diff --git a/extensions/ql-vscode/src/debugger/debug-session.ts b/extensions/ql-vscode/src/debugger/debug-session.ts index 64100a7831f..a99b6d03a68 100644 --- a/extensions/ql-vscode/src/debugger/debug-session.ts +++ b/extensions/ql-vscode/src/debugger/debug-session.ts @@ -118,11 +118,7 @@ class EvaluationCompletedEvent * Possible states of the debug session. Used primarily to guard against unexpected requests. */ type State = - | "uninitialized" - | "initialized" - | "running" - | "stopped" - | "terminated"; + "uninitialized" | "initialized" | "running" | "stopped" | "terminated"; // IDs for error messages generated by the debug adapter itself. diff --git a/extensions/ql-vscode/src/model-editor/extension-pack-picker.ts b/extensions/ql-vscode/src/model-editor/extension-pack-picker.ts index d5e8f0d78a5..ec05770b1b2 100644 --- a/extensions/ql-vscode/src/model-editor/extension-pack-picker.ts +++ b/extensions/ql-vscode/src/model-editor/extension-pack-picker.ts @@ -256,12 +256,9 @@ async function readExtensionPack( } const dataExtensionValue = qlpack.dataExtensions; - if ( - !( - Array.isArray(dataExtensionValue) || - typeof dataExtensionValue === "string" - ) - ) { + if (!( + Array.isArray(dataExtensionValue) || typeof dataExtensionValue === "string" + )) { throw new Error( `Expected 'dataExtensions' to be a string or an array in ${qlpackPath}`, ); diff --git a/extensions/ql-vscode/src/model-editor/modeled-method.ts b/extensions/ql-vscode/src/model-editor/modeled-method.ts index 7156ee93e54..3058df3d5a7 100644 --- a/extensions/ql-vscode/src/model-editor/modeled-method.ts +++ b/extensions/ql-vscode/src/model-editor/modeled-method.ts @@ -2,12 +2,7 @@ import { assertNever } from "../common/helpers-pure"; import type { MethodSignature } from "./method"; export type ModeledMethodType = - | "none" - | "source" - | "sink" - | "summary" - | "type" - | "neutral"; + "none" | "source" | "sink" | "summary" | "type" | "neutral"; export type Provenance = // Generated by the dataflow model diff --git a/extensions/ql-vscode/src/query-history/store/query-history-dto.ts b/extensions/ql-vscode/src/query-history/store/query-history-dto.ts index 78cb5b6064e..4d46374381c 100644 --- a/extensions/ql-vscode/src/query-history/store/query-history-dto.ts +++ b/extensions/ql-vscode/src/query-history/store/query-history-dto.ts @@ -10,8 +10,7 @@ export interface QueryHistoryDto { } export type QueryHistoryItemDto = - | QueryHistoryLocalQueryDto - | QueryHistoryVariantAnalysisDto; + QueryHistoryLocalQueryDto | QueryHistoryVariantAnalysisDto; export enum QueryLanguageDto { Actions = "actions", diff --git a/extensions/ql-vscode/src/run-queries-shared.ts b/extensions/ql-vscode/src/run-queries-shared.ts index 03e25df46dc..b8e6a711c59 100644 --- a/extensions/ql-vscode/src/run-queries-shared.ts +++ b/extensions/ql-vscode/src/run-queries-shared.ts @@ -440,9 +440,7 @@ async function getSelectedPosition( } type SaveBeforeStartMode = - | "nonUntitledEditorsInActiveGroup" - | "allEditorsInActiveGroup" - | "none"; + "nonUntitledEditorsInActiveGroup" | "allEditorsInActiveGroup" | "none"; /** * Saves dirty files before running queries, based on the user's settings. diff --git a/extensions/ql-vscode/src/variant-analysis/gh-api/variant-analysis.ts b/extensions/ql-vscode/src/variant-analysis/gh-api/variant-analysis.ts index db71d27b7b5..a38277dc545 100644 --- a/extensions/ql-vscode/src/variant-analysis/gh-api/variant-analysis.ts +++ b/extensions/ql-vscode/src/variant-analysis/gh-api/variant-analysis.ts @@ -26,23 +26,13 @@ export interface VariantAnalysis { } export type VariantAnalysisStatus = - | "in_progress" - | "succeeded" - | "failed" - | "cancelled"; + "in_progress" | "succeeded" | "failed" | "cancelled"; export type VariantAnalysisFailureReason = - | "no_repos_queried" - | "actions_workflow_run_failed" - | "internal_error"; + "no_repos_queried" | "actions_workflow_run_failed" | "internal_error"; export type VariantAnalysisRepoStatus = - | "pending" - | "in_progress" - | "succeeded" - | "failed" - | "canceled" - | "timed_out"; + "pending" | "in_progress" | "succeeded" | "failed" | "canceled" | "timed_out"; export interface VariantAnalysisScannedRepository { repository: RepositoryWithMetadata; diff --git a/extensions/ql-vscode/src/variant-analysis/shared/analysis-result.ts b/extensions/ql-vscode/src/variant-analysis/shared/analysis-result.ts index 833d50bc199..91851c373aa 100644 --- a/extensions/ql-vscode/src/variant-analysis/shared/analysis-result.ts +++ b/extensions/ql-vscode/src/variant-analysis/shared/analysis-result.ts @@ -51,8 +51,7 @@ export interface AnalysisMessage { } export type AnalysisMessageToken = - | AnalysisMessageTextToken - | AnalysisMessageLocationToken; + AnalysisMessageTextToken | AnalysisMessageLocationToken; interface AnalysisMessageTextToken { t: "text"; diff --git a/extensions/ql-vscode/src/view/results/AlertTableHeader.tsx b/extensions/ql-vscode/src/view/results/AlertTableHeader.tsx index 7fa442bf364..4a5389f55eb 100644 --- a/extensions/ql-vscode/src/view/results/AlertTableHeader.tsx +++ b/extensions/ql-vscode/src/view/results/AlertTableHeader.tsx @@ -20,8 +20,7 @@ export function AlertTableHeader({ }, [sortState]); const getNextSortState = useCallback((): - | InterpretedResultsSortState - | undefined => { + InterpretedResultsSortState | undefined => { const prevDirection = sortState?.sortBy === "alert-message" ? sortState.sortDirection diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debug-controller.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debug-controller.ts index 86da827d88d..a014cb66b8b 100644 --- a/extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debug-controller.ts +++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debug-controller.ts @@ -33,8 +33,7 @@ class Tracker implements DebugAdapterTracker { private started: CodeQLProtocol.EvaluationStartedEvent["body"] | undefined = undefined; private completed: - | CodeQLProtocol.EvaluationCompletedEvent["body"] - | undefined = undefined; + CodeQLProtocol.EvaluationCompletedEvent["body"] | undefined = undefined; public constructor( private readonly session: DebugSession,