contextmenu - do not send functions over ipc (fix microsoft#100982)

Benjamin Pasero · Benjamin Pasero · commit 1f31957f810e · 2020-07-01T17:53:00.000+02:00
diff --git a/src/vs/base/parts/contextmenu/common/contextmenu.ts b/src/vs/base/parts/contextmenu/common/contextmenu.ts
@@ -36,8 +36,7 @@ export interface IPopupOptions {
 	x?: number;
 	y?: number;
 	positioningItem?: number;
-	onHide?: () => void;
 }
 
 export const CONTEXT_MENU_CHANNEL = 'vscode:contextmenu';
-export const CONTEXT_MENU_CLOSE_CHANNEL = 'vscode:onCloseContextMenu';
+export const CONTEXT_MENU_CLOSE_CHANNEL = 'vscode:onCloseContextMenu';
diff --git a/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts b/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts
@@ -8,7 +8,7 @@ import { IContextMenuItem, ISerializableContextMenuItem, CONTEXT_MENU_CLOSE_CHAN
 
 let contextMenuIdPool = 0;
 
-export function popup(items: IContextMenuItem[], options?: IPopupOptions): void {
+export function popup(items: IContextMenuItem[], options?: IPopupOptions, onHide?: () => void): void {
 	const processedItems: IContextMenuItem[] = [];
 
 	const contextMenuId = contextMenuIdPool++;
@@ -28,8 +28,8 @@ export function popup(items: IContextMenuItem[], options?: IPopupOptions): void
 
 		ipcRenderer.removeListener(onClickChannel, onClickChannelHandler);
 
-		if (options?.onHide) {
-			options.onHide();
+		if (onHide) {
+			onHide();
 		}
 	});
 
diff --git a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts b/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts
@@ -118,8 +118,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService
 				x: Math.floor(x),
 				y: Math.floor(y),
 				positioningItem: delegate.autoSelectFirstItem ? 0 : undefined,
-				onHide: () => onHide()
-			});
+			}, () => onHide());
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@ export interface IPopupOptions {`
`36`	`36`	`x?: number;`
`37`	`37`	`y?: number;`
`38`	`38`	`positioningItem?: number;`
`39`		`- onHide?: () => void;`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`export const CONTEXT_MENU_CHANNEL = 'vscode:contextmenu';`
`43`		`-export const CONTEXT_MENU_CLOSE_CHANNEL = 'vscode:onCloseContextMenu';`
	`42`	`+export const CONTEXT_MENU_CLOSE_CHANNEL = 'vscode:onCloseContextMenu';`
Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService`
`118`	`118`	`x: Math.floor(x),`
`119`	`119`	`y: Math.floor(y),`
`120`	`120`	`positioningItem: delegate.autoSelectFirstItem ? 0 : undefined,`
`121`		`- onHide: () => onHide()`
`122`		`- });`
	`121`	`+ }, () => onHide());`
`123`	`122`	`}`
`124`	`123`	`}`
`125`	`124`