Skip to content

Commit 2b90273

Browse files
sandy081sandy081
committed
microsoft#53526 Use Promise
1 parent a6f0ff5 commit 2b90273

5 files changed

Lines changed: 80 additions & 83 deletions

File tree

‎src/vs/base/common/cache.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cance
99
import { always } from 'vs/base/common/async';
1010

1111
export interface CacheResult<T> {
12-
promise: Thenable<T>;
12+
promise: Promise<T>;
1313
dispose(): void;
1414
}
1515

1616
export class Cache<T> {
1717

1818
private result: CacheResult<T> = null;
19-
constructor(private task: (ct: CancellationToken) => Thenable<T>) { }
19+
constructor(private task: (ct: CancellationToken) => Promise<T>) { }
2020

2121
get(): CacheResult<T> {
2222
if (this.result) {

‎src/vs/platform/extensionManagement/node/extensionManagementService.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function parseManifest(raw: string): Promise<{ manifest: IExtensionManifest; met
8383
export function validateLocalExtension(zipPath: string): Promise<IExtensionManifest> {
8484
return buffer(zipPath, 'extension/package.json')
8585
.then(buffer => parseManifest(buffer.toString('utf8')))
86-
.then(({ manifest }) => Promise.resolve(manifest));
86+
.then(({ manifest }) => manifest);
8787
}
8888

8989
function readManifest(extensionPath: string): Promise<{ manifest: IExtensionManifest; metadata: IGalleryMetadata; }> {
@@ -162,7 +162,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
162162

163163
zip(extension: ILocalExtension): Promise<URI> {
164164
this.logService.trace('ExtensionManagementService#zip', extension.identifier.id);
165-
return Promise.resolve(this.collectFiles(extension))
165+
return this.collectFiles(extension)
166166
.then(files => zip(path.join(tmpdir(), generateUuid()), files))
167167
.then(path => URI.file(path));
168168
}
@@ -200,7 +200,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
200200

201201
install(vsix: URI, type: LocalExtensionType = LocalExtensionType.User): Promise<IExtensionIdentifier> {
202202
this.logService.trace('ExtensionManagementService#install', vsix.toString());
203-
return Promise.resolve(createCancelablePromise(token => {
203+
return createCancelablePromise(token => {
204204
return this.downloadVsix(vsix)
205205
.then(downloadLocation => {
206206
const zipPath = path.resolve(downloadLocation.fsPath);
@@ -234,7 +234,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
234234
e => Promise.reject(new Error(nls.localize('restartCode', "Please restart Code before reinstalling {0}.", manifest.displayName || manifest.name))));
235235
});
236236
});
237-
}));
237+
});
238238
}
239239

240240
private downloadVsix(vsix: URI): Promise<URI> {
@@ -342,7 +342,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
342342

343343
}
344344

345-
return Promise.resolve(cancellablePromise);
345+
return cancellablePromise;
346346
}
347347

348348
reinstallFromGallery(extension: ILocalExtension): Promise<void> {

‎src/vs/workbench/parts/extensions/common/extensions.ts‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import { IViewlet } from 'vs/workbench/common/viewlet';
77
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
88
import { Event } from 'vs/base/common/event';
9-
import { TPromise } from 'vs/base/common/winjs.base';
109
import { IPager } from 'vs/base/common/paging';
1110
import { IQueryOptions, IExtensionManifest, LocalExtensionType, EnablementState, ILocalExtension, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
1211
import { IViewContainersRegistry, ViewContainer, Extensions as ViewContainerExtensions } from 'vs/workbench/common/views';
@@ -53,10 +52,10 @@ export interface IExtension {
5352
extensionPack: string[];
5453
telemetryData: any;
5554
preview: boolean;
56-
getManifest(token: CancellationToken): TPromise<IExtensionManifest | undefined>;
57-
getReadme(token: CancellationToken): TPromise<string>;
55+
getManifest(token: CancellationToken): Promise<IExtensionManifest | undefined>;
56+
getReadme(token: CancellationToken): Promise<string>;
5857
hasReadme(): boolean;
59-
getChangelog(token: CancellationToken): TPromise<string>;
58+
getChangelog(token: CancellationToken): Promise<string>;
6059
hasChangelog(): boolean;
6160
local?: ILocalExtension;
6261
locals?: ILocalExtension[];
@@ -80,17 +79,17 @@ export interface IExtensionsWorkbenchService {
8079
_serviceBrand: any;
8180
onChange: Event<IExtension | undefined>;
8281
local: IExtension[];
83-
queryLocal(): TPromise<IExtension[]>;
84-
queryGallery(options?: IQueryOptions): TPromise<IPager<IExtension>>;
82+
queryLocal(): Promise<IExtension[]>;
83+
queryGallery(options?: IQueryOptions): Promise<IPager<IExtension>>;
8584
canInstall(extension: IExtension): boolean;
86-
install(vsix: string): TPromise<void>;
87-
install(extension: IExtension, promptToInstallDependencies?: boolean): TPromise<void>;
88-
uninstall(extension: IExtension): TPromise<void>;
89-
reinstall(extension: IExtension): TPromise<void>;
90-
setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): TPromise<void>;
91-
loadDependencies(extension: IExtension, token: CancellationToken): TPromise<IExtensionDependencies>;
92-
open(extension: IExtension, sideByside?: boolean): TPromise<any>;
93-
checkForUpdates(): TPromise<void>;
85+
install(vsix: string): Promise<void>;
86+
install(extension: IExtension, promptToInstallDependencies?: boolean): Promise<void>;
87+
uninstall(extension: IExtension): Promise<void>;
88+
reinstall(extension: IExtension): Promise<void>;
89+
setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): Promise<void>;
90+
loadDependencies(extension: IExtension, token: CancellationToken): Promise<IExtensionDependencies>;
91+
open(extension: IExtension, sideByside?: boolean): Promise<any>;
92+
checkForUpdates(): Promise<void>;
9493
allowedBadgeProviders: string[];
9594
}
9695

‎src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import 'vs/css!./media/extensionEditor';
99
import { localize } from 'vs/nls';
10-
import { TPromise, Promise } from 'vs/base/common/winjs.base';
1110
import * as marked from 'vs/base/common/marked/marked';
1211
import { createCancelablePromise } from 'vs/base/common/async';
1312
import * as arrays from 'vs/base/common/arrays';
@@ -116,11 +115,11 @@ class NavBar {
116115
this._update(this.currentId);
117116
}
118117

119-
_update(id: string = this.currentId, focus?: boolean): TPromise<void> {
118+
_update(id: string = this.currentId, focus?: boolean): Promise<void> {
120119
this.currentId = id;
121120
this._onChange.fire({ id, focus });
122121
this.actions.forEach(a => a.enabled = a.id !== id);
123-
return TPromise.as(null);
122+
return Promise.resolve(null);
124123
}
125124

126125
dispose(): void {
@@ -483,7 +482,7 @@ export class ExtensionEditor extends BaseEditor {
483482
case NavbarSection.Dependencies: return this.openDependencies(extension);
484483
case NavbarSection.ExtensionPack: return this.openExtensionPack(extension);
485484
}
486-
return Promise.wrap(null);
485+
return Promise.resolve(null);
487486
}
488487

489488
private openMarkdown(cacheResult: CacheResult<string>, noContentCopy: string): Promise<IActiveElement> {
@@ -572,7 +571,7 @@ export class ExtensionEditor extends BaseEditor {
572571
private openDependencies(extension: IExtension): Promise<IActiveElement> {
573572
if (extension.dependencies.length === 0) {
574573
append(this.content, $('p.nocontent')).textContent = localize('noDependencies', "No Dependencies");
575-
return TPromise.as(this.content);
574+
return Promise.resolve(this.content);
576575
}
577576

578577
return this.loadContents(() => this.extensionDependencies.get())
@@ -623,7 +622,7 @@ export class ExtensionEditor extends BaseEditor {
623622
}
624623

625624
getChildren(): Promise<IExtensionData[]> {
626-
return this.extensionDependencies.dependencies ? TPromise.as(this.extensionDependencies.dependencies.map(d => new ExtensionData(d))) : null;
625+
return this.extensionDependencies.dependencies ? Promise.resolve(this.extensionDependencies.dependencies.map(d => new ExtensionData(d))) : null;
627626
}
628627
}
629628

@@ -647,7 +646,7 @@ export class ExtensionEditor extends BaseEditor {
647646

648647
this.contentDisposables.push(extensionsPackTree);
649648
scrollableContent.scanDomNode();
650-
return Promise.wrap({ focus() { extensionsPackTree.domFocus(); } });
649+
return Promise.resolve({ focus() { extensionsPackTree.domFocus(); } });
651650
}
652651

653652
private renderExtensionPack(container: HTMLElement, extension: IExtension): Tree {
@@ -672,7 +671,7 @@ export class ExtensionEditor extends BaseEditor {
672671
return extensionsWorkbenchService.queryGallery({ names, pageSize: names.length })
673672
.then(result => result.firstPage.map(extension => new ExtensionData(extension, this)));
674673
}
675-
return TPromise.as(null);
674+
return Promise.resolve(null);
676675
}
677676
}
678677

@@ -1082,7 +1081,7 @@ export class ExtensionEditor extends BaseEditor {
10821081
return this.keybindingService.resolveKeybinding(keyBinding)[0];
10831082
}
10841083

1085-
private loadContents<T>(loadingTask: () => CacheResult<T>): Thenable<T> {
1084+
private loadContents<T>(loadingTask: () => CacheResult<T>): Promise<T> {
10861085
addClass(this.content, 'loading');
10871086

10881087
const result = loadingTask();

0 commit comments

Comments
 (0)