Use createChannelReceiver for webview manager

mjbvz · mjbvz · commit 229602bb7910 · 2020-05-27T22:24:50.000-07:00
From microsoft#98131 (comment)
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
@@ -78,8 +78,6 @@ import { IStorageKeysSyncRegistryService } from 'vs/platform/userDataSync/common
 import { StorageKeysSyncRegistryChannel } from 'vs/platform/userDataSync/common/userDataSyncIpc';
 import { INativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { mnemonicButtonLabel, getPathLabel } from 'vs/base/common/labels';
-import { IFileService } from 'vs/platform/files/common/files';
-import { WebviewChannel } from 'vs/platform/webview/electron-main/webviewIpcs';
 import { WebviewMainService } from 'vs/platform/webview/electron-main/webviewMainService';
 import { IWebviewManagerService } from 'vs/platform/webview/common/webviewManagerService';
 
@@ -90,7 +88,6 @@ export class CodeApplication extends Disposable {
 	constructor(
 		private readonly mainIpcServer: Server,
 		private readonly userEnv: IProcessEnvironment,
-		@IFileService fileService: IFileService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ILogService private readonly logService: ILogService,
 		@IEnvironmentService private readonly environmentService: INativeEnvironmentService,
@@ -580,7 +577,7 @@ export class CodeApplication extends Disposable {
 		electronIpcServer.registerChannel('url', urlChannel);
 
 		const webviewManagerService = accessor.get(IWebviewManagerService);
-		const webviewChannel = new WebviewChannel(webviewManagerService);
+		const webviewChannel = createChannelReceiver(webviewManagerService);
 		electronIpcServer.registerChannel('webview', webviewChannel);
 
 		const storageMainService = accessor.get(IStorageMainService);
diff --git a/src/vs/platform/webview/common/webviewManagerService.ts b/src/vs/platform/webview/common/webviewManagerService.ts
@@ -15,7 +15,7 @@ export interface IWebviewManagerService {
 	unregisterWebview(id: string): Promise<void>;
 	updateLocalResourceRoots(id: string, roots: UriComponents[]): Promise<void>;
 
-	setIgnoreMenuShortcuts(webContentsId: number, enabled: boolean): void;
+	setIgnoreMenuShortcuts(webContentsId: number, enabled: boolean): Promise<void>;
 }
 
 export interface RegisterWebviewMetadata {
diff --git a/src/vs/platform/webview/electron-main/webviewIpcs.ts b/src/vs/platform/webview/electron-main/webviewIpcs.ts
diff --git a/src/vs/platform/webview/electron-main/webviewMainService.ts b/src/vs/platform/webview/electron-main/webviewMainService.ts
@@ -36,7 +36,7 @@ export class WebviewMainService implements IWebviewManagerService {
 		this.protocolProvider.updateLocalResourceRoots(id, roots.map((x: UriComponents) => URI.from(x)));
 	}
 
-	public setIgnoreMenuShortcuts(webContentsId: number, enabled: boolean): void {
+	public async setIgnoreMenuShortcuts(webContentsId: number, enabled: boolean): Promise<void> {
 		const contents = webContents.fromId(webContentsId);
 		if (!contents) {
 			throw new Error(`Invalid webContentsId: ${webContentsId}`);

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ export interface IWebviewManagerService {`
`15`	`15`	`unregisterWebview(id: string): Promise<void>;`
`16`	`16`	`updateLocalResourceRoots(id: string, roots: UriComponents[]): Promise<void>;`
`17`	`17`
`18`		`- setIgnoreMenuShortcuts(webContentsId: number, enabled: boolean): void;`
	`18`	`+ setIgnoreMenuShortcuts(webContentsId: number, enabled: boolean): Promise<void>;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`export interface RegisterWebviewMetadata {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ export class WebviewMainService implements IWebviewManagerService {`
`36`	`36`	`this.protocolProvider.updateLocalResourceRoots(id, roots.map((x: UriComponents) => URI.from(x)));`
`37`	`37`	`}`
`38`	`38`
`39`		`- public setIgnoreMenuShortcuts(webContentsId: number, enabled: boolean): void {`
	`39`	`+ public async setIgnoreMenuShortcuts(webContentsId: number, enabled: boolean): Promise<void> {`
`40`	`40`	`const contents = webContents.fromId(webContentsId);`
`41`	`41`	`if (!contents) {`
`42`	`42`	throw new Error(`Invalid webContentsId: ${webContentsId}`);