From 67859ab139a8dfa526feb965bd3495503c05ae7b Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Tue, 4 Jun 2019 12:54:54 -0700
Subject: [PATCH] dont focus panels when they are shown; dont swallow keys for
 message panel (#5872)

---
 src/sql/base/browser/ui/panel/panel.ts        |  1 -
 .../parts/query/browser/messagePanel.ts       | 21 +++++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/sql/base/browser/ui/panel/panel.ts b/src/sql/base/browser/ui/panel/panel.ts
index f9a1d61cc6..1eb5614c5a 100644
--- a/src/sql/base/browser/ui/panel/panel.ts
+++ b/src/sql/base/browser/ui/panel/panel.ts
@@ -197,7 +197,6 @@ export class TabbedPanel extends Disposable {
 		if (this._currentDimensions) {
 			this._layoutCurrentTab(new DOM.Dimension(this._currentDimensions.width, this._currentDimensions.height - this.headersize));
 		}
-		this.focus();
 	}
 
 	public removeTab(tab: PanelTabIdentifier) {
diff --git a/src/sql/workbench/parts/query/browser/messagePanel.ts b/src/sql/workbench/parts/query/browser/messagePanel.ts
index 2ff19f126e..73fcb8409d 100644
--- a/src/sql/workbench/parts/query/browser/messagePanel.ts
+++ b/src/sql/workbench/parts/query/browser/messagePanel.ts
@@ -110,20 +110,18 @@ export class MessagePanel extends Disposable {
 		this._register(this.themeService.onThemeChange(this.applyStyles, this));
 		this.applyStyles(this.themeService.getTheme());
 		this.controller.onKeyDown = (tree, event) => {
-			if (event.ctrlKey) {
+			if (event.ctrlKey && event.code === 'KeyC') {
 				let context: IMessagesActionContext = {
 					selection: document.getSelection(),
 					tree: this.tree,
 				};
-				// Ctrl + C for copy
-				if (event.code === 'KeyC') {
-					let copyMessageAction = instantiationService.createInstance(CopyMessagesAction, this.clipboardService);
-					copyMessageAction.run(context);
-				}
+				let copyMessageAction = instantiationService.createInstance(CopyMessagesAction, this.clipboardService);
+				copyMessageAction.run(context);
+				event.preventDefault();
+				event.stopPropagation();
+				return true;
 			}
-			event.preventDefault();
-			event.stopPropagation();
-			return true;
+			return false;
 		};
 		this.controller.onContextMenu = (tree, element, event) => {
 			if (event.target && event.target.tagName && event.target.tagName.toLowerCase() === 'input') {
@@ -370,15 +368,12 @@ export class MessageController extends WorkbenchTreeController {
 	constructor(
 		options: IControllerOptions,
 		@IConfigurationService configurationService: IConfigurationService,
-		@IEditorService private workbenchEditorService: IEditorService,
-		@IContextMenuService private contextMenuService: IContextMenuService,
-		@IInstantiationService private instantiationService: IInstantiationService
+		@IEditorService private workbenchEditorService: IEditorService
 	) {
 		super(options, configurationService);
 	}
 
 	protected onLeftClick(tree: ITree, element: any, eventish: ICancelableEvent, origin: string = 'mouse'): boolean {
-		const mouseEvent = <IMouseEvent>eventish;
 		// input and output are one element in the tree => we only expand if the user clicked on the output.
 		// if ((element.reference > 0 || (element instanceof RawObjectReplElement && element.hasChildren)) && mouseEvent.target.className.indexOf('input expression') === -1) {
 		super.onLeftClick(tree, element, eventish, origin);