Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 5.2k
fix(web): open the file a bare filename reference names#6297
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
juliusmarminge
merged 4 commits into
pingdotgg:main
from
Brechard:fix/file-reference-basename-lookupAug 15, 2026
+192
−2
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
d4f5f15
fix(web): open the file a bare filename reference names
rodrigoB-CB f56f585
fix(web): a pending lookup cannot take the panel back
rodrigoB-CB 4c31592
fix(web): claim the lookup sequence on every open
rodrigoB-CB dcb40ad
style(web): match the file's comment density to the codebase
rodrigoB-CB File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| import { describe, expect, it } from "vite-plus/test"; | ||
| import { | ||
| claimWorkspaceBasenameLookup, | ||
| needsWorkspaceBasenameLookup, | ||
| pickWorkspaceBasenameMatch, | ||
| } from "./workspaceBasenameLookup"; | ||
| describe("needsWorkspaceBasenameLookup", () => { | ||
| it("flags bare filenames", () => { | ||
| expect(needsWorkspaceBasenameLookup("ChatView.tsx")).toBe(true); | ||
| expect(needsWorkspaceBasenameLookup("Makefile")).toBe(true); | ||
| }); | ||
| it("leaves anything with a directory alone", () => { | ||
| expect(needsWorkspaceBasenameLookup("apps/web/src/components/ChatView.tsx")).toBe(false); | ||
| expect(needsWorkspaceBasenameLookup("apps\\web\\ChatView.tsx")).toBe(false); | ||
| expect(needsWorkspaceBasenameLookup(" ")).toBe(false); | ||
| }); | ||
| }); | ||
| describe("pickWorkspaceBasenameMatch", () => { | ||
| const entries = [ | ||
| { path: "apps/web/src/components/ChatView.test.tsx", kind: "file" as const }, | ||
| { path: "apps/web/src/components/ChatView.tsx", kind: "file" as const }, | ||
| ]; | ||
| it("takes the first exact filename match, not the closest fuzzy one", () => { | ||
| expect(pickWorkspaceBasenameMatch("ChatView.tsx", entries)).toBe( | ||
| "apps/web/src/components/ChatView.tsx", | ||
| ); | ||
| }); | ||
| it("ignores directories", () => { | ||
| expect( | ||
| pickWorkspaceBasenameMatch("components", [ | ||
| { path: "apps/web/src/components", kind: "directory" }, | ||
| { path: "apps/web/src/components/components", kind: "file" }, | ||
| ]), | ||
| ).toBe("apps/web/src/components/components"); | ||
| }); | ||
| it("prefers the exactly-cased file over a case-only twin", () => { | ||
| expect( | ||
| pickWorkspaceBasenameMatch("foo.ts", [ | ||
| { path: "src/Foo.ts", kind: "file" }, | ||
| { path: "src/foo.ts", kind: "file" }, | ||
| ]), | ||
| ).toBe("src/foo.ts"); | ||
| }); | ||
| it("falls back to case-insensitive when only the casing differs", () => { | ||
| expect(pickWorkspaceBasenameMatch("chatview.tsx", entries)).toBe( | ||
| "apps/web/src/components/ChatView.tsx", | ||
| ); | ||
| }); | ||
| it("returns null when the case-insensitive fallback is ambiguous", () => { | ||
| expect( | ||
| pickWorkspaceBasenameMatch("FOO.ts", [ | ||
| { path: "src/Foo.ts", kind: "file" }, | ||
| { path: "src/foo.ts", kind: "file" }, | ||
| ]), | ||
| ).toBeNull(); | ||
| }); | ||
| it("returns null when nothing matches the name", () => { | ||
| expect(pickWorkspaceBasenameMatch("ChatView.tsx", [])).toBeNull(); | ||
| expect( | ||
| pickWorkspaceBasenameMatch("ChatView.tsx", [ | ||
| { path: "apps/web/src/components/ChatHeader.tsx", kind: "file" }, | ||
| ]), | ||
| ).toBeNull(); | ||
| }); | ||
| }); | ||
| describe("claimWorkspaceBasenameLookup", () => { | ||
| it("keeps only the newest claim, whatever order the lookups settle in", () => { | ||
| const first = claimWorkspaceBasenameLookup(); | ||
| const second = claimWorkspaceBasenameLookup(); | ||
| // The older lookup answering last must not reopen the panel behind the | ||
| // newer one. | ||
| expect(second()).toBe(true); | ||
| expect(first()).toBe(false); | ||
| }); | ||
| it("stays valid while it is the only claim", () => { | ||
| const only = claimWorkspaceBasenameLookup(); | ||
| expect(only()).toBe(true); | ||
| expect(only()).toBe(true); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| // Enough hits to look past same-named neighbours (`ChatView.test.tsx`) without | ||
| // asking for a full listing on a single click. | ||
| export const WORKSPACE_BASENAME_LOOKUP_LIMIT = 25; | ||
| // One counter for every caller: they all open the same panel, so the newest | ||
| // click wins regardless of which one started the lookup. | ||
| let latestLookupSequence = 0; | ||
| /** Call the returned predicate when the search settles; false means a later click superseded it. */ | ||
| export function claimWorkspaceBasenameLookup(): () => boolean { | ||
| latestLookupSequence += 1; | ||
| const claimed = latestLookupSequence; | ||
| return () => claimed === latestLookupSequence; | ||
| } | ||
| export interface WorkspaceEntryCandidate { | ||
| readonly path: string; | ||
| readonly kind: "file" | "directory"; | ||
| } | ||
| function basenameOfPath(path: string): string { | ||
| const separatorIndex = Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\")); | ||
| return separatorIndex >= 0 ? path.slice(separatorIndex + 1) : path; | ||
| } | ||
| export function needsWorkspaceBasenameLookup(relativePath: string): boolean { | ||
| const trimmed = relativePath.trim(); | ||
| return trimmed.length > 0 && !trimmed.includes("/") && !trimmed.includes("\\"); | ||
| } | ||
| export function pickWorkspaceBasenameMatch( | ||
| basename: string, | ||
| entries: ReadonlyArray<WorkspaceEntryCandidate>, | ||
| ): string | null { | ||
| const target = basename.trim(); | ||
| if (!target) return null; | ||
| const files = entries.filter((entry) => entry.kind === "file"); | ||
| const exact = files.find((entry) => basenameOfPath(entry.path) === target); | ||
| if (exact) return exact.path; | ||
| // Folded matching covers casing that drifted from disk, but `FOO.ts` against | ||
| // both `Foo.ts` and `foo.ts` has no right answer, so it resolves to nothing | ||
| // rather than opening whichever the index ranked first. | ||
| const folded = target.toLowerCase(); | ||
| const foldedMatches = files.filter( | ||
| (entry) => basenameOfPath(entry.path).toLowerCase() === folded, | ||
| ); | ||
| return foldedMatches.length === 1 ? (foldedMatches[0]?.path ?? null) : null; | ||
| } |
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.