Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)

* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2

* update distro

* fix layering

* update distro

* fix tests

.vscode/extensions.json

@@ -2,7 +2,6 @@
 	// See https://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
-		"ms-vscode.vscode-typescript-tslint-plugin",
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
 		"msjsdiag.debugger-for-chrome"

.vscode/launch.json

@@ -20,10 +20,7 @@
 			"restart": true,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			],
-			"presentation": {
-				"hidden": true,
-			}
+			]
 		},
 		{
 			"type": "chrome",
@@ -69,10 +66,7 @@
 			"type": "chrome",
 			"request": "attach",
 			"name": "Attach to azuredatastudio",
-			"port": 9222,
-			"presentation": {
-				"hidden": true
-			}
+			"port": 9222
 		},
 		{
 			"type": "chrome",
@@ -96,12 +90,12 @@
 			"urlFilter": "*workbench.html*",
 			"runtimeArgs": [
 				"--inspect=5875",
-				"--no-cached-data"
+				"--no-cached-data",
 			],
 			"webRoot": "${workspaceFolder}",
-			"presentation": {
-				"hidden": true
-			}
+			// Settings for js-debug:
+			"pauseForSourceMap": false,
+			"outFiles": ["${workspaceFolder}/out/**/*.js"],
 		},
 		{
 			"type": "node",

.vscode/searches/ts36031.code-search

@@ -0,0 +1,10 @@
+# Query: \\w+\\?\\..+![(.[]
+# Flags: RegExp
+# ContextLines: 2
+
+src/vs/base/browser/ui/tree/asyncDataTree.ts:
+  270  			} : undefined,
+  271  			isChecked: options.ariaProvider!.isChecked ? (e) => {
+  272: 				return options.ariaProvider?.isChecked!(e.element as T);
+  273  			} : undefined
+  274  		},

.vscode/settings.json

@@ -37,6 +37,11 @@
 			}
 		}
 	],
+	"eslint.options": {
+		"rulePaths": [
+			"./build/lib/eslint"
+		]
+	},
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"npm.exclude": "**/extensions/**",
 	"npm.packageManager": "yarn",

.vscode/tasks.json

@@ -59,14 +59,6 @@
 				"applyTo": "allDocuments"
 			}
 		},
-		{
-			"type": "gulp",
-			"task": "tslint",
-			"label": "Run tslint",
-			"problemMatcher": [
-				"$tslint5"
-			]
-		},
 		{
 			"label": "Run tests",
 			"type": "shell",
@@ -104,7 +96,6 @@
 			"command": "yarn web -- --no-launch",
 			"label": "Run web",
 			"isBackground": true,
-			// This section to make error go away when launching the debug config
 			"problemMatcher": {
 				"pattern": {
 					"regexp": ""
@@ -118,5 +109,13 @@
 				"reveal": "never"
 			}
 		},
+		{
+			"type": "npm",
+			"script": "eslint",
+			"problemMatcher": {
+				"source": "eslint",
+				"base": "$eslint-stylish"
+			}
+		}
 	]
 }