From fa1aa39bd9268c15cf4bfde55e5842f17e6985f4 Mon Sep 17 00:00:00 2001
From: Kevin Cunnane <kcunnane@microsoft.com>
Date: Mon, 8 Jul 2019 10:36:54 -0700
Subject: [PATCH] Fix #6221 notebook shortcut and use new grid in stable
 (#6268)

- Fix #6221 Notebooks: Keyboard Shortcut for New Notebook has Changed.
  - Use Win+Alt+N instead of Win+Shift+N
- New Grid is now "stable" (forgot to do this in last PR)
---
 .../parts/notebook/notebook.contribution.ts   | 37 ++++++-------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/sql/workbench/parts/notebook/notebook.contribution.ts b/src/sql/workbench/parts/notebook/notebook.contribution.ts
index 83b1e40699..d608744c2b 100644
--- a/src/sql/workbench/parts/notebook/notebook.contribution.ts
+++ b/src/sql/workbench/parts/notebook/notebook.contribution.ts
@@ -40,7 +40,7 @@ actionRegistry.registerWorkbenchAction(
 		NewNotebookAction,
 		NewNotebookAction.ID,
 		NewNotebookAction.LABEL,
-		{ primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_N },
+		{ primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.KEY_N },
 
 	),
 	NewNotebookAction.LABEL
@@ -127,31 +127,16 @@ registerComponentType({
  * A mime renderer component for grid data.
  * This will be replaced by a dedicated component in the future
  */
-if (product.quality !== 'stable') {
-	registerComponentType({
-		mimeTypes: [
-			'application/vnd.dataresource+json',
-			'application/vnd.dataresource'
-		],
-		rank: 40,
-		safe: true,
-		ctor: GridOutputComponent,
-		selector: GridOutputComponent.SELECTOR
-	});
-} else {
-	// Default to existing grid view until we're sure the new
-	// implementation is fully stable
-	registerComponentType({
-		mimeTypes: [
-			'application/vnd.dataresource+json',
-			'application/vnd.dataresource'
-		],
-		rank: 40,
-		safe: true,
-		ctor: MimeRendererComponent,
-		selector: MimeRendererComponent.SELECTOR
-	});
-}
+registerComponentType({
+	mimeTypes: [
+		'application/vnd.dataresource+json',
+		'application/vnd.dataresource'
+	],
+	rank: 40,
+	safe: true,
+	ctor: GridOutputComponent,
+	selector: GridOutputComponent.SELECTOR
+});
 
 /**
  * A mime renderer component for LaTeX.