Merge branch 'main' into fish-shell-integration

Author: Tyriar

.github/commands.json

@@ -15,30 +15,35 @@
 		"type": "label",
 		"name": "*question",
 		"action": "close",
+		"reason": "not_planned",
 		"comment": "We closed this issue because it is a question about using VS Code rather than an issue or feature request. Please search for help on [StackOverflow](https://aka.ms/vscodestackoverflow), where the community has already answered thousands of similar questions. You may find their [guide on asking a new question](https://aka.ms/vscodestackoverflowquestion) helpful if your question has not already been asked. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
 	},
 	{
 		"type": "label",
 		"name": "*dev-question",
 		"action": "close",
+		"reason": "not_planned",
 		"comment": "We have a great developer community [over on slack](https://aka.ms/vscode-dev-community) where extension authors help each other. This is a great place for you to ask questions and find support.\n\nHappy Coding!"
 	},
 	{
 		"type": "label",
 		"name": "*extension-candidate",
 		"action": "close",
+		"reason": "not_planned",
 		"comment": "We try to keep VS Code lean and we think the functionality you're asking for is great for a VS Code extension. Maybe you can already find one that suits you in the [VS Code Marketplace](https://aka.ms/vscodemarketplace). Just in case, in a few simple steps you can get started [writing your own extension](https://aka.ms/vscodewritingextensions). See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
 	},
 	{
 		"type": "label",
 		"name": "*not-reproducible",
 		"action": "close",
+		"reason": "not_planned",
 		"comment": "We closed this issue because we are unable to reproduce the problem with the steps you describe. Chances are we've already fixed your problem in a recent version of VS Code. If not, please ask us to reopen the issue and provide us with more detail. Our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) might help you with that.\n\nHappy Coding!"
 	},
 	{
 		"type": "label",
 		"name": "*out-of-scope",
 		"action": "close",
+		"reason": "not_planned",
 		"comment": "We closed this issue because we [don't plan to address it](https://aka.ms/vscode-out-of-scope) in the foreseeable future. If you disagree and feel that this issue is crucial: we are happy to listen and to reconsider.\n\nIf you wonder what we are up to, please see our [roadmap](https://aka.ms/vscoderoadmap) and [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nThanks for your understanding, and happy coding!"
 	},
 	{
@@ -57,12 +62,14 @@
 		"type": "label",
 		"name": "*caused-by-extension",
 		"action": "close",
+		"reason": "not_planned",
 		"comment": "This issue is caused by an extension, please file it with the repository (or contact) the extension has linked in its overview in VS Code or the [marketplace](https://aka.ms/vscodemarketplace) for VS Code. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
 	},
 	{
 		"type": "label",
 		"name": "*as-designed",
 		"action": "close",
+		"reason": "not_planned",
 		"comment": "The described behavior is how it is expected to work. If you disagree, please explain what is expected and what is not in more detail. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
 	},
 	{
@@ -104,6 +111,7 @@
 		"type": "label",
 		"name": "*duplicate",
 		"action": "close",
+		"reason": "not_planned",
 		"comment": "Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for [similar existing issues](${duplicateQuery}). See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
 	},
 	{
@@ -185,6 +193,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "completed",
 		"addLabel": "unreleased"
 	},
 	{
@@ -222,6 +231,7 @@
 		"type": "label",
 		"name": "*off-topic",
 		"action": "close",
+		"reason": "not_planned",
 		"comment": "Thanks for creating this issue. We think this issue is unactionable or unrelated to the goals of this project. Please follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
 	},
 	{
@@ -234,6 +244,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the Python extension. Please file the issue to the [Python extension repository](https://github.com/microsoft/vscode-python). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -247,6 +258,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the Jupyter extension. Please file the issue to the [Jupyter extension repository](https://github.com/microsoft/vscode-jupyter). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -260,6 +272,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the C extension. Please file the issue to the [C extension repository](https://github.com/microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -273,6 +286,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the C++ extension. Please file the issue to the [C++ extension repository](https://github.com/microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -286,6 +300,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the C++ extension. Please file the issue to the [C++ extension repository](https://github.com/microsoft/vscode-cpptools). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -299,6 +314,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the TypeScript language service. Please file the issue to the [TypeScript repository](https://github.com/microsoft/TypeScript/). Make sure to check their [contributing guidelines](https://github.com/microsoft/TypeScript/blob/master/CONTRIBUTING.md) and provide relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -312,6 +328,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the TypeScript/JavaScript language service. Please file the issue to the [TypeScript repository](https://github.com/microsoft/TypeScript/). Make sure to check their [contributing guidelines](https://github.com/microsoft/TypeScript/blob/master/CONTRIBUTING.md) and provide relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -325,6 +342,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the C# extension. Please file the issue to the [C# extension repository](https://github.com/OmniSharp/omnisharp-vscode.git). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -351,6 +369,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the PowerShell extension. Please file the issue to the [PowerShell extension repository](https://github.com/PowerShell/vscode-powershell). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -364,6 +383,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the LiveShare extension. Please file the issue to the [LiveShare repository](https://github.com/MicrosoftDocs/live-share). Make sure to check their [contributing guidelines](https://github.com/MicrosoftDocs/live-share/blob/master/CONTRIBUTING.md) and provide relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -377,6 +397,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the Docker extension. Please file the issue to the [Docker extension repository](https://github.com/microsoft/vscode-docker). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -390,6 +411,7 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the Java extension. Please file the issue to the [Java extension repository](https://github.com/redhat-developer/vscode-java). Make sure to check their [troubleshooting instructions](https://github.com/redhat-developer/vscode-java/wiki/Troubleshooting) and provide relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
@@ -403,9 +425,24 @@
 			"IllusionMH"
 		],
 		"action": "close",
+		"reason": "not_planned",
 		"addLabel": "*caused-by-extension",
 		"comment": "It looks like this is caused by the Java Debugger extension. Please file the issue to the [Java Debugger repository](https://github.com/microsoft/vscode-java-debug). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
 	},
