Skip to content
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.

Sign up for GitHub

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

Jump to bottom

keybindings: search improvement #12312

Merged
merged 2 commits into from
Apr 10, 2023
Merged

keybindings: search improvement #12312

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6336426
keybindings: search improvement
FernandoAscencio Mar 29, 2023
450f948
Merge branch 'master' into fa/keyboardSearchImprovement
vince-fugnitto Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/keymaps/src/browser/keybindings-widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {

protected formatAndMatchKeybinding(item: KeybindingItem, queryItems: string[]): boolean {
if (item.keybinding) {
let match = false;
const unmatchedTerms = queryItems.filter(Boolean);
const segments = this.keybindingRegistry.resolveKeybinding(item.keybinding).reduce<RenderableStringSegment[]>((collection, code, codeIndex) => {
if (codeIndex !== 0) {
// Two non-breaking spaces.
Expand All @@ -224,14 +224,15 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {
if (chunkIndex !== 0) {
collection.push({ value: '+', match: false, key: false });
}
const chunkMatches = queryItems.includes(matchChunks[chunkIndex].toLocaleLowerCase());
match ||= chunkMatches;
const indexOfTerm = unmatchedTerms.indexOf(matchChunks[chunkIndex].toLocaleLowerCase());
const chunkMatches = indexOfTerm > -1;
if (chunkMatches) { unmatchedTerms.splice(indexOfTerm, 1); }
collection.push({ value: chunk, match: chunkMatches, key: true });
});
return collection;
}, []);
item.labels.keybinding = { value: item.labels.keybinding.value, segments };
return match;
return !unmatchedTerms.length;
}
item.labels.keybinding = { value: '' };
return false;
Expand Down