Skip to content

Commit 5cdf679

Browse files
committed
Add explicit undefined parameters / types
These errors come from the new stricter types for Promises in TS 4.1
1 parent fecec73 commit 5cdf679

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

src/vs/base/node/zip.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { mkdirp, rimraf } from 'vs/base/node/pfs';
1212
import { open as _openZip, Entry, ZipFile } from 'yauzl';
1313
import * as yazl from 'yazl';
1414
import { CancellationToken } from 'vs/base/common/cancellation';
15+
import { assertIsDefined } from 'vs/base/common/types';
1516

1617
export interface IExtractOptions {
1718
overwrite?: boolean;
@@ -161,24 +162,24 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions, tok
161162
}
162163

163164
function openZip(zipFile: string, lazy: boolean = false): Promise<ZipFile> {
164-
return new Promise((resolve, reject) => {
165+
return new Promise<ZipFile>((resolve, reject) => {
165166
_openZip(zipFile, lazy ? { lazyEntries: true } : undefined!, (error?: Error, zipfile?: ZipFile) => {
166167
if (error) {
167168
reject(toExtractError(error));
168169
} else {
169-
resolve(zipfile);
170+
resolve(assertIsDefined(zipfile));
170171
}
171172
});
172173
});
173174
}
174175

175176
function openZipStream(zipFile: ZipFile, entry: Entry): Promise<Readable> {
176-
return new Promise((resolve, reject) => {
177+
return new Promise<Readable>((resolve, reject) => {
177178
zipFile.openReadStream(entry, (error?: Error, stream?: Readable) => {
178179
if (error) {
179180
reject(toExtractError(error));
180181
} else {
181-
resolve(stream);
182+
resolve(assertIsDefined(stream));
182183
}
183184
});
184185
});

src/vs/base/parts/quickinput/browser/quickInput.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1416,7 +1416,7 @@ export class QuickInputController extends Disposable {
14161416
}
14171417

14181418
input(options: IInputOptions = {}, token: CancellationToken = CancellationToken.None): Promise<string | undefined> {
1419-
return new Promise<string>((resolve, reject) => {
1419+
return new Promise<string | undefined>((resolve) => {
14201420
if (token.isCancellationRequested) {
14211421
resolve(undefined);
14221422
return;

src/vs/platform/launch/electron-main/launchMainService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ export class LaunchMainService implements ILaunchMainService {
230230
getRemoteDiagnostics(options: IRemoteDiagnosticOptions): Promise<(IRemoteDiagnosticInfo | IRemoteDiagnosticError)[]> {
231231
const windows = this.windowsMainService.getWindows();
232232
const promises: Promise<IDiagnosticInfo | IRemoteDiagnosticError | undefined>[] = windows.map(window => {
233-
return new Promise((resolve, reject) => {
233+
return new Promise<IDiagnosticInfo | IRemoteDiagnosticError | undefined>((resolve) => {
234234
const remoteAuthority = window.remoteAuthority;
235235
if (remoteAuthority) {
236236
const replyChannel = `vscode:getDiagnosticInfoResponse${window.id}`;
@@ -254,7 +254,7 @@ export class LaunchMainService implements ILaunchMainService {
254254
resolve({ hostName: remoteAuthority, errorMessage: `Fetching remote diagnostics for '${remoteAuthority}' timed out.` });
255255
}, 5000);
256256
} else {
257-
resolve();
257+
resolve(undefined);
258258
}
259259
});
260260
});

src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ export class ConfigurationManager implements IConfigurationManager {
317317
await (launch as Launch).writeConfiguration(config);
318318
await this.selectConfiguration(launch, config.name);
319319
}));
320-
disposables.add(input.onDidHide(() => { chosenDidCancel = true; resolve(); }));
320+
disposables.add(input.onDidHide(() => { chosenDidCancel = true; resolve(undefined); }));
321321
});
322322

323323
const token = new CancellationTokenSource();

src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2390,7 +2390,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
23902390
}
23912391
picker.dispose();
23922392
if (!selection) {
2393-
resolve();
2393+
resolve(undefined);
23942394
}
23952395
resolve(selection);
23962396
}));

0 commit comments

Comments
 (0)