Skip to content

Commit c348165

Browse files
committed
Adding more explicit typings for promises
This gets us ready for TS 4.1
1 parent 2a95424 commit c348165

34 files changed

Lines changed: 55 additions & 55 deletions

File tree

build/azure-pipelines/common/createAsset.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ async function uploadBlob(blobService: azure.BlobService, quality: string, blobN
5353
}
5454
};
5555

56-
await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, filePath, blobOptions, err => err ? e(err) : c()));
56+
await new Promise<void>((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, filePath, blobOptions, err => err ? e(err) : c()));
5757
}
5858

5959
function getEnv(name: string): string {

build/azure-pipelines/common/publish-webview.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const fileNames = [
1717
];
1818

1919
async function assertContainer(blobService: azure.BlobService, container: string): Promise<void> {
20-
await new Promise((c, e) => blobService.createContainerIfNotExists(container, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
20+
await new Promise<void>((c, e) => blobService.createContainerIfNotExists(container, { publicAccessLevel: 'blob' }, err => err ? e(err) : c()));
2121
}
2222

2323
async function doesBlobExist(blobService: azure.BlobService, container: string, blobName: string): Promise<boolean | undefined> {
@@ -33,7 +33,7 @@ async function uploadBlob(blobService: azure.BlobService, container: string, blo
3333
}
3434
};
3535

36-
await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(container, blobName, file, blobOptions, err => err ? e(err) : c()));
36+
await new Promise<void>((c, e) => blobService.createBlockBlobFromLocalFile(container, blobName, file, blobOptions, err => err ? e(err) : c()));
3737
}
3838

3939
async function publish(commit: string, files: readonly string[]): Promise<void> {

build/lib/i18n.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ function createResource(project: string, slug: string, xlfFile: File, apiHostnam
996996
* https://dev.befoolish.co/tx-docs/public/projects/updating-content#what-happens-when-you-update-files
997997
*/
998998
function updateResource(project: string, slug: string, xlfFile: File, apiHostname: string, credentials: string): Promise<any> {
999-
return new Promise((resolve, reject) => {
999+
return new Promise<void>((resolve, reject) => {
10001000
const data = JSON.stringify({ content: xlfFile.contents.toString() });
10011001
const options = {
10021002
hostname: apiHostname,

build/lib/preLaunch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const yarn = process.platform === 'win32' ? 'yarn.cmd' : 'yarn';
1515
const rootDir = path.resolve(__dirname, '..', '..');
1616

1717
function runProcess(command: string, args: ReadonlyArray<string> = []) {
18-
return new Promise((resolve, reject) => {
18+
return new Promise<void>((resolve, reject) => {
1919
const child = spawn(command, args, { cwd: rootDir, stdio: 'inherit', env: process.env });
2020
child.on('exit', err => !err ? resolve() : process.exit(err ?? 1));
2121
child.on('error', reject);

src/vs/base/test/common/async.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ suite('Async', () => {
527527

528528
r1Queue.queue(syncPromiseFactory);
529529

530-
return new Promise(c => setTimeout(() => c(), 0)).then(() => {
530+
return new Promise<void>(c => setTimeout(() => c(), 0)).then(() => {
531531
const r1Queue2 = queue.queueFor(URI.file('/some/path'));
532532
assert.notEqual(r1Queue, r1Queue2); // previous one got disposed after finishing
533533
});

src/vs/base/test/common/utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ export class DeferredPromise<T> {
2525
}
2626

2727
public complete(value: T) {
28-
return new Promise(resolve => {
28+
return new Promise<void>(resolve => {
2929
this.completeCallback(value);
3030
resolve();
3131
});
3232
}
3333

3434
public error(err: any) {
35-
return new Promise(resolve => {
35+
return new Promise<void>(resolve => {
3636
this.errorCallback(err);
3737
resolve();
3838
});
3939
}
4040

4141
public cancel() {
42-
new Promise(resolve => {
42+
new Promise<void>(resolve => {
4343
this.errorCallback(canceled());
4444
resolve();
4545
});

src/vs/code/node/cli.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export async function main(argv: string[]): Promise<any> {
138138
child.stdout!.on('data', (data: Buffer) => console.log(data.toString('utf8').trim()));
139139
child.stderr!.on('data', (data: Buffer) => console.log(data.toString('utf8').trim()));
140140

141-
await new Promise(c => child.once('exit', () => c()));
141+
await new Promise<void>(c => child.once('exit', () => c()));
142142
});
143143
}
144144

src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ suite('ParameterHintsModel', () => {
290290
hintsModel.trigger({ triggerKind: modes.SignatureHelpTriggerKind.Invoke }, 0);
291291
assert.strictEqual(-1, didRequestCancellationOf);
292292

293-
return new Promise((resolve, reject) =>
293+
return new Promise<void>((resolve, reject) =>
294294
hintsModel.onChangedHints(newParamterHints => {
295295
try {
296296
assert.strictEqual(0, didRequestCancellationOf);

src/vs/editor/contrib/rename/test/onTypeRename.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ suite('On type rename', () => {
104104

105105
await operations(testEditor);
106106

107-
return new Promise((resolve) => {
107+
return new Promise<void>((resolve) => {
108108
setTimeout(() => {
109109
if (typeof expectedEndText === 'string') {
110110
assert.equal(editor.getModel()!.getValue(), expectedEndText);

src/vs/editor/contrib/smartSelect/bracketSelections.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export class BracketSelectionRangeProvider implements SelectionRangeProvider {
1919
result.push(bucket);
2020

2121
const ranges = new Map<string, LinkedList<Range>>();
22-
await new Promise(resolve => BracketSelectionRangeProvider._bracketsRightYield(resolve, 0, model, position, ranges));
23-
await new Promise(resolve => BracketSelectionRangeProvider._bracketsLeftYield(resolve, 0, model, position, ranges, bucket));
22+
await new Promise<void>(resolve => BracketSelectionRangeProvider._bracketsRightYield(resolve, 0, model, position, ranges));
23+
await new Promise<void>(resolve => BracketSelectionRangeProvider._bracketsLeftYield(resolve, 0, model, position, ranges, bucket));
2424
}
2525

2626
return result;

0 commit comments

Comments
 (0)