Skip to content

Commit 90171da

Browse files
sandy081sandy081
committed
microsoft#53526 Use Promise
1 parent 7872435 commit 90171da

19 files changed

Lines changed: 259 additions & 262 deletions

File tree

‎src/vs/editor/standalone/browser/simpleServices.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,9 @@ export class SimpleConfigurationService implements IConfigurationService {
409409
return this.configuration().getValue(section, overrides, null);
410410
}
411411

412-
public updateValue(key: string, value: any, arg3?: any, arg4?: any): TPromise<void> {
412+
public updateValue(key: string, value: any, arg3?: any, arg4?: any): Promise<void> {
413413
this.configuration().updateValue(key, value);
414-
return TPromise.as(null);
414+
return Promise.resolve(null);
415415
}
416416

417417
public inspect<C>(key: string, options: IConfigurationOverrides = {}): {
@@ -428,8 +428,8 @@ export class SimpleConfigurationService implements IConfigurationService {
428428
return this.configuration().keys(null);
429429
}
430430

431-
public reloadConfiguration(): TPromise<void> {
432-
return TPromise.as(null);
431+
public reloadConfiguration(): Promise<void> {
432+
return Promise.resolve(null);
433433
}
434434

435435
public getConfigurationData(): IConfigurationData {

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { TPromise } from 'vs/base/common/winjs.base';
76
import * as objects from 'vs/base/common/objects';
87
import * as types from 'vs/base/common/types';
98
import { URI } from 'vs/base/common/uri';
@@ -79,13 +78,13 @@ export interface IConfigurationService {
7978
getValue<T>(overrides: IConfigurationOverrides): T;
8079
getValue<T>(section: string, overrides: IConfigurationOverrides): T;
8180

82-
updateValue(key: string, value: any): TPromise<void>;
83-
updateValue(key: string, value: any, overrides: IConfigurationOverrides): TPromise<void>;
84-
updateValue(key: string, value: any, target: ConfigurationTarget): TPromise<void>;
85-
updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget, donotNotifyError?: boolean): TPromise<void>;
81+
updateValue(key: string, value: any): Promise<void>;
82+
updateValue(key: string, value: any, overrides: IConfigurationOverrides): Promise<void>;
83+
updateValue(key: string, value: any, target: ConfigurationTarget): Promise<void>;
84+
updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget, donotNotifyError?: boolean): Promise<void>;
8685

87-
reloadConfiguration(): TPromise<void>;
88-
reloadConfiguration(folder: IWorkspaceFolder): TPromise<void>;
86+
reloadConfiguration(): Promise<void>;
87+
reloadConfiguration(folder: IWorkspaceFolder): Promise<void>;
8988

9089
inspect<T>(key: string, overrides?: IConfigurationOverrides): {
9190
default: T,

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { onUnexpectedError } from 'vs/base/common/errors';
88
import { ConfigurationModelParser, ConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
99
import { ConfigWatcher } from 'vs/base/node/config';
1010
import { Event, Emitter } from 'vs/base/common/event';
11-
import { TPromise } from 'vs/base/common/winjs.base';
1211

1312
export class UserConfiguration extends Disposable {
1413

@@ -37,8 +36,8 @@ export class UserConfiguration extends Disposable {
3736
return this.userConfigModelWatcher.getConfig().configurationModel;
3837
}
3938

40-
reload(): TPromise<void> {
41-
return new TPromise(c => this.userConfigModelWatcher.reload(() => c(null)));
39+
reload(): Promise<void> {
40+
return new Promise(c => this.userConfigModelWatcher.reload(() => c(null)));
4241
}
4342

4443
}

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { IConfigurationService, IConfigurationChangeEvent, IConfigurationOverrid
1010
import { DefaultConfigurationModel, Configuration, ConfigurationChangeEvent } from 'vs/platform/configuration/common/configurationModels';
1111
import { Event, Emitter } from 'vs/base/common/event';
1212
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
13-
import { TPromise } from 'vs/base/common/winjs.base';
1413
import { equals } from 'vs/base/common/objects';
1514
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
1615
import { UserConfiguration } from 'vs/platform/configuration/node/configuration';
@@ -57,12 +56,12 @@ export class ConfigurationService extends Disposable implements IConfigurationSe
5756
return this.configuration.getValue(section, overrides, null);
5857
}
5958

60-
updateValue(key: string, value: any): TPromise<void>;
61-
updateValue(key: string, value: any, overrides: IConfigurationOverrides): TPromise<void>;
62-
updateValue(key: string, value: any, target: ConfigurationTarget): TPromise<void>;
63-
updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget): TPromise<void>;
64-
updateValue(key: string, value: any, arg3?: any, arg4?: any): TPromise<void> {
65-
return TPromise.wrapError(new Error('not supported'));
59+
updateValue(key: string, value: any): Promise<void>;
60+
updateValue(key: string, value: any, overrides: IConfigurationOverrides): Promise<void>;
61+
updateValue(key: string, value: any, target: ConfigurationTarget): Promise<void>;
62+
updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget): Promise<void>;
63+
updateValue(key: string, value: any, arg3?: any, arg4?: any): Promise<void> {
64+
return Promise.reject(new Error('not supported'));
6665
}
6766

6867
inspect<T>(key: string): {
@@ -84,8 +83,8 @@ export class ConfigurationService extends Disposable implements IConfigurationSe
8483
return this.configuration.keys(null);
8584
}
8685

87-
reloadConfiguration(folder?: IWorkspaceFolder): TPromise<void> {
88-
return folder ? TPromise.as(null) :
86+
reloadConfiguration(folder?: IWorkspaceFolder): Promise<void> {
87+
return folder ? Promise.resolve(null) :
8988
this.userConfiguration.reload().then(() => this.onDidChangeUserConfiguration());
9089
}
9190

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export class TestConfigurationService implements IConfigurationService {
1515

1616
private configurationByRoot: TernarySearchTree<any> = TernarySearchTree.forPaths<any>();
1717

18-
public reloadConfiguration<T>(): TPromise<T> {
19-
return TPromise.as(this.getValue());
18+
public reloadConfiguration<T>(): Promise<T> {
19+
return Promise.resolve(this.getValue());
2020
}
2121

2222
public getValue(arg1?: any, arg2?: any): any {
@@ -31,8 +31,8 @@ export class TestConfigurationService implements IConfigurationService {
3131
return this.configuration;
3232
}
3333

34-
public updateValue(key: string, overrides?: IConfigurationOverrides): TPromise<void> {
35-
return TPromise.as(null);
34+
public updateValue(key: string, overrides?: IConfigurationOverrides): Promise<void> {
35+
return Promise.resolve(null);
3636
}
3737

3838
public setUserConfiguration(key: any, value: any, root?: URI): Thenable<void> {

‎src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ suite('TelemetryService', () => {
740740
enableTelemetry: enableTelemetry
741741
} as any;
742742
},
743-
updateValue(): TPromise<void> {
743+
updateValue(): Promise<void> {
744744
return null;
745745
},
746746
inspect(key: string) {
@@ -754,7 +754,7 @@ suite('TelemetryService', () => {
754754
},
755755
keys() { return { default: [], user: [], workspace: [], workspaceFolder: [] }; },
756756
onDidChangeConfiguration: emitter.event,
757-
reloadConfiguration(): TPromise<void> { return null; },
757+
reloadConfiguration(): Promise<void> { return null; },
758758
getConfigurationData() { return null; }
759759
});
760760

0 commit comments

Comments
 (0)