+	{
+		"type": "comment",
+		"name": "extCodespaces",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"action": "close",
+		"reason": "not_planned",
+		"addLabel": "*caused-by-extension",
+		"comment": "It looks like this is caused by the Codespaces extension. Please file the issue in the [Codespaces Discussion Forum](http://aka.ms/ghcs-feedback). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
+	},
 	{
 		"type": "comment",
 		"name": "gifPlease",
@@ -439,6 +476,7 @@
 		"type": "label",
 		"name": "*workspace-trust-docs",
 		"action": "close",
+		"reason": "not_planned",
 		"comment": "This issue appears to be the result of the new workspace trust feature shipped in June 2021. This security-focused feature has major impact on the functionality of VS Code. Due to the volume of issues, we ask that you take some time to review our [comprehensive documentation](https://aka.ms/vscode-workspace-trust) on the feature. If your issue is still not resolved, please let us know."
 	},
 	{

build/lib/eslint/vscode-dts-provider-naming.js

@@ -17,7 +17,7 @@ module.exports = new (_a = class ApiProviderNaming {
             const allowed = new Set(config.allowed);
             return {
                 ['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature']: (node) => {
-                    const interfaceName = node.parent?.parent.id.name;
+                    const interfaceName = (node.parent?.parent).id.name;
                     if (allowed.has(interfaceName)) {
                         // allowed
                         return;

build/monaco/monaco.d.ts.recipe

@@ -72,7 +72,7 @@ export interface ICommandHandler {
 #include(vs/editor/common/core/editOperation): ISingleEditOperation
 #include(vs/editor/common/core/wordHelper): IWordAtPosition
 #includeAll(vs/editor/common/model): IScrollEvent
-#include(vs/editor/common/diff/diffComputer): IChange, ICharChange, ILineChange
+#include(vs/editor/common/diff/smartLinesDiffComputer): IChange, ICharChange, ILineChange
 #include(vs/editor/common/core/dimension): IDimension
 #includeAll(vs/editor/common/editorCommon): IScrollEvent
 #includeAll(vs/editor/common/textModelEvents):

extensions/git/package.json

@@ -2716,7 +2716,7 @@
     "@vscode/extension-telemetry": "0.6.2",
     "@vscode/iconv-lite-umd": "0.7.0",
     "byline": "^5.0.0",
-    "file-type": "^7.2.0",
+    "file-type": "16.5.4",
     "jschardet": "3.0.0",
     "picomatch": "2.3.1",
     "vscode-nls": "^5.1.0",
@@ -2725,7 +2725,6 @@
   },
   "devDependencies": {
     "@types/byline": "4.2.31",
-    "@types/file-type": "^5.2.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "16.x",
     "@types/picomatch": "2.3.0",

extensions/git/src/git.ts

@@ -1095,7 +1095,7 @@ export class Repository {
 		}
 
 		if (!isText) {
-			const result = filetype(buffer);
+			const result = await filetype.fromBuffer(buffer);
 
 			if (!result) {
 				return { mimetype: 'application/octet-stream' };

extensions/git/src/repository.ts

@@ -914,7 +914,6 @@ export class Repository implements Disposable {
 		const root = Uri.file(repository.root);
 		this._sourceControl = scm.createSourceControl('git', 'Git', root);
 
-		this._sourceControl.acceptInputCommand = { command: 'git.commit', title: localize('commit', "Commit"), arguments: [this._sourceControl] };
 		this._sourceControl.quickDiffProvider = this;
 		this._sourceControl.inputBox.validateInput = this.validateInput.bind(this);
 		this.disposables.push(this._sourceControl);
@@ -951,6 +950,17 @@ export class Repository implements Disposable {
 			|| e.affectsConfiguration('git.showActionButton', root)
 		)(this.updateModelState, this, this.disposables);
 
+		const updateInputBoxAcceptInputCommand = () => {
+			const config = workspace.getConfiguration('git', root);
+			const postCommitCommand = config.get<string>('postCommitCommand');
+			const postCommitCommandArg = postCommitCommand === 'push' || postCommitCommand === 'sync' ? `git.${postCommitCommand}` : '';
+			this._sourceControl.acceptInputCommand = { command: 'git.commit', title: localize('commit', "Commit"), arguments: [this._sourceControl, postCommitCommandArg] };
+		};
+
+		const onConfigListenerForPostCommitCommand = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git.postCommitCommand', root));
+		onConfigListenerForPostCommitCommand(updateInputBoxAcceptInputCommand, this, this.disposables);
+		updateInputBoxAcceptInputCommand();
+
 		const updateInputBoxVisibility = () => {
 			const config = workspace.getConfiguration('git', root);
 			this._sourceControl.inputBox.visible = config.get<boolean>('showCommitInput', true);