mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Initial VS Code 1.19 source merge (#571)
* Initial 1.19 xcopy * Fix yarn build * Fix numerous build breaks * Next batch of build break fixes * More build break fixes * Runtime breaks * Additional post merge fixes * Fix windows setup file * Fix test failures. * Update license header blocks to refer to source eula
This commit is contained in:
@@ -26,10 +26,10 @@ import { IConstructorSignature0, IInstantiationService } from 'vs/platform/insta
|
||||
* layout and focus call, but only one create and dispose call.
|
||||
*/
|
||||
export abstract class Composite extends Component implements IComposite {
|
||||
private _telemetryData: any = {};
|
||||
private _onTitleAreaUpdate: Emitter<void>;
|
||||
|
||||
private visible: boolean;
|
||||
private parent: Builder;
|
||||
private _onTitleAreaUpdate: Emitter<void>;
|
||||
|
||||
protected actionRunner: IActionRunner;
|
||||
|
||||
@@ -100,42 +100,6 @@ export abstract class Composite extends Component implements IComposite {
|
||||
public setVisible(visible: boolean): TPromise<void> {
|
||||
this.visible = visible;
|
||||
|
||||
// Reset telemetry data when composite becomes visible
|
||||
if (visible) {
|
||||
this._telemetryData = {};
|
||||
this._telemetryData.startTime = new Date();
|
||||
|
||||
// Only submit telemetry data when not running from an integration test
|
||||
if (this._telemetryService && this._telemetryService.publicLog) {
|
||||
const eventName: string = 'compositeOpen';
|
||||
/* __GDPR__
|
||||
"compositeOpen" : {
|
||||
"composite" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
|
||||
}
|
||||
*/
|
||||
this._telemetryService.publicLog(eventName, { composite: this.getId() });
|
||||
}
|
||||
}
|
||||
|
||||
// Send telemetry data when composite hides
|
||||
else {
|
||||
this._telemetryData.timeSpent = (Date.now() - this._telemetryData.startTime) / 1000;
|
||||
delete this._telemetryData.startTime;
|
||||
|
||||
// Only submit telemetry data when not running from an integration test
|
||||
if (this._telemetryService && this._telemetryService.publicLog) {
|
||||
const eventName: string = 'compositeShown';
|
||||
this._telemetryData.composite = this.getId();
|
||||
/* __GDPR__
|
||||
"compositeShown" : {
|
||||
"timeSpent" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
|
||||
"composite": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
|
||||
}
|
||||
*/
|
||||
this._telemetryService.publicLog(eventName, this._telemetryData);
|
||||
}
|
||||
}
|
||||
|
||||
return TPromise.as(null);
|
||||
}
|
||||
|
||||
@@ -234,7 +198,7 @@ export abstract class CompositeDescriptor<T extends Composite> {
|
||||
public name: string;
|
||||
public cssClass: string;
|
||||
public order: number;
|
||||
public keybindingId;
|
||||
public keybindingId: string;
|
||||
|
||||
private ctor: IConstructorSignature0<T>;
|
||||
|
||||
@@ -275,10 +239,6 @@ export abstract class CompositeRegistry<T extends Composite> {
|
||||
return this.composites.slice(0);
|
||||
}
|
||||
|
||||
protected setComposites(compositesToSet: CompositeDescriptor<T>[]): void {
|
||||
this.composites = compositesToSet;
|
||||
}
|
||||
|
||||
private compositeById(id: string): CompositeDescriptor<T> {
|
||||
for (let i = 0; i < this.composites.length; i++) {
|
||||
if (this.composites[i].id === id) {
|
||||
|
||||
Reference in New Issue
Block a user