Skip to content

Commit 84fb26a

Browse files
feat(web): hide test files in the chat diff panel too
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent bff09dc commit 84fb26a

3 files changed

Lines changed: 54 additions & 11 deletions

File tree

‎apps/web/src/components/DiffPanel.tsx‎

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
CheckIcon,
1313
ChevronDownIcon,
1414
Columns2Icon,
15+
FlaskConicalOffIcon,
1516
FolderTreeIcon,
1617
PilcrowIcon,
1718
Rows3Icon,
@@ -37,6 +38,8 @@ import {
3738
useDiffPanelStore,
3839
} from "../diffPanelStore";
3940
import { useLocalStorage } from "../hooks/useLocalStorage";
41+
import { isTestChangedFile } from "@t3tools/shared/changedFileKind";
42+
import { useHideTestFiles } from "./diffs/useHideTestFiles";
4043
import { useRenderedAppearance } from "../hooks/useTheme";
4144
import { useStableCallback } from "../hooks/useStableCallback";
4245
import {
@@ -218,6 +221,7 @@ export default function DiffPanel({
218221
false,
219222
Schema.Boolean,
220223
);
224+
const [hideTestFiles, setHideTestFiles] = useHideTestFiles();
221225
const [baseRefQuery, setBaseRefQuery] = useState("");
222226
const [codeViewRevision, setCodeViewRevision] = useState(0);
223227

@@ -539,6 +543,16 @@ export default function DiffPanel({
539543
const isRefreshingDiff = branchDiffPreview.isPending || areFilePatchesPending;
540544
const renderableFileEntries = renderableFiles.map(getCachedFileEntry);
541545
const diffFileKeys = renderableFileEntries.map((file) => file.fileKey);
546+
const testFileCount = renderableFiles.filter((file) =>
547+
isTestChangedFile(resolveFileDiffPath(file)),
548+
).length;
549+
// Hiding is display-only: lazy loading indexes into the full list. A requested file stays visible.
550+
const isFileShown = (file: FileDiffMetadata) => {
551+
const path = resolveFileDiffPath(file);
552+
return !hideTestFiles || path === selectedFilePath || !isTestChangedFile(path);
553+
};
554+
const shownFileEntries = renderableFileEntries.filter(({ fileDiff }) => isFileShown(fileDiff));
555+
const shownFileKeys = shownFileEntries.map((file) => file.fileKey);
542556
const defaultCollapsedDiffFileKeys = settings.diffFilesCollapsed
543557
? new Set(diffFileKeys)
544558
: EMPTY_COLLAPSED_DIFF_FILE_KEYS;
@@ -561,7 +575,7 @@ export default function DiffPanel({
561575
count={renderableFiles.length - settledFileCount}
562576
/>
563577
) : null;
564-
const codeViewFiles = renderableFileEntries
578+
const codeViewFiles = shownFileEntries
565579
.filter(
566580
({ fileDiff }) =>
567581
!lazySource || !readyFilePaths || readyFilePaths.has(resolveFileDiffPath(fileDiff)),
@@ -574,10 +588,12 @@ export default function DiffPanel({
574588
collapsed:
575589
collapsedDiffFileKeys.has(fileKey) || fileDiff.cacheKey?.endsWith(":pending") === true,
576590
}));
577-
const pendingFiles = renderableFiles.filter((file) => file.cacheKey?.endsWith(":pending"));
578-
const allDiffFilesCollapsed = areAllDiffFilesCollapsed(diffFileKeys, collapsedDiffFileKeys);
591+
const pendingFiles = renderableFiles.filter(
592+
(file) => file.cacheKey?.endsWith(":pending") && isFileShown(file),
593+
);
594+
const allDiffFilesCollapsed = areAllDiffFilesCollapsed(shownFileKeys, collapsedDiffFileKeys);
579595
const diffLineStat = sourceLineStat ?? getDiffLineStat(renderableFiles);
580-
const fileTreeEntries = diffFileTreeEntries(renderableFiles);
596+
const fileTreeEntries = diffFileTreeEntries(renderableFiles.filter(isFileShown));
581597
const codeViewReveal = useCodeViewFileReveal();
582598
const revealDiffFile = (filePath: string) => {
583599
const index = renderableFileEntries.findIndex(
@@ -661,7 +677,7 @@ export default function DiffPanel({
661677

662678
const toggleDiffFileCollapse = () => {
663679
setCodeViewRevision((current) => current + 1);
664-
updateCollapsedDiffFiles((current) => toggleAllDiffFiles(diffFileKeys, current));
680+
updateCollapsedDiffFiles((current) => toggleAllDiffFiles(shownFileKeys, current));
665681
};
666682

667683
const selectTurn = (runId: RunId) => {
@@ -991,6 +1007,28 @@ export default function DiffPanel({
9911007
{diffIgnoreWhitespace ? "Show whitespace changes" : "Hide whitespace changes"}
9921008
</TooltipPopup>
9931009
</Tooltip>
1010+
{testFileCount > 0 && (
1011+
<Tooltip>
1012+
<TooltipTrigger
1013+
render={
1014+
<Toggle
1015+
aria-label="Hide test files"
1016+
variant="ghost"
1017+
size="sm"
1018+
pressed={hideTestFiles}
1019+
onPressedChange={(pressed) => setHideTestFiles(Boolean(pressed))}
1020+
/>
1021+
}
1022+
>
1023+
<FlaskConicalOffIcon className="size-3.5" />
1024+
</TooltipTrigger>
1025+
<TooltipPopup side="top">
1026+
{hideTestFiles
1027+
? `Show ${testFileCount} hidden test ${testFileCount === 1 ? "file" : "files"}`
1028+
: "Hide test files"}
1029+
</TooltipPopup>
1030+
</Tooltip>
1031+
)}
9941032
{diffFileKeys.length > 0 && (
9951033
<Tooltip>
9961034
<TooltipTrigger
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import * as Schema from "effect/Schema";
2+
3+
import { useLocalStorage } from "~/hooks/useLocalStorage";
4+
5+
const HIDE_TEST_FILES_STORAGE_KEY = "t3code.diffHideTestFiles";
6+
7+
export function useHideTestFiles() {
8+
return useLocalStorage(HIDE_TEST_FILES_STORAGE_KEY, false, Schema.Boolean);
9+
}

‎apps/web/src/components/pullRequest/PullRequestCodeTab.tsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ import { useDiffWorkerPool } from "../DiffWorkerPoolProvider";
8282
import { DiffCommentAnnotation } from "../diffs/DiffCommentAnnotation";
8383
import { DiffFileTree } from "../diffs/DiffFileTree";
8484
import { useCodeViewFileReveal } from "../diffs/useCodeViewFileReveal";
85+
import { useHideTestFiles } from "../diffs/useHideTestFiles";
8586
import { diffFileTreeEntries, orderDiffFilesLikeTree } from "../diffs/diffFileTree.logic";
8687
import { StyledDiffCodeView } from "../diffs/StyledDiffCodeView";
8788
import { Button } from "../ui/button";
@@ -136,7 +137,6 @@ type ReviewAnnotation = DiffLineAnnotation<ReviewAnnotationGroup>;
136137
const COMMIT_PAGE_SIZE = 10;
137138

138139
const PULL_REQUEST_FILE_TREE_STORAGE_KEY = "t3code.pullRequestFileTreeOpen";
139-
const PULL_REQUEST_HIDE_TEST_FILES_STORAGE_KEY = "t3code.pullRequestHideTestFiles";
140140

141141
interface DiffSlice {
142142
readonly source: PullRequestDiffResult;
@@ -310,11 +310,7 @@ function PullRequestCodeTab({
310310
false,
311311
Schema.Boolean,
312312
);
313-
const [hideTestFiles, setHideTestFiles] = useLocalStorage(
314-
PULL_REQUEST_HIDE_TEST_FILES_STORAGE_KEY,
315-
false,
316-
Schema.Boolean,
317-
);
313+
const [hideTestFiles, setHideTestFiles] = useHideTestFiles();
318314
const [selectedLines, setSelectedLines] = useState<{
319315
id: string;
320316
range: SelectedLineRange;

0 commit comments

Comments
 (0)