From c8ce66aca8a6270ca6c6c92b23747bb67e48dc01 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 8 Feb 2016 08:05:35 +0100 Subject: [PATCH] lint vs/platform --- src/vs/platform/actions/common/actions.ts | 56 +-- .../platform/actions/common/actionsService.ts | 8 +- .../actions/test/common/actions.test.ts | 14 +- .../configuration/common/configuration.ts | 10 +- .../common/configurationRegistry.ts | 20 +- .../common/configurationService.ts | 20 +- src/vs/platform/configuration/common/model.ts | 64 ++-- .../configuration/test/common/model.test.ts | 39 +- .../contextview/browser/contextMenuHandler.ts | 28 +- .../contextview/browser/contextMenuService.ts | 9 +- .../contextview/browser/contextView.ts | 30 +- .../contextview/browser/contextViewService.ts | 13 +- src/vs/platform/editor/common/editor.ts | 4 +- src/vs/platform/event/common/event.ts | 2 +- src/vs/platform/files/common/files.ts | 6 +- .../instantiation/common/descriptors.ts | 296 ++++++++-------- .../instantiation/common/extensions.ts | 14 +- .../instantiation/common/instantiation.ts | 4 +- .../common/instantiationService.ts | 4 +- .../test/common/instantiationService.test.ts | 120 +++---- .../common/jsonContributionRegistry.ts | 34 +- .../common/jsonValidationExtensionPoint.ts | 15 +- .../browser/keybindingServiceImpl.ts | 48 +-- .../keybinding/common/keybindingResolver.ts | 12 +- .../keybinding/common/keybindingService.ts | 66 ++-- .../keybinding/common/keybindingsRegistry.ts | 18 +- .../test/common/keybindingIO.test.ts | 10 +- .../test/common/keybindingService.test.ts | 65 ++-- .../test/common/keybindingsRegistry.test.ts | 4 +- .../test/common/mockKeybindingService.ts | 6 +- src/vs/platform/lifecycle/common/lifecycle.ts | 2 +- .../lifecycle/common/nullLifecycleService.ts | 2 +- .../platform/markers/common/markerService.ts | 66 ++-- src/vs/platform/markers/common/markers.ts | 2 +- .../markers/test/common/markerService.test.ts | 22 +- src/vs/platform/message/common/message.ts | 6 +- src/vs/platform/platform.ts | 34 +- .../plugins/common/abstractPluginService.ts | 26 +- .../platform/plugins/common/ipcRemoteCom.ts | 34 +- .../plugins/common/nativePluginService.ts | 57 +-- src/vs/platform/plugins/common/plugins.ts | 16 +- .../plugins/common/pluginsRegistry.ts | 90 ++--- .../plugins/node/pluginVersionValidator.ts | 14 +- .../test/node/pluginVersionValidator.test.ts | 32 +- src/vs/platform/progress/common/progress.ts | 2 +- .../request/common/baseRequestService.ts | 59 ++-- src/vs/platform/request/common/request.ts | 12 +- src/vs/platform/search/common/search.ts | 4 +- .../storage/common/remotable.storage.ts | 2 +- src/vs/platform/storage/common/storage.ts | 6 +- .../telemetry/browser/mainTelemetryService.ts | 46 +-- .../common/abstractRemoteTelemetryService.ts | 6 +- .../common/abstractTelemetryService.ts | 90 ++--- .../telemetry/common/nullTelemetryService.ts | 10 +- src/vs/platform/telemetry/common/telemetry.ts | 22 +- .../common/workerTelemetryService.ts | 4 +- .../telemetry/common/workspaceStats.ts | 38 +- .../electronTelemetryService.ts | 24 +- .../test/node/telemetryService.test.ts | 334 +++++++++--------- .../platform/test/common/nullThreadService.ts | 24 +- src/vs/platform/test/common/platform.test.ts | 12 +- .../thread/common/abstractThreadService.ts | 64 ++-- .../thread/common/mainThreadService.ts | 124 +++---- .../thread/common/pluginHostThreadService.ts | 20 +- src/vs/platform/thread/common/thread.ts | 32 +- .../platform/thread/common/threadService.ts | 52 +-- .../thread/common/workerThreadService.ts | 52 +-- src/vs/platform/workspace/common/workspace.ts | 2 +- 68 files changed, 1227 insertions(+), 1256 deletions(-) diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts index 875b8c7dbf9..d37aa6d0a4e 100644 --- a/src/vs/platform/actions/common/actions.ts +++ b/src/vs/platform/actions/common/actions.ts @@ -14,7 +14,7 @@ import Instantiation = require('vs/platform/instantiation/common/instantiation') import {KbExpr, IKeybindings} from 'vs/platform/keybinding/common/keybindingService'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var IActionsService = createDecorator('actionsService'); +export let IActionsService = createDecorator('actionsService'); export interface IActionsService { serviceId: ServiceIdentifier; @@ -31,8 +31,8 @@ export class SyncActionDescriptor { private _keybindingContext: KbExpr; private _keybindingWeight: number; - constructor(ctor:Instantiation.INewConstructorSignature2, - id:string, label:string, keybindings?:IKeybindings, keybindingContext?:KbExpr, keybindingWeight?:number + constructor(ctor: Instantiation.INewConstructorSignature2, + id: string, label: string, keybindings?: IKeybindings, keybindingContext?: KbExpr, keybindingWeight?: number ) { this._id = id; this._label = label; @@ -46,15 +46,15 @@ export class SyncActionDescriptor { return this._descriptor; } - public get id():string { + public get id(): string { return this._id; } - public get label():string { + public get label(): string { return this._label; } - public get keybindings():IKeybindings { + public get keybindings(): IKeybindings { return this._keybindings; } @@ -72,24 +72,24 @@ export class SyncActionDescriptor { * module loading up to the point until the run method is being executed. */ export class DeferredAction extends Actions.Action { - private _cachedAction:Actions.IAction; - private _emitterUnbind:EventEmitter.ListenerUnbind; + private _cachedAction: Actions.IAction; + private _emitterUnbind: EventEmitter.ListenerUnbind; - constructor(private _instantiationService:Instantiation.IInstantiationService, private _descriptor:Descriptors.AsyncDescriptor, - id:string, label='', cssClass='', enabled= true) { + constructor(private _instantiationService: Instantiation.IInstantiationService, private _descriptor: Descriptors.AsyncDescriptor, + id: string, label = '', cssClass = '', enabled = true) { super(id, label, cssClass, enabled); } - public get cachedAction():Actions.IAction { + public get cachedAction(): Actions.IAction { return this._cachedAction; } - public set cachedAction(action:Actions.IAction) { + public set cachedAction(action: Actions.IAction) { this._cachedAction = action; } - public get id():string { + public get id(): string { if (this._cachedAction instanceof Actions.Action) { return this._cachedAction.id; } @@ -97,7 +97,7 @@ export class DeferredAction extends Actions.Action { return this._id; } - public get label():string { + public get label(): string { if (this._cachedAction instanceof Actions.Action) { return this._cachedAction.label; } @@ -105,7 +105,7 @@ export class DeferredAction extends Actions.Action { return this._label; } - public set label(value:string) { + public set label(value: string) { if (this._cachedAction instanceof Actions.Action) { this._cachedAction.label = value; } else { @@ -113,7 +113,7 @@ export class DeferredAction extends Actions.Action { } } - public get class():string { + public get class(): string { if (this._cachedAction instanceof Actions.Action) { return this._cachedAction.class; } @@ -121,7 +121,7 @@ export class DeferredAction extends Actions.Action { return this._cssClass; } - public set class(value:string) { + public set class(value: string) { if (this._cachedAction instanceof Actions.Action) { this._cachedAction.class = value; } else { @@ -129,14 +129,14 @@ export class DeferredAction extends Actions.Action { } } - public get enabled():boolean { + public get enabled(): boolean { if (this._cachedAction instanceof Actions.Action) { return this._cachedAction.enabled; } return this._enabled; } - public set enabled(value:boolean) { + public set enabled(value: boolean) { if (this._cachedAction instanceof Actions.Action) { this._cachedAction.enabled = value; } else { @@ -144,14 +144,14 @@ export class DeferredAction extends Actions.Action { } } - public get order():number { + public get order(): number { if (this._cachedAction instanceof Actions.Action) { return (this._cachedAction).order; } return this._order; } - public set order(order:number) { + public set order(order: number) { if (this._cachedAction instanceof Actions.Action) { (this._cachedAction).order = order; } else { @@ -159,17 +159,17 @@ export class DeferredAction extends Actions.Action { } } - public run(event?:any):WinJS.Promise { - if(this._cachedAction) { + public run(event?: any): WinJS.Promise { + if (this._cachedAction) { return this._cachedAction.run(event); } - return this._createAction().then((action:Actions.IAction)=>{ + return this._createAction().then((action: Actions.IAction) => { return action.run(event); }); } - private _createAction():WinJS.TPromise { - var promise = WinJS.TPromise.as(undefined); + private _createAction(): WinJS.TPromise { + let promise = WinJS.TPromise.as(undefined); return promise.then(() => { return this._instantiationService.createInstance(this._descriptor); @@ -184,11 +184,11 @@ export class DeferredAction extends Actions.Action { }); } - public dispose():void { + public dispose(): void { if (this._emitterUnbind) { this._emitterUnbind(); } - if(this._cachedAction) { + if (this._cachedAction) { this._cachedAction.dispose(); } super.dispose(); diff --git a/src/vs/platform/actions/common/actionsService.ts b/src/vs/platform/actions/common/actionsService.ts index 06d63b3b8bb..bca5953c955 100644 --- a/src/vs/platform/actions/common/actionsService.ts +++ b/src/vs/platform/actions/common/actionsService.ts @@ -4,10 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {IPluginService, IPluginDescription, IPointListener} from 'vs/platform/plugins/common/plugins'; +import {IPluginService} from 'vs/platform/plugins/common/plugins'; import {PluginsRegistry, IMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry'; -import {Registry} from 'vs/platform/platform'; -import {IMessageService, Severity} from 'vs/platform/message/common/message'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {IAction, Action} from 'vs/base/common/actions'; import {localize} from 'vs/nls'; @@ -28,8 +26,8 @@ function isCommands(thing: Command | Command[]): thing is Command[] { return Array.isArray(thing); } -function isValidCommand(candidate:Command, rejects: string[]): boolean { - if(!candidate) { +function isValidCommand(candidate: Command, rejects: string[]): boolean { + if (!candidate) { rejects.push(localize('nonempty', "expected non-empty value.")); return false; } diff --git a/src/vs/platform/actions/test/common/actions.test.ts b/src/vs/platform/actions/test/common/actions.test.ts index 6e75cbf7fe7..ff951260a79 100644 --- a/src/vs/platform/actions/test/common/actions.test.ts +++ b/src/vs/platform/actions/test/common/actions.test.ts @@ -15,10 +15,10 @@ import {IEventService} from 'vs/platform/event/common/event'; export class TestAction extends Actions.Action { private service; - private first:string; - private second:string; + private first: string; + private second: string; - constructor(first:string, second:string, @IEventService eventService: IEventService) { + constructor(first: string, second: string, @IEventService eventService: IEventService) { super(first); this.service = eventService; this.first = first; @@ -26,7 +26,7 @@ export class TestAction extends Actions.Action { } - public run():WinJS.Promise { + public run(): WinJS.Promise { return WinJS.TPromise.as((!!this.service && !!this.first && !!this.second) ? true : false); } } @@ -37,13 +37,13 @@ class TestEventService extends EventEmitter.EventEmitter { suite('Platform actions', () => { test('DeferredAction', (done) => { - var services:any = { + let services: any = { eventService: {} }; - var instantiationService = InstantiationService.create(services); + let instantiationService = InstantiationService.create(services); - var action = new DeferredAction( + let action = new DeferredAction( instantiationService, new AsyncDescriptor('vs/platform/actions/test/common/actions.test', 'TestAction', 'my.id', 'Second'), 'my.test.action', diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts index 1b36f95daee..49620c8cac6 100644 --- a/src/vs/platform/configuration/common/configuration.ts +++ b/src/vs/platform/configuration/common/configuration.ts @@ -8,16 +8,16 @@ import {IEventEmitter} from 'vs/base/common/eventEmitter'; import Event from 'vs/base/common/event'; import winjs = require('vs/base/common/winjs.base'); -export var IConfigurationService = createDecorator('configurationService'); +export const IConfigurationService = createDecorator('configurationService'); export interface IConfigurationService extends IEventEmitter { - serviceId : ServiceIdentifier; + serviceId: ServiceIdentifier; /** * Fetches the appropriate section of the configuration JSON file. * This will be an object keyed off the section name. */ - loadConfiguration(section?:string):winjs.TPromise; + loadConfiguration(section?: string): winjs.TPromise; /** * Returns iff the workspace has configuration or not. @@ -45,8 +45,8 @@ export class ConfigurationServiceEventTypes { } export interface IConfigurationServiceEvent { - section?:string; - config:any; + section?: string; + config: any; } export function extractSetting(config: any, settingPath: string): any { diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts index cd21084632f..3074d0f8ac5 100644 --- a/src/vs/platform/configuration/common/configurationRegistry.ts +++ b/src/vs/platform/configuration/common/configurationRegistry.ts @@ -9,13 +9,11 @@ import Event, {Emitter} from 'vs/base/common/event'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import platform = require('vs/platform/platform'); import objects = require('vs/base/common/objects'); -import strings = require('vs/base/common/strings'); -import {IPluginDescription} from 'vs/platform/plugins/common/plugins'; import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; import JSONContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); -export var Extensions = { +export const Extensions = { Configuration: 'base.contributions.configuration' }; @@ -86,19 +84,19 @@ class ConfigurationRegistry implements IConfigurationRegistry { } private registerJSONConfiguration(configuration: IConfigurationNode) { - var schema = objects.clone(configuration); + let schema = objects.clone(configuration); this.configurationSchema.allOf.push(schema); contributionRegistry.registerSchema(schemaId, this.configurationSchema); } } -var configurationRegistry = new ConfigurationRegistry(); +const configurationRegistry = new ConfigurationRegistry(); platform.Registry.add(Extensions.Configuration, configurationRegistry); let configurationExtPoint = PluginsRegistry.registerExtensionPoint('configuration', { description: nls.localize('vscode.extension.contributes.configuration', 'Contributes configuration settings.'), type: 'object', - default: { title: '', properties: {}}, + default: { title: '', properties: {} }, properties: { title: { description: nls.localize('vscode.extension.contributes.configuration.title', 'A summary of the settings. This label will be used in the settings file as separating comment.'), @@ -115,9 +113,9 @@ let configurationExtPoint = PluginsRegistry.registerExtensionPoint { - for (var i = 0; i < extensions.length; i++) { - var configuration = extensions[i].value; - var collector = extensions[i].collector; + for (let i = 0; i < extensions.length; i++) { + let configuration = extensions[i].value; + let collector = extensions[i].collector; if (configuration.type && configuration.type !== 'object') { collector.warn(nls.localize('invalid.type', "if set, 'configuration.type' must be set to 'object")); @@ -129,11 +127,11 @@ configurationExtPoint.setHandler((extensions) => { collector.error(nls.localize('invalid.title', "'configuration.title' must be a string")); } - if (configuration.properties && (typeof configuration.properties !== 'object') ) { + if (configuration.properties && (typeof configuration.properties !== 'object')) { collector.error(nls.localize('invalid.properties', "'configuration.properties' must be an object")); return; } - var clonedConfiguration = objects.clone(configuration); + let clonedConfiguration = objects.clone(configuration); clonedConfiguration.id = extensions[i].description.id; configurationRegistry.registerConfiguration(clonedConfiguration); } diff --git a/src/vs/platform/configuration/common/configurationService.ts b/src/vs/platform/configuration/common/configurationService.ts index 4bb95d3448d..d6b84a35f5c 100644 --- a/src/vs/platform/configuration/common/configurationService.ts +++ b/src/vs/platform/configuration/common/configurationService.ts @@ -69,7 +69,7 @@ export abstract class ConfigurationService extends eventEmitter.EventEmitter imp this.callOnDispose = () => { unbind(); subscription.dispose(); - } + }; this.onDidUpdateConfiguration = fromEventEmitter(this, ConfigurationServiceEventTypes.UPDATED); } @@ -92,9 +92,9 @@ export abstract class ConfigurationService extends eventEmitter.EventEmitter imp } return this.loadConfigurationPromise.then((res: ILoadConfigResult) => { - var result = section ? res.merged[section] : res.merged; + let result = section ? res.merged[section] : res.merged; - var parseErrors = res.consolidated.parseErrors; + let parseErrors = res.consolidated.parseErrors; if (res.globals.parseErrors) { parseErrors.push.apply(parseErrors, res.globals.parseErrors); } @@ -119,10 +119,10 @@ export abstract class ConfigurationService extends eventEmitter.EventEmitter imp return this.loadWorkspaceConfiguration().then((values) => { // Consolidate - var consolidated = model.consolidate(values); + let consolidated = model.consolidate(values); // Override with workspace locals - var merged = objects.mixin( + let merged = objects.mixin( objects.clone(globals.contents), // target: global/default values (but dont modify!) consolidated.contents, // source: workspace configured values true // overwrite @@ -186,10 +186,10 @@ export abstract class ConfigurationService extends eventEmitter.EventEmitter imp } private handleFileEvents(event: Files.FileChangesEvent): void { - var events = event.changes; - var affectedByChanges = false; - for (var i = 0, len = events.length; i < len; i++) { - var workspacePath = this.contextService.toWorkspaceRelativePath(events[i].resource); + let events = event.changes; + let affectedByChanges = false; + for (let i = 0, len = events.length; i < len; i++) { + let workspacePath = this.contextService.toWorkspaceRelativePath(events[i].resource); if (!workspacePath) { continue; // event is not inside workspace } @@ -240,4 +240,4 @@ export class NullConfigurationService extends eventEmitter.EventEmitter implemen } } -export var nullService = new NullConfigurationService(); +export let nullService = new NullConfigurationService(); diff --git a/src/vs/platform/configuration/common/model.ts b/src/vs/platform/configuration/common/model.ts index d1e4105a00f..eb458bb93ca 100644 --- a/src/vs/platform/configuration/common/model.ts +++ b/src/vs/platform/configuration/common/model.ts @@ -11,20 +11,20 @@ import json = require('vs/base/common/json'); import configurationRegistry = require('./configurationRegistry'); -export var CONFIG_DEFAULT_NAME = 'settings'; +export const CONFIG_DEFAULT_NAME = 'settings'; export interface IConfigFile { contents: any; parseError?: any; } -function setNode(root: any, key: string, value: any) : void { - var segments = key.split('.'); - var last = segments.pop(); +function setNode(root: any, key: string, value: any): void { + let segments = key.split('.'); + let last = segments.pop(); - var curr = root; + let curr = root; segments.forEach((s) => { - var obj = curr[s]; + let obj = curr[s]; switch (typeof obj) { case 'undefined': obj = curr[s] = Object.create(null); @@ -42,9 +42,9 @@ function setNode(root: any, key: string, value: any) : void { export function newConfigFile(value: string): IConfigFile { try { - var root: any = Object.create(null); - var contents = json.parse(value) || {}; - for (var key in contents) { + let root: any = Object.create(null); + let contents = json.parse(value) || {}; + for (let key in contents) { setNode(root, key, contents[key]); } return { @@ -73,29 +73,29 @@ export function merge(base: any, add: any, overwrite: boolean): void { } export function consolidate(configMap: { [key: string]: IConfigFile; }): { contents: any; parseErrors: string[]; } { - var finalConfig: any = Object.create(null); - var parseErrors: string[] = []; - var regexp = /\/(team\.)?([^\.]*)*\.json/; + let finalConfig: any = Object.create(null); + let parseErrors: string[] = []; + let regexp = /\/(team\.)?([^\.]*)*\.json/; // For each config file in .vscode folder Object.keys(configMap).forEach((configFileName) => { - var config = objects.clone(configMap[configFileName]); + let config = objects.clone(configMap[configFileName]); - var matches = regexp.exec(configFileName); + let matches = regexp.exec(configFileName); if (!matches) { return; } // If a file is team.foo.json, it indicates team settings, strip this away - var isTeamSetting = !!matches[1]; + let isTeamSetting = !!matches[1]; // Extract the config key from the file name (except for settings.json which is the default) - var configElement:any = finalConfig; + let configElement: any = finalConfig; if (matches && matches[2] && matches[2] !== CONFIG_DEFAULT_NAME) { // Use the name of the file as top level config section for all settings inside - var configSection = matches[2]; - var element = configElement[configSection]; + let configSection = matches[2]; + let element = configElement[configSection]; if (!element) { element = Object.create(null); configElement[configSection] = element; @@ -120,9 +120,9 @@ export function consolidate(configMap: { [key: string]: IConfigFile; }): { conte function processDefaultValues(withConfig: (config: configurationRegistry.IConfigurationNode, isTop?: boolean) => void): void { - var configurations = (platform.Registry.as(configurationRegistry.Extensions.Configuration)).getConfigurations(); + let configurations = (platform.Registry.as(configurationRegistry.Extensions.Configuration)).getConfigurations(); - var visit = (config: configurationRegistry.IConfigurationNode, isFirst: boolean) => { + let visit = (config: configurationRegistry.IConfigurationNode, isFirst: boolean) => { withConfig(config, isFirst); if (Array.isArray(config.allOf)) { @@ -149,13 +149,13 @@ function processDefaultValues(withConfig: (config: configurationRegistry.IConfig export function getDefaultValues(): any { - var ret: any = Object.create(null); + let ret: any = Object.create(null); - var handleConfig = (config: configurationRegistry.IConfigurationNode, isTop: boolean) => { + let handleConfig = (config: configurationRegistry.IConfigurationNode, isTop: boolean) => { if (config.properties) { Object.keys(config.properties).forEach((key) => { - var prop = config.properties[key]; - var value = prop.default; + let prop = config.properties[key]; + let value = prop.default; if (types.isUndefined(prop.default)) { value = getDefaultValue(prop.type); } @@ -168,12 +168,12 @@ export function getDefaultValues(): any { } -export function getDefaultValuesContent() : string { - var lastEntry = -1; - var result: string[] = []; +export function getDefaultValuesContent(): string { + let lastEntry = -1; + let result: string[] = []; result.push('{'); - var handleConfig = (config: configurationRegistry.IConfigurationNode, isTop: boolean) => { + let handleConfig = (config: configurationRegistry.IConfigurationNode, isTop: boolean) => { if (config.title) { if (isTop) { @@ -187,8 +187,8 @@ export function getDefaultValuesContent() : string { if (config.properties) { Object.keys(config.properties).forEach((key) => { - var prop = config.properties[key]; - var defaultValue = prop.default; + let prop = config.properties[key]; + let defaultValue = prop.default; if (types.isUndefined(defaultValue)) { defaultValue = getDefaultValue(prop.type); } @@ -196,7 +196,7 @@ export function getDefaultValuesContent() : string { result.push('\t// ' + prop.description); } - var valueString = JSON.stringify(defaultValue, null, '\t'); + let valueString = JSON.stringify(defaultValue, null, '\t'); if (valueString && (typeof defaultValue === 'object')) { valueString = addIndent(valueString); } @@ -217,7 +217,7 @@ export function getDefaultValuesContent() : string { return result.join('\n'); } -function addIndent(str: string) : string { +function addIndent(str: string): string { return str.split('\n').join('\n\t'); } diff --git a/src/vs/platform/configuration/test/common/model.test.ts b/src/vs/platform/configuration/test/common/model.test.ts index 110dadc8a25..d06300d5a28 100644 --- a/src/vs/platform/configuration/test/common/model.test.ts +++ b/src/vs/platform/configuration/test/common/model.test.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; - import assert = require('assert'); import model = require('vs/platform/configuration/common/model'); @@ -12,63 +11,63 @@ suite('ConfigurationService - Model', () => { test('simple merge', () => { - var base = {'a': 1, 'b': 2}; - model.merge(base, {'a': 3, 'c': 4}, true); - assert.deepEqual(base, {'a': 3, 'b': 2, 'c': 4}); - base = {'a': 1, 'b': 2}; - model.merge(base, {'a': 3, 'c': 4}, false); - assert.deepEqual(base, {'a': 1, 'b': 2, 'c': 4}); + let base = { 'a': 1, 'b': 2 }; + model.merge(base, { 'a': 3, 'c': 4 }, true); + assert.deepEqual(base, { 'a': 3, 'b': 2, 'c': 4 }); + base = { 'a': 1, 'b': 2 }; + model.merge(base, { 'a': 3, 'c': 4 }, false); + assert.deepEqual(base, { 'a': 1, 'b': 2, 'c': 4 }); }); test('Recursive merge', () => { - var base = {'a': { 'b': 1}}; - model.merge(base, {'a': { 'b': 2}}, true); - assert.deepEqual(base, {'a': { 'b': 2}}); + let base = { 'a': { 'b': 1 } }; + model.merge(base, { 'a': { 'b': 2 } }, true); + assert.deepEqual(base, { 'a': { 'b': 2 } }); }); test('Test consolidate (settings)', () => { - var config1:model.IConfigFile = { + let config1: model.IConfigFile = { contents: { awesome: true } }; - var config2: model.IConfigFile = { + let config2: model.IConfigFile = { contents: { awesome: false } }; - var expected = { + let expected = { awesome: false }; - assert.deepEqual(model.consolidate({'.vscode/team.settings.json': config1, '.vscode/settings.json': config2}).contents, expected); - assert.deepEqual(model.consolidate({'settings.json': config2, 'team.settings.json': config1}).contents, {}); - assert.deepEqual(model.consolidate({'.vscode/team.settings.json': config1, '.vscode/settings.json': config2, '.vscode/team2.settings.json': config1}).contents, expected); + assert.deepEqual(model.consolidate({ '.vscode/team.settings.json': config1, '.vscode/settings.json': config2 }).contents, expected); + assert.deepEqual(model.consolidate({ 'settings.json': config2, 'team.settings.json': config1 }).contents, {}); + assert.deepEqual(model.consolidate({ '.vscode/team.settings.json': config1, '.vscode/settings.json': config2, '.vscode/team2.settings.json': config1 }).contents, expected); }); test('Test consolidate (settings and tasks)', () => { - var config1:model.IConfigFile = { + let config1: model.IConfigFile = { contents: { awesome: true } }; - var config2: model.IConfigFile = { + let config2: model.IConfigFile = { contents: { awesome: false } }; - var expected = { + let expected = { awesome: true, tasks: { awesome: false } }; - assert.deepEqual(model.consolidate({'.vscode/settings.json': config1, '.vscode/tasks.json': config2}).contents, expected); + assert.deepEqual(model.consolidate({ '.vscode/settings.json': config1, '.vscode/tasks.json': config2 }).contents, expected); }); }); diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.ts b/src/vs/platform/contextview/browser/contextMenuHandler.ts index c57f929db2e..d16756177f9 100644 --- a/src/vs/platform/contextview/browser/contextMenuHandler.ts +++ b/src/vs/platform/contextview/browser/contextMenuHandler.ts @@ -7,11 +7,9 @@ import 'vs/css!./contextMenuHandler'; import Builder = require('vs/base/browser/builder'); -import WinJS = require('vs/base/common/winjs.base'); import Lifecycle = require('vs/base/common/lifecycle'); import Mouse = require('vs/base/browser/mouseEvent'); import Actions = require('vs/base/common/actions'); -import ActionBar = require('vs/base/browser/ui/actionbar/actionbar'); import Menu = require('vs/base/browser/ui/menu/menu'); import Events = require('vs/base/common/events'); import Severity from 'vs/base/common/severity'; @@ -20,7 +18,7 @@ import {IContextViewService, IContextMenuDelegate} from './contextView'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IMessageService} from 'vs/platform/message/common/message'; -var $ = Builder.$; +const $ = Builder.$; export class ContextMenuHandler { @@ -33,7 +31,7 @@ export class ContextMenuHandler { private menuContainerElement: HTMLElement; private toDispose: Lifecycle.IDisposable[]; - constructor(element: HTMLElement, contextViewService:IContextViewService, telemetryService:ITelemetryService, messageService:IMessageService) { + constructor(element: HTMLElement, contextViewService: IContextViewService, telemetryService: ITelemetryService, messageService: IMessageService) { this.setContainer(element); this.contextViewService = contextViewService; @@ -44,11 +42,11 @@ export class ContextMenuHandler { this.menuContainerElement = null; this.toDispose = []; - var hideViewOnRun = false; + let hideViewOnRun = false; this.toDispose.push(this.actionRunner.addListener2(Events.EventType.BEFORE_RUN, (e: any) => { if (this.telemetryService) { - this.telemetryService.publicLog('workbenchActionExecuted', {id: e.action.id, From: 'contextMenu'}); + this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, From: 'contextMenu' }); } hideViewOnRun = !!e.retainActionItem; @@ -82,7 +80,7 @@ export class ContextMenuHandler { } } - public showContextMenu(delegate: IContextMenuDelegate):void { + public showContextMenu(delegate: IContextMenuDelegate): void { delegate.getActions().done((actions: Actions.IAction[]) => { this.contextViewService.showContextView({ getAnchor: () => delegate.getAnchor(), @@ -91,23 +89,23 @@ export class ContextMenuHandler { render: (container) => { this.menuContainerElement = container; - var className = delegate.getMenuClassName ? delegate.getMenuClassName() : ''; + let className = delegate.getMenuClassName ? delegate.getMenuClassName() : ''; if (className) { container.className += ' ' + className; } - var menu = new Menu.Menu(container, actions, { + let menu = new Menu.Menu(container, actions, { actionItemProvider: delegate.getActionItem, context: delegate.getActionsContext ? delegate.getActionsContext() : null, actionRunner: this.actionRunner }); - var listener1 = menu.addListener2(Events.EventType.CANCEL, (e: any) => { + let listener1 = menu.addListener2(Events.EventType.CANCEL, (e: any) => { this.contextViewService.hideContextView(true); }); - var listener2 = menu.addListener2(Events.EventType.BLUR, (e: any) => { + let listener2 = menu.addListener2(Events.EventType.BLUR, (e: any) => { this.contextViewService.hideContextView(true); }); @@ -127,13 +125,13 @@ export class ContextMenuHandler { }); } - private onMouseDown(e: MouseEvent):void { + private onMouseDown(e: MouseEvent): void { if (!this.menuContainerElement) { return; } - var event = new Mouse.StandardMouseEvent(e); - var element = event.target; + let event = new Mouse.StandardMouseEvent(e); + let element = event.target; while (element) { if (element === this.menuContainerElement) { @@ -146,7 +144,7 @@ export class ContextMenuHandler { this.contextViewService.hideContextView(); } - public dispose():void { + public dispose(): void { this.setContainer(null); } } \ No newline at end of file diff --git a/src/vs/platform/contextview/browser/contextMenuService.ts b/src/vs/platform/contextview/browser/contextMenuService.ts index 18d04661d7c..a9a277a26d8 100644 --- a/src/vs/platform/contextview/browser/contextMenuService.ts +++ b/src/vs/platform/contextview/browser/contextMenuService.ts @@ -5,8 +5,7 @@ 'use strict'; import {ContextMenuHandler} from './contextMenuHandler'; -import {IContextViewService, IContextMenuService, IContextViewDelegate, IContextMenuDelegate} from './contextView'; -import {ContextView} from 'vs/base/browser/ui/contextview/contextview'; +import {IContextViewService, IContextMenuService, IContextMenuDelegate} from './contextView'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IMessageService} from 'vs/platform/message/common/message'; @@ -15,11 +14,11 @@ export class ContextMenuService implements IContextMenuService { private contextMenuHandler: ContextMenuHandler; - constructor(container: HTMLElement, telemetryService:ITelemetryService, messageService:IMessageService, contextViewService: IContextViewService) { + constructor(container: HTMLElement, telemetryService: ITelemetryService, messageService: IMessageService, contextViewService: IContextViewService) { this.contextMenuHandler = new ContextMenuHandler(container, contextViewService, telemetryService, messageService); } - public dispose():void { + public dispose(): void { this.contextMenuHandler.dispose(); } @@ -29,7 +28,7 @@ export class ContextMenuService implements IContextMenuService { // ContextMenu - public showContextMenu(delegate: IContextMenuDelegate):void { + public showContextMenu(delegate: IContextMenuDelegate): void { this.contextMenuHandler.showContextMenu(delegate); } } \ No newline at end of file diff --git a/src/vs/platform/contextview/browser/contextView.ts b/src/vs/platform/contextview/browser/contextView.ts index 0d98de4eb32..9b4e642b6ef 100644 --- a/src/vs/platform/contextview/browser/contextView.ts +++ b/src/vs/platform/contextview/browser/contextView.ts @@ -11,36 +11,36 @@ import { TPromise } from 'vs/base/common/winjs.base'; import {Keybinding} from 'vs/base/common/keyCodes'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var IContextViewService = createDecorator('contextViewService'); +export const IContextViewService = createDecorator('contextViewService'); export interface IContextViewService { - serviceId : ServiceIdentifier; - showContextView(delegate: IContextViewDelegate):void; - hideContextView(data?: any):void; - layout():void; + serviceId: ServiceIdentifier; + showContextView(delegate: IContextViewDelegate): void; + hideContextView(data?: any): void; + layout(): void; } export interface IContextViewDelegate { - getAnchor():HTMLElement|{x: number; y: number; } + getAnchor(): HTMLElement | { x: number; y: number; } render(container: HTMLElement): Lifecycle.IDisposable; - canRelayout?:boolean; // Default: true - onDOMEvent?(e:Event, activeElement: HTMLElement):void; - onHide?(data?: any):void; + canRelayout?: boolean; // Default: true + onDOMEvent?(e: Event, activeElement: HTMLElement): void; + onHide?(data?: any): void; } -export var IContextMenuService = createDecorator('contextMenuService'); +export const IContextMenuService = createDecorator('contextMenuService'); export interface IContextMenuService { - serviceId : ServiceIdentifier; - showContextMenu(delegate: IContextMenuDelegate):void; + serviceId: ServiceIdentifier; + showContextMenu(delegate: IContextMenuDelegate): void; } export interface IContextMenuDelegate { - getAnchor():HTMLElement|{x: number; y: number; } + getAnchor(): HTMLElement | { x: number; y: number; } getActions(): TPromise; getActionItem?(action: IAction): ActionBar.IActionItem; - getActionsContext?():any; + getActionsContext?(): any; getKeyBinding?(action: IAction): Keybinding; - getMenuClassName?():string; + getMenuClassName?(): string; onHide?(didCancel: boolean): void; } diff --git a/src/vs/platform/contextview/browser/contextViewService.ts b/src/vs/platform/contextview/browser/contextViewService.ts index 6ee5d580d70..9a69250446d 100644 --- a/src/vs/platform/contextview/browser/contextViewService.ts +++ b/src/vs/platform/contextview/browser/contextViewService.ts @@ -4,8 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {ContextMenuHandler} from './contextMenuHandler'; -import {IContextViewService, IContextMenuService, IContextViewDelegate, IContextMenuDelegate} from './contextView'; +import {IContextViewService, IContextViewDelegate} from './contextView'; import {ContextView} from 'vs/base/browser/ui/contextview/contextview'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IMessageService} from 'vs/platform/message/common/message'; @@ -15,11 +14,11 @@ export class ContextViewService implements IContextViewService { private contextView: ContextView; - constructor(container: HTMLElement, telemetryService:ITelemetryService, messageService:IMessageService) { + constructor(container: HTMLElement, telemetryService: ITelemetryService, messageService: IMessageService) { this.contextView = new ContextView(container); } - public dispose():void { + public dispose(): void { this.contextView.dispose(); } @@ -29,15 +28,15 @@ export class ContextViewService implements IContextViewService { this.contextView.setContainer(container); } - public showContextView(delegate: IContextViewDelegate):void { + public showContextView(delegate: IContextViewDelegate): void { this.contextView.show(delegate); } - public layout():void { + public layout(): void { this.contextView.layout(); } - public hideContextView(data?: any):void { + public hideContextView(data?: any): void { this.contextView.hide(data); } } \ No newline at end of file diff --git a/src/vs/platform/editor/common/editor.ts b/src/vs/platform/editor/common/editor.ts index a07eea93ee7..2681cdcbb81 100644 --- a/src/vs/platform/editor/common/editor.ts +++ b/src/vs/platform/editor/common/editor.ts @@ -11,7 +11,7 @@ import {IEventEmitter} from 'vs/base/common/eventEmitter'; import {ISelection} from 'vs/platform/selection/common/selection'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var IEditorService = createDecorator('editorService'); +export const IEditorService = createDecorator('editorService'); export interface IEditorService { serviceId: ServiceIdentifier; @@ -131,7 +131,7 @@ export enum Position { RIGHT = 2 } -export var POSITIONS = [Position.LEFT, Position.CENTER, Position.RIGHT]; +export const POSITIONS = [Position.LEFT, Position.CENTER, Position.RIGHT]; export interface IEditorInput extends IEventEmitter { diff --git a/src/vs/platform/event/common/event.ts b/src/vs/platform/event/common/event.ts index b90211bcdfb..42930f0aa9b 100644 --- a/src/vs/platform/event/common/event.ts +++ b/src/vs/platform/event/common/event.ts @@ -8,7 +8,7 @@ import {IEventEmitter} from 'vs/base/common/eventEmitter'; import {IDisposable} from 'vs/base/common/lifecycle'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var IEventService = createDecorator('eventService'); +export const IEventService = createDecorator('eventService'); export interface IEventService { serviceId: ServiceIdentifier; diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts index 06be9949a43..d976fcce550 100644 --- a/src/vs/platform/files/common/files.ts +++ b/src/vs/platform/files/common/files.ts @@ -11,7 +11,7 @@ import glob = require('vs/base/common/glob'); import events = require('vs/base/common/events'); import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var IFileService = createDecorator('fileService'); +export const IFileService = createDecorator('fileService'); export interface IFileService { serviceId: ServiceIdentifier; @@ -148,7 +148,7 @@ export interface IFileChange { * The unified resource identifier of the file that changed. */ resource: URI; -}; +} export class FileChangesEvent extends events.Event { private _changes: IFileChange[]; @@ -416,7 +416,7 @@ export const AutoSaveConfiguration = { OFF: 'off', AFTER_DELAY: 'afterDelay', ON_FOCUS_CHANGE: 'onFocusChange' -} +}; export interface IFilesConfiguration { files: { diff --git a/src/vs/platform/instantiation/common/descriptors.ts b/src/vs/platform/instantiation/common/descriptors.ts index d96998416d0..53dc5bf8de0 100644 --- a/src/vs/platform/instantiation/common/descriptors.ts +++ b/src/vs/platform/instantiation/common/descriptors.ts @@ -11,26 +11,26 @@ import instantiation = require('./instantiation'); export class AbstractDescriptor { - constructor(private _staticArguments:any[]) { + constructor(private _staticArguments: any[]) { // empty } - public appendStaticArguments(more:any[]):void { + public appendStaticArguments(more: any[]): void { this._staticArguments.push.apply(this._staticArguments, more); } - public staticArguments():any[]; - public staticArguments(nth:number):any; - public staticArguments(nth?:number):any[] { - if(isNaN(nth)) { + public staticArguments(): any[]; + public staticArguments(nth: number): any; + public staticArguments(nth?: number): any[] { + if (isNaN(nth)) { return this._staticArguments.slice(0); } else { return this._staticArguments[nth]; } } - _validate(type:T):void { - if(!type) { + _validate(type: T): void { + if (!type) { throw errors.illegalArgument('can not be falsy'); } } @@ -38,30 +38,30 @@ export class AbstractDescriptor { export class SyncDescriptor extends AbstractDescriptor implements objects.IEqualable { - constructor(private _ctor:any, ...staticArguments:any[]) { + constructor(private _ctor: any, ...staticArguments: any[]) { super(staticArguments); } - public get ctor():any { + public get ctor(): any { return this._ctor; } - public equals(other:any):boolean { - if(other === this) { + public equals(other: any): boolean { + if (other === this) { return true; } - if(!(other instanceof SyncDescriptor)) { + if (!(other instanceof SyncDescriptor)) { return false; } - return (> other).ctor === this.ctor; + return (>other).ctor === this.ctor; } - public hashCode():number { + public hashCode(): number { return 61 * (1 + this.ctor.length); } protected bind(...moreStaticArguments): SyncDescriptor { - var allArgs = []; + let allArgs = []; allArgs = allArgs.concat(this.staticArguments()); allArgs = allArgs.concat(moreStaticArguments); return new SyncDescriptor(this._ctor, ...allArgs); @@ -69,97 +69,97 @@ export class SyncDescriptor extends AbstractDescriptor implements objects. } export interface CreateSyncFunc { - (ctor:instantiation.IConstructorSignature0): SyncDescriptor0; - (ctor:instantiation.IConstructorSignature1): SyncDescriptor1; - (ctor:instantiation.IConstructorSignature1, a1: A1): SyncDescriptor0; + (ctor: instantiation.IConstructorSignature0): SyncDescriptor0; + (ctor: instantiation.IConstructorSignature1): SyncDescriptor1; + (ctor: instantiation.IConstructorSignature1, a1: A1): SyncDescriptor0; - (ctor:instantiation.INewConstructorSignature0): SyncDescriptor0; + (ctor: instantiation.INewConstructorSignature0): SyncDescriptor0; - (ctor:instantiation.INewConstructorSignature1): SyncDescriptor1; - (ctor:instantiation.INewConstructorSignature1, a1: A1): SyncDescriptor0; + (ctor: instantiation.INewConstructorSignature1): SyncDescriptor1; + (ctor: instantiation.INewConstructorSignature1, a1: A1): SyncDescriptor0; - (ctor:instantiation.INewConstructorSignature2): SyncDescriptor2; - (ctor:instantiation.INewConstructorSignature2, a1: A1): SyncDescriptor1; - (ctor:instantiation.INewConstructorSignature2, a1: A1, a2: A2): SyncDescriptor0; + (ctor: instantiation.INewConstructorSignature2): SyncDescriptor2; + (ctor: instantiation.INewConstructorSignature2, a1: A1): SyncDescriptor1; + (ctor: instantiation.INewConstructorSignature2, a1: A1, a2: A2): SyncDescriptor0; - (ctor:instantiation.INewConstructorSignature3): SyncDescriptor3; - (ctor:instantiation.INewConstructorSignature3, a1: A1): SyncDescriptor2; - (ctor:instantiation.INewConstructorSignature3, a1: A1, a2: A2): SyncDescriptor1; - (ctor:instantiation.INewConstructorSignature3, a1: A1, a2: A2, a3: A3): SyncDescriptor0; + (ctor: instantiation.INewConstructorSignature3): SyncDescriptor3; + (ctor: instantiation.INewConstructorSignature3, a1: A1): SyncDescriptor2; + (ctor: instantiation.INewConstructorSignature3, a1: A1, a2: A2): SyncDescriptor1; + (ctor: instantiation.INewConstructorSignature3, a1: A1, a2: A2, a3: A3): SyncDescriptor0; - (ctor:instantiation.INewConstructorSignature4): SyncDescriptor4; - (ctor:instantiation.INewConstructorSignature4, a1: A1): SyncDescriptor3; - (ctor:instantiation.INewConstructorSignature4, a1: A1, a2: A2): SyncDescriptor2; - (ctor:instantiation.INewConstructorSignature4, a1: A1, a2: A2, a3: A3): SyncDescriptor1; - (ctor:instantiation.INewConstructorSignature4, a1: A1, a2: A2, a3: A3, a4: A4): SyncDescriptor0; + (ctor: instantiation.INewConstructorSignature4): SyncDescriptor4; + (ctor: instantiation.INewConstructorSignature4, a1: A1): SyncDescriptor3; + (ctor: instantiation.INewConstructorSignature4, a1: A1, a2: A2): SyncDescriptor2; + (ctor: instantiation.INewConstructorSignature4, a1: A1, a2: A2, a3: A3): SyncDescriptor1; + (ctor: instantiation.INewConstructorSignature4, a1: A1, a2: A2, a3: A3, a4: A4): SyncDescriptor0; - (ctor:instantiation.INewConstructorSignature5): SyncDescriptor5; - (ctor:instantiation.INewConstructorSignature5, a1: A1): SyncDescriptor4; - (ctor:instantiation.INewConstructorSignature5, a1: A1, a2: A2): SyncDescriptor3; - (ctor:instantiation.INewConstructorSignature5, a1: A1, a2: A2, a3: A3): SyncDescriptor2; - (ctor:instantiation.INewConstructorSignature5, a1: A1, a2: A2, a3: A3, a4: A4): SyncDescriptor1; - (ctor:instantiation.INewConstructorSignature5, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): SyncDescriptor0; + (ctor: instantiation.INewConstructorSignature5): SyncDescriptor5; + (ctor: instantiation.INewConstructorSignature5, a1: A1): SyncDescriptor4; + (ctor: instantiation.INewConstructorSignature5, a1: A1, a2: A2): SyncDescriptor3; + (ctor: instantiation.INewConstructorSignature5, a1: A1, a2: A2, a3: A3): SyncDescriptor2; + (ctor: instantiation.INewConstructorSignature5, a1: A1, a2: A2, a3: A3, a4: A4): SyncDescriptor1; + (ctor: instantiation.INewConstructorSignature5, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): SyncDescriptor0; - (ctor:instantiation.INewConstructorSignature6): SyncDescriptor6; - (ctor:instantiation.INewConstructorSignature6, a1: A1): SyncDescriptor5; - (ctor:instantiation.INewConstructorSignature6, a1: A1, a2: A2): SyncDescriptor4; - (ctor:instantiation.INewConstructorSignature6, a1: A1, a2: A2, a3: A3): SyncDescriptor3; - (ctor:instantiation.INewConstructorSignature6, a1: A1, a2: A2, a3: A3, a4: A4): SyncDescriptor2; - (ctor:instantiation.INewConstructorSignature6, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): SyncDescriptor1; - (ctor:instantiation.INewConstructorSignature6, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): SyncDescriptor0; + (ctor: instantiation.INewConstructorSignature6): SyncDescriptor6; + (ctor: instantiation.INewConstructorSignature6, a1: A1): SyncDescriptor5; + (ctor: instantiation.INewConstructorSignature6, a1: A1, a2: A2): SyncDescriptor4; + (ctor: instantiation.INewConstructorSignature6, a1: A1, a2: A2, a3: A3): SyncDescriptor3; + (ctor: instantiation.INewConstructorSignature6, a1: A1, a2: A2, a3: A3, a4: A4): SyncDescriptor2; + (ctor: instantiation.INewConstructorSignature6, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): SyncDescriptor1; + (ctor: instantiation.INewConstructorSignature6, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): SyncDescriptor0; - (ctor:instantiation.INewConstructorSignature7): SyncDescriptor7; - (ctor:instantiation.INewConstructorSignature7, a1: A1): SyncDescriptor6; - (ctor:instantiation.INewConstructorSignature7, a1: A1, a2: A2): SyncDescriptor5; - (ctor:instantiation.INewConstructorSignature7, a1: A1, a2: A2, a3: A3): SyncDescriptor4; - (ctor:instantiation.INewConstructorSignature7, a1: A1, a2: A2, a3: A3, a4: A4): SyncDescriptor3; - (ctor:instantiation.INewConstructorSignature7, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): SyncDescriptor2; - (ctor:instantiation.INewConstructorSignature7, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): SyncDescriptor1; - (ctor:instantiation.INewConstructorSignature7, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7): SyncDescriptor0; + (ctor: instantiation.INewConstructorSignature7): SyncDescriptor7; + (ctor: instantiation.INewConstructorSignature7, a1: A1): SyncDescriptor6; + (ctor: instantiation.INewConstructorSignature7, a1: A1, a2: A2): SyncDescriptor5; + (ctor: instantiation.INewConstructorSignature7, a1: A1, a2: A2, a3: A3): SyncDescriptor4; + (ctor: instantiation.INewConstructorSignature7, a1: A1, a2: A2, a3: A3, a4: A4): SyncDescriptor3; + (ctor: instantiation.INewConstructorSignature7, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): SyncDescriptor2; + (ctor: instantiation.INewConstructorSignature7, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): SyncDescriptor1; + (ctor: instantiation.INewConstructorSignature7, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7): SyncDescriptor0; - (ctor:instantiation.INewConstructorSignature8): SyncDescriptor8; - (ctor:instantiation.INewConstructorSignature8, a1: A1): SyncDescriptor7; - (ctor:instantiation.INewConstructorSignature8, a1: A1, a2: A2): SyncDescriptor6; - (ctor:instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3): SyncDescriptor5; - (ctor:instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3, a4: A4): SyncDescriptor4; - (ctor:instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): SyncDescriptor3; - (ctor:instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): SyncDescriptor2; - (ctor:instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7): SyncDescriptor1; - (ctor:instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7, a8: A8): SyncDescriptor0; + (ctor: instantiation.INewConstructorSignature8): SyncDescriptor8; + (ctor: instantiation.INewConstructorSignature8, a1: A1): SyncDescriptor7; + (ctor: instantiation.INewConstructorSignature8, a1: A1, a2: A2): SyncDescriptor6; + (ctor: instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3): SyncDescriptor5; + (ctor: instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3, a4: A4): SyncDescriptor4; + (ctor: instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): SyncDescriptor3; + (ctor: instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): SyncDescriptor2; + (ctor: instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7): SyncDescriptor1; + (ctor: instantiation.INewConstructorSignature8, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7, a8: A8): SyncDescriptor0; } -export var createSyncDescriptor: CreateSyncFunc = (ctor: any, ...staticArguments: any[]): any => { +export const createSyncDescriptor: CreateSyncFunc = (ctor: any, ...staticArguments: any[]): any => { return new SyncDescriptor(ctor, ...staticArguments); }; export interface SyncDescriptor0 { - ctor:any; + ctor: any; bind(): SyncDescriptor0; } export interface SyncDescriptor1 { - ctor:any; + ctor: any; bind(a1: A1): SyncDescriptor0; } export interface SyncDescriptor2 { - ctor:any; + ctor: any; bind(a1: A1): SyncDescriptor1; bind(a1: A1, a2: A2): SyncDescriptor0; } export interface SyncDescriptor3 { - ctor:any; + ctor: any; bind(a1: A1): SyncDescriptor2; bind(a1: A1, a2: A2): SyncDescriptor1; bind(a1: A1, a2: A2, a3: A3): SyncDescriptor0; } export interface SyncDescriptor4 { - ctor:any; + ctor: any; bind(a1: A1): SyncDescriptor3; bind(a1: A1, a2: A2): SyncDescriptor2; bind(a1: A1, a2: A2, a3: A3): SyncDescriptor1; bind(a1: A1, a2: A2, a3: A3, a4: A4): SyncDescriptor0; } export interface SyncDescriptor5 { - ctor:any; + ctor: any; bind(a1: A1): SyncDescriptor4; bind(a1: A1, a2: A2): SyncDescriptor3; bind(a1: A1, a2: A2, a3: A3): SyncDescriptor2; @@ -167,7 +167,7 @@ export interface SyncDescriptor5 { bind(a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): SyncDescriptor0; } export interface SyncDescriptor6 { - ctor:any; + ctor: any; bind(a1: A1): SyncDescriptor5; bind(a1: A1, a2: A2): SyncDescriptor4; bind(a1: A1, a2: A2, a3: A3): SyncDescriptor3; @@ -176,7 +176,7 @@ export interface SyncDescriptor6 { bind(a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): SyncDescriptor0; } export interface SyncDescriptor7 { - ctor:any; + ctor: any; bind(a1: A1): SyncDescriptor6; bind(a1: A1, a2: A2): SyncDescriptor5; bind(a1: A1, a2: A2, a3: A3): SyncDescriptor4; @@ -186,7 +186,7 @@ export interface SyncDescriptor7 { bind(a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7): SyncDescriptor0; } export interface SyncDescriptor8 { - ctor:any; + ctor: any; bind(a1: A1): SyncDescriptor7; bind(a1: A1, a2: A2): SyncDescriptor6; bind(a1: A1, a2: A2, a3: A3): SyncDescriptor5; @@ -199,39 +199,39 @@ export interface SyncDescriptor8 { export class AsyncDescriptor extends AbstractDescriptor implements objects.IEqualable { - public static create(moduleName:string, ctorName:string):AsyncDescriptor { + public static create(moduleName: string, ctorName: string): AsyncDescriptor { return new AsyncDescriptor(moduleName, ctorName); } - constructor(private _moduleName:string, private _ctorName?:string, ...staticArguments:any[]) { + constructor(private _moduleName: string, private _ctorName?: string, ...staticArguments: any[]) { super(staticArguments); } - public get moduleName():string { + public get moduleName(): string { return this._moduleName; } - public get ctorName():string { + public get ctorName(): string { return this._ctorName; } - public equals(other:any):boolean { - if(other === this) { + public equals(other: any): boolean { + if (other === this) { return true; } - if(!(other instanceof AsyncDescriptor)) { + if (!(other instanceof AsyncDescriptor)) { return false; } - return (> other).moduleName === this.moduleName && - (> other).ctorName === this.ctorName; + return (>other).moduleName === this.moduleName && + (>other).ctorName === this.ctorName; } - public hashCode():number { + public hashCode(): number { return hash.computeMurmur2StringHashCode(this.moduleName) * hash.computeMurmur2StringHashCode(this.ctorName); } protected bind(...moreStaticArguments): AsyncDescriptor { - var allArgs = []; + let allArgs = []; allArgs = allArgs.concat(this.staticArguments()); allArgs = allArgs.concat(moreStaticArguments); return new AsyncDescriptor(this.moduleName, this.ctorName, ...allArgs); @@ -239,117 +239,117 @@ export class AsyncDescriptor extends AbstractDescriptor implements objects } export interface CreateAsyncFunc0 { - (moduleName:string, ctorName:string): AsyncDescriptor0; - (moduleName:string, ctorName:string, a1: A1): AsyncDescriptor0; - (moduleName:string, ctorName:string, a1: A1, a2: A2): AsyncDescriptor0; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3): AsyncDescriptor0; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4): AsyncDescriptor0; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): AsyncDescriptor0; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): AsyncDescriptor0; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7): AsyncDescriptor0; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7, a8: A8): AsyncDescriptor0; + (moduleName: string, ctorName: string): AsyncDescriptor0; + (moduleName: string, ctorName: string, a1: A1): AsyncDescriptor0; + (moduleName: string, ctorName: string, a1: A1, a2: A2): AsyncDescriptor0; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3): AsyncDescriptor0; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4): AsyncDescriptor0; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): AsyncDescriptor0; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): AsyncDescriptor0; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7): AsyncDescriptor0; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7, a8: A8): AsyncDescriptor0; } export interface CreateAsyncFunc1 { - (moduleName:string, ctorName:string): AsyncDescriptor1; - (moduleName:string, ctorName:string, a1: A1): AsyncDescriptor1; - (moduleName:string, ctorName:string, a1: A1, a2: A2): AsyncDescriptor1; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3): AsyncDescriptor1; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4): AsyncDescriptor1; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): AsyncDescriptor1; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): AsyncDescriptor1; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7): AsyncDescriptor1; + (moduleName: string, ctorName: string): AsyncDescriptor1; + (moduleName: string, ctorName: string, a1: A1): AsyncDescriptor1; + (moduleName: string, ctorName: string, a1: A1, a2: A2): AsyncDescriptor1; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3): AsyncDescriptor1; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4): AsyncDescriptor1; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): AsyncDescriptor1; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): AsyncDescriptor1; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7): AsyncDescriptor1; } export interface CreateAsyncFunc2 { - (moduleName:string, ctorName:string): AsyncDescriptor2; - (moduleName:string, ctorName:string, a1: A1): AsyncDescriptor2; - (moduleName:string, ctorName:string, a1: A1, a2: A2): AsyncDescriptor2; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3): AsyncDescriptor2; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4): AsyncDescriptor2; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): AsyncDescriptor2; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): AsyncDescriptor2; + (moduleName: string, ctorName: string): AsyncDescriptor2; + (moduleName: string, ctorName: string, a1: A1): AsyncDescriptor2; + (moduleName: string, ctorName: string, a1: A1, a2: A2): AsyncDescriptor2; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3): AsyncDescriptor2; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4): AsyncDescriptor2; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): AsyncDescriptor2; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): AsyncDescriptor2; } export interface CreateAsyncFunc3 { - (moduleName:string, ctorName:string): AsyncDescriptor3; - (moduleName:string, ctorName:string, a1: A1): AsyncDescriptor3; - (moduleName:string, ctorName:string, a1: A1, a2: A2): AsyncDescriptor3; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3): AsyncDescriptor3; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4): AsyncDescriptor3; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): AsyncDescriptor3; + (moduleName: string, ctorName: string): AsyncDescriptor3; + (moduleName: string, ctorName: string, a1: A1): AsyncDescriptor3; + (moduleName: string, ctorName: string, a1: A1, a2: A2): AsyncDescriptor3; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3): AsyncDescriptor3; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4): AsyncDescriptor3; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): AsyncDescriptor3; } export interface CreateAsyncFunc4 { - (moduleName:string, ctorName:string): AsyncDescriptor4; - (moduleName:string, ctorName:string, a1: A1): AsyncDescriptor4; - (moduleName:string, ctorName:string, a1: A1, a2: A2): AsyncDescriptor4; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3): AsyncDescriptor4; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3, a4: A4): AsyncDescriptor4; + (moduleName: string, ctorName: string): AsyncDescriptor4; + (moduleName: string, ctorName: string, a1: A1): AsyncDescriptor4; + (moduleName: string, ctorName: string, a1: A1, a2: A2): AsyncDescriptor4; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3): AsyncDescriptor4; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3, a4: A4): AsyncDescriptor4; } export interface CreateAsyncFunc5 { - (moduleName:string, ctorName:string): AsyncDescriptor5; - (moduleName:string, ctorName:string, a1: A1): AsyncDescriptor5; - (moduleName:string, ctorName:string, a1: A1, a2: A2): AsyncDescriptor5; - (moduleName:string, ctorName:string, a1: A1, a2: A2, a3: A3): AsyncDescriptor5; + (moduleName: string, ctorName: string): AsyncDescriptor5; + (moduleName: string, ctorName: string, a1: A1): AsyncDescriptor5; + (moduleName: string, ctorName: string, a1: A1, a2: A2): AsyncDescriptor5; + (moduleName: string, ctorName: string, a1: A1, a2: A2, a3: A3): AsyncDescriptor5; } export interface CreateAsyncFunc6 { - (moduleName:string, ctorName:string): AsyncDescriptor6; - (moduleName:string, ctorName:string, a1: A1): AsyncDescriptor6; - (moduleName:string, ctorName:string, a1: A1, a2: A2): AsyncDescriptor6; + (moduleName: string, ctorName: string): AsyncDescriptor6; + (moduleName: string, ctorName: string, a1: A1): AsyncDescriptor6; + (moduleName: string, ctorName: string, a1: A1, a2: A2): AsyncDescriptor6; } export interface CreateAsyncFunc7 { - (moduleName:string, ctorName:string): AsyncDescriptor7; - (moduleName:string, ctorName:string, a1: A1): AsyncDescriptor7; + (moduleName: string, ctorName: string): AsyncDescriptor7; + (moduleName: string, ctorName: string, a1: A1): AsyncDescriptor7; } export interface CreateAsyncFunc8 { - (moduleName:string, ctorName:string): AsyncDescriptor8; + (moduleName: string, ctorName: string): AsyncDescriptor8; } -var _createAsyncDescriptor = (moduleName: string, ctorName: string, ...staticArguments: any[]): any => { +let _createAsyncDescriptor = (moduleName: string, ctorName: string, ...staticArguments: any[]): any => { return new AsyncDescriptor(moduleName, ctorName, ...staticArguments); }; -export var createAsyncDescriptor0:CreateAsyncFunc0 = _createAsyncDescriptor; -export var createAsyncDescriptor1:CreateAsyncFunc1 = _createAsyncDescriptor; -export var createAsyncDescriptor2:CreateAsyncFunc2 = _createAsyncDescriptor; -export var createAsyncDescriptor3:CreateAsyncFunc3 = _createAsyncDescriptor; -export var createAsyncDescriptor4:CreateAsyncFunc4 = _createAsyncDescriptor; -export var createAsyncDescriptor5:CreateAsyncFunc5 = _createAsyncDescriptor; -export var createAsyncDescriptor6:CreateAsyncFunc6 = _createAsyncDescriptor; -export var createAsyncDescriptor7:CreateAsyncFunc7 = _createAsyncDescriptor; +export const createAsyncDescriptor0: CreateAsyncFunc0 = _createAsyncDescriptor; +export const createAsyncDescriptor1: CreateAsyncFunc1 = _createAsyncDescriptor; +export const createAsyncDescriptor2: CreateAsyncFunc2 = _createAsyncDescriptor; +export const createAsyncDescriptor3: CreateAsyncFunc3 = _createAsyncDescriptor; +export const createAsyncDescriptor4: CreateAsyncFunc4 = _createAsyncDescriptor; +export const createAsyncDescriptor5: CreateAsyncFunc5 = _createAsyncDescriptor; +export const createAsyncDescriptor6: CreateAsyncFunc6 = _createAsyncDescriptor; +export const createAsyncDescriptor7: CreateAsyncFunc7 = _createAsyncDescriptor; export interface AsyncDescriptor0 { - moduleName:string; + moduleName: string; bind(): AsyncDescriptor0; } export interface AsyncDescriptor1 { - moduleName:string; + moduleName: string; bind(a1: A1): AsyncDescriptor0; } export interface AsyncDescriptor2 { - moduleName:string; + moduleName: string; bind(a1: A1): AsyncDescriptor1; bind(a1: A1, a2: A2): AsyncDescriptor0; } export interface AsyncDescriptor3 { - moduleName:string; + moduleName: string; bind(a1: A1): AsyncDescriptor2; bind(a1: A1, a2: A2): AsyncDescriptor1; bind(a1: A1, a2: A2, a3: A3): AsyncDescriptor0; } export interface AsyncDescriptor4 { - moduleName:string; + moduleName: string; bind(a1: A1): AsyncDescriptor3; bind(a1: A1, a2: A2): AsyncDescriptor2; bind(a1: A1, a2: A2, a3: A3): AsyncDescriptor1; bind(a1: A1, a2: A2, a3: A3, a4: A4): AsyncDescriptor0; } export interface AsyncDescriptor5 { - moduleName:string; + moduleName: string; bind(a1: A1): AsyncDescriptor4; bind(a1: A1, a2: A2): AsyncDescriptor3; bind(a1: A1, a2: A2, a3: A3): AsyncDescriptor2; @@ -357,7 +357,7 @@ export interface AsyncDescriptor5 { bind(a1: A1, a2: A2, a3: A3, a4: A4, a5: A5): AsyncDescriptor0; } export interface AsyncDescriptor6 { - moduleName:string; + moduleName: string; bind(a1: A1): AsyncDescriptor5; bind(a1: A1, a2: A2): AsyncDescriptor4; bind(a1: A1, a2: A2, a3: A3): AsyncDescriptor3; @@ -366,7 +366,7 @@ export interface AsyncDescriptor6 { bind(a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6): AsyncDescriptor0; } export interface AsyncDescriptor7 { - moduleName:string; + moduleName: string; bind(a1: A1): AsyncDescriptor6; bind(a1: A1, a2: A2): AsyncDescriptor5; bind(a1: A1, a2: A2, a3: A3): AsyncDescriptor4; @@ -376,7 +376,7 @@ export interface AsyncDescriptor7 { bind(a1: A1, a2: A2, a3: A3, a4: A4, a5: A5, a6: A6, a7: A7): AsyncDescriptor0; } export interface AsyncDescriptor8 { - moduleName:string; + moduleName: string; bind(a1: A1): AsyncDescriptor7; bind(a1: A1, a2: A2): AsyncDescriptor6; bind(a1: A1, a2: A2, a3: A3): AsyncDescriptor5; diff --git a/src/vs/platform/instantiation/common/extensions.ts b/src/vs/platform/instantiation/common/extensions.ts index bd7af6ec0e4..a16cd6b3d39 100644 --- a/src/vs/platform/instantiation/common/extensions.ts +++ b/src/vs/platform/instantiation/common/extensions.ts @@ -11,23 +11,15 @@ export const Services = 'di.services'; export interface IServiceContribution { id: ServiceIdentifier; - descriptor:SyncDescriptor + descriptor: SyncDescriptor; } const _registry: IServiceContribution[] = []; -export function registerSingleton(id: ServiceIdentifier, ctor: INewConstructorSignature0):void { +export function registerSingleton(id: ServiceIdentifier, ctor: INewConstructorSignature0): void { _registry.push({ id, descriptor: new SyncDescriptor(ctor) }); } export function getServices(): IServiceContribution[] { return _registry; -} - -// export function createInstantionService() { -// let result = create(); -// for (let service of _registry) { -// result.addSingleton(service.id, service.descriptor); -// } -// return result; -// } \ No newline at end of file +} \ No newline at end of file diff --git a/src/vs/platform/instantiation/common/instantiation.ts b/src/vs/platform/instantiation/common/instantiation.ts index 0949a1b5bad..d7df1e07179 100644 --- a/src/vs/platform/instantiation/common/instantiation.ts +++ b/src/vs/platform/instantiation/common/instantiation.ts @@ -295,7 +295,7 @@ export interface ServiceIdentifier { */ export function createDecorator(serviceId: string): { (...args: any[]): void; type: T; } { - var ret = function(target: any, key: string, index: number): any { + let ret = function(target: any, key: string, index: number): any { if (arguments.length !== 3) { throw new Error('@IServiceName-decorator can only be used to decorate a parameter'); @@ -325,7 +325,7 @@ export interface Context { /* * Dummy service to make signal that the new service injection is used. I will go away once we remove the old way (using ctx) */ -export var INullService = createDecorator('nullService'); +export const INullService = createDecorator('nullService'); export interface INullService { serviceId: ServiceIdentifier; diff --git a/src/vs/platform/instantiation/common/instantiationService.ts b/src/vs/platform/instantiation/common/instantiationService.ts index 7eed58128f0..4e853f3d3b7 100644 --- a/src/vs/platform/instantiation/common/instantiationService.ts +++ b/src/vs/platform/instantiation/common/instantiationService.ts @@ -300,8 +300,8 @@ class InstantiationService implements IInstantiationService { createInstance(param: any): any { - var rest = new Array(arguments.length - 1); - for (var i = 1, len = arguments.length; i < len; i++) { + let rest = new Array(arguments.length - 1); + for (let i = 1, len = arguments.length; i < len; i++) { rest[i - 1] = arguments[i]; } diff --git a/src/vs/platform/instantiation/test/common/instantiationService.test.ts b/src/vs/platform/instantiation/test/common/instantiationService.test.ts index f51b95b7e59..67e91ca5609 100644 --- a/src/vs/platform/instantiation/test/common/instantiationService.test.ts +++ b/src/vs/platform/instantiation/test/common/instantiationService.test.ts @@ -17,11 +17,11 @@ export class Target1 { assert.ok(!!platformServices.editorService); } - validate():boolean { + validate(): boolean { try { this.platformServices.editorService; return false; - } catch(e) { + } catch (e) { return e instanceof Error; } } @@ -29,18 +29,18 @@ export class Target1 { export class Target2 { - constructor(private platformServices, private far:boolean) { + constructor(private platformServices, private far: boolean) { assert.ok(!!platformServices.editorService); } - validate():boolean { - if(!this.far) { + validate(): boolean { + if (!this.far) { return false; } try { this.platformServices.editorService; return false; - } catch(e) { + } catch (e) { return e instanceof Error; } } @@ -66,10 +66,10 @@ export class EvilTarget1 { } } -var IService1 = instantiation.createDecorator('service1') +let IService1 = instantiation.createDecorator('service1'); interface IService1 { - serviceId : instantiation.ServiceIdentifier; + serviceId: instantiation.ServiceIdentifier; c: number; } @@ -78,10 +78,10 @@ class Service1 implements IService1 { c = 1; } -var IService2 = instantiation.createDecorator('service2'); +let IService2 = instantiation.createDecorator('service2'); interface IService2 { - serviceId : instantiation.ServiceIdentifier; + serviceId: instantiation.ServiceIdentifier; d: boolean; } @@ -90,10 +90,10 @@ class Service2 implements IService2 { d = true; } -var IService3 = instantiation.createDecorator('service3'); +let IService3 = instantiation.createDecorator('service3'); interface IService3 { - serviceId : instantiation.ServiceIdentifier; + serviceId: instantiation.ServiceIdentifier; s: string; } @@ -102,10 +102,10 @@ class Service3 implements IService3 { s = 'farboo'; } -var IDependentService = instantiation.createDecorator('dependentService') +let IDependentService = instantiation.createDecorator('dependentService'); interface IDependentService { - serviceId : instantiation.ServiceIdentifier; + serviceId: instantiation.ServiceIdentifier; name: string; } @@ -127,7 +127,7 @@ class ParameterTarget { } class ParameterTarget2 { - constructor(v:boolean, @IService1 service1: IService1) { + constructor(v: boolean, @IService1 service1: IService1) { assert.ok(v); assert.ok(service1); assert.equal(service1.c, 1); @@ -138,7 +138,7 @@ class TargetOptional { constructor( @IService1 service1: IService1, @IService2 service2?: IService2) { assert.ok(service1); assert.equal(service1.c, 1); - assert.ok(service2 === void 0) + assert.ok(service2 === void 0); } } @@ -150,7 +150,7 @@ class DependentServiceTarget { } class DependentServiceTarget2 { - constructor( @IDependentService d:IDependentService, @IService1 s:IService1) { + constructor( @IDependentService d: IDependentService, @IService1 s: IService1) { assert.ok(d); assert.equal(d.name, 'farboo'); assert.ok(s); @@ -172,13 +172,13 @@ class ServiceLoop2 implements IService2 { serviceId = IService2; d = true; - constructor(@IService1 s:IService1) { + constructor( @IService1 s: IService1) { } } suite('Instantiation Service', () => { - var service:instantiation.IInstantiationService; + let service: instantiation.IInstantiationService; setup(() => { service = instantiationService.create({ @@ -186,37 +186,37 @@ suite('Instantiation Service', () => { }); }); - test('sync create, platformServices only', function(){ - var instance = service.createInstance(Target1); + test('sync create, platformServices only', function() { + let instance = service.createInstance(Target1); assert.ok(instance.validate()); }); - test('sync create, platformServices & argument', function(){ - var instance = service.createInstance(Target2, true); + test('sync create, platformServices & argument', function() { + let instance = service.createInstance(Target2, true); assert.ok(instance.validate()); }); - test('sync create, access service defined by child instantiation service', function(){ - var instance = service.createChild({ editorService: 'wee' } ).createInstance(Target2, true); + test('sync create, access service defined by child instantiation service', function() { + let instance = service.createChild({ editorService: 'wee' }).createInstance(Target2, true); assert.ok(instance.validate()); }); - test('sync create, access service defined in a child instantiation service', function(){ - var instance = service.createChild({ someOtherService: 'hey' } ).createInstance(Target2, true); + test('sync create, access service defined in a child instantiation service', function() { + let instance = service.createChild({ someOtherService: 'hey' }).createInstance(Target2, true); assert.ok(instance.validate()); }); - test('sync create, platformServices & static argument', function(){ - var descriptor = createSyncDescriptor(Target2, true); - var instance = service.createInstance(descriptor); + test('sync create, platformServices & static argument', function() { + let descriptor = createSyncDescriptor(Target2, true); + let instance = service.createInstance(descriptor); assert.ok(instance.validate()); }); - test('sync create, register NEW service', function(){ + test('sync create, register NEW service', function() { service.registerService('far', 1234); service.createInstance(Target3); - var child = service.createChild({}); + let child = service.createChild({}); child.createInstance(Target3); }); @@ -225,7 +225,7 @@ suite('Instantiation Service', () => { }); // test('async create, platformServices only', (done) => { - // var descriptor = new services.AsyncDescriptor('vs/platform/instantiation/tests/instantiationService.test', 'Target1'); + // let descriptor = new services.AsyncDescriptor('vs/platform/instantiation/tests/instantiationService.test', 'Target1'); // service.createInstance(descriptor, true).then((instance) => { // assert.ok(instance.validate()); // done(); @@ -235,7 +235,7 @@ suite('Instantiation Service', () => { // }); // test('async create, platformServices only & argument', (done) => { - // var descriptor = new services.AsyncDescriptor('vs/platform/instantiation/tests/instantiationService.test', 'Target1'); + // let descriptor = new services.AsyncDescriptor('vs/platform/instantiation/tests/instantiationService.test', 'Target1'); // service.createInstance(descriptor, true).then((instance) => { // assert.ok(instance.validate()); // done(); @@ -245,7 +245,7 @@ suite('Instantiation Service', () => { // }); // test('async create, platformServices only & static argument', (done) => { - // var descriptor = new services.AsyncDescriptor('vs/platform/instantiation/tests/instantiationService.test', 'Target1', true); + // let descriptor = new services.AsyncDescriptor('vs/platform/instantiation/tests/instantiationService.test', 'Target1', true); // service.createInstance(descriptor).then((instance) => { // assert.ok(instance.validate()); // done(); @@ -255,7 +255,7 @@ suite('Instantiation Service', () => { // }); // test('async create, illegal ctor name', (done) => { - // var descriptor = new services.AsyncDescriptor('vs/platform/instantiation/tests/instantiationService.test', 'TaRget1', true); + // let descriptor = new services.AsyncDescriptor('vs/platform/instantiation/tests/instantiationService.test', 'TaRget1', true); // service.createInstance(descriptor).then((instance) => { // assert.ok(false); // done(); @@ -268,8 +268,8 @@ suite('Instantiation Service', () => { assert.throws(() => service.createInstance(EvilTarget1)); }); - test('@Param - simple clase', function () { - var service = instantiationService.create(Object.create(null)); + test('@Param - simple clase', function() { + let service = instantiationService.create(Object.create(null)); service.addSingleton(IService1, new Service1()); service.addSingleton(IService2, new Service2()); service.addSingleton(IService3, new Service3()); @@ -277,8 +277,8 @@ suite('Instantiation Service', () => { service.createInstance(ParameterTarget); }); - test('@Param - fixed args', function () { - var service = instantiationService.create(Object.create(null)); + test('@Param - fixed args', function() { + let service = instantiationService.create(Object.create(null)); service.addSingleton(IService1, new Service1()); service.addSingleton(IService2, new Service2()); service.addSingleton(IService3, new Service3()); @@ -287,7 +287,7 @@ suite('Instantiation Service', () => { }); test('@Param - optional', function() { - var service = instantiationService.create(Object.create(null)); + let service = instantiationService.create(Object.create(null)); service.addSingleton(IService1, new Service1()); // service.addSingleton(IService2, new Service2()); @@ -296,7 +296,7 @@ suite('Instantiation Service', () => { // we made this a warning // test('@Param - too many args', function () { - // var service = instantiationService.create(Object.create(null)); + // let service = instantiationService.create(Object.create(null)); // service.addSingleton(IService1, new Service1()); // service.addSingleton(IService2, new Service2()); // service.addSingleton(IService3, new Service3()); @@ -305,7 +305,7 @@ suite('Instantiation Service', () => { // }); // test('@Param - too few args', function () { - // var service = instantiationService.create(Object.create(null)); + // let service = instantiationService.create(Object.create(null)); // service.addSingleton(IService1, new Service1()); // service.addSingleton(IService2, new Service2()); // service.addSingleton(IService3, new Service3()); @@ -313,42 +313,42 @@ suite('Instantiation Service', () => { // assert.throws(() => service.createInstance(ParameterTarget2)); // }); - test('SyncDesc - no dependencies', function () { - var service = instantiationService.create(Object.create(null)); + test('SyncDesc - no dependencies', function() { + let service = instantiationService.create(Object.create(null)); service.addSingleton(IService1, new SyncDescriptor(Service1)); - var service1 = service.getInstance(IService1); + let service1 = service.getInstance(IService1); assert.ok(service1); assert.equal(service1.c, 1); - var service2 = service.getInstance(IService1); + let service2 = service.getInstance(IService1); assert.ok(service1 === service2); }); - test('SyncDesc - service with service dependency', function () { - var service = instantiationService.create(Object.create(null)); + test('SyncDesc - service with service dependency', function() { + let service = instantiationService.create(Object.create(null)); service.addSingleton(IService1, new SyncDescriptor(Service1)); service.addSingleton(IDependentService, new SyncDescriptor(DependentService)); - var d = service.getInstance(IDependentService); + let d = service.getInstance(IDependentService); assert.ok(d); assert.equal(d.name, 'farboo'); }); - test('SyncDesc - target depends on service future', function () { - var service = instantiationService.create(Object.create(null)); + test('SyncDesc - target depends on service future', function() { + let service = instantiationService.create(Object.create(null)); service.addSingleton(IService1, new SyncDescriptor(Service1)); service.addSingleton(IDependentService, new SyncDescriptor(DependentService)); - var d = service.createInstance(DependentServiceTarget); + let d = service.createInstance(DependentServiceTarget); assert.ok(d instanceof DependentServiceTarget); - var d2 = service.createInstance(DependentServiceTarget2); + let d2 = service.createInstance(DependentServiceTarget2); assert.ok(d2 instanceof DependentServiceTarget2); }); - test('SyncDesc - explode on loop', function () { - var service = instantiationService.create(Object.create(null)); + test('SyncDesc - explode on loop', function() { + let service = instantiationService.create(Object.create(null)); service.addSingleton(IService1, new SyncDescriptor(ServiceLoop1)); service.addSingleton(IService2, new SyncDescriptor(ServiceLoop2)); @@ -357,7 +357,7 @@ suite('Instantiation Service', () => { }); test('Invoke - get services', function() { - var service = instantiationService.create(Object.create(null)); + let service = instantiationService.create(Object.create(null)); service.addSingleton(IService1, new Service1()); service.addSingleton(IService2, new Service2()); @@ -372,7 +372,7 @@ suite('Instantiation Service', () => { }); test('Invoke - keeping accessor NOT allowed', function() { - var service = instantiationService.create(Object.create(null)); + let service = instantiationService.create(Object.create(null)); service.addSingleton(IService1, new Service1()); service.addSingleton(IService2, new Service2()); @@ -391,7 +391,7 @@ suite('Instantiation Service', () => { }); test('Invoke - throw error', function() { - var service = instantiationService.create(Object.create(null)); + let service = instantiationService.create(Object.create(null)); service.addSingleton(IService1, new Service1()); service.addSingleton(IService2, new Service2()); @@ -400,5 +400,5 @@ suite('Instantiation Service', () => { } assert.throws(() => service.invokeFunction(test)); - }) + }); }); diff --git a/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts b/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts index 0df2079dc96..c7b2897b547 100644 --- a/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts +++ b/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts @@ -7,18 +7,16 @@ import nls = require('vs/nls'); import {IJSONSchema} from 'vs/base/common/jsonSchema'; import platform = require('vs/platform/platform'); -import {IPluginDescription} from 'vs/platform/plugins/common/plugins'; -import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; import {IEventEmitter, EventEmitter} from 'vs/base/common/eventEmitter'; import {IDisposable} from 'vs/base/common/lifecycle'; -export var Extensions = { +export const Extensions = { JSONContribution: 'base.contributions.json' }; export interface ISchemaContributions { - schemas?: { [id:string]: IJSONSchema }; - schemaAssociations?: { [pattern:string]: string[] }; + schemas?: { [id: string]: IJSONSchema }; + schemaAssociations?: { [pattern: string]: string[] }; } export interface IJSONContributionRegistry { @@ -31,17 +29,17 @@ export interface IJSONContributionRegistry { /** * Register a schema association */ - addSchemaFileAssociation(pattern: string, uri:string): void; + addSchemaFileAssociation(pattern: string, uri: string): void; /** * Get all schemas */ - getSchemaContributions() : ISchemaContributions; + getSchemaContributions(): ISchemaContributions; /** * Adds a change listener */ - addRegistryChangedListener(callback: (e: IJSONContributionRegistryEvent) => void) : IDisposable; + addRegistryChangedListener(callback: (e: IJSONContributionRegistryEvent) => void): IDisposable; } @@ -59,8 +57,8 @@ function normalizeId(id: string) { class JSONContributionRegistry implements IJSONContributionRegistry { - private schemasById: { [id:string]:IJSONSchema }; - private schemaAssociations: { [pattern:string]:string[] }; + private schemasById: { [id: string]: IJSONSchema }; + private schemaAssociations: { [pattern: string]: string[] }; private eventEmitter: IEventEmitter; constructor() { @@ -69,7 +67,7 @@ class JSONContributionRegistry implements IJSONContributionRegistry { this.eventEmitter = new EventEmitter(); } - public addRegistryChangedListener(callback: (e: IJSONContributionRegistryEvent) => void) : IDisposable { + public addRegistryChangedListener(callback: (e: IJSONContributionRegistryEvent) => void): IDisposable { return this.eventEmitter.addListener2('registryChanged', callback); } @@ -78,9 +76,9 @@ class JSONContributionRegistry implements IJSONContributionRegistry { this.eventEmitter.emit('registryChanged', {}); } - public addSchemaFileAssociation(pattern: string, uri:string): void { - var uris = this.schemaAssociations[pattern]; - if(!uris) { + public addSchemaFileAssociation(pattern: string, uri: string): void { + let uris = this.schemaAssociations[pattern]; + if (!uris) { uris = []; this.schemaAssociations[pattern] = uris; } @@ -88,7 +86,7 @@ class JSONContributionRegistry implements IJSONContributionRegistry { this.eventEmitter.emit('registryChanged', {}); } - public getSchemaContributions() : ISchemaContributions { + public getSchemaContributions(): ISchemaContributions { return { schemas: this.schemasById, schemaAssociations: this.schemaAssociations @@ -97,7 +95,7 @@ class JSONContributionRegistry implements IJSONContributionRegistry { } -var jsonContributionRegistry = new JSONContributionRegistry(); +const jsonContributionRegistry = new JSONContributionRegistry(); platform.Registry.add(Extensions.JSONContribution, jsonContributionRegistry); // preload the schema-schema with a version that contains descriptions. @@ -303,8 +301,8 @@ jsonContributionRegistry.registerSchema('http://json-schema.org/draft-04/schema# { 'type': 'string', 'description': nls.localize('schema.json.format', 'Describes the format expected for the value.'), - 'enum': [ 'date-time', 'uri', 'email', 'hostname', 'ipv4', 'ipv6', 'regex'] - },{ + 'enum': ['date-time', 'uri', 'email', 'hostname', 'ipv4', 'ipv6', 'regex'] + }, { 'type': 'string' } ] diff --git a/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts b/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts index 9ab22226830..9a5d35825d7 100644 --- a/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts +++ b/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts @@ -5,7 +5,6 @@ 'use strict'; import nls = require('vs/nls'); -import {IJSONSchema} from 'vs/base/common/jsonSchema'; import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; import {Registry} from 'vs/platform/platform'; import URI from 'vs/base/common/uri'; @@ -15,8 +14,8 @@ import paths = require('vs/base/common/paths'); import {INullService} from 'vs/platform/instantiation/common/instantiation'; interface IJSONValidationExtensionPoint { - fileMatch: string, - url: string + fileMatch: string; + url: string; } let schemaRegistry = Registry.as(JSONContributionRegistry.Extensions.JSONContribution); @@ -24,10 +23,10 @@ let schemaRegistry = Registr let configurationExtPoint = PluginsRegistry.registerExtensionPoint('jsonValidation', { description: nls.localize('contributes.jsonValidation', 'Contributes json schema configuration.'), type: 'array', - default: [ { fileMatch: "{{file.json}}", url: "{{url}}" } ], + default: [{ fileMatch: '{{file.json}}', url: '{{url}}' }], items: { type: 'object', - default: { fileMatch: "{{file.json}}", url: "{{url}}" }, + default: { fileMatch: '{{file.json}}', url: '{{url}}' }, properties: { fileMatch: { type: 'string', @@ -48,7 +47,7 @@ export class JSONValidationExtensionPoint { ) { configurationExtPoint.setHandler((extensions) => { for (var i = 0; i < extensions.length; i++) { - var extensionValue = extensions[i].value; + var extensionValue = extensions[i].value; var collector = extensions[i].collector; var extensionPath = extensions[i].description.extensionFolderPath; @@ -61,7 +60,7 @@ export class JSONValidationExtensionPoint { collector.error(nls.localize('invalid.fileMatch', "'configuration.jsonValidation.fileMatch' must be defined")); return; } - var uri = extension.url; + let uri = extension.url; if (typeof extension.url !== 'string') { collector.error(nls.localize('invalid.url', "'configuration.jsonValidation.url' must be a URL or relative path")); return; @@ -76,7 +75,7 @@ export class JSONValidationExtensionPoint { collector.error(nls.localize('invalid.url.schema', "'configuration.jsonValidation.url' must start with 'http:', 'https:' or './' to reference schemas located in the extension")); return; } - var fileMatch = extension.fileMatch; + let fileMatch = extension.fileMatch; if (!strings.startsWith(extension.fileMatch, '/')) { fileMatch = '/' + fileMatch; } diff --git a/src/vs/platform/keybinding/browser/keybindingServiceImpl.ts b/src/vs/platform/keybinding/browser/keybindingServiceImpl.ts index c541ed2e697..540d0725473 100644 --- a/src/vs/platform/keybinding/browser/keybindingServiceImpl.ts +++ b/src/vs/platform/keybinding/browser/keybindingServiceImpl.ts @@ -35,12 +35,12 @@ export class KeybindingContext { } public setValue(key: string, value: any): void { -// console.log('SET ' + key + ' = ' + value + ' ON ' + this._id); + // console.log('SET ' + key + ' = ' + value + ' ON ' + this._id); this._value[key] = value; } public removeValue(key: string): void { -// console.log('REMOVE ' + key + ' FROM ' + this._id); + // console.log('REMOVE ' + key + ' FROM ' + this._id); delete this._value[key]; } @@ -118,23 +118,23 @@ export abstract class AbstractKeybindingService { this.getContext(this._myContextId).removeValue(key); } - public abstract getLabelFor(keybinding:Keybinding): string; - public abstract getHTMLLabelFor(keybinding:Keybinding): IHTMLContentElement[]; - public abstract getElectronAcceleratorFor(keybinding:Keybinding): string; + public abstract getLabelFor(keybinding: Keybinding): string; + public abstract getHTMLLabelFor(keybinding: Keybinding): IHTMLContentElement[]; + public abstract getElectronAcceleratorFor(keybinding: Keybinding): string; public abstract customKeybindingsCount(): number; public abstract getContext(contextId: number): KeybindingContext; public abstract createChildContext(parentContextId?: number): number; public abstract disposeContext(contextId: number): void; public abstract getDefaultKeybindings(): string; public abstract lookupKeybindings(commandId: string): Keybinding[]; - public abstract executeCommand(commandId: string, args:any): TPromise; + public abstract executeCommand(commandId: string, args: any): TPromise; } export class KeybindingService extends AbstractKeybindingService implements IKeybindingService { private _lastContextId: number; private _contexts: { - [contextId:string]: KeybindingContext; + [contextId: string]: KeybindingContext; }; protected _domNode: HTMLElement; @@ -149,7 +149,7 @@ export class KeybindingService extends AbstractKeybindingService implements IKey this._domNode = domNode; this._contexts = Object.create(null); this._contexts[String(this._myContextId)] = new KeybindingContext(this._myContextId, null); - this._toDispose = DOM.addDisposableListener(this._domNode, DOM.EventType.KEY_DOWN, (e:KeyboardEvent) => { + this._toDispose = DOM.addDisposableListener(this._domNode, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => { let keyEvent = new StandardKeyboardEvent(e); this._dispatch(keyEvent); }); @@ -164,15 +164,15 @@ export class KeybindingService extends AbstractKeybindingService implements IKey this._toDispose = null; } - public getLabelFor(keybinding:Keybinding): string { + public getLabelFor(keybinding: Keybinding): string { return keybinding._toUSLabel(); } - public getHTMLLabelFor(keybinding:Keybinding): IHTMLContentElement[] { + public getHTMLLabelFor(keybinding: Keybinding): IHTMLContentElement[] { return keybinding._toUSHTMLLabel(); } - public getElectronAcceleratorFor(keybinding:Keybinding): string { + public getElectronAcceleratorFor(keybinding: Keybinding): string { return keybinding._toElectronAccelerator(); } @@ -180,11 +180,11 @@ export class KeybindingService extends AbstractKeybindingService implements IKey this._createOrUpdateResolver(false); } - private _createOrUpdateResolver(isFirstTime:boolean): void { + private _createOrUpdateResolver(isFirstTime: boolean): void { this._resolver = new KeybindingResolver(KeybindingsRegistry.getDefaultKeybindings(), this._getExtraKeybindings(isFirstTime)); } - protected _getExtraKeybindings(isFirstTime:boolean): IKeybindingItem[] { + protected _getExtraKeybindings(isFirstTime: boolean): IKeybindingItem[] { return []; } @@ -209,7 +209,7 @@ export class KeybindingService extends AbstractKeybindingService implements IKey return '// ' + nls.localize('unboundCommands', "Here are other available commands: ") + '\n// - ' + pretty; } - protected _getCommandHandler(commandId:string): ICommandHandler { + protected _getCommandHandler(commandId: string): ICommandHandler { return KeybindingsRegistry.getCommands()[commandId]; } @@ -222,7 +222,7 @@ export class KeybindingService extends AbstractKeybindingService implements IKey let contextId = this._findContextAttr(e.target); let context = this.getContext(contextId); let contextValue = context.getValue(); -// console.log(JSON.stringify(contextValue, null, '\t')); + // console.log(JSON.stringify(contextValue, null, '\t')); let resolveResult = this._resolver.resolve(contextValue, this._currentChord, e.asKeybinding()); @@ -295,11 +295,11 @@ export class KeybindingService extends AbstractKeybindingService implements IKey return id; } - public disposeContext(contextId:number): void { + public disposeContext(contextId: number): void { delete this._contexts[String(contextId)]; } - public executeCommand(commandId: string, args:any = {}): TPromise { + public executeCommand(commandId: string, args: any = {}): TPromise { if (!args.context) { let contextId = this._findContextAttr(document.activeElement); let context = this.getContext(contextId); @@ -317,7 +317,7 @@ class ScopedKeybindingService extends AbstractKeybindingService { private _parent: AbstractKeybindingService; private _domNode: IKeybindingScopeLocation; - constructor(parent: AbstractKeybindingService, domNode:IKeybindingScopeLocation) { + constructor(parent: AbstractKeybindingService, domNode: IKeybindingScopeLocation) { this._parent = parent; this._domNode = domNode; super(this._parent.createChildContext()); @@ -329,15 +329,15 @@ class ScopedKeybindingService extends AbstractKeybindingService { this._domNode.removeAttribute(KEYBINDING_CONTEXT_ATTR); } - public getLabelFor(keybinding:Keybinding): string { + public getLabelFor(keybinding: Keybinding): string { return this._parent.getLabelFor(keybinding); } - public getHTMLLabelFor(keybinding:Keybinding): IHTMLContentElement[] { + public getHTMLLabelFor(keybinding: Keybinding): IHTMLContentElement[] { return this._parent.getHTMLLabelFor(keybinding); } - public getElectronAcceleratorFor(keybinding:Keybinding): string { + public getElectronAcceleratorFor(keybinding: Keybinding): string { return this._parent.getElectronAcceleratorFor(keybinding); } @@ -349,7 +349,7 @@ class ScopedKeybindingService extends AbstractKeybindingService { return this._parent.customKeybindingsCount(); } - public lookupKeybindings(commandId: string): Keybinding[]{ + public lookupKeybindings(commandId: string): Keybinding[] { return this._parent.lookupKeybindings(commandId); } @@ -361,11 +361,11 @@ class ScopedKeybindingService extends AbstractKeybindingService { return this._parent.createChildContext(parentContextId); } - public disposeContext(contextId:number): void { + public disposeContext(contextId: number): void { this._parent.disposeContext(contextId); } - public executeCommand(commandId: string, args:any): TPromise { + public executeCommand(commandId: string, args: any): TPromise { return this._parent.executeCommand(commandId, args); } } diff --git a/src/vs/platform/keybinding/common/keybindingResolver.ts b/src/vs/platform/keybinding/common/keybindingResolver.ts index 1c139a50f8a..dfd876d4a68 100644 --- a/src/vs/platform/keybinding/common/keybindingResolver.ts +++ b/src/vs/platform/keybinding/common/keybindingResolver.ts @@ -45,7 +45,7 @@ export class KeybindingResolver { }; private _shouldWarnOnConflict: boolean; - constructor(defaultKeybindings: IKeybindingItem[], overrides: IKeybindingItem[], shouldWarnOnConflict:boolean = true) { + constructor(defaultKeybindings: IKeybindingItem[], overrides: IKeybindingItem[], shouldWarnOnConflict: boolean = true) { defaultKeybindings = defaultKeybindings.slice(0).sort(sorter); this._defaultKeybindings = defaultKeybindings; @@ -72,7 +72,7 @@ export class KeybindingResolver { k.context = k.context.normalize(); } - let entry:ICommandEntry = { + let entry: ICommandEntry = { context: k.context, keybinding: k.keybinding, commandId: k.command @@ -96,7 +96,7 @@ export class KeybindingResolver { } } - private _addKeyPress(keypress: number, entry: ICommandEntry, item:IKeybindingItem, isDefault:boolean): void { + private _addKeyPress(keypress: number, entry: ICommandEntry, item: IKeybindingItem, isDefault: boolean): void { if (!this._map[keypress]) { // There is no conflict so far @@ -153,7 +153,7 @@ export class KeybindingResolver { let aRulesArr = a.serialize().split(' && '); let bRulesArr = b.serialize().split(' && '); - let aRules: { [rule:string]: boolean; } = Object.create(null); + let aRules: { [rule: string]: boolean; } = Object.create(null); for (let i = 0, len = aRulesArr.length; i < len; i++) { aRules[aRulesArr[i]] = true; } @@ -338,11 +338,11 @@ export class IOSupport { } else { out.write('"' + item.command + '" '); } -// out.write(String(item.weight)); + // out.write(String(item.weight)); out.write('}'); } - public static readKeybindingItem(input: IUserFriendlyKeybinding, index:number): IKeybindingItem { + public static readKeybindingItem(input: IUserFriendlyKeybinding, index: number): IKeybindingItem { let key = IOSupport.readKeybinding(input.key); let context = IOSupport.readKeybindingContexts(input.when); return { diff --git a/src/vs/platform/keybinding/common/keybindingService.ts b/src/vs/platform/keybinding/common/keybindingService.ts index b5f87c78e3c..e7482e2cb8b 100644 --- a/src/vs/platform/keybinding/common/keybindingService.ts +++ b/src/vs/platform/keybinding/common/keybindingService.ts @@ -34,24 +34,24 @@ export interface IKeybindings { } export interface KbExpr { - equals(other:KbExpr): boolean; - evaluate(context:any): boolean; + equals(other: KbExpr): boolean; + evaluate(context: any): boolean; normalize(): KbExpr; serialize(): string; } export class KbDefinedExpression implements KbExpr { - constructor(private key:string) { + constructor(private key: string) { } - public equals(other:KbExpr): boolean { + public equals(other: KbExpr): boolean { if (other instanceof KbDefinedExpression) { return (this.key === other.key); } return false; } - public evaluate(context:any): boolean { + public evaluate(context: any): boolean { return (!!context[this.key]); } @@ -65,17 +65,17 @@ export class KbDefinedExpression implements KbExpr { } export class KbEqualsExpression implements KbExpr { - constructor(private key:string, private value:any) { + constructor(private key: string, private value: any) { } - public equals(other:KbExpr): boolean { + public equals(other: KbExpr): boolean { if (other instanceof KbEqualsExpression) { return (this.key === other.key && this.value === other.value); } return false; } - public evaluate(context:any): boolean { + public evaluate(context: any): boolean { // Intentional == return (context[this.key] == this.value); } @@ -100,17 +100,17 @@ export class KbEqualsExpression implements KbExpr { } export class KbNotEqualsExpression implements KbExpr { - constructor(private key:string, private value:any) { + constructor(private key: string, private value: any) { } - public equals(other:KbExpr): boolean { + public equals(other: KbExpr): boolean { if (other instanceof KbNotEqualsExpression) { return (this.key === other.key && this.value === other.value); } return false; } - public evaluate(context:any): boolean { + public evaluate(context: any): boolean { // Intentional != return (context[this.key] != this.value); } @@ -135,17 +135,17 @@ export class KbNotEqualsExpression implements KbExpr { } export class KbNotExpression implements KbExpr { - constructor(private key:string) { + constructor(private key: string) { } - public equals(other:KbExpr): boolean { + public equals(other: KbExpr): boolean { if (other instanceof KbNotExpression) { return (this.key === other.key); } return false; } - public evaluate(context:any): boolean { + public evaluate(context: any): boolean { return (!context[this.key]); } @@ -159,17 +159,17 @@ export class KbNotExpression implements KbExpr { } export class KbAndExpression implements KbExpr { - private expr:KbExpr[]; + private expr: KbExpr[]; - constructor(expr:KbExpr[]) { + constructor(expr: KbExpr[]) { this.expr = expr || []; } - public equals(other:KbExpr): boolean { + public equals(other: KbExpr): boolean { return this === other; } - public evaluate(context:any): boolean { + public evaluate(context: any): boolean { for (let i = 0, len = this.expr.length; i < len; i++) { if (!this.expr[i].evaluate(context)) { return false; @@ -179,7 +179,7 @@ export class KbAndExpression implements KbExpr { } public normalize(): KbExpr { - let expr:KbExpr[] = []; + let expr: KbExpr[] = []; for (let i = 0, len = this.expr.length; i < len; i++) { let e = this.expr[i]; @@ -224,12 +224,12 @@ export class KbAndExpression implements KbExpr { export let KbExpr = { - has: (key:string) => new KbDefinedExpression(key), - equals: (key:string, value:any) => new KbEqualsExpression(key, value), - notEquals: (key:string, value:any) => new KbNotEqualsExpression(key, value), - not: (key:string) => new KbNotExpression(key), - and: (...expr:KbExpr[]) => new KbAndExpression(expr), - deserialize: (serialized:string): KbExpr => { + has: (key: string) => new KbDefinedExpression(key), + equals: (key: string, value: any) => new KbEqualsExpression(key, value), + notEquals: (key: string, value: any) => new KbNotEqualsExpression(key, value), + not: (key: string) => new KbNotExpression(key), + and: (...expr: KbExpr[]) => new KbAndExpression(expr), + deserialize: (serialized: string): KbExpr => { if (!serialized) { return null; } @@ -239,7 +239,7 @@ export let KbExpr = { return result.normalize(); }, - _deserializeOne: (serializedOne:string): KbExpr => { + _deserializeOne: (serializedOne: string): KbExpr => { serializedOne = serializedOne.trim(); if (serializedOne.indexOf('!=') >= 0) { @@ -259,7 +259,7 @@ export let KbExpr = { return new KbDefinedExpression(serializedOne); }, - _deserializeValue: (serializedValue:string): any => { + _deserializeValue: (serializedValue: string): any => { serializedValue = serializedValue.trim(); if (serializedValue === 'true') { @@ -310,12 +310,12 @@ export interface IKeybindingContextKey { export let IKeybindingService = createDecorator('keybindingService'); export interface IKeybindingScopeLocation { - setAttribute(attr:string, value:string): void; - removeAttribute(attr:string): void; + setAttribute(attr: string, value: string): void; + removeAttribute(attr: string): void; } export interface IKeybindingService { - serviceId : ServiceIdentifier; + serviceId: ServiceIdentifier; dispose(): void; createKey(key: string, defaultValue: T): IKeybindingContextKey; @@ -326,9 +326,9 @@ export interface IKeybindingService { lookupKeybindings(commandId: string): Keybinding[]; customKeybindingsCount(): number; - getLabelFor(keybinding:Keybinding): string; - getHTMLLabelFor(keybinding:Keybinding): IHTMLContentElement[]; - getElectronAcceleratorFor(keybinding:Keybinding): string; + getLabelFor(keybinding: Keybinding): string; + getHTMLLabelFor(keybinding: Keybinding): IHTMLContentElement[]; + getElectronAcceleratorFor(keybinding: Keybinding): string; executeCommand(commandId: string, args?: any): TPromise; executeCommand(commandId: string, args?: any): TPromise; diff --git a/src/vs/platform/keybinding/common/keybindingsRegistry.ts b/src/vs/platform/keybinding/common/keybindingsRegistry.ts index 5093cc3917c..837cbbc96d6 100644 --- a/src/vs/platform/keybinding/common/keybindingsRegistry.ts +++ b/src/vs/platform/keybinding/common/keybindingsRegistry.ts @@ -22,7 +22,7 @@ export interface ICommandDescriptor extends ICommandRule { } export interface IKeybindingsRegistry { - registerCommandRule(rule:ICommandRule); + registerCommandRule(rule: ICommandRule); registerCommandDesc(desc: ICommandDescriptor): void; getCommands(): ICommandsMap; getDefaultKeybindings(): IKeybindingItem[]; @@ -31,8 +31,8 @@ export interface IKeybindingsRegistry { editorCore(importance?: number): number; editorContrib(importance?: number): number; workbenchContrib(importance?: number): number; - builtinExtension(importance?:number): number; - externalExtension(importance?:number): number; + builtinExtension(importance?: number): number; + externalExtension(importance?: number): number; }; } @@ -51,10 +51,10 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry { workbenchContrib: (importance: number = 0): number => { return 200 + importance; }, - builtinExtension: (importance:number = 0): number => { + builtinExtension: (importance: number = 0): number => { return 300 + importance; }, - externalExtension: (importance:number = 0): number => { + externalExtension: (importance: number = 0): number => { return 400 + importance; } }; @@ -67,7 +67,7 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry { /** * Take current platform into account and reduce to primary & secondary. */ - private static bindToCurrentPlatform(kb:IKeybindings): { primary?: number; secondary?: number[]; } { + private static bindToCurrentPlatform(kb: IKeybindings): { primary?: number; secondary?: number[]; } { if (Platform.isWindows) { if (kb && kb.win) { return kb.win; @@ -85,7 +85,7 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry { return kb; } - public registerCommandRule(rule:ICommandRule): void { + public registerCommandRule(rule: ICommandRule): void { let actualKb = KeybindingsRegistryImpl.bindToCurrentPlatform(rule); if (actualKb && actualKb.primary) { @@ -131,7 +131,7 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry { return this._commands; } - private registerDefaultKeybinding(keybinding: number, commandId:string, weight1: number, weight2:number, context:KbExpr): void { + private registerDefaultKeybinding(keybinding: number, commandId: string, weight1: number, weight2: number, context: KbExpr): void { if (Platform.isWindows) { if (BinaryKeybindings.hasCtrlCmd(keybinding) && !BinaryKeybindings.hasShift(keybinding) && BinaryKeybindings.hasAlt(keybinding) && !BinaryKeybindings.hasWinCtrl(keybinding)) { if (/^[A-Z0-9\[\]\|\;\'\,\.\/\`]$/.test(KeyCode.toString(BinaryKeybindings.extractKeyCode(keybinding)))) { @@ -152,7 +152,7 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry { return this._keybindings; } } -export let KeybindingsRegistry:IKeybindingsRegistry = new KeybindingsRegistryImpl(); +export let KeybindingsRegistry: IKeybindingsRegistry = new KeybindingsRegistryImpl(); // Define extension point ids export let Extensions = { diff --git a/src/vs/platform/keybinding/test/common/keybindingIO.test.ts b/src/vs/platform/keybinding/test/common/keybindingIO.test.ts index 30b2b28cd51..79619ff3ee1 100644 --- a/src/vs/platform/keybinding/test/common/keybindingIO.test.ts +++ b/src/vs/platform/keybinding/test/common/keybindingIO.test.ts @@ -15,27 +15,27 @@ suite('Keybinding IO', () => { const MACINTOSH = { isMacintosh: true, isWindows: false }; const LINUX = { isMacintosh: false, isWindows: false }; - function testOneSerialization(keybinding:number, expected:string, msg:string, Platform:ISimplifiedPlatform): void { + function testOneSerialization(keybinding: number, expected: string, msg: string, Platform: ISimplifiedPlatform): void { let actualSerialized = IOSupport.writeKeybinding(keybinding, Platform); assert.equal(actualSerialized, expected, expected + ' - ' + msg); } - function testSerialization(keybinding:number, expectedWin:string, expectedMac:string, expectedLinux:string): void { + function testSerialization(keybinding: number, expectedWin: string, expectedMac: string, expectedLinux: string): void { testOneSerialization(keybinding, expectedWin, 'win', WINDOWS); testOneSerialization(keybinding, expectedMac, 'mac', MACINTOSH); testOneSerialization(keybinding, expectedLinux, 'linux', LINUX); } - function testOneDeserialization(keybinding:string, expected:number, msg:string, Platform:ISimplifiedPlatform): void { + function testOneDeserialization(keybinding: string, expected: number, msg: string, Platform: ISimplifiedPlatform): void { let actualDeserialized = IOSupport.readKeybinding(keybinding, Platform); assert.equal(actualDeserialized, expected, keybinding + ' - ' + msg); } - function testDeserialization(inWin:string, inMac:string, inLinux:string, expected:number): void { + function testDeserialization(inWin: string, inMac: string, inLinux: string, expected: number): void { testOneDeserialization(inWin, expected, 'win', WINDOWS); testOneDeserialization(inMac, expected, 'mac', MACINTOSH); testOneDeserialization(inLinux, expected, 'linux', LINUX); } - function testRoundtrip(keybinding:number, expectedWin:string, expectedMac:string, expectedLinux:string): void { + function testRoundtrip(keybinding: number, expectedWin: string, expectedMac: string, expectedLinux: string): void { testSerialization(keybinding, expectedWin, expectedMac, expectedLinux); testDeserialization(expectedWin, expectedMac, expectedLinux, keybinding); } diff --git a/src/vs/platform/keybinding/test/common/keybindingService.test.ts b/src/vs/platform/keybinding/test/common/keybindingService.test.ts index 3eb08ee6fe7..6ba6da1ef52 100644 --- a/src/vs/platform/keybinding/test/common/keybindingService.test.ts +++ b/src/vs/platform/keybinding/test/common/keybindingService.test.ts @@ -6,16 +6,15 @@ import * as assert from 'assert'; import {KeybindingResolver, IOSupport} from 'vs/platform/keybinding/common/keybindingResolver'; -import * as Platform from 'vs/base/common/platform'; import {KbExpr, KbAndExpression, IKeybindingItem} from 'vs/platform/keybinding/common/keybindingService'; import {KeyMod, KeyCode, BinaryKeybindings} from 'vs/base/common/keyCodes'; suite('Keybinding Service', () => { test('resolve key', function() { - var keybinding = KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Z; - var contextRules = KbExpr.equals('bar', 'baz'); - var keybindingItem: IKeybindingItem = { + let keybinding = KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Z; + let contextRules = KbExpr.equals('bar', 'baz'); + let keybindingItem: IKeybindingItem = { command: 'yes', context: contextRules, keybinding: keybinding, @@ -26,16 +25,16 @@ suite('Keybinding Service', () => { assert.equal(KeybindingResolver.contextMatchesRules({ bar: 'baz' }, contextRules), true); assert.equal(KeybindingResolver.contextMatchesRules({ bar: 'bz' }, contextRules), false); - var resolver = new KeybindingResolver([keybindingItem], []); + let resolver = new KeybindingResolver([keybindingItem], []); assert.equal(resolver.resolve({ bar: 'baz' }, 0, keybinding).commandId, 'yes'); assert.equal(resolver.resolve({ bar: 'bz' }, 0, keybinding), null); }); - test('normalizeRule', function () { - var key1IsTrue = KbExpr.equals('key1', true); - var key1IsNotFalse = KbExpr.notEquals('key1', false); - var key1IsFalse = KbExpr.equals('key1', false); - var key1IsNotTrue = KbExpr.notEquals('key1', true); + test('normalizeRule', function() { + let key1IsTrue = KbExpr.equals('key1', true); + let key1IsNotFalse = KbExpr.notEquals('key1', false); + let key1IsFalse = KbExpr.equals('key1', false); + let key1IsNotTrue = KbExpr.notEquals('key1', true); assert.ok(key1IsTrue.normalize().equals(KbExpr.has('key1'))); assert.ok(key1IsNotFalse.normalize().equals(KbExpr.has('key1'))); @@ -43,21 +42,21 @@ suite('Keybinding Service', () => { assert.ok(key1IsNotTrue.normalize().equals(KbExpr.not('key1'))); }); - test('contextIsEntirelyIncluded', function () { - var assertIsIncluded = (a: KbExpr[], b: KbExpr[]) => { + test('contextIsEntirelyIncluded', function() { + let assertIsIncluded = (a: KbExpr[], b: KbExpr[]) => { assert.equal(KeybindingResolver.contextIsEntirelyIncluded(false, new KbAndExpression(a), new KbAndExpression(b)), true); }; - var assertIsNotIncluded = (a: KbExpr[], b: KbExpr[]) => { + let assertIsNotIncluded = (a: KbExpr[], b: KbExpr[]) => { assert.equal(KeybindingResolver.contextIsEntirelyIncluded(false, new KbAndExpression(a), new KbAndExpression(b)), false); }; - var key1IsTrue = KbExpr.equals('key1', true); - var key1IsNotFalse = KbExpr.notEquals('key1', false); - var key1IsFalse = KbExpr.equals('key1', false); - var key1IsNotTrue = KbExpr.notEquals('key1', true); - var key2IsTrue = KbExpr.equals('key2', true); - var key2IsNotFalse = KbExpr.notEquals('key2', false); - var key3IsTrue = KbExpr.equals('key3', true); - var key4IsTrue = KbExpr.equals('key4', true); + let key1IsTrue = KbExpr.equals('key1', true); + let key1IsNotFalse = KbExpr.notEquals('key1', false); + let key1IsFalse = KbExpr.equals('key1', false); + let key1IsNotTrue = KbExpr.notEquals('key1', true); + let key2IsTrue = KbExpr.equals('key2', true); + let key2IsNotFalse = KbExpr.notEquals('key2', false); + let key3IsTrue = KbExpr.equals('key3', true); + let key4IsTrue = KbExpr.equals('key4', true); assertIsIncluded([key1IsTrue], null); assertIsIncluded([key1IsTrue], []); @@ -95,9 +94,9 @@ suite('Keybinding Service', () => { assertIsNotIncluded(null, [key2IsTrue]); }); - test('resolve command', function () { + test('resolve command', function() { - var items: IKeybindingItem[] = [ + let items: IKeybindingItem[] = [ // This one will never match because its context is always overwritten by another one { keybinding: KeyCode.KEY_X, @@ -201,20 +200,20 @@ suite('Keybinding Service', () => { } ]; - var resolver = new KeybindingResolver(items, [], false); + let resolver = new KeybindingResolver(items, [], false); - var testKey = (commandId: string, expectedKeys: number[]) => { + let testKey = (commandId: string, expectedKeys: number[]) => { // Test lookup - var lookupResult = resolver.lookupKeybinding(commandId); + let lookupResult = resolver.lookupKeybinding(commandId); assert.equal(lookupResult.length, expectedKeys.length, 'Length mismatch @ commandId ' + commandId + '; GOT: ' + JSON.stringify(lookupResult, null, '\t')); for (let i = 0, len = lookupResult.length; i < len; i++) { assert.equal(lookupResult[i].value, expectedKeys[i]); } }; - var testResolve = (ctx:any, expectedKey:number, commandId:string) => { + let testResolve = (ctx: any, expectedKey: number, commandId: string) => { if (BinaryKeybindings.hasChord(expectedKey)) { let firstPart = BinaryKeybindings.extractFirstPart(expectedKey); @@ -235,16 +234,16 @@ suite('Keybinding Service', () => { assert.equal(result.commandId, commandId, 'Finds command ' + commandId); assert.equal(result.enterChord, 0, 'Finds command ' + commandId); } - } + }; testKey('first', []); testKey('second', [KeyCode.KEY_Z, KeyCode.KEY_X]); - testResolve({key2: true}, KeyCode.KEY_X, 'second'); + testResolve({ key2: true }, KeyCode.KEY_X, 'second'); testResolve({}, KeyCode.KEY_Z, 'second'); testKey('third', [KeyCode.KEY_X]); - testResolve({key3:true}, KeyCode.KEY_X, 'third'); + testResolve({ key3: true }, KeyCode.KEY_X, 'third'); testKey('fourth', []); @@ -268,17 +267,17 @@ suite('Keybinding Service', () => { testKey('sixth', []); }); - test('contextMatchesRules', function () { + test('contextMatchesRules', function() { let context = { 'a': true, 'b': false, 'c': '5' }; - function testExpression(expr:string, expected:boolean): void { + function testExpression(expr: string, expected: boolean): void { let rules = IOSupport.readKeybindingContexts(expr); assert.equal(KeybindingResolver.contextMatchesRules(context, rules), expected, expr); } - function testBatch(expr:string, value:any): void { + function testBatch(expr: string, value: any): void { testExpression(expr, !!value); testExpression(expr + ' == true', !!value); testExpression(expr + ' != true', !value); diff --git a/src/vs/platform/keybinding/test/common/keybindingsRegistry.test.ts b/src/vs/platform/keybinding/test/common/keybindingsRegistry.test.ts index a092384f506..b5df784c51e 100644 --- a/src/vs/platform/keybinding/test/common/keybindingsRegistry.test.ts +++ b/src/vs/platform/keybinding/test/common/keybindingsRegistry.test.ts @@ -17,7 +17,7 @@ suite('Keybinding Registry', () => { primary: undefined, weight: 0, handler: function(accessor, args) { - assert.ok(typeof args === 'string') + assert.ok(typeof args === 'string'); } }); @@ -28,7 +28,7 @@ suite('Keybinding Registry', () => { primary: undefined, weight: 0, handler: function(accessor, args) { - assert.ok(typeof args === 'string') + assert.ok(typeof args === 'string'); } }); diff --git a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts index 15e6a12cb55..2e0bbc6bffe 100644 --- a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts +++ b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts @@ -39,15 +39,15 @@ export class MockKeybindingService implements IKeybindingService { return new MockKeybindingContextKey(key, defaultValue); } - public getLabelFor(keybinding:Keybinding): string { + public getLabelFor(keybinding: Keybinding): string { return keybinding._toUSLabel(); } - public getHTMLLabelFor(keybinding:Keybinding): IHTMLContentElement[] { + public getHTMLLabelFor(keybinding: Keybinding): IHTMLContentElement[] { return keybinding._toUSHTMLLabel(); } - public getElectronAcceleratorFor(keybinding:Keybinding): string { + public getElectronAcceleratorFor(keybinding: Keybinding): string { return keybinding._toElectronAccelerator(); } diff --git a/src/vs/platform/lifecycle/common/lifecycle.ts b/src/vs/platform/lifecycle/common/lifecycle.ts index 50f64f2583d..3a314d2c989 100644 --- a/src/vs/platform/lifecycle/common/lifecycle.ts +++ b/src/vs/platform/lifecycle/common/lifecycle.ts @@ -8,7 +8,7 @@ import winjs = require('vs/base/common/winjs.base'); import Event from 'vs/base/common/event'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var ILifecycleService = createDecorator('lifecycleService'); +export const ILifecycleService = createDecorator('lifecycleService'); export interface IBeforeShutdownParticipant { diff --git a/src/vs/platform/lifecycle/common/nullLifecycleService.ts b/src/vs/platform/lifecycle/common/nullLifecycleService.ts index 1e61e4d96db..ce223c17d16 100644 --- a/src/vs/platform/lifecycle/common/nullLifecycleService.ts +++ b/src/vs/platform/lifecycle/common/nullLifecycleService.ts @@ -26,4 +26,4 @@ class NullLifecycleService implements ILifecycleService { } } -export var Instance: ILifecycleService = new NullLifecycleService(); \ No newline at end of file +export const Instance: ILifecycleService = new NullLifecycleService(); \ No newline at end of file diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts index 8bc1029032f..a8811f9d937 100644 --- a/src/vs/platform/markers/common/markerService.ts +++ b/src/vs/platform/markers/common/markerService.ts @@ -13,7 +13,7 @@ import Event, {Emitter} from 'vs/base/common/event'; import Severity from 'vs/base/common/severity'; import {IThreadService, IThreadSynchronizableObject} from 'vs/platform/thread/common/thread'; import {MainThreadAttr} from 'vs/platform/thread/common/threadService'; -import {IMarkerService, IMarkerData, IResourceMarker, IMarker, MarkerStatistics} from './markers'; +import {IMarkerService, IMarkerData, IResourceMarker, IMarker, MarkerStatistics} from './markers'; interface Key { owner: string; @@ -23,7 +23,7 @@ interface Key { module Key { export function fromValue(value: string): Key { - var regexp = /^(.*)→(.*)$/.exec(value); + let regexp = /^(.*)→(.*)$/.exec(value); return { owner: regexp[1], resource: URI.parse(regexp[2]) @@ -34,7 +34,7 @@ module Key { return k.owner + '→' + k.resource; } - var _selectorPattern = '^({0})→({1})$'; + let _selectorPattern = '^({0})→({1})$'; export function selector(owner?: string, resource?: URI): RegExp { return new RegExp(strings.format(_selectorPattern, owner ? strings.escapeRegExpCharacters(owner) : '.*', resource ? strings.escapeRegExpCharacters(resource.toString()) : '.*')); @@ -64,15 +64,15 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec // ---- IThreadSynchronizableObject ------------------------------ - public getId():string { + public getId(): string { return '__markerService'; } - public getSerializableState():MarkerData { + public getSerializableState(): MarkerData { return this._data; } - public setData(data: MarkerData):void { + public setData(data: MarkerData): void { this._data = data; } @@ -98,7 +98,7 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec } public remove(owner: string, resources: URI[]): void { - if(arrays.isFalsyOrEmpty(resources)) { + if (arrays.isFalsyOrEmpty(resources)) { return; } let changedResources: URI[]; @@ -117,14 +117,14 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec private _doChangeOne(owner: string, resource: URI, markers: IMarkerData[]): boolean { - var key = Key.raw(owner, resource), + let key = Key.raw(owner, resource), oldMarkers = this._data[key], hasOldMarkers = !arrays.isFalsyOrEmpty(oldMarkers), getsNewMarkers = !arrays.isFalsyOrEmpty(markers), oldStats = this._computeStats(oldMarkers), newStats = this._computeStats(markers); - if(!hasOldMarkers && !getsNewMarkers) { + if (!hasOldMarkers && !getsNewMarkers) { return; } if (getsNewMarkers) { @@ -140,12 +140,12 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec } public changeAll(owner: string, data: IResourceMarker[]): void { - var changedResources: { [n: string]: URI } = Object.create(null); + let changedResources: { [n: string]: URI } = Object.create(null); // remove and record old markers - var oldStats = this._emptyStats(); + let oldStats = this._emptyStats(); this._forEach(owner, undefined, undefined, -1, (e, r) => { - var resource = Key.fromValue(e.key).resource; + let resource = Key.fromValue(e.key).resource; if (this._isStatRelevant(resource)) { this._updateStatsPlus(oldStats, this._computeStats(e.value)); } @@ -155,8 +155,8 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec this._updateStatsMinus(oldStats); // add and record new markers - if(!arrays.isFalsyOrEmpty(data)) { - var newStats = this._emptyStats(); + if (!arrays.isFalsyOrEmpty(data)) { + let newStats = this._emptyStats(); data.forEach(d => { changedResources[d.resource.toString()] = d.resource; collections.lookupOrInsert(this._data, Key.raw(owner, d.resource), []).push(d.marker); @@ -170,7 +170,7 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec } public read(filter: { owner?: string; resource?: URI; selector?: RegExp, take?: number; } = Object.create(null)): IMarker[] { - var ret: IMarker[] = []; + let ret: IMarker[] = []; this._forEach(filter.owner, filter.resource, filter.selector, filter.take, entry => this._fromEntry(entry, ret)); return ret; } @@ -180,24 +180,24 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec return resource.scheme !== network.schemas.inMemory; } - private _forEach(owner: string, resource: URI, regexp: RegExp, take: number, callback: (entry: { key: string; value: IMarkerData[]; }, remove:Function) => any):void { + private _forEach(owner: string, resource: URI, regexp: RegExp, take: number, callback: (entry: { key: string; value: IMarkerData[]; }, remove: Function) => any): void { //TODO@Joh: be smart and use an index - var selector = regexp || Key.selector(owner, resource), + let selector = regexp || Key.selector(owner, resource), took = 0; collections.forEach(this._data, (entry, remove) => { - if(selector.test(entry.key)) { + if (selector.test(entry.key)) { callback(entry, remove); - if(take > 0 && took++ >= take) { + if (take > 0 && took++ >= take) { return false; } } }); } - private _fromEntry(entry: { key: string; value: IMarkerData[];}, bucket:IMarker[]):void { + private _fromEntry(entry: { key: string; value: IMarkerData[]; }, bucket: IMarker[]): void { - var key = Key.fromValue(entry.key); + let key = Key.fromValue(entry.key); entry.value.forEach(data => { @@ -220,12 +220,12 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec } private _computeStats(markers: IMarkerData[]): MarkerStatistics { - var errors = 0, warnings = 0, infos = 0, unknwons = 0; + let errors = 0, warnings = 0, infos = 0, unknwons = 0; if (markers) { - for(var i = 0; i < markers.length; i++) { - var marker = markers[i]; + for (let i = 0; i < markers.length; i++) { + let marker = markers[i]; if (marker.severity) { - switch(marker.severity) { + switch (marker.severity) { case Severity.Error: errors++; break; @@ -256,9 +256,9 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec return { errors: 0, warnings: 0, infos: 0, unknwons: 0 }; } - private _updateStatsPlus(toAdd:MarkerStatistics): void; - private _updateStatsPlus(toUpdate:MarkerStatistics, toAdd:MarkerStatistics): void; - private _updateStatsPlus(toUpdate:MarkerStatistics, toAdd?:MarkerStatistics): void { + private _updateStatsPlus(toAdd: MarkerStatistics): void; + private _updateStatsPlus(toUpdate: MarkerStatistics, toAdd: MarkerStatistics): void; + private _updateStatsPlus(toUpdate: MarkerStatistics, toAdd?: MarkerStatistics): void { if (!toAdd) { toAdd = toUpdate; toUpdate = this._stats; @@ -269,9 +269,9 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec toUpdate.unknwons += toAdd.unknwons; } - private _updateStatsMinus(toSubtract:MarkerStatistics): void; - private _updateStatsMinus(toUpdate:MarkerStatistics, toSubtract:MarkerStatistics): void; - private _updateStatsMinus(toUpdate:MarkerStatistics, toSubtract?:MarkerStatistics): void { + private _updateStatsMinus(toSubtract: MarkerStatistics): void; + private _updateStatsMinus(toUpdate: MarkerStatistics, toSubtract: MarkerStatistics): void; + private _updateStatsMinus(toUpdate: MarkerStatistics, toSubtract?: MarkerStatistics): void { if (!toSubtract) { toSubtract = toUpdate; toUpdate = this._stats; @@ -282,8 +282,8 @@ export class MarkerService implements IMarkerService, IThreadSynchronizableObjec toUpdate.unknwons -= toSubtract.unknwons; } - private _updateStatsMarker(toUpdate:MarkerStatistics, marker:IMarkerData): void { - switch(marker.severity) { + private _updateStatsMarker(toUpdate: MarkerStatistics, marker: IMarkerData): void { + switch (marker.severity) { case Severity.Error: toUpdate.errors++; break; diff --git a/src/vs/platform/markers/common/markers.ts b/src/vs/platform/markers/common/markers.ts index e4b1f0ccbfd..45def349064 100644 --- a/src/vs/platform/markers/common/markers.ts +++ b/src/vs/platform/markers/common/markers.ts @@ -9,7 +9,7 @@ import Severity from 'vs/base/common/severity'; import Event from 'vs/base/common/event'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var IMarkerService = createDecorator('markerService'); +export const IMarkerService = createDecorator('markerService'); export interface IMarkerService { serviceId: ServiceIdentifier; diff --git a/src/vs/platform/markers/test/common/markerService.test.ts b/src/vs/platform/markers/test/common/markerService.test.ts index 96598eeb24b..dab8cff7bfc 100644 --- a/src/vs/platform/markers/test/common/markerService.test.ts +++ b/src/vs/platform/markers/test/common/markerService.test.ts @@ -26,7 +26,7 @@ suite('Marker Service', () => { test('query', () => { - var service = new markerService.MarkerService(NULL_THREAD_SERVICE); + let service = new markerService.MarkerService(NULL_THREAD_SERVICE); service.changeAll('far', [{ resource: URI.parse('file:///c/test/file.cs'), @@ -52,7 +52,7 @@ suite('Marker Service', () => { test('changeOne override', () => { - var service = new markerService.MarkerService(NULL_THREAD_SERVICE); + let service = new markerService.MarkerService(NULL_THREAD_SERVICE); service.changeOne('far', URI.parse('/path/only.cs'), [randomMarkerData()]); assert.equal(service.read().length, 1); assert.equal(service.read({ owner: 'far' }).length, 1); @@ -70,7 +70,7 @@ suite('Marker Service', () => { test('changeOne/All clears', () => { - var service = new markerService.MarkerService(NULL_THREAD_SERVICE); + let service = new markerService.MarkerService(NULL_THREAD_SERVICE); service.changeOne('far', URI.parse('/path/only.cs'), [randomMarkerData()]); service.changeOne('boo', URI.parse('/path/only.cs'), [randomMarkerData()]); assert.equal(service.read({ owner: 'far' }).length, 1); @@ -90,14 +90,14 @@ suite('Marker Service', () => { test('changeAll sends event for cleared', () => { - var service = new markerService.MarkerService(NULL_THREAD_SERVICE); + let service = new markerService.MarkerService(NULL_THREAD_SERVICE); service.changeAll('far', [{ resource: URI.parse('file:///d/path'), marker: randomMarkerData() }, { - resource: URI.parse('file:///d/path'), - marker: randomMarkerData() - }]); + resource: URI.parse('file:///d/path'), + marker: randomMarkerData() + }]); assert.equal(service.read({ owner: 'far' }).length, 2); @@ -111,15 +111,15 @@ suite('Marker Service', () => { }); test('changeAll merges', () => { - var service = new markerService.MarkerService(NULL_THREAD_SERVICE); + let service = new markerService.MarkerService(NULL_THREAD_SERVICE); service.changeAll('far', [{ resource: URI.parse('file:///c/test/file.cs'), marker: randomMarkerData() }, { - resource: URI.parse('file:///c/test/file.cs'), - marker: randomMarkerData() - }]); + resource: URI.parse('file:///c/test/file.cs'), + marker: randomMarkerData() + }]); assert.equal(service.read({ owner: 'far' }).length, 2); }); diff --git a/src/vs/platform/message/common/message.ts b/src/vs/platform/message/common/message.ts index e8d059a249b..fccbeefc07f 100644 --- a/src/vs/platform/message/common/message.ts +++ b/src/vs/platform/message/common/message.ts @@ -24,10 +24,10 @@ export interface IConfirmation { secondaryButton?: string; } -export var CloseAction = new Action('close.message', nls.localize('close', "Close"), null, true, () => TPromise.as(true)); -export var CancelAction = new Action('close.message', nls.localize('cancel', "Cancel"), null, true, () => TPromise.as(true)); +export const CloseAction = new Action('close.message', nls.localize('close', "Close"), null, true, () => TPromise.as(true)); +export const CancelAction = new Action('close.message', nls.localize('cancel', "Cancel"), null, true, () => TPromise.as(true)); -export var IMessageService = createDecorator('messageService'); +export const IMessageService = createDecorator('messageService'); export interface IMessageService { serviceId: ServiceIdentifier; diff --git a/src/vs/platform/platform.ts b/src/vs/platform/platform.ts index 887e2c6c5c7..0488d5fa555 100644 --- a/src/vs/platform/platform.ts +++ b/src/vs/platform/platform.ts @@ -16,30 +16,30 @@ export interface IRegistry { * @param id a unique identifier * @param data a contribution */ - add(id:string, data:any):void; + add(id: string, data: any): void; /** * Returns true iff there is an extension with the provided id. * @param id an extension idenifier */ - knows(id:string):boolean; + knows(id: string): boolean; /** * Returns the extension functions and properties defined by the specified key or null. * @param id an extension idenifier */ - as(id:string):any; + as(id: string): any; } class RegistryImpl implements IRegistry { - private data:{[id:string]:any;}; + private data: { [id: string]: any; }; constructor() { this.data = {}; } - public add(id:string, data:any):void { + public add(id: string, data: any): void { Assert.ok(Types.isString(id)); Assert.ok(Types.isObject(data)); Assert.ok(!this.data.hasOwnProperty(id), 'There is already an extension with this id'); @@ -47,40 +47,40 @@ class RegistryImpl implements IRegistry { this.data[id] = data; } - public knows(id:string):boolean { + public knows(id: string): boolean { return this.data.hasOwnProperty(id); } - public as(id:string):any { + public as(id: string): any { return this.data[id] || null; } } -export var Registry = new RegistryImpl(); +export var Registry = new RegistryImpl(); /** * A base class for registries that leverage the instantiation service to create instances. */ export class BaseRegistry { - private toBeInstantiated:IConstructorSignature0[] = []; - private instances:T[] = []; - private instantiationService:IInstantiationService; + private toBeInstantiated: IConstructorSignature0[] = []; + private instances: T[] = []; + private instantiationService: IInstantiationService; - public setInstantiationService(service:IInstantiationService):void { + public setInstantiationService(service: IInstantiationService): void { this.instantiationService = service; - while(this.toBeInstantiated.length > 0) { + while (this.toBeInstantiated.length > 0) { let entry = this.toBeInstantiated.shift(); this.instantiate(entry); } } - private instantiate(ctor:IConstructorSignature0 | INewConstructorSignature0):void { + private instantiate(ctor: IConstructorSignature0 | INewConstructorSignature0): void { let instance = this.instantiationService.createInstance(ctor); this.instances.push(instance); } - _register(ctor:IConstructorSignature0 | INewConstructorSignature0):void { + _register(ctor: IConstructorSignature0 | INewConstructorSignature0): void { if (this.instantiationService) { this.instantiate(ctor); } else { @@ -88,11 +88,11 @@ export class BaseRegistry { } } - _getInstances():T[] { + _getInstances(): T[] { return this.instances.slice(0); } - _setInstances(instances:T[]):void { + _setInstances(instances: T[]): void { this.instances = instances; } } diff --git a/src/vs/platform/plugins/common/abstractPluginService.ts b/src/vs/platform/plugins/common/abstractPluginService.ts index 4a322368996..df688a7a113 100644 --- a/src/vs/platform/plugins/common/abstractPluginService.ts +++ b/src/vs/platform/plugins/common/abstractPluginService.ts @@ -11,14 +11,14 @@ import {IDisposable} from 'vs/base/common/lifecycle'; import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; import Severity from 'vs/base/common/severity'; -var hasOwnProperty = Object.hasOwnProperty; +const hasOwnProperty = Object.hasOwnProperty; export interface IPluginContext { subscriptions: IDisposable[]; workspaceState: IPluginMemento; globalState: IPluginMemento; extensionPath: string; - asAbsolutePath(relativePath:string): string; + asAbsolutePath(relativePath: string): string; } export interface IPluginMemento { @@ -50,7 +50,7 @@ export abstract class AbstractPluginService implement private _onReady: WinJS.TPromise; private _onReadyC: (v: boolean) => void; - constructor(isReadyByDefault:boolean) { + constructor(isReadyByDefault: boolean) { if (isReadyByDefault) { this._onReady = WinJS.TPromise.as(true); this._onReadyC = (v: boolean) => { /*No-op*/ }; @@ -65,11 +65,11 @@ export abstract class AbstractPluginService implement this.activatedPlugins = {}; } - public abstract deactivate(pluginId:string): void; - protected abstract _showMessage(severity:Severity, message:string): void; + public abstract deactivate(pluginId: string): void; + protected abstract _showMessage(severity: Severity, message: string): void; - protected showMessage(severity:Severity, source:string, message:string): void { - this._showMessage(severity, ( source ? '[' + source + ']: ' : '') + message); + protected showMessage(severity: Severity, source: string, message: string): void { + this._showMessage(severity, (source ? '[' + source + ']: ' : '') + message); } public registrationDone(messages: IMessage[]): void { @@ -92,7 +92,7 @@ export abstract class AbstractPluginService implement return null; } - public isActivated(pluginId:string): boolean { + public isActivated(pluginId: string): boolean { return hasOwnProperty.call(this.activatedPlugins, pluginId); } @@ -106,7 +106,7 @@ export abstract class AbstractPluginService implement public activateAndGet(pluginId: string): WinJS.TPromise { return this._onReady.then(() => { - var desc = PluginsRegistry.getPluginDescription(pluginId); + let desc = PluginsRegistry.getPluginDescription(pluginId); if (!desc) { throw new Error('Plugin `' + pluginId + '` is not known'); } @@ -119,7 +119,7 @@ export abstract class AbstractPluginService implement * Handle semantics related to dependencies for `currentPlugin`. * semantics: `redExtensions` must wait for `greenExtensions`. */ - private _handleActivateRequest(currentPlugin:IPluginDescription, greenExtensions: { [id:string]: IPluginDescription; }, redExtensions: IPluginDescription[]): void { + private _handleActivateRequest(currentPlugin: IPluginDescription, greenExtensions: { [id: string]: IPluginDescription; }, redExtensions: IPluginDescription[]): void { let depIds = (typeof currentPlugin.extensionDependencies === 'undefined' ? [] : currentPlugin.extensionDependencies); let currentPluginGetsGreenLight = true; @@ -156,7 +156,7 @@ export abstract class AbstractPluginService implement } } - private _activatePlugins(pluginDescriptions: IPluginDescription[], recursionLevel:number): WinJS.TPromise { + private _activatePlugins(pluginDescriptions: IPluginDescription[], recursionLevel: number): WinJS.TPromise { // console.log(recursionLevel, '_activatePlugins: ', pluginDescriptions.map(p => p.id)); if (pluginDescriptions.length === 0) { return WinJS.TPromise.as(void 0); @@ -177,7 +177,7 @@ export abstract class AbstractPluginService implement return WinJS.TPromise.as(void 0); } - let greenMap: { [id:string]: IPluginDescription; } = Object.create(null), + let greenMap: { [id: string]: IPluginDescription; } = Object.create(null), red: IPluginDescription[] = []; for (let i = 0, len = pluginDescriptions.length; i < len; i++) { @@ -221,7 +221,7 @@ export abstract class AbstractPluginService implement console.log('Here is the error stack: ', err.stack); // Treat the plugin as being empty return this._createFailedPlugin(); - }).then((x:T) => { + }).then((x: T) => { this.activatedPlugins[pluginDescription.id] = x; delete this.activatingPlugins[pluginDescription.id]; }); diff --git a/src/vs/platform/plugins/common/ipcRemoteCom.ts b/src/vs/platform/plugins/common/ipcRemoteCom.ts index e19a048fce8..fd8ffb74a06 100644 --- a/src/vs/platform/plugins/common/ipcRemoteCom.ts +++ b/src/vs/platform/plugins/common/ipcRemoteCom.ts @@ -19,19 +19,19 @@ interface IRPCFunc { (rpcId: string, method: string, args: any[]): winjs.TPromise; } -var pendingRPCReplies: { [msgId: string]: IRPCReply; } = {}; +const pendingRPCReplies: { [msgId: string]: IRPCReply; } = {}; -function createRPC(serializeAndSend:(obj:any)=>void): IRPCFunc { - var lastMessageId = 0; +function createRPC(serializeAndSend: (obj: any) => void): IRPCFunc { + let lastMessageId = 0; return function rpc(rpcId: string, method: string, args: any[]): winjs.TPromise { - var req = String(++lastMessageId); - var reply: IRPCReply = { + let req = String(++lastMessageId); + let reply: IRPCReply = { c: null, e: null, p: null }; - var r = new winjs.TPromise((c, e, p) => { + let r = new winjs.TPromise((c, e, p) => { reply.c = c; reply.e = e; reply.p = p; @@ -58,24 +58,24 @@ export interface IPluginsIPC extends remote.IRemoteCom { } export function create(send: (obj: string) => void): IPluginsIPC { - var rpc = createRPC(marshallAndSend); - var bigHandler: remote.IManyHandler = null; - var invokedHandlers: { [req: string]: winjs.TPromise; } = Object.create(null); + let rpc = createRPC(marshallAndSend); + let bigHandler: remote.IManyHandler = null; + let invokedHandlers: { [req: string]: winjs.TPromise; } = Object.create(null); - var r: IPluginsIPC = { + let r: IPluginsIPC = { callOnRemote: rpc, registerBigHandler: (_bigHandler: remote.IManyHandler): void => { bigHandler = _bigHandler; }, handle: (rawmsg) => { - var msg = marshalling.parse(rawmsg); + let msg = marshalling.parse(rawmsg); if (msg.seq) { if (!pendingRPCReplies.hasOwnProperty(msg.seq)) { console.warn('Got reply to unknown seq'); return; } - var reply = pendingRPCReplies[msg.seq]; + let reply = pendingRPCReplies[msg.seq]; delete pendingRPCReplies[msg.seq]; if (msg.err) { @@ -106,13 +106,13 @@ export function create(send: (obj: string) => void): IPluginsIPC { return; } - var rpcId = msg.rpcId; + let rpcId = msg.rpcId; if (!bigHandler) { throw new Error('got message before big handler attached!'); } - var req = msg.req; + let req = msg.req; invokedHandlers[req] = invokeHandler(rpcId, msg.method, msg.args); @@ -122,7 +122,7 @@ export function create(send: (obj: string) => void): IPluginsIPC { seq: req, res: r }); - },(err) => { + }, (err) => { delete invokedHandlers[req]; marshallAndSend({ seq: req, @@ -132,11 +132,11 @@ export function create(send: (obj: string) => void): IPluginsIPC { } }; - function marshallAndSend(msg:any): void { + function marshallAndSend(msg: any): void { send(marshalling.stringify(msg)); } - function invokeHandler(rpcId:string, method:string, args:any[]): winjs.TPromise { + function invokeHandler(rpcId: string, method: string, args: any[]): winjs.TPromise { try { return winjs.TPromise.as(bigHandler.handle(rpcId, method, args)); } catch (err) { diff --git a/src/vs/platform/plugins/common/nativePluginService.ts b/src/vs/platform/plugins/common/nativePluginService.ts index 87ccafb45da..f8cc27f72e2 100644 --- a/src/vs/platform/plugins/common/nativePluginService.ts +++ b/src/vs/platform/plugins/common/nativePluginService.ts @@ -17,7 +17,8 @@ import {PluginHostStorage} from 'vs/platform/storage/common/remotable.storage'; import * as paths from 'vs/base/common/paths'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {disposeAll} from 'vs/base/common/lifecycle'; -var hasOwnProperty = Object.hasOwnProperty; + +const hasOwnProperty = Object.hasOwnProperty; class PluginMemento implements IPluginMemento { @@ -25,10 +26,10 @@ class PluginMemento implements IPluginMemento { private _shared: boolean; private _storage: PluginHostStorage; - private _init:WinJS.TPromise; - private _value: { [n: string]: any;}; + private _init: WinJS.TPromise; + private _value: { [n: string]: any; }; - constructor(id: string, global:boolean, storage: PluginHostStorage) { + constructor(id: string, global: boolean, storage: PluginHostStorage) { this._id = id; this._shared = global; this._storage = storage; @@ -95,8 +96,8 @@ export class MainProcessPluginService extends AbstractPluginService p ? p + ',' + c['type']: c['type'], ''); + let types = contributionDetails.reduce((p, c) => p ? p + ',' + c['type'] : c['type'], ''); event['contribution.debuggers'] = types; break; case 'grammars': - let grammers = contributionDetails.reduce((p,c)=> p ? p + ',' + c['language']: c['language'], ''); + let grammers = contributionDetails.reduce((p, c) => p ? p + ',' + c['language'] : c['language'], ''); event['contribution.grammars'] = grammers; break; case 'languages': - let languages = contributionDetails.reduce((p,c)=> p ? p + ',' + c['id']: c['id'], ''); + let languages = contributionDetails.reduce((p, c) => p ? p + ',' + c['id'] : c['id'], ''); event['contribution.languages'] = languages; break; case 'tmSnippets': - let tmSnippets = contributionDetails.reduce((p,c)=> p ? p + ',' + c['languageId']: c['languageId'], ''); + let tmSnippets = contributionDetails.reduce((p, c) => p ? p + ',' + c['languageId'] : c['languageId'], ''); event['contribution.tmSnippets'] = tmSnippets; break; default: @@ -158,12 +159,12 @@ export class MainProcessPluginService extends AbstractPluginService { return paths.normalize(paths.join(pluginDescription.extensionFolderPath, relativePath), true); } + asAbsolutePath: (relativePath: string) => { return paths.normalize(paths.join(pluginDescription.extensionFolderPath, relativePath), true); } }); }); } @@ -420,10 +421,10 @@ export class PluginHostPluginService extends AbstractPluginService(modulePath: string): WinJS.TPromise { - var r: T = null; + let r: T = null; try { r = require.__$__nodeRequire(modulePath); - } catch(e) { + } catch (e) { return WinJS.TPromise.wrapError(e); } return WinJS.TPromise.as(r); @@ -435,7 +436,7 @@ function loadCommonJSModule(modulePath: string): WinJS.TPromise { // * src\vs\workbench\electron-main\bootstrap.js // * src\vs\platform\plugins\common\nativePluginService.ts function uriFromPath(_path) { - var pathName = _path.replace(/\\/g, '/'); + let pathName = _path.replace(/\\/g, '/'); if (pathName.length > 0 && pathName.charAt(0) !== '/') { pathName = '/' + pathName; diff --git a/src/vs/platform/plugins/common/plugins.ts b/src/vs/platform/plugins/common/plugins.ts index 877936ba017..32ea486049b 100644 --- a/src/vs/platform/plugins/common/plugins.ts +++ b/src/vs/platform/plugins/common/plugins.ts @@ -26,14 +26,14 @@ export interface IPluginDescription { } export interface IActivationEventListener { - ():void; + (): void; } export interface IPointListener { (desc: IPluginDescription[]): void; } -export var IPluginService = createDecorator('pluginService'); +export const IPluginService = createDecorator('pluginService'); export interface IMessage { type: Severity; @@ -48,20 +48,20 @@ export interface IPluginStatus { export interface IPluginService { serviceId: ServiceIdentifier; - activateByEvent(activationEvent:string): TPromise; - activateAndGet(pluginId:string): TPromise; - isActivated(pluginId:string): boolean; + activateByEvent(activationEvent: string): TPromise; + activateAndGet(pluginId: string): TPromise; + isActivated(pluginId: string): boolean; /** * This method should be called only on shutdown! * More work is needed for this to be called any time! */ - deactivate(pluginId:string): void; + deactivate(pluginId: string): void; /** * To be used only by the platform once on startup. */ - registrationDone(errors?:IMessage[]): void; + registrationDone(errors?: IMessage[]): void; registerOneTimeActivationEventListener(activationEvent: string, listener: IActivationEventListener): void; @@ -72,4 +72,4 @@ export interface IPluginService { getPluginsStatus(): { [id: string]: IPluginStatus }; } -export var INSTANCE:IPluginService = null; \ No newline at end of file +export const INSTANCE: IPluginService = null; \ No newline at end of file diff --git a/src/vs/platform/plugins/common/pluginsRegistry.ts b/src/vs/platform/plugins/common/pluginsRegistry.ts index 822f39634e2..35ab4001e62 100644 --- a/src/vs/platform/plugins/common/pluginsRegistry.ts +++ b/src/vs/platform/plugins/common/pluginsRegistry.ts @@ -14,42 +14,42 @@ import paths = require('vs/base/common/paths'); import Severity from 'vs/base/common/severity'; export interface IMessageCollector { - error(message:any): void; - warn(message:any): void; - info(message:any): void; + error(message: any): void; + warn(message: any): void; + info(message: any): void; } export interface IPluginsMessageCollector { - error(source:string, message:any): void; - warn(source:string, message:any): void; - info(source:string, message:any): void; - scopeTo(source:string): IMessageCollector; + error(source: string, message: any): void; + warn(source: string, message: any): void; + info(source: string, message: any): void; + scopeTo(source: string): IMessageCollector; } class ScopedMessageCollector implements IMessageCollector { private _scope: string; private _actual: IPluginsMessageCollector; - constructor(scope:string, actual: IPluginsMessageCollector) { + constructor(scope: string, actual: IPluginsMessageCollector) { this._scope = scope; this._actual = actual; } - public error(message:any): void { + public error(message: any): void { this._actual.error(this._scope, message); } - public warn(message:any): void { + public warn(message: any): void { this._actual.warn(this._scope, message); } - public info(message:any): void { + public info(message: any): void { this._actual.info(this._scope, message); } } export interface IMessageHandler { - (severity:Severity, source:string, message:string): void; + (severity: Severity, source: string, message: string): void; } class PluginsMessageForwarder implements IPluginsMessageCollector { @@ -87,7 +87,7 @@ class PluginsMessageForwarder implements IPluginsMessageCollector { this._pushMessage(Severity.Info, source, message); } - public scopeTo(source:string): IMessageCollector { + public scopeTo(source: string): IMessageCollector { return new ScopedMessageCollector(source, this); } } @@ -131,12 +131,12 @@ export class PluginsMessageCollector implements IPluginsMessageCollector { this._pushMessage(Severity.Info, source, message); } - public scopeTo(source:string): IMessageCollector { + public scopeTo(source: string): IMessageCollector { return new ScopedMessageCollector(source, this); } } -export function isValidPluginDescription(extensionFolderPath: string, pluginDescription:IPluginDescription, notices:string[]): boolean { +export function isValidPluginDescription(extensionFolderPath: string, pluginDescription: IPluginDescription, notices: string[]): boolean { if (!pluginDescription) { notices.push(nls.localize('pluginDescription.empty', "Got empty extension description")); return false; @@ -200,7 +200,7 @@ export function isValidPluginDescription(extensionFolderPath: string, pluginDesc interface IPluginDescriptionMap { [pluginId: string]: IPluginDescription; } -var hasOwnProperty = Object.hasOwnProperty; +const hasOwnProperty = Object.hasOwnProperty; let schemaRegistry = Registry.as(JSONContributionRegistry.Extensions.JSONContribution); export interface IExtensionPointUser { @@ -210,7 +210,7 @@ export interface IExtensionPointUser { } export interface IExtensionPointHandler { - (extensions:IExtensionPointUser[]): void; + (extensions: IExtensionPointUser[]): void; } export interface IExtensionPoint { @@ -221,25 +221,25 @@ export interface IExtensionPoint { export interface IPluginsRegistry { registerPlugins(pluginDescriptions: IPluginDescription[]): void; - getPluginDescriptionsForActivationEvent(activationEvent:string): IPluginDescription[]; + getPluginDescriptionsForActivationEvent(activationEvent: string): IPluginDescription[]; getAllPluginDescriptions(): IPluginDescription[]; - getPluginDescription(pluginId:string): IPluginDescription; + getPluginDescription(pluginId: string): IPluginDescription; - registerOneTimeActivationEventListener(activationEvent: string, listener:IActivationEventListener): void; - triggerActivationEventListeners(activationEvent:string): void; + registerOneTimeActivationEventListener(activationEvent: string, listener: IActivationEventListener): void; + triggerActivationEventListeners(activationEvent: string): void; - registerExtensionPoint(extensionPoint:string, jsonSchema: IJSONSchema): IExtensionPoint; - handleExtensionPoints(messageHandler:IMessageHandler): void; + registerExtensionPoint(extensionPoint: string, jsonSchema: IJSONSchema): IExtensionPoint; + handleExtensionPoints(messageHandler: IMessageHandler): void; } class ExtensionPoint implements IExtensionPoint { - public name:string; + public name: string; private _registry: PluginsRegistryImpl; private _handler: IExtensionPointHandler; private _collector: IPluginsMessageCollector; - constructor(name:string, registry: PluginsRegistryImpl) { + constructor(name: string, registry: PluginsRegistryImpl) { this.name = name; this._registry = registry; this._handler = null; @@ -254,7 +254,7 @@ class ExtensionPoint implements IExtensionPoint { this._handle(); } - handle(collector:IPluginsMessageCollector): void { + handle(collector: IPluginsMessageCollector): void { this._collector = collector; this._handle(); } @@ -286,9 +286,9 @@ class PluginsRegistryImpl implements IPluginsRegistry { private _pluginsMap: IPluginDescriptionMap; private _pluginsArr: IPluginDescription[]; - private _activationMap: {[activationEvent:string]:IPluginDescription[];}; + private _activationMap: { [activationEvent: string]: IPluginDescription[]; }; private _pointListeners: IPointListenerEntry[]; - private _oneTimeActivationEventListeners: { [activationEvent:string]: IActivationEventListener[]; }; + private _oneTimeActivationEventListeners: { [activationEvent: string]: IActivationEventListener[]; }; private _extensionPoints: { [extPoint: string]: ExtensionPoint; }; constructor() { @@ -309,7 +309,7 @@ class PluginsRegistryImpl implements IPluginsRegistry { this._triggerPointListener(entry, PluginsRegistryImpl._filterWithExtPoint(this.getAllPluginDescriptions(), point)); } - public registerExtensionPoint(extensionPoint:string, jsonSchema: IJSONSchema): IExtensionPoint { + public registerExtensionPoint(extensionPoint: string, jsonSchema: IJSONSchema): IExtensionPoint { if (hasOwnProperty.call(this._extensionPoints, extensionPoint)) { throw new Error('Duplicate extension point: ' + extensionPoint); } @@ -322,8 +322,8 @@ class PluginsRegistryImpl implements IPluginsRegistry { return result; } - public handleExtensionPoints(messageHandler:IMessageHandler): void { - var collector = new PluginsMessageForwarder(messageHandler); + public handleExtensionPoints(messageHandler: IMessageHandler): void { + let collector = new PluginsMessageForwarder(messageHandler); Object.keys(this._extensionPoints).forEach((extensionPointName) => { this._extensionPoints[extensionPointName].handle(collector); @@ -337,7 +337,7 @@ class PluginsRegistryImpl implements IPluginsRegistry { } try { handler.listener(desc); - } catch(e) { + } catch (e) { Errors.onUnexpectedError(e); } } @@ -377,7 +377,7 @@ class PluginsRegistryImpl implements IPluginsRegistry { }); } - public getPluginDescriptionsForActivationEvent(activationEvent:string): IPluginDescription[] { + public getPluginDescriptionsForActivationEvent(activationEvent: string): IPluginDescription[] { if (!hasOwnProperty.call(this._activationMap, activationEvent)) { return []; } @@ -388,30 +388,30 @@ class PluginsRegistryImpl implements IPluginsRegistry { return this._pluginsArr.slice(0); } - public getPluginDescription(pluginId:string): IPluginDescription { + public getPluginDescription(pluginId: string): IPluginDescription { if (!hasOwnProperty.call(this._pluginsMap, pluginId)) { return null; } return this._pluginsMap[pluginId]; } - public registerOneTimeActivationEventListener(activationEvent: string, listener:IActivationEventListener): void { + public registerOneTimeActivationEventListener(activationEvent: string, listener: IActivationEventListener): void { if (!hasOwnProperty.call(this._oneTimeActivationEventListeners, activationEvent)) { this._oneTimeActivationEventListeners[activationEvent] = []; } this._oneTimeActivationEventListeners[activationEvent].push(listener); } - public triggerActivationEventListeners(activationEvent:string): void { + public triggerActivationEventListeners(activationEvent: string): void { if (hasOwnProperty.call(this._oneTimeActivationEventListeners, activationEvent)) { - var listeners = this._oneTimeActivationEventListeners[activationEvent]; + let listeners = this._oneTimeActivationEventListeners[activationEvent]; delete this._oneTimeActivationEventListeners[activationEvent]; for (let i = 0, len = listeners.length; i < len; i++) { let listener = listeners[i]; try { listener(); - } catch(e) { + } catch (e) { Errors.onUnexpectedError(e); } } @@ -424,7 +424,7 @@ function _isStringArray(arr: string[]): boolean { if (!Array.isArray(arr)) { return false; } - for (var i = 0, len = arr.length; i < len; i++) { + for (let i = 0, len = arr.length; i < len; i++) { if (typeof arr[i] !== 'string') { return false; } @@ -432,14 +432,14 @@ function _isStringArray(arr: string[]): boolean { return true; } -var Extensions = { +const Extensions = { PluginsRegistry: 'PluginsRegistry' }; Registry.add(Extensions.PluginsRegistry, new PluginsRegistryImpl()); -export var PluginsRegistry:IPluginsRegistry = Registry.as(Extensions.PluginsRegistry); +export const PluginsRegistry: IPluginsRegistry = Registry.as(Extensions.PluginsRegistry); -var schemaId = 'vscode://schemas/vscode-extensions'; -var schema : IJSONSchema = { +const schemaId = 'vscode://schemas/vscode-extensions'; +const schema: IJSONSchema = { default: { 'name': '{{name}}', 'description': '{{description}}', @@ -462,7 +462,7 @@ var schema : IJSONSchema = { description: nls.localize('vscode.extension.displayName', 'The display name for the extension used in the VS Code gallery.'), type: 'string' }, - categories : { + categories: { description: nls.localize('vscode.extension.categories', 'The categories used by the VS Code gallery to categorize the extension.'), type: 'array', items: { @@ -518,7 +518,7 @@ var schema : IJSONSchema = { properties: { // extensions will fill in }, - default: { } + default: {} }, isAMD: { description: nls.localize('vscode.extension.isAMD', 'Indicated whether VS Code should load your code as AMD or CommonJS. Default: false.'), diff --git a/src/vs/platform/plugins/node/pluginVersionValidator.ts b/src/vs/platform/plugins/node/pluginVersionValidator.ts index c4e9ca57512..e1f228db62c 100644 --- a/src/vs/platform/plugins/node/pluginVersionValidator.ts +++ b/src/vs/platform/plugins/node/pluginVersionValidator.ts @@ -31,12 +31,12 @@ export interface INormalizedVersion { const VERSION_REGEXP = /^(\^)?((\d+)|x)\.((\d+)|x)\.((\d+)|x)(\-.*)?$/; -export function isValidVersionStr(version:string): boolean { +export function isValidVersionStr(version: string): boolean { version = version.trim(); return (version === '*' || VERSION_REGEXP.test(version)); } -export function parseVersion(version:string): IParsedVersion { +export function parseVersion(version: string): IParsedVersion { if (!isValidVersionStr(version)) { return null; } @@ -100,15 +100,15 @@ export function normalizeVersion(version: IParsedVersion): INormalizedVersion { }; } -export function isValidVersion(_version:string|INormalizedVersion, _desiredVersion:string|INormalizedVersion): boolean { - let version:INormalizedVersion; +export function isValidVersion(_version: string | INormalizedVersion, _desiredVersion: string | INormalizedVersion): boolean { + let version: INormalizedVersion; if (typeof _version === 'string') { version = normalizeVersion(parseVersion(_version)); } else { version = _version; } - let desiredVersion:INormalizedVersion; + let desiredVersion: INormalizedVersion; if (typeof _desiredVersion === 'string') { desiredVersion = normalizeVersion(parseVersion(_desiredVersion)); } else { @@ -165,7 +165,7 @@ export interface IReducedExtensionDescription { main?: string; } -export function isValidExtensionVersion(version: string, extensionDesc:IReducedExtensionDescription, notices:string[]): boolean { +export function isValidExtensionVersion(version: string, extensionDesc: IReducedExtensionDescription, notices: string[]): boolean { if (extensionDesc.isBuiltin || typeof extensionDesc.main === 'undefined') { // No version check for builtin or declarative extensions @@ -203,7 +203,7 @@ export function isValidExtensionVersion(version: string, extensionDesc:IReducedE return true; } -export function isValidPluginDescription(version: string, extensionFolderPath: string, pluginDescription:IPluginDescription, notices:string[]): boolean { +export function isValidPluginDescription(version: string, extensionFolderPath: string, pluginDescription: IPluginDescription, notices: string[]): boolean { if (!baseIsValidPluginDescription(extensionFolderPath, pluginDescription, notices)) { return false; diff --git a/src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts b/src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts index bc5f4d931b3..911fcc2e3ae 100644 --- a/src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts +++ b/src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts @@ -6,10 +6,10 @@ import assert = require('assert'); import { - isValidVersionStr, isValidVersion, - parseVersion, IParsedVersion, - normalizeVersion, INormalizedVersion, - IReducedExtensionDescription, isValidExtensionVersion +isValidVersionStr, isValidVersion, +parseVersion, IParsedVersion, +normalizeVersion, INormalizedVersion, +IReducedExtensionDescription, isValidExtensionVersion } from 'vs/platform/plugins/node/pluginVersionValidator'; suite('Plugin Version Validator', () => { @@ -34,9 +34,9 @@ suite('Plugin Version Validator', () => { }); test('parseVersion', () => { - function assertParseVersion(version:string, hasCaret:boolean, majorBase:number, majorMustEqual:boolean, minorBase:number, minorMustEqual:boolean, patchBase:number, patchMustEqual:boolean, preRelease:string): void { - var actual = parseVersion(version); - var expected: IParsedVersion = { + function assertParseVersion(version: string, hasCaret: boolean, majorBase: number, majorMustEqual: boolean, minorBase: number, minorMustEqual: boolean, patchBase: number, patchMustEqual: boolean, preRelease: string): void { + let actual = parseVersion(version); + let expected: IParsedVersion = { hasCaret: hasCaret, majorBase: majorBase, majorMustEqual: majorMustEqual, @@ -65,9 +65,9 @@ suite('Plugin Version Validator', () => { }); test('normalizeVersion', () => { - function assertNormalizeVersion(version:string, majorBase:number, majorMustEqual:boolean, minorBase:number, minorMustEqual:boolean, patchBase:number, patchMustEqual:boolean): void { - var actual = normalizeVersion(parseVersion(version)); - var expected: INormalizedVersion = { + function assertNormalizeVersion(version: string, majorBase: number, majorMustEqual: boolean, minorBase: number, minorMustEqual: boolean, patchBase: number, patchMustEqual: boolean): void { + let actual = normalizeVersion(parseVersion(version)); + let expected: INormalizedVersion = { majorBase: majorBase, majorMustEqual: majorMustEqual, minorBase: minorBase, @@ -94,7 +94,7 @@ suite('Plugin Version Validator', () => { }); test('isValidVersion', () => { - function testIsValidVersion(version:string, desiredVersion:string, expectedResult:boolean): void { + function testIsValidVersion(version: string, desiredVersion: string, expectedResult: boolean): void { let actual = isValidVersion(version, desiredVersion); assert.equal(actual, expectedResult, 'extension - vscode: ' + version + ', desiredVersion: ' + desiredVersion + ' should be ' + expectedResult); } @@ -156,13 +156,13 @@ suite('Plugin Version Validator', () => { test('isValidExtensionVersion', () => { - function testExtensionVersion(version:string, desiredVersion:string, isBuiltin:boolean, hasMain:boolean, expectedResult:boolean): void { + function testExtensionVersion(version: string, desiredVersion: string, isBuiltin: boolean, hasMain: boolean, expectedResult: boolean): void { let desc: IReducedExtensionDescription = { isBuiltin: isBuiltin, engines: { vscode: desiredVersion }, - main: hasMain ? 'something': undefined + main: hasMain ? 'something' : undefined }; let reasons: string[] = []; let actual = isValidExtensionVersion(version, desc, reasons); @@ -170,15 +170,15 @@ suite('Plugin Version Validator', () => { assert.equal(actual, expectedResult, "version: " + version + ", desiredVersion: " + desiredVersion + ", desc: " + JSON.stringify(desc) + ", reasons: " + JSON.stringify(reasons)); } - function testIsInvalidExtensionVersion(version:string, desiredVersion:string, isBuiltin:boolean, hasMain:boolean): void { + function testIsInvalidExtensionVersion(version: string, desiredVersion: string, isBuiltin: boolean, hasMain: boolean): void { testExtensionVersion(version, desiredVersion, isBuiltin, hasMain, false); } - function testIsValidExtensionVersion(version:string, desiredVersion:string, isBuiltin:boolean, hasMain:boolean): void { + function testIsValidExtensionVersion(version: string, desiredVersion: string, isBuiltin: boolean, hasMain: boolean): void { testExtensionVersion(version, desiredVersion, isBuiltin, hasMain, true); } - function testIsValidVersion(version:string, desiredVersion:string, expectedResult:boolean): void { + function testIsValidVersion(version: string, desiredVersion: string, expectedResult: boolean): void { testExtensionVersion(version, desiredVersion, false, true, expectedResult); } diff --git a/src/vs/platform/progress/common/progress.ts b/src/vs/platform/progress/common/progress.ts index 3d7066e998d..c616a047338 100644 --- a/src/vs/platform/progress/common/progress.ts +++ b/src/vs/platform/progress/common/progress.ts @@ -7,7 +7,7 @@ import {Promise} from 'vs/base/common/winjs.base'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var IProgressService = createDecorator('progressService'); +export const IProgressService = createDecorator('progressService'); export interface IProgressService { serviceId: ServiceIdentifier; diff --git a/src/vs/platform/request/common/baseRequestService.ts b/src/vs/platform/request/common/baseRequestService.ts index 5dc21abb016..af80b1169ac 100644 --- a/src/vs/platform/request/common/baseRequestService.ts +++ b/src/vs/platform/request/common/baseRequestService.ts @@ -21,16 +21,15 @@ import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; */ export class BaseRequestService implements IRequestService { public serviceId = IRequestService; - private _serviceMap:{[service:string]:string;}; - private _origin:string; + private _serviceMap: { [service: string]: string; }; + private _origin: string; - /*protected*/ public _telemetryService:ITelemetryService; + /*protected*/ public _telemetryService: ITelemetryService; constructor(contextService: IWorkspaceContextService, telemetryService?: ITelemetryService) { - var workspaceUri:string = null; + let workspaceUri: string = null; - var contextService = contextService; - var workspace = contextService.getWorkspace(); + let workspace = contextService.getWorkspace(); this._serviceMap = (workspace) || Object.create(null); this._telemetryService = telemetryService; @@ -41,12 +40,12 @@ export class BaseRequestService implements IRequestService { this.computeOrigin(workspaceUri); } - private computeOrigin(workspaceUri:string): void { + private computeOrigin(workspaceUri: string): void { if (workspaceUri) { // Find root server URL from configuration this._origin = workspaceUri; - var urlPath = URI.parse(this._origin).path; + let urlPath = URI.parse(this._origin).path; if (urlPath && urlPath.length > 0) { this._origin = this._origin.substring(0, this._origin.length - urlPath.length + 1); } @@ -59,32 +58,32 @@ export class BaseRequestService implements IRequestService { } } - protected makeCrossOriginRequest(options:http.IXHROptions): winjs.TPromise { + protected makeCrossOriginRequest(options: http.IXHROptions): winjs.TPromise { return null; } - public makeRequest(options:http.IXHROptions):winjs.TPromise { - var timer:Timer.ITimerEvent = Timer.nullEvent; + public makeRequest(options: http.IXHROptions): winjs.TPromise { + let timer: Timer.ITimerEvent = Timer.nullEvent; - var isXhrRequestCORS = false; + let isXhrRequestCORS = false; - var url = options.url; + let url = options.url; if (!url) { throw new Error('IRequestService.makeRequest: Url is required'); } if ((strings.startsWith(url, 'http://') || strings.startsWith(url, 'https://')) && this._origin && !strings.startsWith(url, this._origin)) { - var coPromise = this.makeCrossOriginRequest(options); + let coPromise = this.makeCrossOriginRequest(options); if (coPromise) { return coPromise; } isXhrRequestCORS = true; } - var xhrOptions = options; + let xhrOptions = options; if (!isXhrRequestCORS) { - var additionalHeaders = {}; + let additionalHeaders = {}; if (this._telemetryService) { additionalHeaders['X-TelemetrySession'] = this._telemetryService.getSessionId(); }; @@ -99,33 +98,33 @@ export class BaseRequestService implements IRequestService { } - return Async.always(winjs.xhr(xhrOptions),((xhr:XMLHttpRequest) => { - if(timer.data) { + return Async.always(winjs.xhr(xhrOptions), ((xhr: XMLHttpRequest) => { + if (timer.data) { timer.data.status = xhr.status; } timer.stop(); })); } - public makeChunkedRequest(options:http.IXHROptions):winjs.TPromise<{request:http.IXHRResponse; chunks:http.IDataChunk[];}> { - var from = 0, - c:winjs.ValueCallback, e:winjs.ErrorCallback, p:winjs.ProgressCallback, + public makeChunkedRequest(options: http.IXHROptions): winjs.TPromise<{ request: http.IXHRResponse; chunks: http.IDataChunk[]; }> { + let from = 0, + c: winjs.ValueCallback, e: winjs.ErrorCallback, p: winjs.ProgressCallback, canceled = false; - return new winjs.TPromise<{request:XMLHttpRequest; chunks:http.IDataChunk[];}>((_c, _e, _p) => { + return new winjs.TPromise<{ request: XMLHttpRequest; chunks: http.IDataChunk[]; }>((_c, _e, _p) => { c = _c; e = _e; p = _p; this.makeRequest(options).done((request) => { - var ret = { - request: request, - chunks: [] - }; - from = http.parseChunkedData(request, ret.chunks, from); - c(ret); - }, + let ret = { + request: request, + chunks: [] + }; + from = http.parseChunkedData(request, ret.chunks, from); + c(ret); + }, (err) => { e(err); }, - (request:XMLHttpRequest) => { + (request: XMLHttpRequest) => { // This might fail in IE10 for b i g request. Leave it enabled // for now to see if and when it fails // if(request.readyState === 3) { diff --git a/src/vs/platform/request/common/request.ts b/src/vs/platform/request/common/request.ts index cdd7cf6cad1..fae9f9c274b 100644 --- a/src/vs/platform/request/common/request.ts +++ b/src/vs/platform/request/common/request.ts @@ -4,21 +4,20 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import URI from 'vs/base/common/uri'; import http = require('vs/base/common/http'); import winjs = require('vs/base/common/winjs.base'); import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var IRequestService = createDecorator('requestService'); +export const IRequestService = createDecorator('requestService'); export interface IRequestService { - serviceId : ServiceIdentifier; + serviceId: ServiceIdentifier; /** * Wraps the call into WinJS.XHR to allow for mocking and telemetry. Use this instead * of calling WinJS.XHR directly. */ - makeRequest(options:http.IXHROptions):winjs.TPromise; + makeRequest(options: http.IXHROptions): winjs.TPromise; /** * Executes a xhr request and expects a chunked response. The value callback of the @@ -26,6 +25,5 @@ export interface IRequestService { * recevied. The progress callback receives an array of IDataChunk containing * the delta since the last progress callback. */ - makeChunkedRequest(options:http.IXHROptions):winjs.TPromise<{request:http.IXHRResponse; chunks:http.IDataChunk[];}>; -} - + makeChunkedRequest(options: http.IXHROptions): winjs.TPromise<{ request: http.IXHRResponse; chunks: http.IDataChunk[]; }>; +} \ No newline at end of file diff --git a/src/vs/platform/search/common/search.ts b/src/vs/platform/search/common/search.ts index 948ab502279..ba806e832aa 100644 --- a/src/vs/platform/search/common/search.ts +++ b/src/vs/platform/search/common/search.ts @@ -10,9 +10,9 @@ import glob = require('vs/base/common/glob'); import {IFilesConfiguration} from 'vs/platform/files/common/files'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var ID = 'searchService'; +export const ID = 'searchService'; -export var ISearchService = createDecorator(ID); +export const ISearchService = createDecorator(ID); /** * A service that enables to search for files or with in files. */ diff --git a/src/vs/platform/storage/common/remotable.storage.ts b/src/vs/platform/storage/common/remotable.storage.ts index 243c6044b96..843aae36235 100644 --- a/src/vs/platform/storage/common/remotable.storage.ts +++ b/src/vs/platform/storage/common/remotable.storage.ts @@ -54,7 +54,7 @@ export class PluginHostStorage { return this._proxy.getValue(shared, key).then(value => value || defaultValue); } - setValue(shared:boolean, key: string, value: any): TPromise { + setValue(shared: boolean, key: string, value: any): TPromise { return this._proxy.setValue(shared, key, value); } } \ No newline at end of file diff --git a/src/vs/platform/storage/common/storage.ts b/src/vs/platform/storage/common/storage.ts index 85a7c0c7d12..891d37f9c8c 100644 --- a/src/vs/platform/storage/common/storage.ts +++ b/src/vs/platform/storage/common/storage.ts @@ -8,9 +8,9 @@ import {PropertyChangeEvent} from 'vs/base/common/events'; import {IEventEmitter} from 'vs/base/common/eventEmitter'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var ID = 'storageService'; +export const ID = 'storageService'; -export var IStorageService = createDecorator(ID); +export const IStorageService = createDecorator(ID); export interface IStorageService extends IEventEmitter { serviceId: ServiceIdentifier; @@ -71,7 +71,7 @@ export namespace StorageEventType { * Event type for when a storage value is changed. */ export const STORAGE = 'storage'; -}; +} /** * Storage events are being emitted when user settings change which are persisted to local storage. diff --git a/src/vs/platform/telemetry/browser/mainTelemetryService.ts b/src/vs/platform/telemetry/browser/mainTelemetryService.ts index aa0e0e3e241..61d1c153f11 100644 --- a/src/vs/platform/telemetry/browser/mainTelemetryService.ts +++ b/src/vs/platform/telemetry/browser/mainTelemetryService.ts @@ -22,10 +22,10 @@ export interface TelemetryServiceConfig { version?: string; } -var DefaultTelemetryServiceConfig:TelemetryServiceConfig = { +const DefaultTelemetryServiceConfig: TelemetryServiceConfig = { enableTelemetry: true, enableHardIdle: true, - enableSoftIdle:true + enableSoftIdle: true }; export class MainTelemetryService extends AbstractTelemetryService implements ITelemetryService { @@ -34,55 +34,55 @@ export class MainTelemetryService extends AbstractTelemetryService implements IT public static IDLE_START_EVENT_NAME = 'UserIdleStart'; public static IDLE_STOP_EVENT_NAME = 'UserIdleStop'; - protected config:TelemetryServiceConfig; + protected config: TelemetryServiceConfig; - private hardIdleMonitor:IdleMonitor; - private softIdleMonitor:IdleMonitor; + private hardIdleMonitor: IdleMonitor; + private softIdleMonitor: IdleMonitor; private eventCount: number; private userIdHash: string; private startTime: Date; - constructor(config?:TelemetryServiceConfig) { + constructor(config?: TelemetryServiceConfig) { this.config = Objects.withDefaults(config, DefaultTelemetryServiceConfig); super(); this.sessionId = this.config.sessionID || (uuid.generateUuid() + Date.now()); - if(this.config.enableHardIdle) { + if (this.config.enableHardIdle) { this.hardIdleMonitor = new IdleMonitor(); } - if(this.config.enableSoftIdle) { + if (this.config.enableSoftIdle) { this.softIdleMonitor = new IdleMonitor(MainTelemetryService.SOFT_IDLE_TIME); - this.softIdleMonitor.addOneTimeActiveListener(()=>this.onUserActive()); - this.softIdleMonitor.addOneTimeIdleListener(()=>this.onUserIdle()); + this.softIdleMonitor.addOneTimeActiveListener(() => this.onUserActive()); + this.softIdleMonitor.addOneTimeIdleListener(() => this.onUserIdle()); } this.eventCount = 0; this.startTime = new Date(); } - private onUserIdle():void { + private onUserIdle(): void { this.publicLog(MainTelemetryService.IDLE_START_EVENT_NAME); - this.softIdleMonitor.addOneTimeIdleListener(()=>this.onUserIdle()); + this.softIdleMonitor.addOneTimeIdleListener(() => this.onUserIdle()); } - private onUserActive():void { + private onUserActive(): void { this.publicLog(MainTelemetryService.IDLE_STOP_EVENT_NAME); - this.softIdleMonitor.addOneTimeActiveListener(()=>this.onUserActive()); + this.softIdleMonitor.addOneTimeActiveListener(() => this.onUserActive()); } - public dispose():void { - if(this.hardIdleMonitor) { + public dispose(): void { + if (this.hardIdleMonitor) { this.hardIdleMonitor.dispose(); } - if(this.softIdleMonitor) { + if (this.softIdleMonitor) { this.softIdleMonitor.dispose(); } super.dispose(); } - protected handleEvent(eventName:string, data?:any):void { - if(this.hardIdleMonitor && this.hardIdleMonitor.getStatus() === UserStatus.Idle) { + protected handleEvent(eventName: string, data?: any): void { + if (this.hardIdleMonitor && this.hardIdleMonitor.getStatus() === UserStatus.Idle) { return; } @@ -95,8 +95,8 @@ export class MainTelemetryService extends AbstractTelemetryService implements IT data = this.addCommonProperties(data); - var allAppenders = this.getAppenders(); - for (var i =0; i < allAppenders.length; i++) { + let allAppenders = this.getAppenders(); + for (let i = 0; i < allAppenders.length; i++) { allAppenders[i].log(eventName, data); } } @@ -104,7 +104,7 @@ export class MainTelemetryService extends AbstractTelemetryService implements IT protected addCommonProperties(data?: any): void { data = data || {}; - var eventDate: Date = new Date(); + let eventDate: Date = new Date(); data['sessionID'] = this.sessionId; data['timestamp'] = eventDate; data['version'] = this.config.version; @@ -113,7 +113,7 @@ export class MainTelemetryService extends AbstractTelemetryService implements IT data['common.platform'] = Platform.Platform[Platform.platform]; data['common.timesincesessionstart'] = (eventDate.getTime() - this.startTime.getTime()); - data['common.sequence'] = this.eventCount; + data['common.sequence'] = this.eventCount; data['common.instanceId'] = this.instanceId; data['common.machineId'] = this.machineId; return data; diff --git a/src/vs/platform/telemetry/common/abstractRemoteTelemetryService.ts b/src/vs/platform/telemetry/common/abstractRemoteTelemetryService.ts index f8925efdaa5..fe875b5e773 100644 --- a/src/vs/platform/telemetry/common/abstractRemoteTelemetryService.ts +++ b/src/vs/platform/telemetry/common/abstractRemoteTelemetryService.ts @@ -16,11 +16,11 @@ export class RemoteTelemetryServiceHelper { private _telemetryService: ITelemetryService; - constructor(@ITelemetryService telemetryService: ITelemetryService) { + constructor( @ITelemetryService telemetryService: ITelemetryService) { this._telemetryService = telemetryService; } - public _handleRemoteTelemetryEvent(eventName:string, data?:any):void { + public _handleRemoteTelemetryEvent(eventName: string, data?: any): void { this._telemetryService.publicLog(eventName, data); } @@ -50,7 +50,7 @@ export class AbstractRemoteTelemetryService extends AbstractTelemetryService.Abs throw new Error('Telemetry appenders are not supported in this execution envirnoment'); } - protected handleEvent(eventName:string, data?:any):void { + protected handleEvent(eventName: string, data?: any): void { this._proxy._handleRemoteTelemetryEvent(eventName, data); } } diff --git a/src/vs/platform/telemetry/common/abstractTelemetryService.ts b/src/vs/platform/telemetry/common/abstractTelemetryService.ts index 8092f00ae57..2545c4bf2ce 100644 --- a/src/vs/platform/telemetry/common/abstractTelemetryService.ts +++ b/src/vs/platform/telemetry/common/abstractTelemetryService.ts @@ -22,16 +22,16 @@ export abstract class AbstractTelemetryService implements ITelemetryService { public serviceId = ITelemetryService; - private toUnbind:any[]; - private timeKeeper:TimeKeeper; - private appenders:ITelemetryAppender[]; - private oldOnError:any; + private toUnbind: any[]; + private timeKeeper: TimeKeeper; + private appenders: ITelemetryAppender[]; + private oldOnError: any; private instantiationService: IInstantiationService; private timeKeeperListener: IEventsListener; - private errorBuffer: {[stack: string]: any}; + private errorBuffer: { [stack: string]: any }; private errorFlushTimeout: number; - protected sessionId:string; + protected sessionId: string; protected instanceId: string; protected machineId: string; @@ -40,7 +40,7 @@ export abstract class AbstractTelemetryService implements ITelemetryService { this.timeKeeper = new TimeKeeper(); this.toUnbind = []; this.appenders = []; - this.timeKeeperListener = (events:ITimerEvent[]) => this.onTelemetryTimerEventStop(events); + this.timeKeeperListener = (events: ITimerEvent[]) => this.onTelemetryTimerEventStop(events); this.timeKeeper.addListener(this.timeKeeperListener); this.toUnbind.push(Errors.errorHandler.addListener(this.onErrorEvent.bind(this))); @@ -51,25 +51,25 @@ export abstract class AbstractTelemetryService implements ITelemetryService { this.errorFlushTimeout = -1; } - private _safeStringify(data:any): string { + private _safeStringify(data: any): string { return safeStringify(data); } - private onTelemetryTimerEventStop(events:ITimerEvent[]):void { - for (var i = 0; i < events.length; i++) { - var event = events[i]; - var data = event.data || {}; + private onTelemetryTimerEventStop(events: ITimerEvent[]): void { + for (let i = 0; i < events.length; i++) { + let event = events[i]; + let data = event.data || {}; data.duration = event.timeTaken(); this.publicLog(event.name, data); } } - private onErrorEvent(e:any):void { + private onErrorEvent(e: any): void { let error = Object.create(null); // unwrap nested errors from loader - if(e.detail && e.detail.stack) { + if (e.detail && e.detail.stack) { e = e.detail; } @@ -78,7 +78,7 @@ export abstract class AbstractTelemetryService implements ITelemetryService { let message = e.message ? e.message : this._safeStringify(e); // errors without a stack are not useful telemetry - if(!stack) { + if (!stack) { return; } @@ -88,7 +88,7 @@ export abstract class AbstractTelemetryService implements ITelemetryService { this.addErrortoBuffer(error); } - private addErrortoBuffer(e:any): void { + private addErrortoBuffer(e: any): void { if (this.errorBuffer[e.stack]) { this.errorBuffer[e.stack].count++; } else { @@ -106,7 +106,7 @@ export abstract class AbstractTelemetryService implements ITelemetryService { private flushErrorBuffer(): void { if (this.errorBuffer) { - for(var stack in this.errorBuffer) { + for (let stack in this.errorBuffer) { this.publicLog('UnhandledError', this.errorBuffer[stack]); } } @@ -118,7 +118,7 @@ export abstract class AbstractTelemetryService implements ITelemetryService { private cleanupInfo(stack: string): string { // `file:///DANGEROUS/PATH/resources/app/Useful/Information` - var reg = /file:\/\/\/.*?\/resources\/app\//gi; + let reg = /file:\/\/\/.*?\/resources\/app\//gi; stack = stack.replace(reg, ''); // Any other file path that doesn't match the approved form above should be cleaned. @@ -131,15 +131,15 @@ export abstract class AbstractTelemetryService implements ITelemetryService { return stack; } - private enableGlobalErrorHandler():void { - if(Types.isFunction(Platform.globals.onerror)) { + private enableGlobalErrorHandler(): void { + if (Types.isFunction(Platform.globals.onerror)) { this.oldOnError = Platform.globals.onerror; } - var that = this; - var newHandler:any = function(message:string, filename:string, line:number, column?:number, e?:any) { + let that = this; + let newHandler: any = function(message: string, filename: string, line: number, column?: number, e?: any) { that.onUncaughtError(message, filename, line, column, e); - if(that.oldOnError) { + if (that.oldOnError) { that.oldOnError.apply(this, arguments); } }; @@ -147,17 +147,17 @@ export abstract class AbstractTelemetryService implements ITelemetryService { Platform.globals.onerror = newHandler; } - private onUncaughtError(message:string, filename:string, line:number, column?:number, e?:any):void { + private onUncaughtError(message: string, filename: string, line: number, column?: number, e?: any): void { filename = this.cleanupInfo(filename); message = this.cleanupInfo(message); - var data:any = { + let data: any = { message: message, filename: filename, line: line, column: column }; - if(e) { + if (e) { data.error = { name: e.name, message: e.message @@ -165,8 +165,8 @@ export abstract class AbstractTelemetryService implements ITelemetryService { if (e.stack) { - if(Array.isArray(e.stack)) { - e.stack = e.stack.join('\n'); + if (Array.isArray(e.stack)) { + e.stack = e.stack.join('\n'); } data.stack = this.cleanupInfo(e.stack); @@ -181,11 +181,11 @@ export abstract class AbstractTelemetryService implements ITelemetryService { } private loadTelemetryAppendersFromRegistery(): void { - var appendersRegistry = (Registry.as(Extenstions.TelemetryAppenders)).getTelemetryAppenderDescriptors(); + let appendersRegistry = (Registry.as(Extenstions.TelemetryAppenders)).getTelemetryAppenderDescriptors(); - for (var i = 0; i < appendersRegistry.length; i++) { - var descriptor = appendersRegistry[i]; - var appender = this.instantiationService.createInstance(descriptor); + for (let i = 0; i < appendersRegistry.length; i++) { + let descriptor = appendersRegistry[i]; + let appender = this.instantiationService.createInstance(descriptor); this.addTelemetryAppender(appender); } } @@ -210,7 +210,7 @@ export abstract class AbstractTelemetryService implements ITelemetryService { }); } - public dispose():void { + public dispose(): void { if (this.errorFlushTimeout !== -1) { clearTimeout(this.errorFlushTimeout); this.flushErrorBuffer(); @@ -222,21 +222,21 @@ export abstract class AbstractTelemetryService implements ITelemetryService { this.timeKeeper.removeListener(this.timeKeeperListener); this.timeKeeper.dispose(); - for(var i =0; i< this.appenders.length; i++){ + for (let i = 0; i < this.appenders.length; i++) { this.appenders[i].dispose(); } } - public start(name:string, data?:any):ITimerEvent { - var topic ='public'; - var event = this.timeKeeper.start(topic, name); - if(data) { + public start(name: string, data?: any): ITimerEvent { + let topic = 'public'; + let event = this.timeKeeper.start(topic, name); + if (data) { event.data = data; } return event; } - public publicLog(eventName:string, data?:any):void { + public publicLog(eventName: string, data?: any): void { this.handleEvent(eventName, data); } @@ -253,7 +253,7 @@ export abstract class AbstractTelemetryService implements ITelemetryService { } public removeTelemetryAppender(appender: ITelemetryAppender): void { - var index= this.appenders.indexOf(appender); + let index = this.appenders.indexOf(appender); if (index > -1) { this.appenders.splice(index, 1); @@ -268,13 +268,13 @@ export abstract class AbstractTelemetryService implements ITelemetryService { } } - protected handleEvent(eventName:string, data?:any):void { + protected handleEvent(eventName: string, data?: any): void { throw new Error('Not implemented!'); } } -export var Extenstions = { - TelemetryAppenders : 'telemetry.appenders' +export const Extenstions = { + TelemetryAppenders: 'telemetry.appenders' }; export interface ITelemetryAppendersRegistry { @@ -290,11 +290,11 @@ class TelemetryAppendersRegistry implements ITelemetryAppendersRegistry { this.telemetryAppenderDescriptors = []; } - public registerTelemetryAppenderDescriptor(descriptor:SyncDescriptor0): void { + public registerTelemetryAppenderDescriptor(descriptor: SyncDescriptor0): void { this.telemetryAppenderDescriptors.push(descriptor); } - public getTelemetryAppenderDescriptors(): SyncDescriptor0[] { + public getTelemetryAppenderDescriptors(): SyncDescriptor0[] { return this.telemetryAppenderDescriptors; } } diff --git a/src/vs/platform/telemetry/common/nullTelemetryService.ts b/src/vs/platform/telemetry/common/nullTelemetryService.ts index ed5394d4c63..28c83a1aaec 100644 --- a/src/vs/platform/telemetry/common/nullTelemetryService.ts +++ b/src/vs/platform/telemetry/common/nullTelemetryService.ts @@ -11,14 +11,14 @@ import {IInstantiationService} from 'vs/platform/instantiation/common/instantiat export class NullTelemetryService implements ITelemetryService { public serviceId = ITelemetryService; - protected sessionId:string = null; - protected instanceId:string = null; - protected machineId:string = null; + protected sessionId: string = null; + protected instanceId: string = null; + protected machineId: string = null; - publicLog(eventName: string, data?: any):void { + publicLog(eventName: string, data?: any): void { } - start(name:string, data?:any):any { + start(name: string, data?: any): any { return null; } diff --git a/src/vs/platform/telemetry/common/telemetry.ts b/src/vs/platform/telemetry/common/telemetry.ts index b0d8cbaa2dc..80eb26b5e62 100644 --- a/src/vs/platform/telemetry/common/telemetry.ts +++ b/src/vs/platform/telemetry/common/telemetry.ts @@ -8,29 +8,29 @@ import Lifecycle = require('vs/base/common/lifecycle'); import Timer = require('vs/base/common/timer'); import {createDecorator, ServiceIdentifier, IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; -export var ID = 'telemetryService'; +export const ID = 'telemetryService'; -export var ITelemetryService = createDecorator(ID); +export const ITelemetryService = createDecorator(ID); export interface ITelemetryInfo { - sessionId: string; - machineId: string; - instanceId: string; + sessionId: string; + machineId: string; + instanceId: string; } export interface ITelemetryService extends Lifecycle.IDisposable { - serviceId : ServiceIdentifier; + serviceId: ServiceIdentifier; /** * Sends a telemetry event that has been privacy approved. * Do not call this unless you have been given approval. */ - publicLog(eventName: string, data?: any):void; + publicLog(eventName: string, data?: any): void; /** * Starts a telemetry timer. Call stop() to send the event. */ - start(name:string, data?:any):Timer.ITimerEvent; + start(name: string, data?: any): Timer.ITimerEvent; /** * Session Id @@ -68,9 +68,9 @@ export function anonymize(input: string): string { return input; } - var r = ''; - for (var i = 0; i < input.length; i++) { - var ch = input[i]; + let r = ''; + for (let i = 0; i < input.length; i++) { + let ch = input[i]; if (ch >= '0' && ch <= '9') { r += '0'; continue; diff --git a/src/vs/platform/telemetry/common/workerTelemetryService.ts b/src/vs/platform/telemetry/common/workerTelemetryService.ts index 9ffbc152e74..7293e74cdf1 100644 --- a/src/vs/platform/telemetry/common/workerTelemetryService.ts +++ b/src/vs/platform/telemetry/common/workerTelemetryService.ts @@ -8,8 +8,8 @@ import {AbstractRemoteTelemetryService} from 'vs/platform/telemetry/common/abstr export class WorkerTelemetryService extends AbstractRemoteTelemetryService { - protected handleEvent(eventName:string, data?:any):void { - var data = data || {}; + protected handleEvent(eventName: string, data?: any): void { + data = data || {}; data['workerTelemetry'] = true; super.handleEvent(eventName, data); } diff --git a/src/vs/platform/telemetry/common/workspaceStats.ts b/src/vs/platform/telemetry/common/workspaceStats.ts index c364ba0157e..27273c6528a 100644 --- a/src/vs/platform/telemetry/common/workspaceStats.ts +++ b/src/vs/platform/telemetry/common/workspaceStats.ts @@ -25,12 +25,12 @@ export class WorkspaceStats { } private getWorkspaceTags(): winjs.TPromise<{ [index: string]: boolean }> { - var tags: { [index: string]: boolean } = Object.create(null); - var workspace = this.contextService.getWorkspace(); + let tags: { [index: string]: boolean } = Object.create(null); + let workspace = this.contextService.getWorkspace(); if (workspace && this.fileService) { return this.fileService.resolveFile(workspace.resource).then(stats => { - var names = stats.children.map(c => c.name); + let names = stats.children.map(c => c.name); tags['workspace.empty'] = false; @@ -60,25 +60,25 @@ export class WorkspaceStats { tags['workspace.yeoman.code'] = this.searchArray(names, /^vscodequickstart\.md$/i); tags['workspace.yeoman.code.ext'] = this.searchArray(names, /^vsc-extension-quickstart\.md$/i); - var mainActivity = this.searchArray(names, /^MainActivity\.cs$/i) || this.searchArray(names, /^MainActivity\.fs$/i); - var appDelegate = this.searchArray(names, /^AppDelegate\.cs$/i) || this.searchArray(names, /^AppDelegate\.fs$/i); - var androidManifest = this.searchArray(names, /^AndroidManifest\.xml$/i); + let mainActivity = this.searchArray(names, /^MainActivity\.cs$/i) || this.searchArray(names, /^MainActivity\.fs$/i); + let appDelegate = this.searchArray(names, /^AppDelegate\.cs$/i) || this.searchArray(names, /^AppDelegate\.fs$/i); + let androidManifest = this.searchArray(names, /^AndroidManifest\.xml$/i); - var platforms = this.searchArray(names, /^platforms$/i); - var plugins = this.searchArray(names, /^plugins$/i); - var www = this.searchArray(names, /^www$/i); - var properties = this.searchArray(names, /^Properties/i); - var resources = this.searchArray(names, /^Resources/i); - var jni = this.searchArray(names, /^JNI/i); + let platforms = this.searchArray(names, /^platforms$/i); + let plugins = this.searchArray(names, /^plugins$/i); + let www = this.searchArray(names, /^www$/i); + let properties = this.searchArray(names, /^Properties/i); + let resources = this.searchArray(names, /^Resources/i); + let jni = this.searchArray(names, /^JNI/i); - if ( tags['workspace.config.xml'] && + if (tags['workspace.config.xml'] && !tags['workspace.language.cs'] && !tags['workspace.language.vb'] && !tags['workspace.language.aspx']) { - if (platforms && plugins && www) { - tags['workspace.cordova.high'] = true; - } else { - tags['workspace.cordova.low'] = true; - } + if (platforms && plugins && www) { + tags['workspace.cordova.high'] = true; + } else { + tags['workspace.cordova.low'] = true; } + } if (mainActivity && properties && resources) { tags['workspace.xamarin.android'] = true; @@ -93,7 +93,7 @@ export class WorkspaceStats { } tags['workspace.reactNative'] = this.searchArray(names, /^android$/i) && this.searchArray(names, /^ios$/i) && - this.searchArray(names, /^index\.android\.js$/i) &&this.searchArray(names, /^index\.ios\.js$/i); + this.searchArray(names, /^index\.android\.js$/i) && this.searchArray(names, /^index\.ios\.js$/i); tags['workspace.enableTypeScriptServiceModeForJS'] = !!env.enableTypeScriptServiceModeForJS; return tags; diff --git a/src/vs/platform/telemetry/electron-browser/electronTelemetryService.ts b/src/vs/platform/telemetry/electron-browser/electronTelemetryService.ts index 6b842453447..a79a5c1cd99 100644 --- a/src/vs/platform/telemetry/electron-browser/electronTelemetryService.ts +++ b/src/vs/platform/telemetry/electron-browser/electronTelemetryService.ts @@ -13,15 +13,15 @@ import errors = require('vs/base/common/errors'); import uuid = require('vs/base/common/uuid'); class StorageKeys { - public static MachineId: string = 'telemetry.machineId'; - public static InstanceId: string = 'telemetry.instanceId'; + public static MachineId: string = 'telemetry.machineId'; + public static InstanceId: string = 'telemetry.instanceId'; } export class ElectronTelemetryService extends MainTelemetryService implements ITelemetryService { private _setupIds: Promise; - constructor(@IStorageService private storageService: IStorageService, config?:TelemetryServiceConfig) { + constructor( @IStorageService private storageService: IStorageService, config?: TelemetryServiceConfig) { super(config); this._setupIds = this.setupIds(); @@ -35,18 +35,18 @@ export class ElectronTelemetryService extends MainTelemetryService implements IT } private setupIds(): Promise { - return Promise.all([this.setupInstanceId(), this.setupMachineId()]).then(()=> { - return { - machineId: this.machineId, - instanceId: this.instanceId, - sessionId: this.sessionId - }; + return Promise.all([this.setupInstanceId(), this.setupMachineId()]).then(() => { + return { + machineId: this.machineId, + instanceId: this.instanceId, + sessionId: this.sessionId + }; }); } private setupInstanceId(): Promise { - var instanceId = this.storageService.get(StorageKeys.InstanceId); - if(!instanceId) { + let instanceId = this.storageService.get(StorageKeys.InstanceId); + if (!instanceId) { instanceId = uuid.generateUuid(); this.storageService.store(StorageKeys.InstanceId, instanceId); } @@ -55,7 +55,7 @@ export class ElectronTelemetryService extends MainTelemetryService implements IT } private setupMachineId(): Promise { - var machineId = this.storageService.get(StorageKeys.MachineId); + let machineId = this.storageService.get(StorageKeys.MachineId); if (machineId) { this.machineId = machineId; return Promise.resolve(this.machineId); diff --git a/src/vs/platform/telemetry/test/node/telemetryService.test.ts b/src/vs/platform/telemetry/test/node/telemetryService.test.ts index 7a6e331e75c..0fb4b8d03d3 100644 --- a/src/vs/platform/telemetry/test/node/telemetryService.test.ts +++ b/src/vs/platform/telemetry/test/node/telemetryService.test.ts @@ -10,23 +10,18 @@ import AbstractTelemetryService = require('vs/platform/telemetry/common/abstract import MainTelemetryService = require('vs/platform/telemetry/browser/mainTelemetryService'); import TelemetryService = require('vs/platform/telemetry/common/telemetry'); import InstantiationService = require('vs/platform/instantiation/common/instantiationService'); -import winjs = require('vs/base/common/winjs.base'); import Errors = require('vs/base/common/errors'); -import URI from 'vs/base/common/uri'; import Timer = require('vs/base/common/timer'); -import Strings = require('vs/base/common/strings'); import Platform = require('vs/platform/platform'); import * as sinon from 'sinon'; import {createSyncDescriptor} from 'vs/platform/instantiation/common/descriptors'; -import {BaseRequestService} from 'vs/platform/request/common/baseRequestService'; -import {BaseWorkspaceContextService} from 'vs/platform/workspace/common/baseWorkspaceContextService'; class TestTelemetryAppender implements TelemetryService.ITelemetryAppender { public events: any[]; public isDisposed: boolean; - constructor(){ + constructor() { this.events = []; this.isDisposed = false; } @@ -38,11 +33,11 @@ class TestTelemetryAppender implements TelemetryService.ITelemetryAppender { }); } - public getEventsCount(){ + public getEventsCount() { return this.events.length; } - public dispose(){ + public dispose() { this.isDisposed = true; } } @@ -73,19 +68,19 @@ class ErrorTestingSettings { this.noSuchFileMessage = this.noSuchFilePrefix + ' \'' + this.personalInfo + '\''; this.stack = ['at e._modelEvents (a/path/that/doesnt/contain/code/names.js:11:7309)', - ' at t.AllWorkers (a/path/that/doesnt/contain/code/names.js:6:8844)', - ' at e.(anonymous function) [as _modelEvents] (a/path/that/doesnt/contain/code/names.js:5:29552)', - ' at Function. (a/path/that/doesnt/contain/code/names.js:6:8272)', - ' at e.dispatch (a/path/that/doesnt/contain/code/names.js:5:26931)', - ' at e.request (a/path/that/doesnt/contain/code/names.js:14:1745)', - ' at t._handleMessage (another/path/that/doesnt/contain/code/names.js:14:17447)', - ' at t._onmessage (another/path/that/doesnt/contain/code/names.js:14:16976)', - ' at t.onmessage (another/path/that/doesnt/contain/code/names.js:14:15854)', - ' at DedicatedWorkerGlobalScope.self.onmessage', - this.dangerousPathWithImportantInfo, - this.dangerousPathWithoutImportantInfo, - this.missingModelMessage, - this.noSuchFileMessage]; + ' at t.AllWorkers (a/path/that/doesnt/contain/code/names.js:6:8844)', + ' at e.(anonymous function) [as _modelEvents] (a/path/that/doesnt/contain/code/names.js:5:29552)', + ' at Function. (a/path/that/doesnt/contain/code/names.js:6:8272)', + ' at e.dispatch (a/path/that/doesnt/contain/code/names.js:5:26931)', + ' at e.request (a/path/that/doesnt/contain/code/names.js:14:1745)', + ' at t._handleMessage (another/path/that/doesnt/contain/code/names.js:14:17447)', + ' at t._onmessage (another/path/that/doesnt/contain/code/names.js:14:16976)', + ' at t.onmessage (another/path/that/doesnt/contain/code/names.js:14:15854)', + ' at DedicatedWorkerGlobalScope.self.onmessage', + this.dangerousPathWithImportantInfo, + this.dangerousPathWithoutImportantInfo, + this.missingModelMessage, + this.noSuchFileMessage]; } } @@ -93,12 +88,12 @@ suite('TelemetryService', () => { // Appenders test('No appenders', sinon.test(function() { - var service = new MainTelemetryService.MainTelemetryService(); + let service = new MainTelemetryService.MainTelemetryService(); assert.equal(service.getAppendersCount(), 0); // log events service.publicLog('testEvent'); - var timedEvent = service.start('testTimed', { 'somedata': 'test'}); + let timedEvent = service.start('testTimed', { 'somedata': 'test' }); timedEvent.stop(); //dispose @@ -106,10 +101,10 @@ suite('TelemetryService', () => { })); test('Add appender', sinon.test(function() { - var service = new MainTelemetryService.MainTelemetryService(); + let service = new MainTelemetryService.MainTelemetryService(); assert.equal(service.getAppendersCount(), 0); - var testAppender = new TestTelemetryAppender(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); assert.equal(service.getAppendersCount(), 1); @@ -117,10 +112,10 @@ suite('TelemetryService', () => { })); test('Remove appender', sinon.test(function() { - var service = new MainTelemetryService.MainTelemetryService(); + let service = new MainTelemetryService.MainTelemetryService(); assert.equal(service.getAppendersCount(), 0); - var testAppender = new TestTelemetryAppender(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); assert.equal(service.getAppendersCount(), 1); @@ -140,10 +135,10 @@ suite('TelemetryService', () => { })); test('Multiple appenders', sinon.test(function() { - var service = new MainTelemetryService.MainTelemetryService(); + let service = new MainTelemetryService.MainTelemetryService(); assert.equal(service.getAppendersCount(), 0); - var testAppender1 = new TestTelemetryAppender(); + let testAppender1 = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender1); assert.equal(service.getAppendersCount(), 1); @@ -152,7 +147,7 @@ suite('TelemetryService', () => { assert.equal(testAppender1.getEventsCount(), 1); // add second appender - var testAppender2 = new TestTelemetryAppender(); + let testAppender2 = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender2); assert.equal(service.getAppendersCount(), 2); @@ -176,17 +171,17 @@ suite('TelemetryService', () => { test('load appenders from registry', sinon.test(function() { - var testAppenderDescriptor = createSyncDescriptor(TestTelemetryAppender); - var registry = ( Platform.Registry.as(AbstractTelemetryService.Extenstions.TelemetryAppenders)); + let testAppenderDescriptor = createSyncDescriptor(TestTelemetryAppender); + let registry = (Platform.Registry.as(AbstractTelemetryService.Extenstions.TelemetryAppenders)); registry.registerTelemetryAppenderDescriptor(testAppenderDescriptor); - var telemetryService = new MainTelemetryService.MainTelemetryService(); + let telemetryService = new MainTelemetryService.MainTelemetryService(); - var instantiationService = InstantiationService.create({}); + let instantiationService = InstantiationService.create({}); telemetryService.setInstantiationService(instantiationService); assert.equal(telemetryService.getAppendersCount(), 1); - var testAppender1 = telemetryService.getAppenders()[0]; + let testAppender1 = telemetryService.getAppenders()[0]; //report event telemetryService.publicLog('testEvent'); assert.equal(testAppender1.getEventsCount(), 1); @@ -194,12 +189,12 @@ suite('TelemetryService', () => { telemetryService.dispose(); //clean up registry for other tests - ( registry).telemetryAppenderDescriptors = []; + (registry).telemetryAppenderDescriptors = []; })); test('Disposing', sinon.test(function() { - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); service.publicLog('testPrivateEvent'); @@ -211,8 +206,8 @@ suite('TelemetryService', () => { // event reporting test('Simple event', sinon.test(function() { - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); service.publicLog('testEvent'); @@ -226,8 +221,8 @@ suite('TelemetryService', () => { })); test('Event with data', sinon.test(function() { - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); service.publicLog('testEvent', { @@ -254,19 +249,19 @@ suite('TelemetryService', () => { test('Telemetry Timer events', sinon.test(function() { Timer.ENABLE_TIMER = true; - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var t1 = service.start('editorDance'); + let t1 = service.start('editorDance'); this.clock.tick(20); - var t2 = service.start('editorSwoon', null); + let t2 = service.start('editorSwoon', null); this.clock.tick(20); t1.stop(new Date()); t2.stop(new Date()); - var t3 = service.start('editorMove', {someData: 'data'}); + let t3 = service.start('editorMove', { someData: 'data' }); this.clock.tick(30); t3.stop(new Date()); @@ -287,8 +282,8 @@ suite('TelemetryService', () => { })); test('enableTelemetry on by default', sinon.test(function() { - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); service.publicLog('testEvent'); @@ -299,8 +294,8 @@ suite('TelemetryService', () => { })); test('turn enableTelemetry off', sinon.test(function() { - var service = new MainTelemetryService.MainTelemetryService({enableTelemetry: false}); - var testAppender = new TestTelemetryAppender(); + let service = new MainTelemetryService.MainTelemetryService({ enableTelemetry: false }); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); service.publicLog('testEvent'); @@ -311,18 +306,18 @@ suite('TelemetryService', () => { test('Error events', sinon.test(function() { - var origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); - Errors.setUnexpectedErrorHandler(() => {}); + let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); + Errors.setUnexpectedErrorHandler(() => { }); try { - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var e:any = new Error('This is a test.'); + let e: any = new Error('This is a test.'); // for Phantom - if(!e.stack) { + if (!e.stack) { e.stack = 'blah'; } @@ -330,7 +325,7 @@ suite('TelemetryService', () => { this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); assert.equal(testAppender.getEventsCount(), 1); assert.equal(testAppender.events[0].eventName, 'UnhandledError'); - assert.equal(testAppender.events[0].data.message, 'This is a test.'); + assert.equal(testAppender.events[0].data.message, 'This is a test.'); service.dispose(); } finally { @@ -338,43 +333,43 @@ suite('TelemetryService', () => { } })); -// test('Unhandled Promise Error events', sinon.test(function() { -// -// var origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); -// Errors.setUnexpectedErrorHandler(() => {}); -// -// try { -// var service = new MainTelemetryService.MainTelemetryService(); -// var testAppender = new TestTelemetryAppender(); -// service.addTelemetryAppender(testAppender); -// -// winjs.Promise.wrapError('This should not get logged'); -// winjs.TPromise.as(true).then(() => { -// throw new Error('This should get logged'); -// }); -// // prevent console output from failing the test -// this.stub(console, 'log'); -// // allow for the promise to finish -// this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); -// -// assert.equal(testAppender.getEventsCount(), 1); -// assert.equal(testAppender.events[0].eventName, 'UnhandledError'); -// assert.equal(testAppender.events[0].data.message, 'This should get logged'); -// -// service.dispose(); -// } finally { -// Errors.setUnexpectedErrorHandler(origErrorHandler); -// } -// })); + // test('Unhandled Promise Error events', sinon.test(function() { + // + // let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); + // Errors.setUnexpectedErrorHandler(() => {}); + // + // try { + // let service = new MainTelemetryService.MainTelemetryService(); + // let testAppender = new TestTelemetryAppender(); + // service.addTelemetryAppender(testAppender); + // + // winjs.Promise.wrapError('This should not get logged'); + // winjs.TPromise.as(true).then(() => { + // throw new Error('This should get logged'); + // }); + // // prevent console output from failing the test + // this.stub(console, 'log'); + // // allow for the promise to finish + // this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); + // + // assert.equal(testAppender.getEventsCount(), 1); + // assert.equal(testAppender.events[0].eventName, 'UnhandledError'); + // assert.equal(testAppender.events[0].data.message, 'This should get logged'); + // + // service.dispose(); + // } finally { + // Errors.setUnexpectedErrorHandler(origErrorHandler); + // } + // })); test('Handle global errors', sinon.test(function() { - var errorStub = this.stub(window, 'onerror'); + let errorStub = this.stub(window, 'onerror'); - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var testError = new Error('test'); + let testError = new Error('test'); (window.onerror)('Error Message', 'file.js', 2, 42, testError); this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); @@ -393,15 +388,15 @@ suite('TelemetryService', () => { })); test('Uncaught Error Telemetry removes PII from filename', sinon.test(function() { - var errorStub = this.stub(window, 'onerror'); - var settings = new ErrorTestingSettings(); - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let errorStub = this.stub(window, 'onerror'); + let settings = new ErrorTestingSettings(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var dangerousFilenameError:any = new Error('dangerousFilename'); + let dangerousFilenameError: any = new Error('dangerousFilename'); dangerousFilenameError.stack = settings.stack; - (window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo +'/test.js', 2, 42, dangerousFilenameError); + (window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo + '/test.js', 2, 42, dangerousFilenameError); this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); assert.equal(errorStub.callCount, 1); @@ -409,7 +404,7 @@ suite('TelemetryService', () => { dangerousFilenameError = new Error('dangerousFilename'); dangerousFilenameError.stack = settings.stack; - (window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo +'/test.js', 2, 42, dangerousFilenameError); + (window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo + '/test.js', 2, 42, dangerousFilenameError); this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); assert.equal(errorStub.callCount, 2); @@ -419,17 +414,16 @@ suite('TelemetryService', () => { service.dispose(); })); - test('Unexpected Error Telemetry removes PII', sinon.test(function() { - var origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); - Errors.setUnexpectedErrorHandler(() => {}); + test('Unexpected Error Telemetry removes PII', sinon.test(function() { + let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); + Errors.setUnexpectedErrorHandler(() => { }); try { - var errorStub = this.stub(window, 'onerror'); - var settings = new ErrorTestingSettings(); - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let settings = new ErrorTestingSettings(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var dangerousPathWithoutImportantInfoError:any = new Error(settings.dangerousPathWithoutImportantInfo); + let dangerousPathWithoutImportantInfoError: any = new Error(settings.dangerousPathWithoutImportantInfo); dangerousPathWithoutImportantInfoError.stack = settings.stack; Errors.onUnexpectedError(dangerousPathWithoutImportantInfoError); this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); @@ -449,14 +443,14 @@ suite('TelemetryService', () => { } })); - test('Uncaught Error Telemetry removes PII', sinon.test(function() { - var errorStub = this.stub(window, 'onerror'); - var settings = new ErrorTestingSettings(); - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + test('Uncaught Error Telemetry removes PII', sinon.test(function() { + let errorStub = this.stub(window, 'onerror'); + let settings = new ErrorTestingSettings(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var dangerousPathWithoutImportantInfoError:any = new Error('dangerousPathWithoutImportantInfo'); + let dangerousPathWithoutImportantInfoError: any = new Error('dangerousPathWithoutImportantInfo'); dangerousPathWithoutImportantInfoError.stack = settings.stack; (window.onerror)(settings.dangerousPathWithoutImportantInfo, 'test.js', 2, 42, dangerousPathWithoutImportantInfoError); this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); @@ -473,18 +467,18 @@ suite('TelemetryService', () => { service.dispose(); })); - test('Unexpected Error Telemetry removes PII but preserves Code file path', sinon.test(function() { + test('Unexpected Error Telemetry removes PII but preserves Code file path', sinon.test(function() { - var origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); - Errors.setUnexpectedErrorHandler(() => {}); + let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); + Errors.setUnexpectedErrorHandler(() => { }); try { - var settings = new ErrorTestingSettings(); - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let settings = new ErrorTestingSettings(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var dangerousPathWithImportantInfoError:any = new Error(settings.dangerousPathWithImportantInfo); + let dangerousPathWithImportantInfoError: any = new Error(settings.dangerousPathWithImportantInfo); dangerousPathWithImportantInfoError.stack = settings.stack; // Test that important information remains but personal info does not @@ -507,16 +501,16 @@ suite('TelemetryService', () => { } })); - test('Uncaught Error Telemetry removes PII but preserves Code file path', sinon.test(function() { - var errorStub = this.stub(window, 'onerror'); - var settings = new ErrorTestingSettings(); - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + test('Uncaught Error Telemetry removes PII but preserves Code file path', sinon.test(function() { + let errorStub = this.stub(window, 'onerror'); + let settings = new ErrorTestingSettings(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var dangerousPathWithImportantInfoError:any = new Error('dangerousPathWithImportantInfo'); + let dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo'); dangerousPathWithImportantInfoError.stack = settings.stack; - (window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError); + (window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError); this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); assert.equal(errorStub.callCount, 1); @@ -533,18 +527,18 @@ suite('TelemetryService', () => { service.dispose(); })); - test('Unexpected Error Telemetry removes PII but preserves Missing Model error message', sinon.test(function() { + test('Unexpected Error Telemetry removes PII but preserves Missing Model error message', sinon.test(function() { - var origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); - Errors.setUnexpectedErrorHandler(() => {}); + let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); + Errors.setUnexpectedErrorHandler(() => { }); try { - var settings = new ErrorTestingSettings(); - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let settings = new ErrorTestingSettings(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var missingModelError:any = new Error(settings.missingModelMessage); + let missingModelError: any = new Error(settings.missingModelMessage); missingModelError.stack = settings.stack; // Test that no file information remains, but this particular @@ -567,14 +561,14 @@ suite('TelemetryService', () => { } })); - test('Uncaught Error Telemetry removes PII but preserves Missing Model error message', sinon.test(function() { - var errorStub = this.stub(window, 'onerror'); - var settings = new ErrorTestingSettings(); - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + test('Uncaught Error Telemetry removes PII but preserves Missing Model error message', sinon.test(function() { + let errorStub = this.stub(window, 'onerror'); + let settings = new ErrorTestingSettings(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var missingModelError:any = new Error('missingModelMessage'); + let missingModelError: any = new Error('missingModelMessage'); missingModelError.stack = settings.stack; (window.onerror)(settings.missingModelMessage, 'test.js', 2, 42, missingModelError); this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); @@ -594,18 +588,18 @@ suite('TelemetryService', () => { service.dispose(); })); - test('Unexpected Error Telemetry removes PII but preserves No Such File error message', sinon.test(function() { + test('Unexpected Error Telemetry removes PII but preserves No Such File error message', sinon.test(function() { - var origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); - Errors.setUnexpectedErrorHandler(() => {}); + let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); + Errors.setUnexpectedErrorHandler(() => { }); try { - var settings = new ErrorTestingSettings(); - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let settings = new ErrorTestingSettings(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var noSuchFileError:any = new Error(settings.noSuchFileMessage); + let noSuchFileError: any = new Error(settings.noSuchFileMessage); noSuchFileError.stack = settings.stack; // Test that no file information remains, but this particular @@ -628,18 +622,18 @@ suite('TelemetryService', () => { } })); - test('Uncaught Error Telemetry removes PII but preserves No Such File error message', sinon.test(function() { - var origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); - Errors.setUnexpectedErrorHandler(() => {}); + test('Uncaught Error Telemetry removes PII but preserves No Such File error message', sinon.test(function() { + let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler(); + Errors.setUnexpectedErrorHandler(() => { }); try { - var errorStub = this.stub(window, 'onerror'); - var settings = new ErrorTestingSettings(); - var service = new MainTelemetryService.MainTelemetryService(); - var testAppender = new TestTelemetryAppender(); + let errorStub = this.stub(window, 'onerror'); + let settings = new ErrorTestingSettings(); + let service = new MainTelemetryService.MainTelemetryService(); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); - var noSuchFileError:any = new Error('noSuchFileMessage'); + let noSuchFileError: any = new Error('noSuchFileMessage'); noSuchFileError.stack = settings.stack; (window.onerror)(settings.noSuchFileMessage, 'test.js', 2, 42, noSuchFileError); this.clock.tick(AbstractTelemetryService.AbstractTelemetryService.ERROR_FLUSH_TIMEOUT); @@ -665,8 +659,8 @@ suite('TelemetryService', () => { test('Test hard idle does not affect sending normal events in active state', sinon.test(function() { - var service = new MainTelemetryService.MainTelemetryService({enableHardIdle: true, enableSoftIdle: false}); - var testAppender = new TestTelemetryAppender(); + let service = new MainTelemetryService.MainTelemetryService({ enableHardIdle: true, enableSoftIdle: false }); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); //report an event @@ -681,8 +675,8 @@ suite('TelemetryService', () => { test('Test hard idle stops events from being sent in idle state', sinon.test(function() { - var service = new MainTelemetryService.MainTelemetryService({enableHardIdle: true, enableSoftIdle: false}); - var testAppender = new TestTelemetryAppender(); + let service = new MainTelemetryService.MainTelemetryService({ enableHardIdle: true, enableSoftIdle: false }); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); // make the user idle @@ -699,18 +693,18 @@ suite('TelemetryService', () => { test('Test soft idle start/stop events', sinon.test(function() { - var activeListener:()=>void = null; - var idleListener:()=>void = null; + let activeListener: () => void = null; + let idleListener: () => void = null; - function MockIdleMonitor(timeout:number):void { + function MockIdleMonitor(timeout: number): void { assert.equal(timeout, MainTelemetryService.MainTelemetryService.SOFT_IDLE_TIME); } - MockIdleMonitor.prototype.addOneTimeActiveListener = function(callback:()=>void):void { + MockIdleMonitor.prototype.addOneTimeActiveListener = function(callback: () => void): void { activeListener = callback; }; - MockIdleMonitor.prototype.addOneTimeIdleListener = function(callback:()=>void):void { + MockIdleMonitor.prototype.addOneTimeIdleListener = function(callback: () => void): void { idleListener = callback; }; @@ -720,8 +714,8 @@ suite('TelemetryService', () => { this.stub(IdleMonitor, 'IdleMonitor', MockIdleMonitor); - var service = new MainTelemetryService.MainTelemetryService({enableHardIdle: false, enableSoftIdle: true}); - var testAppender = new TestTelemetryAppender(); + let service = new MainTelemetryService.MainTelemetryService({ enableHardIdle: false, enableSoftIdle: true }); + let testAppender = new TestTelemetryAppender(); service.addTelemetryAppender(testAppender); @@ -735,19 +729,19 @@ suite('TelemetryService', () => { //verify that two idle happened assert.equal(testAppender.getEventsCount(), 4); //first idle - assert.equal(testAppender.events[0].eventName, MainTelemetryService.MainTelemetryService.IDLE_START_EVENT_NAME); - assert.equal(testAppender.events[1].eventName, MainTelemetryService.MainTelemetryService.IDLE_STOP_EVENT_NAME); + assert.equal(testAppender.events[0].eventName, MainTelemetryService.MainTelemetryService.IDLE_START_EVENT_NAME); + assert.equal(testAppender.events[1].eventName, MainTelemetryService.MainTelemetryService.IDLE_STOP_EVENT_NAME); //second idle - assert.equal(testAppender.events[2].eventName, MainTelemetryService.MainTelemetryService.IDLE_START_EVENT_NAME); - assert.equal(testAppender.events[3].eventName, MainTelemetryService.MainTelemetryService.IDLE_STOP_EVENT_NAME); + assert.equal(testAppender.events[2].eventName, MainTelemetryService.MainTelemetryService.IDLE_START_EVENT_NAME); + assert.equal(testAppender.events[3].eventName, MainTelemetryService.MainTelemetryService.IDLE_STOP_EVENT_NAME); service.dispose(); })); test('Telemetry Service uses provided session ID', sinon.test(function() { - var testSessionId = 'test session id'; - var service = new MainTelemetryService.MainTelemetryService({sessionID: testSessionId}); + let testSessionId = 'test session id'; + let service = new MainTelemetryService.MainTelemetryService({ sessionID: testSessionId }); assert.equal(service.getSessionId(), testSessionId); service.dispose(); })); diff --git a/src/vs/platform/test/common/nullThreadService.ts b/src/vs/platform/test/common/nullThreadService.ts index 52e76004bee..078d9dc50d2 100644 --- a/src/vs/platform/test/common/nullThreadService.ts +++ b/src/vs/platform/test/common/nullThreadService.ts @@ -24,19 +24,19 @@ export class NullThreadService extends abstractThreadService.AbstractThreadServi return super._doCreateInstance(params); } - MainThread(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): winjs.Promise { + MainThread(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): winjs.Promise { return target.apply(obj, params); } - OneWorker(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[], affinity:ThreadAffinity): winjs.Promise { + OneWorker(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[], affinity: ThreadAffinity): winjs.Promise { return winjs.TPromise.as(null); } - AllWorkers(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): winjs.Promise { + AllWorkers(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): winjs.Promise { return winjs.TPromise.as(null); } - Everywhere(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): any { + Everywhere(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): any { return target.apply(obj, params); } @@ -44,11 +44,11 @@ export class NullThreadService extends abstractThreadService.AbstractThreadServi // Nothing to do } - addStatusListener(listener:IThreadServiceStatusListener): void { + addStatusListener(listener: IThreadServiceStatusListener): void { // Nothing to do } - removeStatusListener(listener:IThreadServiceStatusListener): void { + removeStatusListener(listener: IThreadServiceStatusListener): void { // Nothing to do } @@ -56,7 +56,7 @@ export class NullThreadService extends abstractThreadService.AbstractThreadServi return this._getOrCreateLocalInstance(id, descriptor); } - protected _registerMainProcessActor(id: string, actor:T): void { + protected _registerMainProcessActor(id: string, actor: T): void { this._registerLocalInstance(id, actor); } @@ -64,21 +64,21 @@ export class NullThreadService extends abstractThreadService.AbstractThreadServi return this._getOrCreateLocalInstance(id, descriptor); } - protected _registerPluginHostActor(id: string, actor:T): void { + protected _registerPluginHostActor(id: string, actor: T): void { throw new Error('Not supported in this runtime context!'); } - protected _registerAndInstantiateWorkerActor(id: string, descriptor: SyncDescriptor0, whichWorker:ThreadAffinity): T { + protected _registerAndInstantiateWorkerActor(id: string, descriptor: SyncDescriptor0, whichWorker: ThreadAffinity): T { return this._getOrCreateProxyInstance({ - callOnRemote: (proxyId: string, path: string, args:any[]): winjs.Promise => { + callOnRemote: (proxyId: string, path: string, args: any[]): winjs.Promise => { return winjs.TPromise.as(null); } }, id, descriptor); } - protected _registerWorkerActor(id: string, actor:T): void { + protected _registerWorkerActor(id: string, actor: T): void { throw new Error('Not supported in this runtime context!'); } } -export var NULL_THREAD_SERVICE = new NullThreadService(); \ No newline at end of file +export const NULL_THREAD_SERVICE = new NullThreadService(); \ No newline at end of file diff --git a/src/vs/platform/test/common/platform.test.ts b/src/vs/platform/test/common/platform.test.ts index a6c1c094a2d..5564df47cbf 100644 --- a/src/vs/platform/test/common/platform.test.ts +++ b/src/vs/platform/test/common/platform.test.ts @@ -10,13 +10,13 @@ import Types = require('vs/base/common/types'); suite('Platform / Registry', () => { - test('registry - api', function () { + test('registry - api', function() { assert.ok(Types.isFunction(Platform.Registry.add)); assert.ok(Types.isFunction(Platform.Registry.as)); assert.ok(Types.isFunction(Platform.Registry.knows)); }); - test('registry - mixin', function () { + test('registry - mixin', function() { Platform.Registry.add('foo', { bar: true }); @@ -25,9 +25,9 @@ suite('Platform / Registry', () => { assert.equal(Platform.Registry.as('foo').bar, true); }); - test('registry - knows, as', function () { + test('registry - knows, as', function() { - var ext = {}; + let ext = {}; Platform.Registry.add('knows,as', ext); @@ -38,14 +38,14 @@ suite('Platform / Registry', () => { assert.ok(Platform.Registry.as('knows,as1234') === null); }); - test('registry - mixin, fails on duplicate ids', function () { + test('registry - mixin, fails on duplicate ids', function() { Platform.Registry.add('foo-dup', { bar: true }); try { Platform.Registry.add('foo-dup', { bar: false }); assert.ok(false); - } catch(e) { + } catch (e) { assert.ok(true); } }); diff --git a/src/vs/platform/thread/common/abstractThreadService.ts b/src/vs/platform/thread/common/abstractThreadService.ts index 058536f3c82..08231de3b02 100644 --- a/src/vs/platform/thread/common/abstractThreadService.ts +++ b/src/vs/platform/thread/common/abstractThreadService.ts @@ -12,15 +12,15 @@ import instantiation = require('vs/platform/instantiation/common/instantiation') import {SyncDescriptor0, createSyncDescriptor, AsyncDescriptor0, AsyncDescriptor1, AsyncDescriptor2, AsyncDescriptor3} from 'vs/platform/instantiation/common/descriptors'; export interface IThreadServiceData { - [id:string]:any; + [id: string]: any; } class DynamicProxy implements IDynamicProxy { private _proxyDefinition: T; - private _disposeDelegate: ()=>void; + private _disposeDelegate: () => void; - constructor(proxyDefinition:T, disposeDelegate:()=>void) { + constructor(proxyDefinition: T, disposeDelegate: () => void) { this._proxyDefinition = proxyDefinition; this._disposeDelegate = disposeDelegate; } @@ -36,14 +36,14 @@ class DynamicProxy implements IDynamicProxy { export abstract class AbstractThreadService implements remote.IManyHandler { - public isInMainThread:boolean; + public isInMainThread: boolean; protected _instantiationService: instantiation.IInstantiationService; - protected _boundObjects:{[id:string]:IThreadSynchronizableObject;}; - protected _pendingObjects:TPromise>[]; - private _localObjMap: { [id:string]: any; }; - private _proxyObjMap: { [id:string]: any; }; + protected _boundObjects: { [id: string]: IThreadSynchronizableObject; }; + protected _pendingObjects: TPromise>[]; + private _localObjMap: { [id: string]: any; }; + private _proxyObjMap: { [id: string]: any; }; constructor(isInMainThread: boolean) { this.isInMainThread = isInMainThread; @@ -53,33 +53,33 @@ export abstract class AbstractThreadService implements remote.IManyHandler { this._proxyObjMap = Object.create(null); } - setInstantiationService(service:instantiation.IInstantiationService): void { + setInstantiationService(service: instantiation.IInstantiationService): void { this._instantiationService = service; } - createInstance>(ctor:instantiation.IConstructorSignature0):T; - createInstance>(ctor:instantiation.IConstructorSignature1, a1:A1):T; - createInstance>(ctor:instantiation.IConstructorSignature2, a1:A1, a2:A2):T; - createInstance>(ctor:instantiation.IConstructorSignature3, a1:A1, a2:A2, a3:A3):T; + createInstance>(ctor: instantiation.IConstructorSignature0): T; + createInstance>(ctor: instantiation.IConstructorSignature1, a1: A1): T; + createInstance>(ctor: instantiation.IConstructorSignature2, a1: A1, a2: A2): T; + createInstance>(ctor: instantiation.IConstructorSignature3, a1: A1, a2: A2, a3: A3): T; createInstance>(descriptor: AsyncDescriptor0): T; createInstance>(descriptor: AsyncDescriptor1, a1: A1): T; createInstance>(descriptor: AsyncDescriptor2, a1: A1, a2: A2): T; createInstance>(descriptor: AsyncDescriptor3, a1: A1, a2: A2, a3: A3): T; - createInstance(...params:any[]):any { + createInstance(...params: any[]): any { return this._doCreateInstance(params); } - protected _doCreateInstance(params:any[]): any { - var instanceOrPromise = this._instantiationService.createInstance.apply(this._instantiationService, params); + protected _doCreateInstance(params: any[]): any { + let instanceOrPromise = this._instantiationService.createInstance.apply(this._instantiationService, params); if (TPromise.is(instanceOrPromise)) { - var objInstantiated: TPromise>; + let objInstantiated: TPromise>; objInstantiated = instanceOrPromise.then((instance: IThreadSynchronizableObject): any => { if (instance.asyncCtor) { - var initPromise = instance.asyncCtor(); + let initPromise = instance.asyncCtor(); if (TPromise.is(initPromise)) { return initPromise.then(() => { return instance; @@ -91,9 +91,9 @@ export abstract class AbstractThreadService implements remote.IManyHandler { this._pendingObjects.push(objInstantiated); return objInstantiated.then((instance: IThreadSynchronizableObject) => { - var r = this._finishInstance(instance); + let r = this._finishInstance(instance); - for (var i = 0; i < this._pendingObjects.length; i++) { + for (let i = 0; i < this._pendingObjects.length; i++) { if (this._pendingObjects[i] === objInstantiated) { this._pendingObjects.splice(i, 1); break; @@ -108,7 +108,7 @@ export abstract class AbstractThreadService implements remote.IManyHandler { return this._finishInstance(>instanceOrPromise); } - _finishInstance(instance:IThreadSynchronizableObject): IThreadSynchronizableObject { + _finishInstance(instance: IThreadSynchronizableObject): IThreadSynchronizableObject { instance[THREAD_SERVICE_PROPERTY_NAME] = this; this._boundObjects[instance.getId()] = instance; @@ -123,7 +123,7 @@ export abstract class AbstractThreadService implements remote.IManyHandler { this._finishInstance(instance); } - public handle(rpcId:string, methodName:string, args:any[]): any { + public handle(rpcId: string, methodName: string, args: any[]): any { if (!this._localObjMap[rpcId]) { throw new Error('Unknown actor ' + rpcId); } @@ -139,12 +139,12 @@ export abstract class AbstractThreadService implements remote.IManyHandler { if (this._proxyObjMap[id]) { return this._proxyObjMap[id]; } - var result = remote.createProxyFromCtor(remoteCom, id, descriptor.ctor); + let result = remote.createProxyFromCtor(remoteCom, id, descriptor.ctor); this._proxyObjMap[id] = result; return result; } - protected _registerLocalInstance(id:string, obj:any): any { + protected _registerLocalInstance(id: string, obj: any): any { this._localObjMap[id] = obj; } @@ -152,18 +152,18 @@ export abstract class AbstractThreadService implements remote.IManyHandler { if (this._localObjMap[id]) { return this._localObjMap[id]; } - var result = this._instantiationService.createInstance(descriptor); + let result = this._instantiationService.createInstance(descriptor); this._registerLocalInstance(id, result); return result; } getRemotable(ctor: instantiation.INewConstructorSignature0): T { - var id = Remotable.getId(ctor); + let id = Remotable.getId(ctor); if (!id) { throw new Error('Unknown Remotable: <<' + id + '>>'); } - var desc = createSyncDescriptor(ctor); + let desc = createSyncDescriptor(ctor); if (Remotable.Registry.MainContext[id]) { return this._registerAndInstantiateMainProcessActor(id, desc); @@ -181,7 +181,7 @@ export abstract class AbstractThreadService implements remote.IManyHandler { } registerRemotableInstance(ctor: any, instance: any): void { - var id = Remotable.getId(ctor); + let id = Remotable.getId(ctor); if (!id) { throw new Error('Unknown Remotable: <<' + id + '>>'); } @@ -202,9 +202,9 @@ export abstract class AbstractThreadService implements remote.IManyHandler { } protected abstract _registerAndInstantiateMainProcessActor(id: string, descriptor: SyncDescriptor0): T; - protected abstract _registerMainProcessActor(id: string, actor:T): void; + protected abstract _registerMainProcessActor(id: string, actor: T): void; protected abstract _registerAndInstantiatePluginHostActor(id: string, descriptor: SyncDescriptor0): T; - protected abstract _registerPluginHostActor(id: string, actor:T): void; - protected abstract _registerAndInstantiateWorkerActor(id: string, descriptor: SyncDescriptor0, whichWorker:ThreadAffinity): T; - protected abstract _registerWorkerActor(id: string, actor:T): void; + protected abstract _registerPluginHostActor(id: string, actor: T): void; + protected abstract _registerAndInstantiateWorkerActor(id: string, descriptor: SyncDescriptor0, whichWorker: ThreadAffinity): T; + protected abstract _registerWorkerActor(id: string, actor: T): void; } \ No newline at end of file diff --git a/src/vs/platform/thread/common/mainThreadService.ts b/src/vs/platform/thread/common/mainThreadService.ts index 2e5d32cd3c3..43d9a9fd315 100644 --- a/src/vs/platform/thread/common/mainThreadService.ts +++ b/src/vs/platform/thread/common/mainThreadService.ts @@ -19,7 +19,7 @@ import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {DefaultWorkerFactory} from 'vs/base/worker/defaultWorkerFactory'; interface IAffinityMap { - [qualifiedMethodName:string]: number; + [qualifiedMethodName: string]: number; } export interface IWorker { @@ -34,18 +34,18 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi public serviceId = IThreadService; static MAXIMUM_WORKER_CREATION_DELAY = 500; // 500ms - private _workerPool:Worker.WorkerClient[]; - private _contextService:IWorkspaceContextService; - private _affinityScrambler:IAffinityMap; + private _workerPool: Worker.WorkerClient[]; + private _contextService: IWorkspaceContextService; + private _affinityScrambler: IAffinityMap; - private _workersCreatedPromise:TPromise; - private _triggerWorkersCreatedPromise:(value:void)=>void; - private _listeners:IThreadServiceStatusListener[]; + private _workersCreatedPromise: TPromise; + private _triggerWorkersCreatedPromise: (value: void) => void; + private _listeners: IThreadServiceStatusListener[]; - private _workerFactory:Worker.IWorkerFactory; - private _workerModuleId:string; + private _workerFactory: Worker.IWorkerFactory; + private _workerModuleId: string; - constructor(contextService:IWorkspaceContextService, workerModuleId:string) { + constructor(contextService: IWorkspaceContextService, workerModuleId: string) { super(true); this._contextService = contextService; this._workerModuleId = workerModuleId; @@ -76,24 +76,24 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi if (this._triggerWorkersCreatedPromise) { // Workers not created yet - var createCount = Env.workersCount; + let createCount = Env.workersCount; if (!Platform.hasWebWorkerSupport()) { // Create at most 1 compatibility worker createCount = Math.min(createCount, 1); } - for (var i = 0; i < createCount; i++) { + for (let i = 0; i < createCount; i++) { this._createWorker(); } - var complete = this._triggerWorkersCreatedPromise; + let complete = this._triggerWorkersCreatedPromise; this._triggerWorkersCreatedPromise = null; complete(null); } } - addStatusListener(listener:IThreadServiceStatusListener): void { - for (var i = 0; i < this._listeners.length; i++) { + addStatusListener(listener: IThreadServiceStatusListener): void { + for (let i = 0; i < this._listeners.length; i++) { if (this._listeners[i] === listener) { // listener is already in return; @@ -102,8 +102,8 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi this._listeners.push(listener); } - removeStatusListener(listener:IThreadServiceStatusListener): void { - for (var i = 0; i < this._listeners.length; i++) { + removeStatusListener(listener: IThreadServiceStatusListener): void { + for (let i = 0; i < this._listeners.length; i++) { if (this._listeners[i] === listener) { this._listeners.splice(i, 1); return; @@ -112,7 +112,7 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi } private _afterWorkers(): TPromise { - var shouldCancelPromise = false; + let shouldCancelPromise = false; return new TPromise((c, e, p) => { @@ -138,8 +138,8 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi return major.substring(major.length - 14) + '.' + minor.substr(0, 14); } - private _doCreateWorker(workerId?:number): Worker.WorkerClient { - var worker = new Worker.WorkerClient( + private _doCreateWorker(workerId?: number): Worker.WorkerClient { + let worker = new Worker.WorkerClient( this._workerFactory, this._workerModuleId, (msg) => { @@ -148,14 +148,14 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi } return msg.type; }, - (crashed:Worker.WorkerClient) => { - var index = 0; + (crashed: Worker.WorkerClient) => { + let index = 0; for (; index < this._workerPool.length; index++) { if (crashed === this._workerPool[index]) { break; } } - var newWorker = this._doCreateWorker(crashed.workerId); + let newWorker = this._doCreateWorker(crashed.workerId); if (crashed === this._workerPool[index]) { this._workerPool[index] = newWorker; } else { @@ -173,16 +173,16 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi options: this._contextService.getOptions() } }); - worker.addMessageHandler('threadService', (msg:any) => { - var identifier = msg.identifier; - var memberName = msg.memberName; - var args = msg.args; + worker.addMessageHandler('threadService', (msg: any) => { + let identifier = msg.identifier; + let memberName = msg.memberName; + let args = msg.args; if (!this._boundObjects.hasOwnProperty(identifier)) { throw new Error('Object ' + identifier + ' was not found on the main thread.'); } - var obj = this._boundObjects[identifier]; + let obj = this._boundObjects[identifier]; return TPromise.as(obj[memberName].apply(obj, args)); }); @@ -190,9 +190,9 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi } private _getRegisteredObjectsData(): any { - var r:any = {}; + let r: any = {}; Object.keys(this._boundObjects).forEach((identifier) => { - var obj = this._boundObjects[identifier]; + let obj = this._boundObjects[identifier]; if (obj.getSerializableState) { r[identifier] = obj.getSerializableState(); } @@ -200,17 +200,17 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi return r; } - MainThread(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): TPromise { + MainThread(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): TPromise { return target.apply(obj, params); } - private _getWorkerIndex(obj:IThreadSynchronizableObject, affinity:ThreadAffinity): number { + private _getWorkerIndex(obj: IThreadSynchronizableObject, affinity: ThreadAffinity): number { if (affinity === ThreadAffinity.None) { - var winners:number[] = [ 0 ], + let winners: number[] = [0], winnersQueueSize = this._workerPool[0].getQueueSize(); - for (var i = 1; i < this._workerPool.length; i++) { - var queueSize = this._workerPool[i].getQueueSize(); + for (let i = 1; i < this._workerPool.length; i++) { + let queueSize = this._workerPool[i].getQueueSize(); if (queueSize < winnersQueueSize) { winnersQueueSize = queueSize; winners = [i]; @@ -222,7 +222,7 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi return winners[Math.floor(Math.random() * winners.length)]; } - var scramble = 0; + let scramble = 0; if (this._affinityScrambler.hasOwnProperty(obj.getId())) { scramble = this._affinityScrambler[obj.getId()]; } else { @@ -233,19 +233,19 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi return (scramble + affinity) % this._workerPool.length; } - OneWorker(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[], affinity:ThreadAffinity): TPromise { + OneWorker(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[], affinity: ThreadAffinity): TPromise { return this._afterWorkers().then(() => { if (this._workerPool.length === 0) { throw new Error('Cannot fulfill request...'); } - var workerIdx = this._getWorkerIndex(obj, affinity); + let workerIdx = this._getWorkerIndex(obj, affinity); return this._remoteCall(this._workerPool[workerIdx], obj, methodName, params); }); } - AllWorkers(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): TPromise { + AllWorkers(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): TPromise { return this._afterWorkers().then(() => { return TPromise.join(this._workerPool.map((w) => { return this._remoteCall(w, obj, methodName, params); @@ -253,7 +253,7 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi }); } - Everywhere(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): any { + Everywhere(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): any { this._afterWorkers().then(() => { this._workerPool.forEach((w) => { this._remoteCall(w, obj, methodName, params).done(null, errors.onUnexpectedError); @@ -262,21 +262,21 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi return target.apply(obj, params); } - private _remoteCall(worker:Worker.WorkerClient, obj:IThreadSynchronizableObject, methodName:string, params:any[]): TPromise { - var id = obj.getId(); + private _remoteCall(worker: Worker.WorkerClient, obj: IThreadSynchronizableObject, methodName: string, params: any[]): TPromise { + let id = obj.getId(); if (!id) { throw new Error('Synchronizable Objects must have an identifier'); } - var timerEvent = Timer.start(Timer.Topic.LANGUAGES, this._shortName(id, methodName)); - var stopTimer = () => { + let timerEvent = Timer.start(Timer.Topic.LANGUAGES, this._shortName(id, methodName)); + let stopTimer = () => { timerEvent.stop(); -// console.log(timerEvent.timeTaken(), this._workerPool.indexOf(worker), obj.getId() + ' >>> ' + methodName + ': ', params); + // console.log(timerEvent.timeTaken(), this._workerPool.indexOf(worker), obj.getId() + ' >>> ' + methodName + ': ', params); this._pingListenersIfNecessary(); }; - var r = decoratePromise(worker.request('threadService', [id, methodName, params]), stopTimer, stopTimer); + let r = decoratePromise(worker.request('threadService', [id, methodName, params]), stopTimer, stopTimer); this._pingListenersIfNecessary(); @@ -285,20 +285,20 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi private _pingListenersIfNecessary(): void { if (this._listeners.length > 0) { - var status = this._buildStatus(); - var listeners = this._listeners.slice(0); + let status = this._buildStatus(); + let listeners = this._listeners.slice(0); try { - for (var i = 0; i < listeners.length; i++) { + for (let i = 0; i < listeners.length; i++) { listeners[i].onThreadServiceStatus(status); } - } catch(e) { + } catch (e) { errors.onUnexpectedError(e); } } } private _buildStatus(): IThreadServiceStatus { - var queueSizes = this._workerPool.map((worker) => { + let queueSizes = this._workerPool.map((worker) => { return { queueSize: worker.getQueueSize() }; @@ -313,7 +313,7 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi return this._getOrCreateLocalInstance(id, descriptor); } - protected _registerMainProcessActor(id: string, actor:T): void { + protected _registerMainProcessActor(id: string, actor: T): void { this._registerLocalInstance(id, actor); } @@ -321,40 +321,40 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi throw new Error('Not supported in this runtime context: Cannot communicate to non-existant Plugin Host!'); } - protected _registerPluginHostActor(id: string, actor:T): void { + protected _registerPluginHostActor(id: string, actor: T): void { throw new Error('Not supported in this runtime context!'); } - protected _registerAndInstantiateWorkerActor(id: string, descriptor: SyncDescriptor0, whichWorker:ThreadAffinity): T { - var helper = this._createWorkerProxyHelper(whichWorker); + protected _registerAndInstantiateWorkerActor(id: string, descriptor: SyncDescriptor0, whichWorker: ThreadAffinity): T { + let helper = this._createWorkerProxyHelper(whichWorker); return this._getOrCreateProxyInstance(helper, id, descriptor); } - protected _registerWorkerActor(id: string, actor:T): void { + protected _registerWorkerActor(id: string, actor: T): void { throw new Error('Not supported in this runtime context!'); } - private _createWorkerProxyHelper(whichWorker:ThreadAffinity): remote.IProxyHelper { + private _createWorkerProxyHelper(whichWorker: ThreadAffinity): remote.IProxyHelper { return { - callOnRemote: (proxyId: string, path: string, args:any[]): TPromise => { + callOnRemote: (proxyId: string, path: string, args: any[]): TPromise => { return this._callOnWorker(whichWorker, proxyId, path, args); } }; } - private _callOnWorker(whichWorker:ThreadAffinity, proxyId: string, path: string, args:any[]): TPromise { + private _callOnWorker(whichWorker: ThreadAffinity, proxyId: string, path: string, args: any[]): TPromise { if (whichWorker === ThreadAffinity.None) { return TPromise.as(null); } return this._afterWorkers().then(() => { if (whichWorker === ThreadAffinity.All) { - var promises = this._workerPool.map(w => w.getRemoteCom()).map(rCom => rCom.callOnRemote(proxyId, path, args)); + let promises = this._workerPool.map(w => w.getRemoteCom()).map(rCom => rCom.callOnRemote(proxyId, path, args)); return TPromise.join(promises); } - var workerIdx = whichWorker % this._workerPool.length; - var worker = this._workerPool[workerIdx]; + let workerIdx = whichWorker % this._workerPool.length; + let worker = this._workerPool[workerIdx]; return worker.getRemoteCom().callOnRemote(proxyId, path, args); }); } diff --git a/src/vs/platform/thread/common/pluginHostThreadService.ts b/src/vs/platform/thread/common/pluginHostThreadService.ts index 64859859860..a99e9ae877d 100644 --- a/src/vs/platform/thread/common/pluginHostThreadService.ts +++ b/src/vs/platform/thread/common/pluginHostThreadService.ts @@ -25,19 +25,19 @@ export class PluginHostThreadService extends abstractThreadService.AbstractThrea readThreadSynchronizableObjects().forEach((obj) => this.registerInstance(obj)); } - MainThread(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): TPromise { + MainThread(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): TPromise { return target.apply(obj, params); } - OneWorker(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[], affinity:ThreadAffinity): TPromise { + OneWorker(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[], affinity: ThreadAffinity): TPromise { return TPromise.as(null); } - AllWorkers(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): TPromise { + AllWorkers(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): TPromise { return TPromise.as(null); } - Everywhere(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): TPromise { + Everywhere(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): TPromise { return target.apply(obj, params); } @@ -45,11 +45,11 @@ export class PluginHostThreadService extends abstractThreadService.AbstractThrea // Nothing to do } - addStatusListener(listener:IThreadServiceStatusListener): void { + addStatusListener(listener: IThreadServiceStatusListener): void { // Nothing to do } - removeStatusListener(listener:IThreadServiceStatusListener): void { + removeStatusListener(listener: IThreadServiceStatusListener): void { // Nothing to do } @@ -57,7 +57,7 @@ export class PluginHostThreadService extends abstractThreadService.AbstractThrea return this._getOrCreateProxyInstance(this._remoteCom, id, descriptor); } - protected _registerMainProcessActor(id: string, actor:T): void { + protected _registerMainProcessActor(id: string, actor: T): void { throw new Error('Not supported in this runtime context!'); } @@ -65,15 +65,15 @@ export class PluginHostThreadService extends abstractThreadService.AbstractThrea return this._getOrCreateLocalInstance(id, descriptor); } - protected _registerPluginHostActor(id: string, actor:T): void { + protected _registerPluginHostActor(id: string, actor: T): void { this._registerLocalInstance(id, actor); } - protected _registerAndInstantiateWorkerActor(id: string, descriptor: descriptors.SyncDescriptor0, whichWorker:ThreadAffinity): T { + protected _registerAndInstantiateWorkerActor(id: string, descriptor: descriptors.SyncDescriptor0, whichWorker: ThreadAffinity): T { throw new Error('Not supported in this runtime context! Cannot communicate directly from Plugin Host to Worker!'); } - protected _registerWorkerActor(id: string, actor:T): void { + protected _registerWorkerActor(id: string, actor: T): void { throw new Error('Not supported in this runtime context!'); } } \ No newline at end of file diff --git a/src/vs/platform/thread/common/thread.ts b/src/vs/platform/thread/common/thread.ts index 5ce77c6b917..eaa9be3d14a 100644 --- a/src/vs/platform/thread/common/thread.ts +++ b/src/vs/platform/thread/common/thread.ts @@ -11,14 +11,14 @@ import {IDisposable} from 'vs/base/common/lifecycle'; // --- thread service (web workers) -export var IThreadService = instantiation.createDecorator('threadService'); +export const IThreadService = instantiation.createDecorator('threadService'); export interface IDynamicProxy extends IDisposable { getProxyDefinition(): T; } export interface IThreadService { - serviceId : instantiation.ServiceIdentifier; + serviceId: instantiation.ServiceIdentifier; // --- BEGIN deprecated methods isInMainThread: boolean; @@ -52,11 +52,11 @@ export interface IThreadService { } export class IRemotableCtorMap { - [identifier:string]:Function; + [identifier: string]: Function; } export class IRemotableCtorAffinityMap { - [identifier:string]: { + [identifier: string]: { ctor: Function; affinity: ThreadAffinity; }; @@ -77,7 +77,7 @@ export class Remotable { } public static MainContext(identifier: string) { - return function (target: Function) { + return function(target: Function) { Remotable._ensureUnique(identifier); Remotable.Registry.MainContext[identifier] = target; target[Remotable.PROP_NAME] = identifier; @@ -85,15 +85,15 @@ export class Remotable { } public static PluginHostContext(identifier: string) { - return function (target: Function) { + return function(target: Function) { Remotable._ensureUnique(identifier); Remotable.Registry.PluginHostContext[identifier] = target; target[Remotable.PROP_NAME] = identifier; }; } - public static WorkerContext(identifier: string, whichWorker:ThreadAffinity) { - return function (target: Function) { + public static WorkerContext(identifier: string, whichWorker: ThreadAffinity) { + return function(target: Function) { Remotable._ensureUnique(identifier); Remotable.Registry.WorkerContext[identifier] = { ctor: target, @@ -103,7 +103,7 @@ export class Remotable { }; } - private static _ensureUnique(identifier:string): void { + private static _ensureUnique(identifier: string): void { if (Remotable.Registry.MainContext[identifier] || Remotable.Registry.PluginHostContext[identifier] || Remotable.Registry.WorkerContext[identifier]) { throw new Error('Duplicate Remotable identifier found'); } @@ -111,15 +111,15 @@ export class Remotable { } export interface IThreadSynchronizableObject { - getId():string; + getId(): string; - creationDone?:()=>void; + creationDone?: () => void; - asyncCtor?:()=>TPromise; + asyncCtor?: () => TPromise; - getSerializableState?:()=>S; + getSerializableState?: () => S; - setData?:(data:S)=>void; + setData?: (data: S) => void; } export enum ThreadAffinity { @@ -137,7 +137,7 @@ export enum ThreadAffinity { } export interface IWorkerStatus { - queueSize:number; + queueSize: number; } export interface IThreadServiceStatus { @@ -145,5 +145,5 @@ export interface IThreadServiceStatus { } export interface IThreadServiceStatusListener { - onThreadServiceStatus(status:IThreadServiceStatus): void; + onThreadServiceStatus(status: IThreadServiceStatus): void; } diff --git a/src/vs/platform/thread/common/threadService.ts b/src/vs/platform/thread/common/threadService.ts index d77ada07ee8..ba93f6b4b38 100644 --- a/src/vs/platform/thread/common/threadService.ts +++ b/src/vs/platform/thread/common/threadService.ts @@ -8,10 +8,10 @@ import Platform = require('vs/platform/platform'); import {TPromise} from 'vs/base/common/winjs.base'; import thread = require('./thread'); -export var THREAD_SERVICE_PROPERTY_NAME = '__$$__threadService'; +export const THREAD_SERVICE_PROPERTY_NAME = '__$$__threadService'; -function findMember(proto:any, target:any): string { - for (var i in proto) { +function findMember(proto: any, target: any): string { + for (let i in proto) { if (proto[i] === target) { return i; } @@ -19,17 +19,17 @@ function findMember(proto:any, target:any): string { throw new Error('Member not found in prototype'); } -function findThreadService(obj:any): thread.IThreadService { - var threadService:thread.IThreadService = obj[THREAD_SERVICE_PROPERTY_NAME]; +function findThreadService(obj: any): thread.IThreadService { + let threadService: thread.IThreadService = obj[THREAD_SERVICE_PROPERTY_NAME]; if (!threadService) { throw new Error('Objects that use thread attributes must be instantiated with the thread service'); } return threadService; } -export function MainThreadAttr(type:Function, target:Function): void { - var methodName = findMember(type.prototype, target); - type.prototype[methodName] = function(...param:any[]) { +export function MainThreadAttr(type: Function, target: Function): void { + let methodName = findMember(type.prototype, target); + type.prototype[methodName] = function(...param: any[]) { return findThreadService(this).MainThread(this, methodName, target, param); }; } @@ -39,28 +39,28 @@ export interface IOneWorkerAnnotation { (type: Function, target: Function, condition: () => TPromise, affinity?: thread.ThreadAffinity): void; } -function OneWorkerFn(type: Function, target: Function, conditionOrAffinity?: any, affinity:thread.ThreadAffinity = thread.ThreadAffinity.None): void { +function OneWorkerFn(type: Function, target: Function, conditionOrAffinity?: any, affinity: thread.ThreadAffinity = thread.ThreadAffinity.None): void { - var methodName = findMember(type.prototype, target), + let methodName = findMember(type.prototype, target), condition: () => TPromise; - if(typeof conditionOrAffinity === 'function') { + if (typeof conditionOrAffinity === 'function') { condition = conditionOrAffinity; - } else if(typeof conditionOrAffinity !== 'undefined') { + } else if (typeof conditionOrAffinity !== 'undefined') { affinity = conditionOrAffinity; } - type.prototype[methodName] = function(...param:any[]) { + type.prototype[methodName] = function(...param: any[]) { - if(!condition) { + if (!condition) { return findThreadService(this).OneWorker(this, methodName, target, param, affinity); } else { - var that = this, + let that = this, promise = condition.call(that); - if(!TPromise.is(promise)) { + if (!TPromise.is(promise)) { promise = TPromise.as(promise); } @@ -72,18 +72,18 @@ function OneWorkerFn(type: Function, target: Function, conditionOrAffinity?: any }; } -export var OneWorkerAttr: IOneWorkerAnnotation = OneWorkerFn; +export let OneWorkerAttr: IOneWorkerAnnotation = OneWorkerFn; -export function AllWorkersAttr(type:Function, target:Function): void { - var methodName = findMember(type.prototype, target); - type.prototype[methodName] = function(...param:any[]) { +export function AllWorkersAttr(type: Function, target: Function): void { + let methodName = findMember(type.prototype, target); + type.prototype[methodName] = function(...param: any[]) { return findThreadService(this).AllWorkers(this, methodName, target, param); }; } -export function EverywhereAttr(type:Function, target:Function): void { - var methodName = findMember(type.prototype, target); - type.prototype[methodName] = function(...param:any[]) { +export function EverywhereAttr(type: Function, target: Function): void { + let methodName = findMember(type.prototype, target); + type.prototype[methodName] = function(...param: any[]) { return findThreadService(this).Everywhere(this, methodName, target, param); }; } @@ -104,18 +104,18 @@ class SynchronizableObjectsRegistry { } } -export var Extensions = { +export const Extensions = { SynchronizableObjects: 'SynchronizableObjects' }; Platform.Registry.add(Extensions.SynchronizableObjects, new SynchronizableObjectsRegistry()); export function registerThreadSynchronizableObject(obj: thread.IThreadSynchronizableObject): void { - var registry = Platform.Registry.as(Extensions.SynchronizableObjects); + let registry = Platform.Registry.as(Extensions.SynchronizableObjects); registry.register(obj); } export function readThreadSynchronizableObjects(): thread.IThreadSynchronizableObject[] { - var registry = Platform.Registry.as(Extensions.SynchronizableObjects); + let registry = Platform.Registry.as(Extensions.SynchronizableObjects); return registry.read(); } \ No newline at end of file diff --git a/src/vs/platform/thread/common/workerThreadService.ts b/src/vs/platform/thread/common/workerThreadService.ts index 03de1cfaf91..874bd20dd05 100644 --- a/src/vs/platform/thread/common/workerThreadService.ts +++ b/src/vs/platform/thread/common/workerThreadService.ts @@ -12,16 +12,16 @@ import {SyncDescriptor0} from 'vs/platform/instantiation/common/descriptors'; import {IThreadService, IThreadServiceStatusListener, IThreadSynchronizableObject, ThreadAffinity} from 'vs/platform/thread/common/thread'; export interface IMainThreadPublisher { - (messageName:string, payload:any): TPromise; + (messageName: string, payload: any): TPromise; } export class WorkerThreadService extends abstractThreadService.AbstractThreadService implements IThreadService { public serviceId = IThreadService; - private _mainThreadData:abstractThreadService.IThreadServiceData; - private _publisher:IMainThreadPublisher; + private _mainThreadData: abstractThreadService.IThreadServiceData; + private _publisher: IMainThreadPublisher; protected _remoteCom: remote.IRemoteCom; - constructor(mainThreadData:abstractThreadService.IThreadServiceData, remoteCom: remote.IRemoteCom, workerPublisher:IMainThreadPublisher) { + constructor(mainThreadData: abstractThreadService.IThreadServiceData, remoteCom: remote.IRemoteCom, workerPublisher: IMainThreadPublisher) { super(false); this._mainThreadData = mainThreadData; this._remoteCom = remoteCom; @@ -33,39 +33,39 @@ export class WorkerThreadService extends abstractThreadService.AbstractThreadSer readThreadSynchronizableObjects().forEach((obj) => this.registerInstance(obj)); } - private _handleRequest(identifier:string, memberName:string, args:any[]): TPromise { + private _handleRequest(identifier: string, memberName: string, args: any[]): TPromise { if (!this._boundObjects.hasOwnProperty(identifier)) { // Wait until all objects are constructed return TPromise.join(this._pendingObjects.slice(0)).then(() => { if (!this._boundObjects.hasOwnProperty(identifier)) { return TPromise.wrapError(new Error('Bound object `' + identifier + '` was not found.')); } -// console.log(identifier + ' > ' + memberName); - var obj = this._boundObjects[identifier]; + // console.log(identifier + ' > ' + memberName); + let obj = this._boundObjects[identifier]; return TPromise.as(obj[memberName].apply(obj, args)); }); } -// console.log(identifier + ' > ' + memberName); - var obj = this._boundObjects[identifier]; + // console.log(identifier + ' > ' + memberName); + let obj = this._boundObjects[identifier]; return TPromise.as(obj[memberName].apply(obj, args)); } - public dispatch(data:{ type:string; payload:any; }):TPromise { + public dispatch(data: { type: string; payload: any; }): TPromise { try { - var args = data.payload; - var result = this._handleRequest(args[0], args[1], args[2]); + let args = data.payload; + let result = this._handleRequest(args[0], args[1], args[2]); return TPromise.is(result) ? result : TPromise.as(result); - } catch(e) { + } catch (e) { // handler error return TPromise.wrapError(e); } } - _finishInstance(instance:IThreadSynchronizableObject): IThreadSynchronizableObject { - var id = instance.getId(); + _finishInstance(instance: IThreadSynchronizableObject): IThreadSynchronizableObject { + let id = instance.getId(); if (this._mainThreadData.hasOwnProperty(id)) { - var dataValue = this._mainThreadData[id]; + let dataValue = this._mainThreadData[id]; delete this._mainThreadData[id]; if (!instance.setData) { console.log('BROKEN INSTANCE!!! ' + id); @@ -76,7 +76,7 @@ export class WorkerThreadService extends abstractThreadService.AbstractThreadSer return super._finishInstance(instance); } - MainThread(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): TPromise { + MainThread(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): TPromise { return this._publisher('threadService', { identifier: obj.getId(), memberName: methodName, @@ -84,15 +84,15 @@ export class WorkerThreadService extends abstractThreadService.AbstractThreadSer }); } - OneWorker(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[], affinity:ThreadAffinity): TPromise { + OneWorker(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[], affinity: ThreadAffinity): TPromise { return target.apply(obj, params); } - AllWorkers(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): TPromise { + AllWorkers(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): TPromise { return target.apply(obj, params); } - Everywhere(obj:IThreadSynchronizableObject, methodName:string, target:Function, params:any[]): TPromise { + Everywhere(obj: IThreadSynchronizableObject, methodName: string, target: Function, params: any[]): TPromise { return target.apply(obj, params); } @@ -100,11 +100,11 @@ export class WorkerThreadService extends abstractThreadService.AbstractThreadSer // Nothing to do } - addStatusListener(listener:IThreadServiceStatusListener): void { + addStatusListener(listener: IThreadServiceStatusListener): void { // Nothing to do } - removeStatusListener(listener:IThreadServiceStatusListener): void { + removeStatusListener(listener: IThreadServiceStatusListener): void { // Nothing to do } @@ -112,7 +112,7 @@ export class WorkerThreadService extends abstractThreadService.AbstractThreadSer return this._getOrCreateProxyInstance(this._remoteCom, id, descriptor); } - protected _registerMainProcessActor(id: string, actor:T): void { + protected _registerMainProcessActor(id: string, actor: T): void { throw new Error('Not supported in this runtime context!'); } @@ -120,15 +120,15 @@ export class WorkerThreadService extends abstractThreadService.AbstractThreadSer throw new Error('Not supported in this runtime context: Cannot communicate from Worker directly to Plugin Host!'); } - protected _registerPluginHostActor(id: string, actor:T): void { + protected _registerPluginHostActor(id: string, actor: T): void { throw new Error('Not supported in this runtime context!'); } - protected _registerAndInstantiateWorkerActor(id: string, descriptor: SyncDescriptor0, whichWorker:ThreadAffinity): T { + protected _registerAndInstantiateWorkerActor(id: string, descriptor: SyncDescriptor0, whichWorker: ThreadAffinity): T { return this._getOrCreateLocalInstance(id, descriptor); } - protected _registerWorkerActor(id: string, actor:T): void { + protected _registerWorkerActor(id: string, actor: T): void { this._registerLocalInstance(id, actor); } } \ No newline at end of file diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts index dc5b00c25b7..e261308484e 100644 --- a/src/vs/platform/workspace/common/workspace.ts +++ b/src/vs/platform/workspace/common/workspace.ts @@ -7,7 +7,7 @@ import URI from 'vs/base/common/uri'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -export var IWorkspaceContextService = createDecorator('contextService'); +export const IWorkspaceContextService = createDecorator('contextService'); export interface IWorkspaceContextService { serviceId: ServiceIdentifier;