ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode de81ccf04849309f843db21130c806a5783678f7 (#4738)

Browse Source
This commit is contained in:
Anthony Dresser
2019-03-28 13:06:16 -07:00
committed by GitHub
parent cc2951265e
commit e6785ffe95
77 changed files with 562 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/browser/actions/listCommands.ts
View File

@@ -28,7 +28,7 @@ function ensureDOMFocus(widget: ListWidget | undefined): void {
}
}
function focusDown(accessor: ServicesAccessor, arg2?: number, loop: boolean = true): void {
function focusDown(accessor: ServicesAccessor, arg2?: number, loop: boolean = false): void {
const focused = accessor.get(IListService).lastFocusedList;
const count = typeof arg2 === 'number' ? arg2 : 1;
@@ -165,7 +165,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
}
});
function focusUp(accessor: ServicesAccessor, arg2?: number, loop: boolean = true): void {
function focusUp(accessor: ServicesAccessor, arg2?: number, loop: boolean = false): void {
const focused = accessor.get(IListService).lastFocusedList;
const count = typeof arg2 === 'number' ? arg2 : 1;
@@ -582,8 +582,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
else if (focused instanceof ObjectTree || focused instanceof DataTree || focused instanceof AsyncDataTree) {
const list = focused;
const fakeKeyboardEvent = getSelectionKeyboardEvent('keydown', false);
list.setSelection(list.getFocus(), fakeKeyboardEvent);
list.open(list.getFocus(), fakeKeyboardEvent);
const focus = list.getFocus();
if (focus.length > 0) {
list.toggleCollapsed(focus[0]);
}
list.setSelection(focus, fakeKeyboardEvent);
list.open(focus, fakeKeyboardEvent);
}
// Tree

2
src/vs/workbench/browser/parts/titlebar/menubarControl.ts
View File

@@ -463,7 +463,7 @@ export class MenubarControl extends Disposable {
return new Action('update.updating', nls.localize('installingUpdate', "Installing Update..."), undefined, false);
case StateType.Ready:
return new Action('update.restart', nls.localize({ key: 'restartToUpdate', comment: ['&& denotes a mnemonic'] }, "Restart to &&Update..."), undefined, true, () =>
return new Action('update.restart', nls.localize({ key: 'restartToUpdate', comment: ['&& denotes a mnemonic'] }, "Restart to &&Update"), undefined, true, () =>
this.updateService.quitAndInstall());
}
}