Skip to content

Commit c8ce66a

Browse files
author
Benjamin Pasero
committed
lint vs/platform
1 parent 5163e10 commit c8ce66a

68 files changed

Lines changed: 1237 additions & 1266 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/vs/platform/actions/common/actions.ts‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import Instantiation = require('vs/platform/instantiation/common/instantiation')
1414
import {KbExpr, IKeybindings} from 'vs/platform/keybinding/common/keybindingService';
1515
import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation';
1616

17-
export var IActionsService = createDecorator<IActionsService>('actionsService');
17+
export let IActionsService = createDecorator<IActionsService>('actionsService');
1818

1919
export interface IActionsService {
2020
serviceId: ServiceIdentifier<any>;
@@ -31,8 +31,8 @@ export class SyncActionDescriptor {
3131
private _keybindingContext: KbExpr;
3232
private _keybindingWeight: number;
3333

34-
constructor(ctor:Instantiation.INewConstructorSignature2<string, string, Actions.Action>,
35-
id:string, label:string, keybindings?:IKeybindings, keybindingContext?:KbExpr, keybindingWeight?:number
34+
constructor(ctor: Instantiation.INewConstructorSignature2<string, string, Actions.Action>,
35+
id: string, label: string, keybindings?: IKeybindings, keybindingContext?: KbExpr, keybindingWeight?: number
3636
) {
3737
this._id = id;
3838
this._label = label;
@@ -46,15 +46,15 @@ export class SyncActionDescriptor {
4646
return this._descriptor;
4747
}
4848

49-
public get id():string {
49+
public get id(): string {
5050
return this._id;
5151
}
5252

53-
public get label():string {
53+
public get label(): string {
5454
return this._label;
5555
}
5656

57-
public get keybindings():IKeybindings {
57+
public get keybindings(): IKeybindings {
5858
return this._keybindings;
5959
}
6060

@@ -72,104 +72,104 @@ export class SyncActionDescriptor {
7272
* module loading up to the point until the run method is being executed.
7373
*/
7474
export class DeferredAction extends Actions.Action {
75-
private _cachedAction:Actions.IAction;
76-
private _emitterUnbind:EventEmitter.ListenerUnbind;
75+
private _cachedAction: Actions.IAction;
76+
private _emitterUnbind: EventEmitter.ListenerUnbind;
7777

78-
constructor(private _instantiationService:Instantiation.IInstantiationService, private _descriptor:Descriptors.AsyncDescriptor<Actions.Action>,
79-
id:string, label='', cssClass='', enabled= true) {
78+
constructor(private _instantiationService: Instantiation.IInstantiationService, private _descriptor: Descriptors.AsyncDescriptor<Actions.Action>,
79+
id: string, label = '', cssClass = '', enabled = true) {
8080

8181
super(id, label, cssClass, enabled);
8282
}
8383

84-
public get cachedAction():Actions.IAction {
84+
public get cachedAction(): Actions.IAction {
8585
return this._cachedAction;
8686
}
8787

88-
public set cachedAction(action:Actions.IAction) {
88+
public set cachedAction(action: Actions.IAction) {
8989
this._cachedAction = action;
9090
}
9191

92-
public get id():string {
92+
public get id(): string {
9393
if (this._cachedAction instanceof Actions.Action) {
9494
return this._cachedAction.id;
9595
}
9696

9797
return this._id;
9898
}
9999

100-
public get label():string {
100+
public get label(): string {
101101
if (this._cachedAction instanceof Actions.Action) {
102102
return this._cachedAction.label;
103103
}
104104

105105
return this._label;
106106
}
107107

108-
public set label(value:string) {
108+
public set label(value: string) {
109109
if (this._cachedAction instanceof Actions.Action) {
110110
this._cachedAction.label = value;
111111
} else {
112112
this._setLabel(value);
113113
}
114114
}
115115

116-
public get class():string {
116+
public get class(): string {
117117
if (this._cachedAction instanceof Actions.Action) {
118118
return this._cachedAction.class;
119119
}
120120

121121
return this._cssClass;
122122
}
123123

124-
public set class(value:string) {
124+
public set class(value: string) {
125125
if (this._cachedAction instanceof Actions.Action) {
126126
this._cachedAction.class = value;
127127
} else {
128128
this._setClass(value);
129129
}
130130
}
131131

132-
public get enabled():boolean {
132+
public get enabled(): boolean {
133133
if (this._cachedAction instanceof Actions.Action) {
134134
return this._cachedAction.enabled;
135135
}
136136
return this._enabled;
137137
}
138138

139-
public set enabled(value:boolean) {
139+
public set enabled(value: boolean) {
140140
if (this._cachedAction instanceof Actions.Action) {
141141
this._cachedAction.enabled = value;
142142
} else {
143143
this._setEnabled(value);
144144
}
145145
}
146146

147-
public get order():number {
147+
public get order(): number {
148148
if (this._cachedAction instanceof Actions.Action) {
149149
return (<Actions.Action>this._cachedAction).order;
150150
}
151151
return this._order;
152152
}
153153

154-
public set order(order:number) {
154+
public set order(order: number) {
155155
if (this._cachedAction instanceof Actions.Action) {
156156
(<Actions.Action>this._cachedAction).order = order;
157157
} else {
158158
this._order = order;
159159
}
160160
}
161161

162-
public run(event?:any):WinJS.Promise {
163-
if(this._cachedAction) {
162+
public run(event?: any): WinJS.Promise {
163+
if (this._cachedAction) {
164164
return this._cachedAction.run(event);
165165
}
166-
return this._createAction().then((action:Actions.IAction)=>{
166+
return this._createAction().then((action: Actions.IAction) => {
167167
return action.run(event);
168168
});
169169
}
170170

171-
private _createAction():WinJS.TPromise<Actions.IAction> {
172-
var promise = WinJS.TPromise.as(undefined);
171+
private _createAction(): WinJS.TPromise<Actions.IAction> {
172+
let promise = WinJS.TPromise.as(undefined);
173173
return promise.then(() => {
174174
return this._instantiationService.createInstance(this._descriptor);
175175

@@ -184,11 +184,11 @@ export class DeferredAction extends Actions.Action {
184184
});
185185
}
186186

187-
public dispose():void {
187+
public dispose(): void {
188188
if (this._emitterUnbind) {
189189
this._emitterUnbind();
190190
}
191-
if(this._cachedAction) {
191+
if (this._cachedAction) {
192192
this._cachedAction.dispose();
193193
}
194194
super.dispose();

‎src/vs/platform/actions/common/actionsService.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import {IPluginService, IPluginDescription, IPointListener} from 'vs/platform/plugins/common/plugins';
7+
import {IPluginService} from 'vs/platform/plugins/common/plugins';
88
import {PluginsRegistry, IMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry';
9-
import {Registry} from 'vs/platform/platform';
10-
import {IMessageService, Severity} from 'vs/platform/message/common/message';
119
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
1210
import {IAction, Action} from 'vs/base/common/actions';
1311
import {localize} from 'vs/nls';
@@ -28,8 +26,8 @@ function isCommands(thing: Command | Command[]): thing is Command[] {
2826
return Array.isArray(thing);
2927
}
3028

31-
function isValidCommand(candidate:Command, rejects: string[]): boolean {
32-
if(!candidate) {
29+
function isValidCommand(candidate: Command, rejects: string[]): boolean {
30+
if (!candidate) {
3331
rejects.push(localize('nonempty', "expected non-empty value."));
3432
return false;
3533
}

‎src/vs/platform/actions/test/common/actions.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ import {IEventService} from 'vs/platform/event/common/event';
1515

1616
export class TestAction extends Actions.Action {
1717
private service;
18-
private first:string;
19-
private second:string;
18+
private first: string;
19+
private second: string;
2020

21-
constructor(first:string, second:string, @IEventService eventService: IEventService) {
21+
constructor(first: string, second: string, @IEventService eventService: IEventService) {
2222
super(first);
2323
this.service = eventService;
2424
this.first = first;
2525
this.second = second;
2626
}
2727

2828

29-
public run():WinJS.Promise {
29+
public run(): WinJS.Promise {
3030
return WinJS.TPromise.as((!!this.service && !!this.first && !!this.second) ? true : false);
3131
}
3232
}
@@ -37,13 +37,13 @@ class TestEventService extends EventEmitter.EventEmitter {
3737
suite('Platform actions', () => {
3838
test('DeferredAction', (done) => {
3939

40-
var services:any = {
40+
let services: any = {
4141
eventService: {}
4242
};
4343

44-
var instantiationService = InstantiationService.create(services);
44+
let instantiationService = InstantiationService.create(services);
4545

46-
var action = new DeferredAction(
46+
let action = new DeferredAction(
4747
instantiationService,
4848
new AsyncDescriptor<Actions.Action>('vs/platform/actions/test/common/actions.test', 'TestAction', 'my.id', 'Second'),
4949
'my.test.action',

‎src/vs/platform/configuration/common/configuration.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ import {IEventEmitter} from 'vs/base/common/eventEmitter';
88
import Event from 'vs/base/common/event';
99
import winjs = require('vs/base/common/winjs.base');
1010

11-
export var IConfigurationService = createDecorator<IConfigurationService>('configurationService');
11+
export const IConfigurationService = createDecorator<IConfigurationService>('configurationService');
1212

1313
export interface IConfigurationService extends IEventEmitter {
14-
serviceId : ServiceIdentifier<any>;
14+
serviceId: ServiceIdentifier<any>;
1515

1616
/**
1717
* Fetches the appropriate section of the configuration JSON file.
1818
* This will be an object keyed off the section name.
1919
*/
20-
loadConfiguration(section?:string):winjs.TPromise<any>;
20+
loadConfiguration(section?: string): winjs.TPromise<any>;
2121

2222
/**
2323
* Returns iff the workspace has configuration or not.
@@ -45,8 +45,8 @@ export class ConfigurationServiceEventTypes {
4545
}
4646

4747
export interface IConfigurationServiceEvent {
48-
section?:string;
49-
config:any;
48+
section?: string;
49+
config: any;
5050
}
5151

5252
export function extractSetting(config: any, settingPath: string): any {

‎src/vs/platform/configuration/common/configurationRegistry.ts‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ import Event, {Emitter} from 'vs/base/common/event';
99
import { IJSONSchema } from 'vs/base/common/jsonSchema';
1010
import platform = require('vs/platform/platform');
1111
import objects = require('vs/base/common/objects');
12-
import strings = require('vs/base/common/strings');
13-
import {IPluginDescription} from 'vs/platform/plugins/common/plugins';
1412
import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry';
1513
import JSONContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry');
1614

1715

18-
export var Extensions = {
16+
export const Extensions = {
1917
Configuration: 'base.contributions.configuration'
2018
};
2119

@@ -86,19 +84,19 @@ class ConfigurationRegistry implements IConfigurationRegistry {
8684
}
8785

8886
private registerJSONConfiguration(configuration: IConfigurationNode) {
89-
var schema = <IJSONSchema> objects.clone(configuration);
87+
let schema = <IJSONSchema>objects.clone(configuration);
9088
this.configurationSchema.allOf.push(schema);
9189
contributionRegistry.registerSchema(schemaId, this.configurationSchema);
9290
}
9391
}
9492

95-
var configurationRegistry = new ConfigurationRegistry();
93+
const configurationRegistry = new ConfigurationRegistry();
9694
platform.Registry.add(Extensions.Configuration, configurationRegistry);
9795

9896
let configurationExtPoint = PluginsRegistry.registerExtensionPoint<IConfigurationNode>('configuration', {
9997
description: nls.localize('vscode.extension.contributes.configuration', 'Contributes configuration settings.'),
10098
type: 'object',
101-
default: { title: '', properties: {}},
99+
default: { title: '', properties: {} },
102100
properties: {
103101
title: {
104102
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<IConfiguratio
115113
});
116114

117115
configurationExtPoint.setHandler((extensions) => {
118-
for (var i = 0; i < extensions.length; i++) {
119-
var configuration = <IConfigurationNode> extensions[i].value;
120-
var collector = extensions[i].collector;
116+
for (let i = 0; i < extensions.length; i++) {
117+
let configuration = <IConfigurationNode>extensions[i].value;
118+
let collector = extensions[i].collector;
121119

122120
if (configuration.type && configuration.type !== 'object') {
123121
collector.warn(nls.localize('invalid.type', "if set, 'configuration.type' must be set to 'object"));
@@ -129,11 +127,11 @@ configurationExtPoint.setHandler((extensions) => {
129127
collector.error(nls.localize('invalid.title', "'configuration.title' must be a string"));
130128
}
131129

132-
if (configuration.properties && (typeof configuration.properties !== 'object') ) {
130+
if (configuration.properties && (typeof configuration.properties !== 'object')) {
133131
collector.error(nls.localize('invalid.properties', "'configuration.properties' must be an object"));
134132
return;
135133
}
136-
var clonedConfiguration = objects.clone(configuration);
134+
let clonedConfiguration = objects.clone(configuration);
137135
clonedConfiguration.id = extensions[i].description.id;
138136
configurationRegistry.registerConfiguration(clonedConfiguration);
139137
}

‎src/vs/platform/configuration/common/configurationService.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export abstract class ConfigurationService extends eventEmitter.EventEmitter imp
6969
this.callOnDispose = () => {
7070
unbind();
7171
subscription.dispose();
72-
}
72+
};
7373

7474
this.onDidUpdateConfiguration = fromEventEmitter(this, ConfigurationServiceEventTypes.UPDATED);
7575
}
@@ -92,9 +92,9 @@ export abstract class ConfigurationService extends eventEmitter.EventEmitter imp
9292
}
9393

9494
return this.loadConfigurationPromise.then((res: ILoadConfigResult) => {
95-
var result = section ? res.merged[section] : res.merged;
95+
let result = section ? res.merged[section] : res.merged;
9696

97-
var parseErrors = res.consolidated.parseErrors;
97+
let parseErrors = res.consolidated.parseErrors;
9898
if (res.globals.parseErrors) {
9999
parseErrors.push.apply(parseErrors, res.globals.parseErrors);
100100
}
@@ -119,10 +119,10 @@ export abstract class ConfigurationService extends eventEmitter.EventEmitter imp
119119
return this.loadWorkspaceConfiguration().then((values) => {
120120

121121
// Consolidate
122-
var consolidated = model.consolidate(values);
122+
let consolidated = model.consolidate(values);
123123

124124
// Override with workspace locals
125-
var merged = objects.mixin(
125+
let merged = objects.mixin(
126126
objects.clone(globals.contents), // target: global/default values (but dont modify!)
127127
consolidated.contents, // source: workspace configured values
128128
true // overwrite
@@ -186,10 +186,10 @@ export abstract class ConfigurationService extends eventEmitter.EventEmitter imp
186186
}
187187

188188
private handleFileEvents(event: Files.FileChangesEvent): void {
189-
var events = event.changes;
190-
var affectedByChanges = false;
191-
for (var i = 0, len = events.length; i < len; i++) {
192-
var workspacePath = this.contextService.toWorkspaceRelativePath(events[i].resource);
189+
let events = event.changes;
190+
let affectedByChanges = false;
191+
for (let i = 0, len = events.length; i < len; i++) {
192+
let workspacePath = this.contextService.toWorkspaceRelativePath(events[i].resource);
193193
if (!workspacePath) {
194194
continue; // event is not inside workspace
195195
}
@@ -240,4 +240,4 @@ export class NullConfigurationService extends eventEmitter.EventEmitter implemen
240240
}
241241
}
242242

243-
export var nullService = new NullConfigurationService();
243+
export let nullService = new NullConfigurationService();

0 commit comments

Comments
 (0)