-
-
+
+
+ onSelectionFilterEnabledChange(e.target.checked)}
+ />
+
-
+
{
- setSelectedTable(SELECT_TABLE_NAME);
+ onSelectedTableChange(SELECT_TABLE_NAME);
sendTelemetry("local-results-show-raw-results");
}}
offset={offset}
+ selectionFilter={selectionFilter}
+ filteredRawRows={filteredRawRows}
+ filteredSarifResults={filteredSarifResults}
+ isLoadingFilteredResults={isLoadingFilteredResults}
/>
)}
);
}
-function getDefaultResultSet(resultSets: readonly ResultSet[]): string {
- return getDefaultResultSetName(
- resultSets.map((resultSet) => getResultSetName(resultSet)),
- );
-}
-
function getResultSetName(resultSet: ResultSet): string {
switch (resultSet.t) {
case "RawResultSet":
diff --git a/extensions/ql-vscode/src/view/results/ResultTablesHeader.tsx b/extensions/ql-vscode/src/view/results/ResultTablesHeader.tsx
index 602ee6b70db..f69f54fd532 100644
--- a/extensions/ql-vscode/src/view/results/ResultTablesHeader.tsx
+++ b/extensions/ql-vscode/src/view/results/ResultTablesHeader.tsx
@@ -13,6 +13,7 @@ interface Props {
queryPath: string;
parsedResultSets: ParsedResultSets;
selectedTable: string;
+ disablePagination?: boolean;
}
const Container = styled.span`
@@ -57,7 +58,13 @@ const OpenQueryLink = styled(TextButton)`
`;
export function ResultTablesHeader(props: Props) {
- const { queryPath, queryName, parsedResultSets, selectedTable } = props;
+ const {
+ queryPath,
+ queryName,
+ parsedResultSets,
+ selectedTable,
+ disablePagination,
+ } = props;
const [selectedPage, setSelectedPage] = useState(
`${parsedResultSets.pageNumber + 1}`,
@@ -145,19 +152,26 @@ export function ResultTablesHeader(props: Props) {
return (
- «
+
+ «
+
- / {numPages}
-
+ / {disablePagination ? 1 : numPages}
+
»
{queryName}
diff --git a/extensions/ql-vscode/src/view/results/ResultsApp.tsx b/extensions/ql-vscode/src/view/results/ResultsApp.tsx
index 014080a9bdd..baca3c3cbcc 100644
--- a/extensions/ql-vscode/src/view/results/ResultsApp.tsx
+++ b/extensions/ql-vscode/src/view/results/ResultsApp.tsx
@@ -1,6 +1,8 @@
import { assertNever, getErrorMessage } from "../../common/helpers-pure";
import type {
DatabaseInfo,
+ EditorSelection,
+ FileFilteredResults,
Interpretation,
IntoResultsViewMsg,
SortedResultSetInfo,
@@ -15,13 +17,15 @@ import {
ALERTS_TABLE_NAME,
DEFAULT_USER_SETTINGS,
GRAPH_TABLE_NAME,
+ getDefaultResultSetName,
} from "../../common/interface-types";
import { useMessageFromExtension } from "../common/useMessageFromExtension";
import { ResultTables } from "./ResultTables";
import { onNavigation } from "./navigation";
import "./resultsView.css";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
+import { vscode } from "../vscode-api";
/**
* ResultsApp.tsx
@@ -64,6 +68,10 @@ interface ResultsViewState {
displayedResults: ResultsState;
nextResultsInfo: ResultsInfo | null;
isExpectingResultsUpdate: boolean;
+ selectionFilterEnabled: boolean;
+ editorSelection: EditorSelection | undefined;
+ selectedTable: string | undefined;
+ fileFilteredResults: FileFilteredResults | undefined;
}
/**
@@ -78,12 +86,76 @@ export function ResultsApp() {
},
nextResultsInfo: null,
isExpectingResultsUpdate: true,
+ selectionFilterEnabled: false,
+ editorSelection: undefined,
+ selectedTable: undefined,
+ fileFilteredResults: undefined,
});
const [userSettings, setUserSettings] = useState(
DEFAULT_USER_SETTINGS,
);
+ useEffect(() => {
+ if (
+ state.selectionFilterEnabled &&
+ state.editorSelection?.fileUri != null &&
+ state.selectedTable != null &&
+ state.fileFilteredResults == null
+ ) {
+ vscode.postMessage({
+ t: "requestFileFilteredResults",
+ fileUri: state.editorSelection.fileUri,
+ selectedTable: state.selectedTable,
+ });
+ }
+ }, [
+ state.selectionFilterEnabled,
+ state.editorSelection?.fileUri,
+ state.selectedTable,
+ state.fileFilteredResults,
+ ]);
+
+ const [problemsViewSelected, setProblemsViewSelected] = useState(false);
+
+ const onSelectedTableChange = useCallback((tableName: string) => {
+ setState((prev) => {
+ if (tableName === prev.selectedTable) return prev;
+ return {
+ ...prev,
+ selectedTable: tableName,
+ fileFilteredResults: undefined, // Discard stale results (they are from another table)
+ };
+ });
+ }, []);
+
+ // Ensure selectedTable is valid for the current result sets.
+ // This runs in ResultsApp (not ResultTables) so it survives remounts.
+ const displayedResultsInfo = state.displayedResults.resultsInfo;
+ useEffect(() => {
+ if (!displayedResultsInfo) return;
+ const { parsedResultSets, interpretation } = displayedResultsInfo;
+ const allNames = interpretation
+ ? parsedResultSets.resultSetNames.concat([
+ interpretation.data.t === "GraphInterpretationData"
+ ? GRAPH_TABLE_NAME
+ : ALERTS_TABLE_NAME,
+ ])
+ : parsedResultSets.resultSetNames;
+ if (
+ state.selectedTable === undefined ||
+ !allNames.includes(state.selectedTable)
+ ) {
+ const tableName =
+ parsedResultSets.selectedTable ?? getDefaultResultSetName(allNames);
+ onSelectedTableChange(tableName);
+ }
+ }, [displayedResultsInfo, state.selectedTable, onSelectedTableChange]);
+
+ const selectionFilter = state.selectionFilterEnabled
+ ? state.editorSelection
+ : undefined;
+
const updateStateWithNewResultsInfo = useCallback(
(resultsInfo: ResultsInfo): void => {
let results: Results | null = null;
@@ -101,7 +173,8 @@ export function ResultsApp() {
statusText = `Error loading results: ${errorMessage}`;
}
- setState({
+ setState((prev) => ({
+ ...prev,
displayedResults: {
resultsInfo,
results,
@@ -109,7 +182,7 @@ export function ResultsApp() {
},
nextResultsInfo: null,
isExpectingResultsUpdate: false,
- });
+ }));
},
[],
);
@@ -180,9 +253,44 @@ export function ResultsApp() {
break;
case "untoggleShowProblems":
- // noop
+ setProblemsViewSelected(false);
break;
+ case "setEditorSelection":
+ if (msg.selection) {
+ const selection = msg.selection;
+ const wasFromUserInteraction = msg.wasFromUserInteraction ?? false;
+ setState((prev) => {
+ if (prev.selectionFilterEnabled && !wasFromUserInteraction) {
+ return prev; // Ignore selection changes we caused ourselves while filter was active
+ }
+ return {
+ ...prev,
+ editorSelection: selection,
+ fileFilteredResults:
+ selection.fileUri === prev.editorSelection?.fileUri
+ ? prev.fileFilteredResults
+ : undefined, // Discard stale results (they are from another file)
+ };
+ });
+ }
+ break;
+
+ case "setFileFilteredResults": {
+ const results = msg.results;
+ setState((prev) => {
+ if (
+ results.fileUri === prev.editorSelection?.fileUri &&
+ results.selectedTable === prev.selectedTable &&
+ prev.fileFilteredResults === undefined
+ ) {
+ return { ...prev, fileFilteredResults: results };
+ }
+ return prev;
+ });
+ break;
+ }
+
default:
assertNever(msg);
}
@@ -230,6 +338,16 @@ export function ResultsApp() {
}
queryName={displayedResults.resultsInfo.queryName}
queryPath={displayedResults.resultsInfo.queryPath}
+ selectedTable={state.selectedTable ?? ""}
+ onSelectedTableChange={onSelectedTableChange}
+ selectionFilter={selectionFilter}
+ fileFilteredResults={state.fileFilteredResults}
+ selectionFilterEnabled={state.selectionFilterEnabled}
+ onSelectionFilterEnabledChange={(selectionFilterEnabled) => {
+ setState((prev) => ({ ...prev, selectionFilterEnabled }));
+ }}
+ problemsViewSelected={problemsViewSelected}
+ onProblemsViewSelectedChange={setProblemsViewSelected}
/>
);
} else {
diff --git a/extensions/ql-vscode/src/view/results/SelectionFilterCheckbox.tsx b/extensions/ql-vscode/src/view/results/SelectionFilterCheckbox.tsx
new file mode 100644
index 00000000000..e4376faa66f
--- /dev/null
+++ b/extensions/ql-vscode/src/view/results/SelectionFilterCheckbox.tsx
@@ -0,0 +1,31 @@
+import {
+ alertExtrasClassName,
+ toggleDiagnosticsClassName,
+} from "./result-table-utils";
+
+interface Props {
+ checked: boolean;
+ onChange: (event: React.ChangeEvent) => void;
+}
+
+export function SelectionFilterCheckbox({
+ checked,
+ onChange,
+}: Props): React.JSX.Element {
+ return (
+
+
+
+
+
+
+ This file is not part of a source archive for a database.
+
+ )}
+ {sourceArchiveRelationship ===
+ SourceArchiveRelationship.WrongArchive && (
+ <>
+
+ This file is part of the source archive for a different database
+ than the one this query was run on.
+
+ )}
+
+
+ );
+}
diff --git a/extensions/ql-vscode/src/view/results/result-table-utils.ts b/extensions/ql-vscode/src/view/results/result-table-utils.ts
index 8e340324296..114f614fd93 100644
--- a/extensions/ql-vscode/src/view/results/result-table-utils.ts
+++ b/extensions/ql-vscode/src/view/results/result-table-utils.ts
@@ -1,4 +1,5 @@
import type {
+ EditorSelection,
QueryMetadata,
RawResultsSortState,
ResultSet,
@@ -7,7 +8,16 @@ import type {
import { SortDirection } from "../../common/interface-types";
import { assertNever } from "../../common/helpers-pure";
import { vscode } from "../vscode-api";
-import type { UrlValueResolvable } from "../../common/raw-result-types";
+import type {
+ CellValue,
+ Row,
+ UrlValueResolvable,
+} from "../../common/raw-result-types";
+import type { Result } from "sarif";
+import {
+ getLocationsFromSarifResult,
+ normalizeFileUri,
+} from "../../common/sarif-utils";
export interface ResultTableProps {
resultSet: ResultSet;
@@ -107,3 +117,110 @@ export function nextSortDirection(
return assertNever(direction);
}
}
+
+/**
+ * Extracts all resolvable locations from a raw result row.
+ */
+function getLocationsFromRawRow(
+ row: Row,
+): Array<{ uri: string; startLine?: number; endLine?: number }> {
+ const locations: Array<{
+ uri: string;
+ startLine?: number;
+ endLine?: number;
+ }> = [];
+
+ for (const cell of row) {
+ const loc = getLocationFromCell(cell);
+ if (loc) {
+ locations.push(loc);
+ }
+ }
+
+ return locations;
+}
+
+function getLocationFromCell(
+ cell: CellValue,
+): { uri: string; startLine?: number; endLine?: number } | undefined {
+ if (cell.type !== "entity") {
+ return undefined;
+ }
+ const url = cell.value.url;
+ if (!url) {
+ return undefined;
+ }
+ if (url.type === "wholeFileLocation") {
+ return { uri: url.uri };
+ }
+ if (url.type === "lineColumnLocation") {
+ return {
+ uri: url.uri,
+ startLine: url.startLine,
+ endLine: url.endLine,
+ };
+ }
+ return undefined;
+}
+
+/**
+ * Checks if a result location overlaps with the editor selection.
+ * If the selection is empty (just a cursor), matches any result in the same file.
+ */
+function doesLocationOverlapSelection(
+ loc: { uri: string; startLine?: number; endLine?: number },
+ selection: EditorSelection,
+): boolean {
+ const normalizedLocUri = normalizeFileUri(loc.uri);
+ const normalizedSelUri = normalizeFileUri(selection.fileUri);
+
+ if (normalizedLocUri !== normalizedSelUri) {
+ return false;
+ }
+
+ // If selection is empty (just a cursor), match the whole file
+ if (selection.isEmpty) {
+ return true;
+ }
+
+ // If the result location has no line info, it's a whole-file location — include it
+ if (loc.startLine === undefined) {
+ return true;
+ }
+
+ // Only include results whose starting line falls within the selection range
+ return (
+ loc.startLine >= selection.startLine && loc.startLine <= selection.endLine
+ );
+}
+
+/**
+ * Filters raw result rows to those with at least one location overlapping the selection.
+ */
+export function filterRawRows(
+ rows: readonly Row[],
+ selection: EditorSelection,
+): Row[] {
+ return rows.filter((row) => {
+ const locations = getLocationsFromRawRow(row);
+ return locations.some((loc) =>
+ doesLocationOverlapSelection(loc, selection),
+ );
+ });
+}
+
+/**
+ * Filters SARIF results to those with at least one location overlapping the selection.
+ */
+export function filterSarifResults(
+ results: Result[],
+ sourceLocationPrefix: string,
+ selection: EditorSelection,
+): Result[] {
+ return results.filter((result) => {
+ const locations = getLocationsFromSarifResult(result, sourceLocationPrefix);
+ return locations.some((loc) =>
+ doesLocationOverlapSelection(loc, selection),
+ );
+ });
+}