提交 6fb75b9a 编写于 作者: M Matt Bierner

Strict null check updateService.win32

上级 479bec0f
......@@ -619,6 +619,7 @@
"./vs/platform/update/electron-main/updateService.darwin.ts",
"./vs/platform/update/electron-main/updateService.linux.ts",
"./vs/platform/update/electron-main/updateService.snap.ts",
"./vs/platform/update/electron-main/updateService.win32.ts",
"./vs/platform/update/node/update.config.contribution.ts",
"./vs/platform/update/node/updateIpc.ts",
"./vs/platform/url/common/url.ts",
......
......@@ -8,7 +8,7 @@ import * as crypto from 'crypto';
import * as stream from 'stream';
import { once } from 'vs/base/common/functional';
export function checksum(path: string, sha1hash: string): Promise<void> {
export function checksum(path: string, sha1hash: string | undefined): Promise<void> {
const promise = new Promise<string | undefined>((c, e) => {
const input = fs.createReadStream(path);
const hash = crypto.createHash('sha1');
......
......@@ -55,7 +55,7 @@ export class Win32UpdateService extends AbstractUpdateService {
@memoize
get cachePath(): Thenable<string> {
const result = path.join(tmpdir(), `vscode-update-${product.target}-${process.arch}`);
return pfs.mkdirp(result, null).then(() => result);
return pfs.mkdirp(result, void 0).then(() => result);
}
constructor(
......@@ -143,7 +143,7 @@ export class Win32UpdateService extends AbstractUpdateService {
return this.requestService.request({ url }, CancellationToken.None)
.then(context => download(downloadPath, context))
.then(hash ? () => checksum(downloadPath, update.hash) : () => null)
.then(hash ? () => checksum(downloadPath, update.hash) : () => void 0)
.then(() => pfs.rename(downloadPath, updatePackagePath))
.then(() => updatePackagePath);
});
......@@ -180,7 +180,9 @@ export class Win32UpdateService extends AbstractUpdateService {
}
protected async doDownloadUpdate(state: AvailableForDownload): Promise<void> {
shell.openExternal(state.update.url);
if (state.update.url) {
shell.openExternal(state.update.url);
}
this.setState(State.Idle(getUpdateType()));
}
......@@ -208,11 +210,11 @@ export class Win32UpdateService extends AbstractUpdateService {
protected async doApplyUpdate(): Promise<void> {
if (this.state.type !== StateType.Downloaded && this.state.type !== StateType.Downloading) {
return Promise.resolve(null);
return Promise.resolve(void 0);
}
if (!this.availableUpdate) {
return Promise.resolve(null);
return Promise.resolve(void 0);
}
const update = this.state.update;
......@@ -243,7 +245,7 @@ export class Win32UpdateService extends AbstractUpdateService {
}
protected doQuitAndInstall(): void {
if (this.state.type !== StateType.Ready) {
if (this.state.type !== StateType.Ready || !this.availableUpdate) {
return;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册