Skip to content

list.clear should clear both focus and selection in one go #78709

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

Merged
isidorn merged 3 commits into from
Aug 9, 2019
+6 −15
Merged

list.clear should clear both focus and selection in one go #78709

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35cac93
list.clear should clear both focus and selection in one go
isidorn Aug 8, 2019
2da0f12
simplify
isidorn Aug 8, 2019
9054054
Merge branch 'master' into isidorn/listClear
isidorn Aug 9, 2019
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
21 changes: 6 additions & 15 deletions src/vs/workbench/browser/actions/listCommands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,34 +749,25 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
if (focused instanceof List || focused instanceof PagedList) {
const list = focused;

if (list.getSelection().length > 0) {
list.setSelection([]);
} else if (list.getFocus().length > 0) {
list.setFocus([]);
}
list.setSelection([]);
list.setFocus([]);
}

// ObjectTree
else if (focused instanceof ObjectTree || focused instanceof DataTree || focused instanceof AsyncDataTree) {
const list = focused;
const fakeKeyboardEvent = new KeyboardEvent('keydown');

if (list.getSelection().length > 0) {
list.setSelection([], fakeKeyboardEvent);
} else if (list.getFocus().length > 0) {
list.setFocus([], fakeKeyboardEvent);
}
list.setSelection([], fakeKeyboardEvent);
list.setFocus([], fakeKeyboardEvent);
}

// Tree
else if (focused) {
const tree = focused;

if (tree.getSelection().length) {
tree.clearSelection({ origin: 'keyboard' });
} else if (tree.getFocus()) {
tree.clearFocus({ origin: 'keyboard' });
}
tree.clearSelection({ origin: 'keyboard' });
tree.clearFocus({ origin: 'keyboard' });
}
}
});
Expand Down