Fix more small TS 3.9 nightly issues

mjbvz · mjbvz · commit 51f11d9bdc3d · 2020-03-24T14:14:20.000-07:00
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -791,7 +791,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 
 		this.refreshPromises.set(node, result);
 
-		return result.finally(() => this.refreshPromises.delete(node));
+		return result.finally(() => { this.refreshPromises.delete(node); });
 	}
 
 	private _onDidChangeCollapseState({ node, deep }: ICollapseStateChangeEvent<IAsyncDataTreeNode<TInput, T> | null, any>): void {
diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts
@@ -526,7 +526,7 @@ export class ChannelClient implements IChannelClient, IDisposable {
 			this.activeRequests.add(disposable);
 		});
 
-		return result.finally(() => this.activeRequests.delete(disposable));
+		return result.finally(() => { this.activeRequests.delete(disposable); });
 	}
 
 	private requestEvent(channelName: string, name: string, arg?: any): Event<any> {
diff --git a/src/vs/base/parts/quickinput/browser/quickInputList.ts b/src/vs/base/parts/quickinput/browser/quickInputList.ts
@@ -496,7 +496,7 @@ export class QuickInputList {
 	}
 
 	set enabled(value: boolean) {
-		this.list.getHTMLElement().style.pointerEvents = value ? null : 'none';
+		this.list.getHTMLElement().style.pointerEvents = value ? '' : 'none';
 	}
 
 	focus(what: QuickInputListFocus): void {
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -331,7 +331,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 
 				this.downloadInstallableExtension(extension, operation)
 					.then(installableExtension => this.installExtension(installableExtension, ExtensionType.User, cancellationToken)
-						.then(local => pfs.rimraf(installableExtension.zipPath).finally(() => null).then(() => local)))
+						.then(local => pfs.rimraf(installableExtension.zipPath).finally(() => { }).then(() => local)))
 					.then(local => this.installDependenciesAndPackExtensions(local, existingExtension)
 						.then(() => local, error => this.uninstall(local, true).then(() => Promise.reject(error), () => Promise.reject(error))))
 					.then(
@@ -486,7 +486,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 					() => this.logService.info('Renamed to', renamePath),
 					e => {
 						this.logService.info('Rename failed. Deleting from extracted location', extractPath);
-						return pfs.rimraf(extractPath).finally(() => null).then(() => Promise.reject(e));
+						return pfs.rimraf(extractPath).finally(() => { }).then(() => Promise.reject(e));
 					}));
 	}
 
@@ -497,7 +497,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				() => extract(zipPath, extractPath, { sourcePath: 'extension', overwrite: true }, token)
 					.then(
 						() => this.logService.info(`Extracted extension to ${extractPath}:`, identifier.id),
-						e => pfs.rimraf(extractPath).finally(() => null)
+						e => pfs.rimraf(extractPath).finally(() => { })
 							.then(() => Promise.reject(new ExtensionManagementError(e.message, e instanceof ExtractError && e.type ? e.type : INSTALL_ERROR_EXTRACTING)))),
 				e => Promise.reject(new ExtensionManagementError(this.joinErrors(e).message, INSTALL_ERROR_DELETING)));
 	}

Original file line number	Diff line number	Diff line change
`@@ -791,7 +791,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable`
`791`	`791`
`792`	`792`	`this.refreshPromises.set(node, result);`
`793`	`793`
`794`		`- return result.finally(() => this.refreshPromises.delete(node));`
	`794`	`+ return result.finally(() => { this.refreshPromises.delete(node); });`
`795`	`795`	`}`
`796`	`796`
`797`	`797`	`private _onDidChangeCollapseState({ node, deep }: ICollapseStateChangeEvent<IAsyncDataTreeNode<TInput, T> \| null, any>): void {`
Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ export class ChannelClient implements IChannelClient, IDisposable {`
`526`	`526`	`this.activeRequests.add(disposable);`
`527`	`527`	`});`
`528`	`528`
`529`		`- return result.finally(() => this.activeRequests.delete(disposable));`
	`529`	`+ return result.finally(() => { this.activeRequests.delete(disposable); });`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`private requestEvent(channelName: string, name: string, arg?: any): Event<any> {`
Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ export class QuickInputList {`
`496`	`496`	`}`
`497`	`497`
`498`	`498`	`set enabled(value: boolean) {`
`499`		`- this.list.getHTMLElement().style.pointerEvents = value ? null : 'none';`
	`499`	`+ this.list.getHTMLElement().style.pointerEvents = value ? '' : 'none';`
`500`	`500`	`}`
`501`	`501`
`502`	`502`	`focus(what: QuickInputListFocus): void {`