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

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,18 +4,17 @@
*--------------------------------------------------------------------------------------------*/
import { TPromise } from 'vs/base/common/winjs.base';
import { Dimension, Builder } from 'vs/base/browser/builder';
import { IAction, IActionRunner, ActionRunner } from 'vs/base/common/actions';
import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
import { Component } from 'vs/workbench/common/component';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IComposite } from 'vs/workbench/common/composite';
import { IEditorControl } from 'vs/platform/editor/common/editor';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { IConstructorSignature0, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import DOM = require('vs/base/browser/dom');
import { IDisposable } from 'vs/base/common/lifecycle';
import { IFocusTracker, trackFocus, Dimension } from 'vs/base/browser/dom';
/**
* Composites are layed out in the sidebar and panel part of the workbench. At a time only one composite
@@ -28,14 +27,14 @@ import { IDisposable } from 'vs/base/common/lifecycle';
* layout and focus call, but only one create and dispose call.
*/
export abstract class Composite extends Component implements IComposite {
private _onTitleAreaUpdate: Emitter<void>;
private _onDidFocus: Emitter<void>;
private readonly _onTitleAreaUpdate: Emitter<void>;
private readonly _onDidFocus: Emitter<void>;
private _focusTracker?: DOM.IFocusTracker;
private _focusTracker?: IFocusTracker;
private _focusListenerDisposable?: IDisposable;
private visible: boolean;
private parent: Builder;
private parent: HTMLElement;
protected actionRunner: IActionRunner;
@@ -75,7 +74,7 @@ export abstract class Composite extends Component implements IComposite {
* Note that DOM-dependent calculations should be performed from the setVisible()
* call. Only then the composite will be part of the DOM.
*/
public create(parent: Builder): TPromise<void> {
public create(parent: HTMLElement): TPromise<void> {
this.parent = parent;
return TPromise.as(null);
@@ -88,12 +87,12 @@ export abstract class Composite extends Component implements IComposite {
/**
* Returns the container this composite is being build in.
*/
public getContainer(): Builder {
public getContainer(): HTMLElement {
return this.parent;
}
public get onDidFocus(): Event<any> {
this._focusTracker = DOM.trackFocus(this.getContainer().getHTMLElement());
this._focusTracker = trackFocus(this.getContainer());
this._focusListenerDisposable = this._focusTracker.onDidFocus(() => {
this._onDidFocus.fire();
});
@@ -243,6 +242,10 @@ export abstract class CompositeDescriptor<T extends Composite> {
}
export abstract class CompositeRegistry<T extends Composite> {
private readonly _onDidRegister: Emitter<CompositeDescriptor<T>> = new Emitter<CompositeDescriptor<T>>();
readonly onDidRegister: Event<CompositeDescriptor<T>> = this._onDidRegister.event;
private composites: CompositeDescriptor<T>[];
constructor() {
@@ -255,6 +258,7 @@ export abstract class CompositeRegistry<T extends Composite> {
}
this.composites.push(descriptor);
this._onDidRegister.fire(descriptor);
}
public getComposite(id: string): CompositeDescriptor<T> {