Merge pull request #18980 from chirag64/master

Fixes #17701 - Integrated Terminal Context Menu is triggered via contextmenu event instead of mousedown

src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts

@@ -26,6 +26,7 @@ export class TerminalPanel extends Panel {
 
 	private _actions: IAction[];
 	private _contextMenuActions: IAction[];
+	private _cancelContextMenu: boolean = false;
 	private _currentBaseThemeId: string;
 	private _font: ITerminalFont;
 	private _fontStyleElement: HTMLElement;
@@ -159,7 +160,12 @@ export class TerminalPanel extends Panel {
 					} else {
 						terminal.paste();
 					}
-				} else {
+					this._cancelContextMenu = true;
+				}
+			}
+		}));
+		this._register(DOM.addDisposableListener(this._parentDomElement, 'contextmenu', (event: MouseEvent) => {
+			if (!this._cancelContextMenu) {
 				const standardEvent = new StandardMouseEvent(event);
 				let anchor: { x: number, y: number } = { x: standardEvent.posx, y: standardEvent.posy };
 				this._contextMenuService.showContextMenu({
@@ -175,7 +181,7 @@ export class TerminalPanel extends Panel {
 					}
 				});
 			}
-			}
+			this._cancelContextMenu = false;
 		}));
 		this._register(DOM.addDisposableListener(this._parentDomElement, 'click', (event) => {
 			if (this._terminalService.terminalInstances.length === 0) {