Merge from vscode 2e5312cd61ff99c570299ecc122c52584265eda2

.vscode/launch.json

@@ -14,18 +14,26 @@
 		{
 			"type": "node",
 			"request": "attach",
+			"restart": true,
 			"name": "Attach to Extension Host",
+			"timeout": 30000,
 			"port": 5870,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"hidden": true
+			}
 		},
 		{
-			"type": "chrome",
+			"type": "pwa-chrome",
 			"request": "attach",
 			"name": "Attach to Shared Process",
 			"port": 9222,
-			"urlFilter": "*"
+			"urlFilter": "*sharedProcess.html*",
+			"presentation": {
+				"hidden": true
+			}
 		},
 		{
 			"type": "node",
@@ -67,9 +75,10 @@
 			"port": 9222
 		},
 		{
-			"type": "chrome",
+			"type": "pwa-chrome",
 			"request": "launch",
 			"name": "Launch azuredatastudio",
+			"browserLaunchLocation": "workspace",
 			"windows": {
 				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat"
 			},
@@ -97,25 +106,7 @@
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
-		},
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Launch ADS (Main Process)",
-			"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh",
-			"windows": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat",
-			},
-			"runtimeArgs": [
-				"--no-cached-data"
-			],
-			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"group": "2_launch",
-				"order": 1
-			}
+			"browserLaunchLocation": "workspace"
 		},
 		{
 			"type": "chrome",
@@ -150,7 +141,7 @@
 				"web"
 			],
 			"presentation": {
-				"group": "2_launch",
+				"group": "0_vscode",
 				"order": 2
 			}
 		},
@@ -161,7 +152,7 @@
 			"url": "http://localhost:8080",
 			"preLaunchTask": "Run web",
 			"presentation": {
-				"group": "2_launch",
+				"group": "0_vscode",
 				"order": 3
 			}
 		},
@@ -270,13 +261,15 @@
 			]
 		},
 		{
-			"name": "Debug azuredatastudio Main and Renderer",
+			"name": "Azure Data Studio",
 			"configurations": [
 				"Launch azuredatastudio",
-				"Attach to Main Process"
+				"Attach to Main Process",
+				"Attach to Extension Host",
+				"Attach to Shared Process",
 			],
 			"presentation": {
-				"group": "1_vscode",
+				"group": "0_vscode",
 				"order": 1
 			}
 		},

.vscode/searches/es6.code-search

@@ -2,7 +2,7 @@
 # Flags: CaseSensitive WordMatch
 # ContextLines: 2
 
-9 results - 4 files
+10 results - 4 files
 
 src/vs/base/common/arrays.ts:
   401  
@@ -24,17 +24,17 @@ src/vs/base/common/arrays.ts:
   564  export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
 
 src/vs/base/common/map.ts:
-   9  
-  10  /**
-  11:  * @deprecated ES6: use `[...SetOrMap.values()]`
-  12   */
-  13  export function values<V = any>(set: Set<V>): V[];
+  11  
+  12  /**
+  13:  * @deprecated ES6: use `[...SetOrMap.values()]`
+  14   */
+  15  export function values<V = any>(set: Set<V>): V[];
 
-  20  
-  21  /**
-  22:  * @deprecated ES6: use `[...map.keys()]`
-  23   */
-  24  export function keys<K, V>(map: Map<K, V>): K[] {
+  22  
+  23  /**
+  24:  * @deprecated ES6: use `[...map.keys()]`
+  25   */
+  26  export function keys<K, V>(map: Map<K, V>): K[] {
 
 src/vs/base/common/objects.ts:
   115  
@@ -61,3 +61,9 @@ src/vs/base/common/strings.ts:
   169:  * @deprecated ES6: use `String.endsWith`
   170   */
   171  export function endsWith(haystack: string, needle: string): boolean {
+
+  853  
+  854  /**
+  855:  * @deprecated ES6
+  856   */
+  857  export function repeat(s: string, count: number): string {

.vscode/settings.json

@@ -72,5 +72,6 @@
 	"files.insertFinalNewline": true,
   "[typescript]": {
 		"editor.defaultFormatter": "vscode.typescript-language-features"
-	}
+	},
+	"typescript.tsc.autoDetect": "off"
 }

.vscode/tasks.json

@@ -3,7 +3,7 @@
 	"tasks": [
 		{
 			"type": "npm",
-			"script": "watch",
+			"script": "watchd",
 			"label": "Build VS Code",
 			"group": {
 				"kind": "build",
@@ -45,6 +45,16 @@
 				"applyTo": "allDocuments"
 			}
 		},
+		{
+			"type": "npm",
+			"script": "kill-watchd",
+			"label": "Kill Build VS Code",
+			"group": "build",
+			"presentation": {
+				"reveal": "never"
+			},
+			"problemMatcher": "$tsc"
+		},
 		{
 			"label": "Run tests",
 			"type": "shell",