Merge branch 'microsoft:main' into main

Author: chengluyu

.github/classifier.json

@@ -145,7 +145,7 @@
 		"snippets": {"assign": ["jrieken"]},
 		"splitview": {"assign": ["joaomoreno"]},
 		"suggest": {"assign": ["jrieken"]},
-		"tasks": {"assign": ["alexr00"], "accuracy": 0.85},
+		"tasks": {"assign": ["meganrogge"], "accuracy": 0.85},
 		"telemetry": {"assign": []},
 		"themes": {"assign": ["aeschli"]},
 		"timeline": {"assign": ["lramos15"]},

build/lib/i18n.js

@@ -599,17 +599,24 @@ function createXlfFilesForExtensions() {
                 const basename = path.basename(file.path);
                 if (basename === 'package.nls.json') {
                     const json = JSON.parse(buffer.toString('utf8'));
-                    const keys = Object.keys(json);
-                    const messages = keys.map((key) => {
+                    const keys = [];
+                    const messages = [];
+                    Object.keys(json).forEach((key) => {
                         const value = json[key];
                         if (Is.string(value)) {
-                            return value;
+                            keys.push(key);
+                            messages.push(value);
                         }
                         else if (value) {
-                            return value.message;
+                            keys.push({
+                                key,
+                                comment: value.comment
+                            });
+                            messages.push(value.message);
                         }
                         else {
-                            return `Unknown message for key: ${key}`;
+                            keys.push(key);
+                            messages.push(`Unknown message for key: ${key}`);
                         }
                     });
                     getXlf().addFile(`extensions/${extensionName}/package`, keys, messages);

build/lib/i18n.ts

@@ -714,15 +714,22 @@ export function createXlfFilesForExtensions(): ThroughStream {
 				const basename = path.basename(file.path);
 				if (basename === 'package.nls.json') {
 					const json: PackageJsonFormat = JSON.parse(buffer.toString('utf8'));
-					const keys = Object.keys(json);
-					const messages = keys.map((key) => {
+					const keys: Array<string | LocalizeInfo> = [];
+					const messages: string[] = [];
+					Object.keys(json).forEach((key) => {
 						const value = json[key];
 						if (Is.string(value)) {
-							return value;
+							keys.push(key);
+							messages.push(value);
 						} else if (value) {
-							return value.message;
+							keys.push({
+								key,
+								comment: value.comment
+							});
+							messages.push(value.message);
 						} else {
-							return `Unknown message for key: ${key}`;
+							keys.push(key);
+							messages.push(`Unknown message for key: ${key}`);
 						}
 					});
 					getXlf().addFile(`extensions/${extensionName}/package`, keys, messages);

extensions/emmet/package.json

@@ -129,7 +129,7 @@
         },
         "emmet.useInlineCompletions": {
           "type": "boolean",
-          "default": true,
+          "default": false,
           "markdownDescription": "%emmetUseInlineCompletions%"
         },
         "emmet.preferences": {

extensions/git/package.json

@@ -307,6 +307,18 @@
         "category": "Git",
         "enablement": "!commitInProgress"
       },
+      {
+        "command": "git.commitMessageAccept",
+        "title": "%command.commitMessageAccept%",
+        "icon": "$(check)",
+        "category": "Git"
+      },
+      {
+        "command": "git.commitMessageDiscard",
+        "title": "%command.commitMessageDiscard%",
+        "icon": "$(discard)",
+        "category": "Git"
+      },
       {
         "command": "git.restoreCommitTemplate",
         "title": "%command.restoreCommitTemplate%",
@@ -315,7 +327,8 @@
       {
         "command": "git.undoCommit",
         "title": "%command.undoCommit%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "!commitInProgress"
       },
       {
         "command": "git.checkout",
@@ -586,7 +599,8 @@
       {
         "command": "git.acceptMerge",
         "title": "%command.git.acceptMerge%",
-        "category": "Git"
+        "category": "Git",
+        "enablement": "isMergeEditor"
       }
     ],
     "keybindings": [
@@ -795,6 +809,14 @@
           "command": "git.restoreCommitTemplate",
           "when": "false"
         },
+        {
+          "command": "git.commitMessageAccept",
+          "when": "false"
+        },
+        {
+          "command": "git.commitMessageDiscard",
+          "when": "false"
+        },
         {
           "command": "git.revealInExplorer",
           "when": "false"
@@ -1480,6 +1502,16 @@
           "group": "navigation",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && !isMergeEditor && resourceScheme == file && scmActiveResourceHasChanges"
         },
+        {
+          "command": "git.commitMessageAccept",
+          "group": "navigation",
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit && commitInProgress"
+        },
+        {
+          "command": "git.commitMessageDiscard",
+          "group": "navigation",
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit && commitInProgress"
+        },
         {
           "command": "git.stageSelectedRanges",
           "group": "2_git@1",
@@ -2438,19 +2470,6 @@
           "default": 10000,
           "description": "%config.statusLimit%"
         },
-        "git.experimental.installGuide": {
-          "type": "string",
-          "enum": [
-            "default",
-            "download"
-          ],
-          "tags": [
-            "experimental"
-          ],
-          "scope": "machine",
-          "description": "%config.experimental.installGuide%",
-          "default": "default"
-        },
         "git.repositoryScanIgnoredFolders": {
           "type": "array",
           "items": {
@@ -2629,54 +2648,49 @@
       },
       {
         "view": "scm",
-        "contents": "%view.workbench.scm.missing.guide%",
-        "when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download"
-      },
-      {
-        "view": "scm",
-        "contents": "%view.workbench.scm.missing.guide.mac%",
-        "when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download && isMac"
+        "contents": "%view.workbench.scm.missing%",
+        "when": "config.git.enabled && git.missing"
       },
       {
         "view": "scm",
-        "contents": "%view.workbench.scm.missing.guide.windows%",
-        "when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download && isWindows"
+        "contents": "%view.workbench.scm.missing.mac%",
+        "when": "config.git.enabled && git.missing && isMac"
       },
       {
         "view": "scm",
-        "contents": "%view.workbench.scm.missing.guide.linux%",
-        "when": "config.git.enabled && git.missing && config.git.experimental.installGuide == download && isLinux"
+        "contents": "%view.workbench.scm.missing.windows%",
+        "when": "config.git.enabled && git.missing && isWindows"
       },
       {
         "view": "scm",
-        "contents": "%view.workbench.scm.missing%",
-        "when": "config.git.enabled && git.missing && config.git.experimental.installGuide == default"
+        "contents": "%view.workbench.scm.missing.linux%",
+        "when": "config.git.enabled && git.missing && isLinux"
       },
       {
         "view": "scm",
         "contents": "%view.workbench.scm.empty%",
-        "when": "config.git.enabled && workbenchState == empty",
+        "when": "config.git.enabled && !git.missing && workbenchState == empty",
         "enablement": "git.state == initialized",
         "group": "2_open@1"
       },
       {
         "view": "scm",
         "contents": "%view.workbench.scm.folder%",
-        "when": "config.git.enabled && workbenchState == folder",
+        "when": "config.git.enabled && !git.missing && workbenchState == folder",
         "enablement": "git.state == initialized",
         "group": "5_scm@1"
       },
       {
         "view": "scm",
         "contents": "%view.workbench.scm.workspace%",
-        "when": "config.git.enabled && workbenchState == workspace && workspaceFolderCount != 0",
+        "when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount != 0",
         "enablement": "git.state == initialized",
         "group": "5_scm@1"
       },
       {
         "view": "scm",
         "contents": "%view.workbench.scm.emptyWorkspace%",
-        "when": "config.git.enabled && workbenchState == workspace && workspaceFolderCount == 0",
+        "when": "config.git.enabled && !git.missing && workbenchState == workspace && workspaceFolderCount == 0",
         "enablement": "git.state == initialized",
         "group": "2_open@1"
       },

extensions/git/package.nls.json

@@ -46,6 +46,8 @@
 	"command.commitAllNoVerify": "Commit All (No Verify)",
 	"command.commitAllSignedNoVerify": "Commit All (Signed Off, No Verify)",
 	"command.commitAllAmendNoVerify": "Commit All (Amend, No Verify)",
+	"command.commitMessageAccept": "Accept Commit Message",
+	"command.commitMessageDiscard": "Discard Commit Message",
 	"command.restoreCommitTemplate": "Restore Commit Template",
 	"command.undoCommit": "Undo Last Commit",
 	"command.checkout": "Checkout to...",
@@ -140,7 +142,7 @@
 	"config.ignoreLimitWarning": "Ignores the warning when there are too many changes in a repository.",
 	"config.ignoreRebaseWarning": "Ignores the warning when it looks like the branch might have been rebased when pulling.",
 	"config.defaultCloneDirectory": "The default location to clone a git repository.",
-	"config.useEditorAsCommitInput": "Use an editor to author the commit message.",
+	"config.useEditorAsCommitInput": "Controls whether a full text editor will be used to author commit messages, whenever no message is provided in the commit input box.",
 	"config.verboseCommit": "Enable verbose output when `#git.useEditorAsCommitInput#` is enabled.",
 	"config.enableSmartCommit": "Commit all changes when there are no staged changes.",
 	"config.smartCommitChanges": "Control which changes are automatically staged by Smart Commit.",
@@ -264,39 +266,31 @@
 	"colors.ignored": "Color for ignored resources.",
 	"colors.conflict": "Color for resources with conflicts.",
 	"colors.submodule": "Color for submodule resources.",
-	"view.workbench.scm.missing": {
-		"message": "A valid git installation was not detected, more details can be found in the [git output](command:git.showOutput).\nPlease [install git](https://git-scm.com/), or learn more about how to use git and source control in VS Code in [our docs](https://aka.ms/vscode-scm).\nIf you're using a different version control system, you can [search the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22) for additional extensions.",
-		"comment": [
-			"{Locked='](command:git.showOutput'}",
-			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
-			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-		]
-	},
-	"view.workbench.scm.missing.guide.windows": {
+	"view.workbench.scm.missing.windows": {
 		"message": "[Download Git for Windows](https://git-scm.com/download/win)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
 		"comment": [
 			"{Locked='](command:workbench.action.reloadWindow'}",
 			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
-	"view.workbench.scm.missing.guide.mac": {
+	"view.workbench.scm.missing.mac": {
 		"message": "[Download Git for macOS](https://git-scm.com/download/mac)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
 		"comment": [
 			"{Locked='](command:workbench.action.reloadWindow'}",
 			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
-	"view.workbench.scm.missing.guide.linux": {
+	"view.workbench.scm.missing.linux": {
 		"message": "Source control depends on Git being installed.\n[Download Git for Linux](https://git-scm.com/download/linux)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
 		"comment": [
 			"{Locked='](command:workbench.action.reloadWindow'}",
 			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
-	"view.workbench.scm.missing.guide": "Install Git, a popular source control system, to track code changes and collaborate with others. Learn more in our [Git guides](https://aka.ms/vscode-scm).",
+	"view.workbench.scm.missing": "Install Git, a popular source control system, to track code changes and collaborate with others. Learn more in our [Git guides](https://aka.ms/vscode-scm).",
 	"view.workbench.scm.disabled": {
 		"message": "If you would like to use git features, please enable git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 		"comment": [