Merge branch 'main' into isidorn/wicked-carp

Author: isidorn

.github/commands.json

@@ -622,6 +622,15 @@
 		"action": "close",
 		"reason": "not_planned",
 		"comment": "Thank you for your submission. This issue has been closed as it doesn't meet our community guidelines or appears to be spam.\n\n**If you believe this was closed in error:**\n- Please review our [Code of Conduct](https://opensource.microsoft.com/codeofconduct/)\n- Ensure your issue contains a clear description of the problem or feature request\n- Feel free to open a new issue with appropriate detail if this was a legitimate concern\n\n**For legitimate issues, please include:**\n- Clear description of the problem\n- Steps to reproduce (for bugs)\n- Expected vs actual behavior\n- VS Code version and environment details\n\nThank you for helping us maintain a welcoming and productive community."
+	},
+	{
+		"type": "label",
+		"name": "~capi",
+		"addLabel": "capi",
+		"removeLabel": "~capi",
+		"assign": [
+			"samvantran",
+			"thispaul"
+		]
 	}
-
 ]

.vscode/settings.json

@@ -1,6 +1,14 @@
 {
 	// --- Chat ---
 	// "inlineChat.enableV2": true,
+	"chat.tools.terminal.autoApprove": {
+		"/^npm (test|lint|run compile)\\b/": true,
+		"/^npx tsc\\b.*--noEmit/": true,
+		"scripts/test.bat": true,
+		"scripts/test.sh": true,
+		"scripts/test-integration.bat": true,
+		"scripts/test-integration.sh": true,
+	},
 
 	// --- Editor ---
 	"editor.insertSpaces": false,

build/win32/code.iss

@@ -1534,9 +1534,8 @@ begin
   if CurStep = ssPostInstall then
   begin
 #ifdef AppxPackageName
-    if not WizardIsTaskSelected('addcontextmenufiles') then begin
-      RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\{#RegValueName}ContextMenu');
-    end else begin
+    // Remove the old context menu registry keys for insiders
+    if QualityIsInsiders() and WizardIsTaskSelected('addcontextmenufiles') then begin
       RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\*\shell\{#RegValueName}');
       RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\directory\shell\{#RegValueName}');
       RegDeleteKeyIncludingSubkeys({#EnvironmentRootKey}, 'Software\Classes\directory\background\shell\{#RegValueName}');

extensions/git/src/commands.ts

@@ -3457,7 +3457,7 @@ export class CommandCenter {
 			return [createBranch, { label: '', kind: QuickPickItemKind.Separator }, ...branchItems];
 		};
 
-		const placeHolder = l10n.t('Select a branch to create the new worktree from');
+		const placeHolder = l10n.t('Select a branch or tag to create the new worktree from');
 		const choice = await this.pickRef(getBranchPicks(), placeHolder);
 
 		if (!choice) {

extensions/github-authentication/package.json

@@ -55,6 +55,12 @@
           "type": "string",
           "markdownDescription": "%config.github-enterprise.uri.description%",
           "pattern": "^(?:$|(https?)://(?!github\\.com).*)"
+        },
+        "github-authentication.useElectronFetch": {
+          "type": "boolean",
+          "default": true,
+          "scope": "application",
+          "markdownDescription": "%config.github-authentication.useElectronFetch.description%"
         }
       }
     }

extensions/github-authentication/package.nls.json

@@ -2,5 +2,6 @@
 	"displayName": "GitHub Authentication",
 	"description": "GitHub Authentication Provider",
 	"config.github-enterprise.title": "GHE.com & GitHub Enterprise Server Authentication",
-	"config.github-enterprise.uri.description": "The URI for your GHE.com or GitHub Enterprise Server instance.\n\nExamples:\n* GHE.com: `https://octocat.ghe.com`\n* GitHub Enterprise Server: `https://github.octocat.com`\n\n> **Note:** This should _not_ be set to a GitHub.com URI. If your account exists on GitHub.com or is a GitHub Enterprise Managed User, you do not need any additional configuration and can simply log in to GitHub."
+	"config.github-enterprise.uri.description": "The URI for your GHE.com or GitHub Enterprise Server instance.\n\nExamples:\n* GHE.com: `https://octocat.ghe.com`\n* GitHub Enterprise Server: `https://github.octocat.com`\n\n> **Note:** This should _not_ be set to a GitHub.com URI. If your account exists on GitHub.com or is a GitHub Enterprise Managed User, you do not need any additional configuration and can simply log in to GitHub.",
+	"config.github-authentication.useElectronFetch.description": "When true, uses Electron's built-in fetch function for HTTP requests. When false, uses the Node.js global fetch function. This setting only applies when running in the Electron environment. **Note:** A restart is required for this setting to take effect."
 }

extensions/github-authentication/src/extension.ts

@@ -79,4 +79,21 @@ export function activate(context: vscode.ExtensionContext) {
 			}
 		}
 	}));
+
+	// Listener to prompt for reload when the fetch implementation setting changes
+	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(async e => {
+		if (e.affectsConfiguration('github-authentication.useElectronFetch')) {
+			const selection = await vscode.window.showInformationMessage(
+				vscode.l10n.t('GitHub Authentication - Reload required'),
+				{
+					modal: true,
+					detail: vscode.l10n.t('A reload is required for the fetch setting change to take effect.')
+				},
+				vscode.l10n.t('Reload Window')
+			);
+			if (selection) {
+				await vscode.commands.executeCommand('workbench.action.reloadWindow');
+			}
+		}
+	}));
 }

extensions/github-authentication/src/node/fetch.ts

@@ -3,10 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { workspace } from 'vscode';
+
 let _fetch: typeof fetch;
-try {
-	_fetch = require('electron').net.fetch;
-} catch {
+
+const useElectronFetch = workspace.getConfiguration('github-authentication').get<boolean>('useElectronFetch', true);
+if (useElectronFetch) {
+	try {
+		_fetch = require('electron').net.fetch;
+	} catch {
+		_fetch = fetch;
+	}
+} else {
 	_fetch = fetch;
 }
+
 export const fetching = _fetch;