Skip to content

Commit da9fea2

Browse files
joaomorenojoaomoreno
committed
more PPRomise cleanup
1 parent e942f0f commit da9fea2

8 files changed

Lines changed: 12 additions & 162 deletions

File tree

‎src/vs/base/common/winjs.base.d.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ export type TValueCallback<T = any> = (value: T | PromiseLike<T>) => void;
5353

5454
export {
5555
Promise as TPromise,
56-
Promise as PPromise,
5756
TValueCallback as ValueCallback
5857
};
5958

‎src/vs/base/parts/ipc/test/node/ipc.perf.ts‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎src/vs/base/parts/ipc/test/node/testService.ts‎

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import { TPromise, PPromise } from 'vs/base/common/winjs.base';
7+
import { TPromise } from 'vs/base/common/winjs.base';
88
import { IChannel } from 'vs/base/parts/ipc/common/ipc';
99
import { Event, Emitter } from 'vs/base/common/event';
1010

@@ -17,16 +17,13 @@ export interface ITestService {
1717
marco(): TPromise<string>;
1818
pong(ping: string): TPromise<{ incoming: string, outgoing: string }>;
1919
cancelMe(): TPromise<boolean>;
20-
batchPerf(batches: number, size: number, dataSize: number): PPromise<any, any[]>;
2120
}
2221

