Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions

View File

@@ -114,7 +114,7 @@ export class ToolBar extends Disposable {
this.actionBar.setAriaLabel(label);
}
setActions(primaryActions: IAction[], secondaryActions?: IAction[]): () => void {
setActions(primaryActions: ReadonlyArray<IAction>, secondaryActions?: ReadonlyArray<IAction>): () => void {
return () => {
let primaryActionsToSet = primaryActions ? primaryActions.slice(0) : [];
@@ -169,7 +169,7 @@ class ToggleMenuAction extends Action {
static readonly ID = 'toolbar.toggle.more';
private _menuActions: IAction[];
private _menuActions: ReadonlyArray<IAction>;
private toggleDropdownMenu: () => void;
constructor(toggleDropdownMenu: () => void, title?: string) {
@@ -185,11 +185,11 @@ class ToggleMenuAction extends Action {
return Promise.resolve(true);
}
get menuActions() {
get menuActions(): ReadonlyArray<IAction> {
return this._menuActions;
}
set menuActions(actions: IAction[]) {
set menuActions(actions: ReadonlyArray<IAction>) {
this._menuActions = actions;
}
}