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

Adds basic keybinding for focusing on an element in outline pane #91799

Merged
merged 9 commits into from
Jun 12, 2020
Merged

Adds basic keybinding for focusing on an element in outline pane #91799

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5546589
Adds basic keybinding for focusing on an element in outline pane
Feb 28, 2020
cb23f00
Adds basic keybinding for focusing on an element in outline pane
Feb 28, 2020
36cbf8c
Moves common features of select and focus event to func
lambainsaan Jun 5, 2020
38e303a
Merge branch 'focus_folder_path_in_sidebar' of github.com:lambainsaan…
lambainsaan Jun 5, 2020
620073d
Merge branch 'master' into focus_folder_path_in_sidebar
lambainsaan Jun 5, 2020
9143fb3
Adds back setSelection to list, changes ObjectTree to Trees
lambainsaan Jun 6, 2020
887f0eb
Removes unecessary changes to outlinePane
lambainsaan Jun 11, 2020
117209c
Changes the name of list.focus command to list.selectAndPreserveFocus
lambainsaan Jun 11, 2020
1cb8a1f
Merge branch 'master' into focus_folder_path_in_sidebar
bpasero Jun 12, 2020
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
74 changes: 43 additions & 31 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 @@ -494,6 +494,40 @@ function listFocusLast(accessor: ServicesAccessor, options?: { fromFocused: bool
}
}


function focusElement(accessor: ServicesAccessor, retainCurrentFocus: boolean): void {
const focused = accessor.get(IListService).lastFocusedList;
const fakeKeyboardEvent = getSelectionKeyboardEvent('keydown', retainCurrentFocus);
// List
if (focused instanceof List || focused instanceof PagedList) {
const list = focused;
list.setSelection(list.getFocus(), fakeKeyboardEvent);
list.open(list.getFocus(), fakeKeyboardEvent);
}

// Trees
else if (focused instanceof ObjectTree || focused instanceof DataTree || focused instanceof AsyncDataTree) {
const list = focused;
const focus = list.getFocus();

if (focus.length > 0) {
let toggleCollapsed = true;

if (list.expandOnlyOnTwistieClick === true) {
toggleCollapsed = false;
} else if (typeof list.expandOnlyOnTwistieClick !== 'boolean' && list.expandOnlyOnTwistieClick(focus[0])) {
toggleCollapsed = false;
}

if (toggleCollapsed) {
list.toggleCollapsed(focus[0]);
}
}
list.setSelection(focus, fakeKeyboardEvent);
list.open(focus, fakeKeyboardEvent);
}
}

KeybindingsRegistry.registerCommandAndKeybindingRule({
id: 'list.select',
weight: KeybindingWeight.WorkbenchContrib,
Expand All @@ -504,38 +538,16 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
secondary: [KeyMod.CtrlCmd | KeyCode.DownArrow]
},
handler: (accessor) => {
const focused = accessor.get(IListService).lastFocusedList;
const fakeKeyboardEvent = getSelectionKeyboardEvent('keydown', false);

// List
if (focused instanceof List || focused instanceof PagedList) {
const list = focused;
list.setSelection(list.getFocus(), fakeKeyboardEvent);
list.open(list.getFocus(), fakeKeyboardEvent);
}

// Tree
else if (focused instanceof ObjectTree || focused instanceof DataTree || focused instanceof AsyncDataTree) {
const list = focused;
const focus = list.getFocus();

if (focus.length > 0) {
let toggleCollapsed = true;

if (list.expandOnlyOnTwistieClick === true) {
toggleCollapsed = false;
} else if (typeof list.expandOnlyOnTwistieClick !== 'boolean' && list.expandOnlyOnTwistieClick(focus[0])) {
toggleCollapsed = false;
}

if (toggleCollapsed) {
list.toggleCollapsed(focus[0]);
}
}
focusElement(accessor, false);
}
});

list.setSelection(focus, fakeKeyboardEvent);
list.open(focus, fakeKeyboardEvent);
}
KeybindingsRegistry.registerCommandAndKeybindingRule({
id: 'list.focus',
weight: KeybindingWeight.WorkbenchContrib,
when: WorkbenchListFocusContextKey,
handler: accessor => {
focusElement(accessor, true);
}
});

Expand Down
5 changes: 3 additions & 2 deletions src/vs/workbench/contrib/outline/browser/outlinePane.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
import { TextEditorSelectionRevealType } from 'vs/platform/editor/common/editor';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { WorkbenchDataTree } from 'vs/platform/list/browser/listService';
import { WorkbenchDataTree, SelectionKeyboardEvent } from 'vs/platform/list/browser/listService';
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
import { attachProgressBarStyler } from 'vs/platform/theme/common/styler';
import { IThemeService } from 'vs/platform/theme/common/themeService';
Expand Down Expand Up @@ -571,7 +571,8 @@ export class OutlinePane extends ViewPane {
// todo@Joh
if (e.browserEvent) {
if (e.browserEvent.type === 'keydown') {
focus = true;
const selectionEvent = e.browserEvent as SelectionKeyboardEvent;
focus = typeof selectionEvent.preserveFocus === 'boolean' ? selectionEvent.preserveFocus : true;
lambainsaan marked this conversation as resolved.
Show resolved Hide resolved
} else if (e.browserEvent.type === 'click') {
const event = new StandardMouseEvent(e.browserEvent as MouseEvent);
focus = e.browserEvent.detail === 2;
Expand Down