Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check

extensions/vscode-test-resolver/package.json

@@ -21,7 +21,7 @@
 	],
 	"main": "./out/extension",
 	"devDependencies": {
-		"@types/node": "^10.12.21",
+		"@types/node": "^10.14.8",
 		"vscode": "1.1.5"
 	},
 	"contributes": {
@@ -43,11 +43,6 @@
 				"category": "Remote-TestResolver",
 				"command": "vscode-testresolver.newWindow"
 			},
-			{
-				"title": "New Window with Error",
-				"category": "Remote-TestResolver",
-				"command": "vscode-testresolver.newWindowWithError"
-			},
 			{
 				"title": "Show Log",
 				"category": "Remote-TestResolver",
@@ -61,11 +56,6 @@
 					"when": "!remoteAuthority",
 					"group": "9_local_testresolver@2"
 				},
-				{
-					"command": "vscode-testresolver.newWindowWithError",
-					"when": "!remoteAuthority",
-					"group": "9_local_testresolver@3"
-				},
 				{
 					"command": "vscode-testresolver.showLog",
 					"when": "remoteAuthority =~ /^test\\+.*$/",
@@ -75,13 +65,27 @@
 					"command": "vscode-testresolver.newWindow",
 					"when": "remoteAuthority =~ /^test\\+.*$/",
 					"group": "1_remote_testresolver_open@1"
-				},
-				{
-					"command": "vscode-testresolver.newWindowWithError",
-					"when": "remoteAuthority =~ /^test\\+.*$/",
-					"group": "1_remote_testresolver_open@2"
 				}
 			]
+		},
+		"configuration": {
+			"properties": {
+				"testresolver.startupDelay": {
+					"description": "If set, the resolver will delay for the given amount of seconds. Use ths setting for testing a slow resolver",
+					"type": "number",
+					"default": 0
+				},
+				"testresolver.startupError": {
+					"description": "If set, the resolver will fail. Use ths setting for testing the failure of a resolver.",
+					"type": "boolean",
+					"default": false
+				},
+				"testresolver.pause": {
+					"description": "If set, connection is paused",
+					"type": "boolean",
+					"default": false
+				}
+			}
 		}
 	}