Skip to content

Commit 6de1b2f

Browse files
committed
Also abbreviate RA names in predicate overview
1 parent 4a2e521 commit 6de1b2f

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

extensions/ql-vscode/src/view/compare-performance/ComparePerformance.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type {
1212
import { formatDecimal } from "../../common/number";
1313
import { styled } from "styled-components";
1414
import { Codicon, ViewTitle, WarningBox } from "../common";
15-
import { abbreviateRASteps } from "./RAPrettyPrinter";
15+
import { abbreviateRANames, abbreviateRASteps } from "./RAPrettyPrinter";
1616

1717
const enum AbsentReason {
1818
NotSeen = "NotSeen",
@@ -364,6 +364,8 @@ export function ComparePerformance(_: Record<string, never>) {
364364
totalDiff += row.diff;
365365
}
366366

367+
const rowNames = abbreviateRANames(rows.map((row) => row.name));
368+
367369
return (
368370
<>
369371
<ViewTitle>Performance comparison</ViewTitle>
@@ -406,7 +408,7 @@ export function ComparePerformance(_: Record<string, never>) {
406408
</HeaderTR>
407409
</thead>
408410
</Table>
409-
{rows.map((row) => (
411+
{rows.map((row, rowIndex) => (
410412
<Table
411413
key={row.name}
412414
className={expandedPredicates.has(row.name) ? "expanded" : ""}
@@ -427,7 +429,7 @@ export function ComparePerformance(_: Record<string, never>) {
427429
{renderAbsoluteValue(row.before)}
428430
{renderAbsoluteValue(row.after)}
429431
{renderDelta(row.diff)}
430-
<NameCell>{row.name}</NameCell>
432+
<NameCell>{rowNames[rowIndex]}</NameCell>
431433
</PredicateTR>
432434
{expandedPredicates.has(row.name) && (
433435
<>

extensions/ql-vscode/src/view/compare-performance/RAPrettyPrinter.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,12 @@ interface ExpandableNamePartProps {
193193
function ExpandableNamePart(props: ExpandableNamePartProps) {
194194
const [isExpanded, setExpanded] = useState(false);
195195
return (
196-
<ExpandableTextButton onClick={() => setExpanded(!isExpanded)}>
196+
<ExpandableTextButton
197+
onClick={(event: Event) => {
198+
setExpanded(!isExpanded);
199+
event.stopPropagation();
200+
}}
201+
>
197202
{isExpanded ? props.children : "..."}
198203
</ExpandableTextButton>
199204
);
@@ -269,3 +274,8 @@ export function abbreviateRASteps(steps: string[]): React.ReactNode[] {
269274
return <Fragment key={index}>{result}</Fragment>;
270275
});
271276
}
277+
278+
export function abbreviateRANames(names: string[]): React.ReactNode[] {
279+
const nameSet = new NameSet(names);
280+
return names.map((name) => nameSet.getAbbreviation(name));
281+
}

0 commit comments

Comments
 (0)