2322
export class TestService implements ITestService {
2423

2524
private _onMarco = new Emitter<IMarcoPoloEvent>();
2625
onMarco: Event<IMarcoPoloEvent> = this._onMarco.event;
2726

28-
private _data = 'abcdefghijklmnopqrstuvwxyz';
29-
3027
marco(): TPromise<string> {
3128
this._onMarco.fire({ answer: 'polo' });
3229
return TPromise.as('polo');
@@ -39,32 +36,6 @@ export class TestService implements ITestService {
3936
cancelMe(): TPromise<boolean> {
4037
return TPromise.timeout(100).then(() => true);
4138
}
42-
43-
batchPerf(batches: number, size: number, dataSize: number): PPromise<any, any[]> {
44-
while (this._data.length < dataSize) {
45-
this._data += this._data;
46-
}
47-
const self = this;
48-
return new PPromise<any, any[]>((complete, error, progress) => {
49-
let j = 0;
50-
function send() {
51-
if (j >= batches) {
52-
complete(null);
53-
return;
54-
}
55-
j++;
56-
const batch = [];
57-
for (let i = 0; i < size; i++) {
58-
batch.push({
59-
prop: `${i}${self._data}`.substr(0, dataSize)
60-
});
61-
}
62-
progress(batch);
63-
process.nextTick(send);
64-
}
65-
process.nextTick(send);
66-
});
67-
}
6839
}
6940

7041
export interface ITestChannel extends IChannel {
@@ -74,7 +45,6 @@ export interface ITestChannel extends IChannel {
7445
call(command: 'marco'): TPromise<any>;
7546
call(command: 'pong', ping: string): TPromise<any>;
7647
call(command: 'cancelMe'): TPromise<any>;
77-
call(command: 'batchPerf', args: { batches: number; size: number; dataSize: number; }): PPromise<any, any[]>;
7848
call(command: string, ...args: any[]): TPromise<any>;
7949
}
8050

@@ -95,7 +65,6 @@ export class TestChannel implements ITestChannel {
9565
case 'pong': return this.testService.pong(args[0]);
9666
case 'cancelMe': return this.testService.cancelMe();
9767
case 'marco': return this.testService.marco();
98-
case 'batchPerf': return this.testService.batchPerf(args[0].batches, args[0].size, args[0].dataSize);
9968
default: return TPromise.wrapError(new Error('command not found'));
10069
}
10170
}
@@ -118,8 +87,4 @@ export class TestServiceClient implements ITestService {
11887
cancelMe(): TPromise<boolean> {
11988
return this.channel.call('cancelMe');
12089
}
121-
122-
batchPerf(batches: number, size: number, dataSize: number): PPromise<any, any[]> {
123-
return this.channel.call('batchPerf', { batches, size, dataSize });
124-
}
12590
}

‎src/vs/platform/url/common/urlIpc.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class URLServiceChannelClient implements IURLService {
3939

4040
constructor(private channel: IChannel) { }
4141

42-
open(url: URI): TPromise<boolean, any> {
42+
open(url: URI): TPromise<boolean> {
4343
return this.channel.call('open', url.toJSON());
4444
}
4545

‎src/vs/workbench/parts/debug/test/common/mockDebug.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ export class MockSession implements IRawSession {
218218
return TPromise.as(null);
219219
}
220220

221-
public terminateThreads(args: DebugProtocol.TerminateThreadsArguments): TPromise<DebugProtocol.TerminateThreadsResponse, any> {
221+
public terminateThreads(args: DebugProtocol.TerminateThreadsArguments): TPromise<DebugProtocol.TerminateThreadsResponse> {
222222
return TPromise.as(null);
223223
}
224224

‎src/vs/workbench/parts/preferences/browser/tocTree.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export class TOCDataSource implements IDataSource {
8383
(element instanceof SettingsTreeGroupElement && element.children && element.children.every(child => child instanceof SettingsTreeGroupElement));
8484
}
8585

86-
getChildren(tree: ITree, element: TOCTreeElement): TPromise<SettingsTreeElement[], any> {
86+
getChildren(tree: ITree, element: TOCTreeElement): TPromise<SettingsTreeElement[]> {
8787
return TPromise.as(this._getChildren(element));
8888
}
8989

@@ -99,7 +99,7 @@ export class TOCDataSource implements IDataSource {
9999
return element.children;
100100
}
101101

102-
getParent(tree: ITree, element: TOCTreeElement): TPromise<any, any> {
102+
getParent(tree: ITree, element: TOCTreeElement): TPromise<any> {
103103
return TPromise.wrap(element instanceof SettingsTreeGroupElement && element.parent);
104104
}
105105

‎src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ export class WebviewEditorInput extends EditorInput {
154154
}
155155
}
156156

157-
public resolve(refresh?: boolean): TPromise<IEditorModel, any> {
157+
public resolve(refresh?: boolean): TPromise<IEditorModel> {
158158
if (this.reviver && !this._revived) {
159159
this._revived = true;
160160
return this.reviver.reviveWebview(this).then(() => new EditorModel());

‎src/vs/workbench/services/files/electron-browser/remoteFileService.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -282,15 +282,15 @@ export class RemoteFileService extends FileService {
282282
});
283283
}
284284

285-
existsFile(resource: URI): TPromise<boolean, any> {
285+
existsFile(resource: URI): TPromise<boolean> {
286286
if (resource.scheme === Schemas.file) {
287287
return super.existsFile(resource);
288288
} else {
289289
return this.resolveFile(resource).then(data => true, err => false);
290290
}
291291
}
292292

293-
resolveFile(resource: URI, options?: IResolveFileOptions): TPromise<IFileStat, any> {
293+
resolveFile(resource: URI, options?: IResolveFileOptions): TPromise<IFileStat> {
294294
if (resource.scheme === Schemas.file) {
295295
return super.resolveFile(resource, options);
296296
} else {
@@ -307,7 +307,7 @@ export class RemoteFileService extends FileService {
307307
}
308308
}
309309

310-
resolveFiles(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): TPromise<IResolveFileResult[], any> {
310+
resolveFiles(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): TPromise<IResolveFileResult[]> {
311311

312312
// soft-groupBy, keep order, don't rearrange/merge groups
313313
let groups: (typeof toResolve)[] = [];
@@ -320,7 +320,7 @@ export class RemoteFileService extends FileService {
320320
group.push(request);
321321
}
322322

323-
const promises: TPromise<IResolveFileResult[], any>[] = [];
323+
const promises: TPromise<IResolveFileResult[]>[] = [];
324324
for (const group of groups) {
325325
if (group[0].resource.scheme === Schemas.file) {
326326
promises.push(super.resolveFiles(group));
@@ -331,7 +331,7 @@ export class RemoteFileService extends FileService {
331331
return TPromise.join(promises).then(data => flatten(data));
332332
}
333333

334-
private _doResolveFiles(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): TPromise<IResolveFileResult[], any> {
334+
private _doResolveFiles(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): TPromise<IResolveFileResult[]> {
335335
return this._withProvider(toResolve[0].resource).then(provider => {
336336
let result: IResolveFileResult[] = [];
337337
let promises = toResolve.map((item, idx) => {
@@ -532,7 +532,7 @@ export class RemoteFileService extends FileService {
532532
}
533533
}
534534

535-
createFolder(resource: URI): TPromise<IFileStat, any> {
535+
createFolder(resource: URI): TPromise<IFileStat> {
536536
if (resource.scheme === Schemas.file) {
537537
return super.createFolder(resource);
538538
} else {

0 commit comments

Comments
 (0)