Skip to content

Commit 0a9b40b

Browse files
committed
fix(web): preserve folder completion edge cases
1 parent 28122f9 commit 0a9b40b

3 files changed

Lines changed: 23 additions & 3 deletions

File tree

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2495,8 +2495,13 @@ function OpenCommandPaletteDialog(props: {
24952495
if (event.ctrlKey || event.shiftKey || event.altKey || event.metaKey) return;
24962496

24972497
if (event.key === "Tab" && isBrowsing && !relativePathNeedsActiveProject) {
2498+
if (event.nativeEvent.isComposing || event.keyCode === 229) return;
24982499
(event as typeof event & { preventBaseUIHandler?: () => void }).preventBaseUIHandler?.();
24992500
event.preventDefault();
2501+
if (highlightedItemValue === "browse:up") {
2502+
void browseUp();
2503+
return;
2504+
}
25002505
const highlightedEntry = visibleBrowseEntries.find(
25012506
(entry) => `browse:${entry.fullPath}` === highlightedItemValue,
25022507
);

‎packages/client-runtime/src/state/filesystem.test.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,15 @@ describe("filesystem browse model", () => {
9191
{ name: "Open", isComplete: false },
9292
);
9393
expect(getFilesystemBrowseTabCompletion([entry("Open"), entry("Opal")], "Op")).toBeNull();
94+
expect(getFilesystemBrowseTabCompletion([entry("openAI"), entry("OpenSource")], "o")).toEqual({
95+
name: "open",
96+
isComplete: false,
97+
});
98+
expect(getFilesystemBrowseTabCompletion([entry("😀one"), entry("😁two")], "")).toBeNull();
99+
expect(getFilesystemBrowseTabCompletion([entry("😀one"), entry("😀other")], "😀")).toEqual({
100+
name: "😀o",
101+
isComplete: false,
102+
});
94103
expect(getFilesystemBrowseTabCompletion([], "x")).toBeNull();
95104
});
96105
});

‎packages/client-runtime/src/state/filesystem.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,19 @@ export function getFilesystemBrowseTabCompletion(
9393
const [first, ...rest] = visibleEntries;
9494
if (first === undefined) return null;
9595
if (rest.length === 0) return { name: first.name, isComplete: true };
96-
let prefix = first.name;
96+
let prefix = Array.from(first.name);
9797
for (const entry of rest) {
98+
const characters = Array.from(entry.name);
9899
let length = 0;
99-
while (length < prefix.length && prefix[length] === entry.name[length]) length += 1;
100+
while (
101+
length < prefix.length &&
102+
prefix[length]?.toLowerCase() === characters[length]?.toLowerCase()
103+
)
104+
length += 1;
100105
prefix = prefix.slice(0, length);
101106
}
102-
return prefix.length > filterQuery.length ? { name: prefix, isComplete: false } : null;
107+
const name = prefix.join("");
108+
return name.length > filterQuery.length ? { name, isComplete: false } : null;
103109
}
104110

105111
export function createBrowseNavigationCoordinator() {

0 commit comments

Comments
 (0)