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

Vscode merge (#4582)

Browse Source 
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies
This commit is contained in:
Anthony Dresser
2019-03-19 17:44:35 -07:00
committed by GitHub
parent 833d197412
commit 87765e8673
1879 changed files with 54505 additions and 38058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/vs/workbench/browser/composite.ts
View File

@@ -38,7 +38,7 @@ export abstract class Composite extends Component implements IComposite {
private _onDidFocus: Emitter<void>;
get onDidFocus(): Event<void> {
if (!this._onDidFocus) {
this._registerFocusTrackEvents();
this.registerFocusTrackEvents();
}
return this._onDidFocus.event;
@@ -47,13 +47,13 @@ export abstract class Composite extends Component implements IComposite {
private _onDidBlur: Emitter<void>;
get onDidBlur(): Event<void> {
if (!this._onDidBlur) {
this._registerFocusTrackEvents();
this.registerFocusTrackEvents();
}
return this._onDidBlur.event;
}
private _registerFocusTrackEvents(): void {
private registerFocusTrackEvents(): void {
this._onDidFocus = this._register(new Emitter<void>());
this._onDidBlur = this._register(new Emitter<void>());
@@ -173,6 +173,13 @@ export abstract class Composite extends Component implements IComposite {
return null;
}
/**
* Provide a context to be passed to the toolbar.
*/
getActionsContext(): any {
return null;
}
/**
* Returns the instance of IActionRunner to use with this composite for the
* composite tool bar.
@@ -217,11 +224,11 @@ export abstract class CompositeDescriptor<T extends Composite> {
constructor(
private readonly ctor: IConstructorSignature0<T>,
public readonly id: string,
public readonly name: string,
public readonly cssClass?: string,
public readonly order?: number,
public readonly keybindingId?: string,
readonly id: string,
readonly name: string,
readonly cssClass?: string,
readonly order?: number,
readonly keybindingId?: string,
) { }
instantiate(instantiationService: IInstantiationService): T {