Fix not being able to type in code cell after switching from text (#17590) (#17592)

* Fix not being able to type in code cell after switching from text

* comment

Co-authored-by: Charles Gagnon <chgagnon@microsoft.com>

.eslintrc.json

@@ -751,7 +751,7 @@
 					"chart.js",
 					"plotly.js",
 					"angular2-grid",
-					"html-query-plan",
+					"kburtram-query-plan",
 					"html-to-image",
 					"turndown",
 					"gridstack",

extensions/admin-pack/package.json

@@ -9,6 +9,12 @@
 		"vscode": "*",
 		"azdata": "*"
 	},
+	"capabilities": {
+		"virtualWorkspaces": false,
+		"untrustedWorkspaces": {
+			"supported": true
+		}
+	},
 	"extensionPack": [
 		"Microsoft.agent",
 		"Microsoft.profiler",

extensions/admin-tool-ext-win/package.json

@@ -15,6 +15,12 @@
   "scripts": {
     "postinstall": "node ./build/postinstall.js"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "activationEvents": [
     "onCommand:adminToolExtWin.launchSsmsMinPropertiesDialog",
     "onCommand:adminToolExtWin.launchSsmsMinGswDialog"

extensions/agent/package.json

@@ -2,7 +2,7 @@
   "name": "agent",
   "displayName": "SQL Server Agent",
   "description": "Manage and troubleshoot SQL Server Agent jobs",
-  "version": "0.49.0",
+  "version": "0.49.1",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -19,6 +19,12 @@
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "extensionDependencies": [
     "Microsoft.mssql"
   ],

extensions/arc/package.json

@@ -2,7 +2,7 @@
   "name": "arc",
   "displayName": "%arc.displayName%",
   "description": "%arc.description%",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -21,6 +21,12 @@
     "Microsoft.azcli",
     "Microsoft.resource-deployment"
   ],
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "repository": {
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"

extensions/asde-deployment/package.json

@@ -2,7 +2,7 @@
   "name": "asde-deployment",
   "displayName": "%extension-displayName%",
   "description": "%extension-description%",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -16,6 +16,12 @@
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "forceReload": true,
   "contributes": {
     "resourceDeploymentTypes": [

extensions/azcli/package.json

@@ -2,7 +2,7 @@
   "name": "azcli",
   "displayName": "%azcli.arc.displayName%",
   "description": "%azcli.arc.description%",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -18,6 +18,12 @@
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "extensionDependencies": [
     "microsoft.resource-deployment"
   ],

extensions/azurecore/package.json

@@ -18,6 +18,12 @@
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "contributes": {
     "resourceViewResources": [
       {

extensions/azurehybridtoolkit/package.json

@@ -15,6 +15,12 @@
   "activationEvents": [
     "*"
   ],
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "repository": {
 		"type": "git",
 		"url": "https://github.com/Microsoft/azuredatastudio.git"

extensions/azuremonitor/package.json

@@ -1,7 +1,7 @@
 {
   "name": "azuremonitor",
   "description": "%azuremonitor.description%",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "publisher": "Microsoft",
   "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
   "activationEvents": [
@@ -16,6 +16,12 @@
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "typings": "./src/azuremonitor",
   "contributes": {
     "connectionProvider": {

extensions/bat/package.json

@@ -11,6 +11,12 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin mmims/language-batchfile grammars/batchfile.cson ./syntaxes/batchfile.tmLanguage.json"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "contributes": {
     "languages": [
       {

extensions/big-data-cluster/package.json

@@ -2,7 +2,7 @@
   "name": "big-data-cluster",
   "displayName": "%text.sqlServerBigDataClusters%",
   "description": "%description%",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -27,6 +27,12 @@
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "main": "./out/extension",
   "contributes": {
     "dataExplorer": {

extensions/cms/package.json

@@ -2,7 +2,7 @@
   "name": "cms",
   "displayName": "%cms.displayName%",
   "description": "%cms.description%",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -22,6 +22,12 @@
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "main": "./out/extension",
   "contributes": {
     "configuration": {

extensions/dacpac/package.json

@@ -2,7 +2,7 @@
   "name": "dacpac",
   "displayName": "SQL Server Dacpac",
   "description": "SQL Server Dacpac for Azure Data Studio.",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "publisher": "Microsoft",
   "preview": false,
   "engines": {
@@ -20,6 +20,12 @@
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "extensionDependencies": [
     "Microsoft.mssql"
   ],

extensions/data-workspace/package.json

@@ -1,8 +1,8 @@
 {
   "name": "data-workspace",
-  "displayName": "%extension-displayName%",
+  "displayName": "Data Workspace",
-  "description": "%extension-description%",
+  "description": "Additional common functionality for database projects",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -20,6 +20,12 @@
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "extensionDependencies": [],
   "contributes": {
     "configuration": [

extensions/data-workspace/package.nls.json

@@ -1,6 +1,4 @@
 {
-	"extension-displayName": "Data workspace",
-	"extension-description": "Data workspace",
 	"data-workspace-view-container-name": "Projects",
 	"main-view-name": "Projects",
 	"new-command": "New",

extensions/data-workspace/package.vscode.json

@@ -1,5 +1,6 @@
 {
 	"name": "data-workspace-vscode",
+	"publisher": "ms-mssql",
 	"extensionDependencies": [
 		"ms-mssql.mssql"
 	]

extensions/data-workspace/src/dataworkspace.d.ts

@@ -8,7 +8,7 @@ declare module 'dataworkspace' {
 	import * as vscode from 'vscode';
 	export const enum extension {
 		name = 'Microsoft.data-workspace',
-		vscodeName = 'Microsoft.data-workspace-vscode'
+		vscodeName = 'ms-mssql.data-workspace-vscode'
 	}
 
 	/**

extensions/import/package.json

@@ -2,7 +2,7 @@
 	"name": "import",
 	"displayName": "SQL Server Import",
 	"description": "SQL Server Import for Azure Data Studio supports importing CSV or JSON files into SQL Server.",
-	"version": "1.5.0",
+	"version": "1.5.1",
 	"publisher": "Microsoft",
 	"preview": true,
 	"engines": {
@@ -20,6 +20,12 @@
 		"type": "git",
 		"url": "https://github.com/Microsoft/azuredatastudio.git"
 	},
+	"capabilities": {
+		"virtualWorkspaces": false,
+		"untrustedWorkspaces": {
+		  "supported": true
+		}
+	},
 	"extensionDependencies": [
 		"Microsoft.mssql"
 	],

extensions/kusto/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kusto",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "publisher": "Microsoft",
   "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
   "activationEvents": [
@@ -20,6 +20,12 @@
     "compile": "gulp compile-extension:kusto-client",
     "update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-kusto ./syntaxes/kusto.tmLanguage"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "contributes": {
     "commands": [
       {

extensions/machine-learning/package.json

@@ -2,7 +2,7 @@
   "name": "machine-learning",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "publisher": "Microsoft",
   "preview": true,
   "engines": {
@@ -23,6 +23,12 @@
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "extensionDependencies": [
     "Microsoft.mssql",
     "Microsoft.notebook"

extensions/mssql/package.json

@@ -19,6 +19,12 @@
     "update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-mssql syntaxes/SQL.plist ./syntaxes/sql.tmLanguage.json",
     "postinstall": "node ./build/postinstall.js"
   },
+  "capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+  },
   "contributes": {
     "problemMatchers": [
       {

extensions/notebook/package.json

@@ -13,6 +13,12 @@
   "activationEvents": [
     "*"
   ],
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "contributes": {
     "configuration": {
       "type": "object",

extensions/profiler/package.json

@@ -2,7 +2,7 @@
 	"name": "profiler",
 	"displayName": "%displayName%",
 	"description": "%description%",
-	"version": "0.12.1",
+	"version": "0.12.2",
 	"publisher": "Microsoft",
 	"preview": true,
 	"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -25,6 +25,12 @@
 	"extensionDependencies": [
 		"Microsoft.mssql"
 	],
+	"capabilities": {
+		"virtualWorkspaces": false,
+		"untrustedWorkspaces": {
+		  "supported": true
+		}
+	},
 	"contributes": {
 		"commands": [
 			{

extensions/query-history/package.json

@@ -2,7 +2,7 @@
 	"name": "query-history",
 	"displayName": "%queryHistory.displayName%",
 	"description": "%queryHistory.description%",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"publisher": "Microsoft",
 	"preview": true,
 	"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -20,6 +20,12 @@
 		"type": "git",
 		"url": "https://github.com/Microsoft/azuredatastudio.git"
 	},
+	"capabilities": {
+		"virtualWorkspaces": false,
+		"untrustedWorkspaces": {
+		  "supported": true
+		}
+	},
 	"extensionDependencies": [],
 	"contributes": {
 		"commands": [

extensions/resource-deployment/package.json

@@ -2,7 +2,7 @@
   "name": "resource-deployment",
   "displayName": "%extension-displayName%",
   "description": "%extension-description%",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -21,6 +21,12 @@
     "type": "git",
     "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "extensionDependencies": [
     "microsoft.mssql",
     "microsoft.notebook"

extensions/schema-compare/package.json

@@ -2,7 +2,7 @@
   "name": "schema-compare",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "publisher": "Microsoft",
   "preview": false,
   "engines": {
@@ -23,6 +23,12 @@
   "extensionDependencies": [
     "Microsoft.mssql"
   ],
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "contributes": {
     "commands": [
       {

extensions/server-report/package.json

@@ -2,7 +2,7 @@
 	"name": "server-report",
 	"displayName": "Server Reports",
 	"description": "Server Reports",
-	"version": "0.2.4",
+	"version": "0.2.5",
 	"publisher": "Microsoft",
 	"preview": true,
 	"engines": {
@@ -19,6 +19,12 @@
 		"*"
 	],
 	"main": "./out/extension",
+	"capabilities": {
+		"virtualWorkspaces": false,
+		"untrustedWorkspaces": {
+		  "supported": true
+		}
+	},
 	"forceReload": true,
 	"contributes": {
 		"commands": [

extensions/sql-assessment/package.json

@@ -2,7 +2,7 @@
   "name": "sql-assessment",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "publisher": "Microsoft",
   "preview": true,
   "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -15,6 +15,12 @@
   "activationEvents": [
     "onDashboardOpen"
   ],
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "main": "./out/main",
   "repository": {
     "type": "git",

extensions/sql-database-projects/package.json

@@ -1,8 +1,8 @@
 {
   "name": "sql-database-projects",
   "displayName": "SQL Database Projects",
-  "description": "The SQL Database Projects extension for Azure Data Studio and VS Code allows users to develop and publish database schemas.",
+  "description": "Allows users to develop and publish database schemas for MSSQL Databases",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "publisher": "Microsoft",
   "preview": true,
   "engines": {
@@ -29,6 +29,12 @@
     "Microsoft.mssql",
     "Microsoft.schema-compare"
   ],
+	"capabilities": {
+    "virtualWorkspaces": false,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+	},
   "contributes": {
     "projects": [
       "sqlproj"

extensions/sql-database-projects/package.vscode.json

@@ -1,7 +1,8 @@
 {
 	"name": "sql-database-projects-vscode",
+	"publisher": "ms-mssql",
 	"extensionDependencies": [
 		"ms-mssql.mssql",
-		"Microsoft.data-workspace-vscode"
+		"ms-mssql.data-workspace-vscode"
 	]
 }

extensions/sql-database-projects/src/sqldbproj.d.ts

@@ -7,7 +7,7 @@ declare module 'sqldbproj' {
 	import * as vscode from 'vscode';
 	export const enum extension {
 		name = 'Microsoft.sql-database-projects',
-		vsCodeName = 'Microsoft.sql-database-projects-vscode'
+		vsCodeName = 'ms-mssql.sql-database-projects-vscode'
 	}
 
 	/**

extensions/sql-migration/package.json

@@ -2,7 +2,7 @@
 	"name": "sql-migration",
 	"displayName": "%displayName%",
 	"description": "%description%",
-	"version": "0.1.9",
+	"version": "0.1.10",
 	"publisher": "Microsoft",
 	"preview": true,
 	"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -19,6 +19,12 @@
 		"onCommand:sqlmigration.sendfeedback",
 		"onCommand:sqlmigration.openNotebooks"
 	],
+	"capabilities": {
+		"virtualWorkspaces": false,
+		"untrustedWorkspaces": {
+		  "supported": true
+		}
+	},
 	"main": "./out/main",
 	"repository": {
 		"type": "git",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "azuredatastudio",
-  "version": "1.33.0",
+  "version": "1.33.1",
   "distro": "e39d1a2d41862fb0f5b4e8fc0886680e32ea5e27",
   "author": {
     "name": "Microsoft Corporation"
@@ -77,7 +77,7 @@
     "chokidar": "3.5.2",
     "graceful-fs": "4.2.6",
     "gridstack": "^3.1.3",
-    "html-query-plan": "git://github.com/kburtram/html-query-plan.git#2.6",
+    "kburtram-query-plan": "2.6.1",
     "html-to-image": "^1.6.2",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.3",

remote/package.json

@@ -19,7 +19,7 @@
     "cookie": "^0.4.0",
     "graceful-fs": "4.2.6",
     "gridstack": "^3.1.3",
-    "html-query-plan": "git://github.com/kburtram/html-query-plan.git#2.6",
+    "kburtram-query-plan": "2.6.1",
     "html-to-image": "^1.6.2",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.3",

remote/web/package.json

@@ -15,7 +15,7 @@
 		"ansi_up": "^3.0.0",
 		"chart.js": "^2.9.4",
 		"gridstack": "^3.1.3",
-		"html-query-plan": "git://github.com/kburtram/html-query-plan.git#2.6",
+		"kburtram-query-plan": "2.6.1",
 		"html-to-image": "^1.6.2",
 		"iconv-lite-umd": "0.6.8",
 		"jquery": "3.5.0",

remote/web/yarn.lock

@@ -176,10 +176,6 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-"html-query-plan@git://github.com/kburtram/html-query-plan.git#2.6":
-  version "2.5.0"
-  resolved "git://github.com/kburtram/html-query-plan.git#c524feb824e4960897ad875a37af068376a2b4a3"
-
 html-to-image@^1.6.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/html-to-image/-/html-to-image-1.7.0.tgz#4ca93bb90c0b9392edaafbfd5d94e8f0d666e18b"
@@ -217,6 +213,11 @@ jschardet@3.0.0:
   resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-3.0.0.tgz#898d2332e45ebabbdb6bf2feece9feea9a99e882"
   integrity sha512-lJH6tJ77V8Nzd5QWRkFYCLc13a3vADkh3r/Fi8HupZGWk2OVVDfnZP8V/VgQgZ+lzW0kG2UGb5hFgt3V3ndotQ==
 
+kburtram-query-plan@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/kburtram-query-plan/-/kburtram-query-plan-2.6.1.tgz#6b86128ec30c53694b53c4ee0e32d64350eb0c2c"
+  integrity sha512-7Brjwp0YOCGug1cmfvcG8s1kN4MOwiLgOmKWS0+QSq5qCH9Bcv78vKAI7Pq1Ro6rTbpiTIRITsFKYrF4XTVlQw==
+
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"

remote/yarn.lock

@@ -393,10 +393,6 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-"html-query-plan@git://github.com/kburtram/html-query-plan.git#2.6":
-  version "2.5.0"
-  resolved "git://github.com/kburtram/html-query-plan.git#c524feb824e4960897ad875a37af068376a2b4a3"
-
 html-to-image@^1.6.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/html-to-image/-/html-to-image-1.7.0.tgz#4ca93bb90c0b9392edaafbfd5d94e8f0d666e18b"
@@ -516,6 +512,11 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+kburtram-query-plan@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/kburtram-query-plan/-/kburtram-query-plan-2.6.1.tgz#6b86128ec30c53694b53c4ee0e32d64350eb0c2c"
+  integrity sha512-7Brjwp0YOCGug1cmfvcG8s1kN4MOwiLgOmKWS0+QSq5qCH9Bcv78vKAI7Pq1Ro6rTbpiTIRITsFKYrF4XTVlQw==
+
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"

src/sql/workbench/contrib/notebook/browser/cellViews/textCell.component.ts

@@ -509,7 +509,9 @@ export class TextCellComponent extends CellView implements OnInit, OnChanges {
 			// Move cursor to the richTextCursorPosition
 			// We iterate through the output element childnodes to get to the element of cursor location
 			// If the elements exist, we set the selection, else the cursor defaults to beginning.
-			if (!this.markdownMode && this.cellModel.richTextCursorPosition) {
+			// Only do this if the cell is active so we don't steal the window selection from another cell
+			// since this function is called whenever any cell in the Notebook changes, not just ourself
+			if (this.isActive() && !this.markdownMode && this.cellModel.richTextCursorPosition) {
 				let selection = window.getSelection();
 				let htmlNodes = this.cellModel.richTextCursorPosition.startElementNodes;
 				let depthToNode = htmlNodes.length;

src/sql/workbench/contrib/queryPlan/browser/queryPlan.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/qp';
-import * as QP from 'html-query-plan';
+import * as QP from 'kburtram-query-plan';
 
 import { IPanelView, IPanelTab } from 'sql/base/browser/ui/panel/panel';
 

src/vs/code/browser/workbench/workbench-dev.html

@@ -59,7 +59,7 @@
 				'angular2-grid': `${window.location.origin}/static/remote/web/node_modules/angular2-grid/bundles/NgGrid.umd.js`,
 				'angular2-slickgrid': `${window.location.origin}/static/remote/web/node_modules/angular2-slickgrid/out/bundles/angular2-slickgrid.umd.js`,
 				'chart.js':  `${window.location.origin}/static/remote/web/node_modules/chart.js/dist/Chart.bundle.min.js`,
-				'html-query-plan': `${window.location.origin}/static/remote/web/node_modules/html-query-plan/dist/index.min.js`,
+				'kburtram-query-plan': `${window.location.origin}/static/remote/web/node_modules/kburtram-query-plan/dist/index.min.js`,
 				'html-to-image': `${window.location.origin}/static/remote/web/node_modules/html-to-image/dist/html-to-image.js`,
 				'ng2-charts': `${window.location.origin}/static/remote/web/node_modules/ng2-charts/bundles/ng2-charts.umd.js`,
 				'rxjs/Observable': `${window.location.origin}/static/remote/web/node_modules/rxjs/bundles/Rx.min.js?0`,

src/vs/code/browser/workbench/workbench.html

@@ -59,7 +59,7 @@
 				'angular2-grid': `${window.location.origin}/static/node_modules/angular2-grid/bundles/NgGrid.umd.js`,
 				'angular2-slickgrid': `${window.location.origin}/static/node_modules/angular2-slickgrid/out/bundles/angular2-slickgrid.umd.js`,
 				'chart.js':  `${window.location.origin}/static/node_modules/chart.js/dist/Chart.bundle.min.js`,
-				'html-query-plan': `${window.location.origin}/static/node_modules/html-query-plan/dist/index.min.js`,
+				'kburtram-query-plan': `${window.location.origin}/static/node_modules/kburtram-query-plan/dist/index.min.js`,
 				'html-to-image': `${window.location.origin}/static/node_modules/html-to-image/dist/html-to-image.js`,
 				'ng2-charts': `${window.location.origin}/static/node_modules/ng2-charts/bundles/ng2-charts.umd.js`,
 				'rxjs/Observable': `${window.location.origin}/static/node_modules/rxjs/bundles/Rx.min.js?0`,

yarn.lock

@@ -5321,10 +5321,6 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491"
   integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==
 
-"html-query-plan@git://github.com/kburtram/html-query-plan.git#2.6":
-  version "2.5.0"
-  resolved "git://github.com/kburtram/html-query-plan.git#c524feb824e4960897ad875a37af068376a2b4a3"
-
 html-to-image@^1.6.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/html-to-image/-/html-to-image-1.7.0.tgz#4ca93bb90c0b9392edaafbfd5d94e8f0d666e18b"
@@ -6359,6 +6355,11 @@ just-extend@^4.0.2:
   resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
   integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==
 
+kburtram-query-plan@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/kburtram-query-plan/-/kburtram-query-plan-2.6.1.tgz#6b86128ec30c53694b53c4ee0e32d64350eb0c2c"
+  integrity sha512-7Brjwp0YOCGug1cmfvcG8s1kN4MOwiLgOmKWS0+QSq5qCH9Bcv78vKAI7Pq1Ro6rTbpiTIRITsFKYrF4XTVlQw==
+
 keytar@7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.2.0.tgz#4db2bec4f9700743ffd9eda22eebb658965c8440"