Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files

extensions/configuration-editing/package.json

@@ -37,7 +37,8 @@
           "launch.json",
           "tasks.json",
           "keybindings.json",
-          "extensions.json"
+          "extensions.json",
+          "argv.json"
         ]
       }
     ],
@@ -71,8 +72,8 @@
         "url": "vscode://schemas/workspaceConfig"
       },
       {
-        "fileMatch": "%APP_SETTINGS_HOME%/locale.json",
-        "url": "vscode://schemas/locale"
+        "fileMatch": "**/argv.json",
+        "url": "vscode://schemas/argv"
       },
       {
         "fileMatch": "/.vscode/settings.json",
@@ -105,6 +106,10 @@
       {
         "fileMatch": "/.devcontainer.json",
         "url": "./schemas/devContainer.schema.json"
+      },
+      {
+        "fileMatch": "%APP_SETTINGS_HOME%/globalStorage/ms-vscode-remote.remote-containers/imageConfigs/*.json",
+        "url": "./schemas/attachContainer.schema.json"
       }
     ]
   },

extensions/configuration-editing/schemas/attachContainer.schema.json

@@ -0,0 +1,36 @@
+{
+	"$schema": "http://json-schema.org/schema#",
+	"description": "Configures an attached to container",
+	"allowComments": true,
+	"type": "object",
+	"definitions": {
+		"attachContainer": {
+			"type": "object",
+			"properties": {
+				"workspaceFolder": {
+					"type": "string",
+					"description": "The path of the workspace folder inside the container."
+				},
+				"forwardPorts": {
+					"type": "array",
+					"description": "Ports that are forwarded from the container to the local machine.",
+					"items": {
+						"type": "integer"
+					}
+				},
+				"extensions": {
+					"type": "array",
+					"description": "An array of extensions that should be installed into the container.",
+					"items": {
+						"type": "string"
+					}
+				}
+			}
+		}
+	},
+	"allOf": [
+		{
+			"$ref": "#/definitions/attachContainer"
+		}
+	]
+}

extensions/configuration-editing/src/extension.ts

@@ -75,7 +75,8 @@ function registerVariableCompletions(pattern: string): vscode.Disposable {
 					{ label: 'fileDirname', detail: localize('fileDirname', "The current opened file's dirname") },
 					{ label: 'fileExtname', detail: localize('fileExtname', "The current opened file's extension") },
 					{ label: 'fileBasename', detail: localize('fileBasename', "The current opened file's basename") },
-					{ label: 'fileBasenameNoExtension', detail: localize('fileBasenameNoExtension', "The current opened file's basename with no file extension") }
+					{ label: 'fileBasenameNoExtension', detail: localize('fileBasenameNoExtension', "The current opened file's basename with no file extension") },
+					{ label: 'defaultBuildTask', detail: localize('defaultBuildTask', "The name of the default build task. If there is not a single default build task then a quick pick is shown to choose the build task.") },
 				].map(variable => ({
 					label: '${' + variable.label + '}',
 					range: new vscode.Range(startPosition, position),