ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-14 12:08:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

VSCode merge (#4610)

Browse Source 
* Merge from vscode e388c734f30757875976c7e326d6cfeee77710de

* fix yarn lcoks

* remove small issue
This commit is contained in:
Anthony Dresser
2019-03-20 10:39:09 -07:00
committed by GitHub
parent 87765e8673
commit c814b92557
310 changed files with 6606 additions and 2129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/base/browser/ui/actionbar/actionbar.ts
View File

@@ -16,6 +16,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
import { Event, Emitter } from 'vs/base/common/event';
import { asArray } from 'vs/base/common/arrays';
export interface IActionItem {
actionRunner: IActionRunner;
@@ -593,7 +594,7 @@ export class ActionBar extends Disposable implements IActionRunner {
}
push(arg: IAction | IAction[], options: IActionOptions = {}): void {
const actions: IAction[] = !Array.isArray(arg) ? [arg] : arg;
const actions: IAction[] = asArray(arg);
let index = types.isNumber(options.index) ? options.index : null;

5
src/vs/base/browser/ui/menu/menubar.ts
View File

@@ -17,6 +17,7 @@ import { Event, Emitter } from 'vs/base/common/event';
import { KeyCode, ResolvedKeybinding } from 'vs/base/common/keyCodes';
import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
import { withNullAsUndefined } from 'vs/base/common/types';
import { asArray } from 'vs/base/common/arrays';
const $ = DOM.$;
@@ -184,7 +185,7 @@ export class MenuBar extends Disposable {
}
push(arg: MenuBarMenu | MenuBarMenu[]): void {
const menus: MenuBarMenu[] = !Array.isArray(arg) ? [arg] : arg;
const menus: MenuBarMenu[] = asArray(arg);
menus.forEach((menuBarMenu) => {
const menuIndex = this.menuCache.length;
@@ -993,4 +994,4 @@ class ModifierKeyEmitter extends Emitter<IModifierKeyStatus> {
super.dispose();
this._subscriptions = dispose(this._subscriptions);
}
}
}