feat: update to 1.78 (#1500)

.github/workflows/insider-linux.yml

@@ -87,7 +87,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn
@@ -131,10 +131,10 @@ jobs:
           image: vscodium/vscodium-linux-build-agent:bionic-x64
         - vscode_arch: arm64
           npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:stretch-arm64
-        - vscode_arch: armhf
-          npm_arch: armv7l
-          image: vscodium/vscodium-linux-build-agent:stretch-armhf
+          image: vscodium/vscodium-linux-build-agent:buster-arm64
+        # - vscode_arch: armhf
+        #   npm_arch: armv7l
+        #   image: vscodium/vscodium-linux-build-agent:buster-armhf
     container:
       image: ${{ matrix.image }}
       env:
@@ -159,7 +159,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn

.github/workflows/insider-macos.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Clone VSCode repo
         env:

.github/workflows/insider-spearhead.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Clone VSCode repo
         run: . get_repo.sh

.github/workflows/insider-windows.yml

@@ -41,7 +41,7 @@ jobs:
       matrix:
         vscode_arch:
           - x64
-          - ia32
+          # - ia32
           - arm64
     outputs:
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
@@ -55,7 +55,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn

.github/workflows/stable-linux.yml

@@ -84,7 +84,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn
@@ -128,10 +128,10 @@ jobs:
           image: vscodium/vscodium-linux-build-agent:bionic-x64
         - vscode_arch: arm64
           npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:stretch-arm64
-        - vscode_arch: armhf
-          npm_arch: armv7l
-          image: vscodium/vscodium-linux-build-agent:stretch-armhf
+          image: vscodium/vscodium-linux-build-agent:buster-arm64
+        # - vscode_arch: armhf
+        #   npm_arch: armv7l
+        #   image: vscodium/vscodium-linux-build-agent:buster-armhf
     container:
       image: ${{ matrix.image }}
       env:
@@ -154,7 +154,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn

.github/workflows/stable-macos.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Clone VSCode repo
         run: . get_repo.sh

.github/workflows/stable-windows.yml

@@ -41,7 +41,7 @@ jobs:
       matrix:
         vscode_arch:
           - x64
-          - ia32
+          # - ia32
           - arm64
     outputs:
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
@@ -53,7 +53,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn

.nvmrc

@@ -1 +1 @@
-v16.14.2
+16.17

announcements-extra.json

@@ -1,12 +1,2 @@
 [
-  {
-    "id": "#1495",
-    "title": "🗳️ [Icon][Linux] Finale Poll",
-    "url": "https://github.com/VSCodium/vscodium/discussions/1495"
-  },
-  {
-    "id": "#1496",
-    "title": "🗳️ [Icon][Windows] Finale Poll",
-    "url": "https://github.com/VSCodium/vscodium/discussions/1496"
-  }
 ]

icons/build_icons.sh

@@ -6,11 +6,13 @@ set -e
 # set -o xtrace
 
 QUALITY="stable"
+COLOR="blue1"
 
 while getopts ":i" opt; do
   case "$opt" in
     i)
       export QUALITY="insider"
+      export COLOR="orange1"
       ;;
   esac
 done
@@ -75,11 +77,7 @@ build_darwin_types() { # {{{
 
 build_linux_main() { # {{{
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" ]; then
-    convert -size 1024x1024 canvas:transparent PNG32:"code_1024.png"
-    rsvg-convert -w 846 -h 824 "icons/${QUALITY}/codium_clt.svg" -o "code_logo.png"
-    composite "code_logo.png" -gravity center -background none "code_1024.png" "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png"
-
-    rm code_1024.png code_logo.png
+    wget "https://raw.githubusercontent.com/VSCodium/icons/main/icons/linux/circle1/${COLOR}/paulo22s.png" -O "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png"
   fi
 
   mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/linux/rpm"
@@ -98,10 +96,7 @@ build_media() { # {{{
 
 build_windows_main() { # {{{
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico" ]; then
-    rsvg-convert -w 1024 -h 1024 "icons/${QUALITY}/codium_clt.svg" -o "code_logo.png"
-    convert "code_logo.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico"
-
-    rm code_logo.png
+    wget "https://raw.githubusercontent.com/VSCodium/icons/main/icons/win32/nobg/${COLOR}/paulo22s.ico" -O "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico"
   fi
 } # }}}
 

patches/build-version.patch

@@ -1,41 +1,41 @@
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index f3cdbff..ac7c39b 100644
+index 2e8ef58..6870416 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -246,4 +246,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -251,4 +251,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const name = product.nameShort;
 +		const release = packageJson.release;
  		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
 -			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined }));
 +			.pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined }));
  
-@@ -252,3 +253,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -257,3 +258,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 -			.pipe(json({ commit, date, version }));
 +			.pipe(json({ commit, date, version, release }));
  
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index cdc802b..49ab315 100644
+index 3d3eee9..964dd18 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -227,3 +227,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -225,3 +225,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  
 -		let version = packageJson.version;
 +		let version = packageJson.version
  		const quality = product.quality;
-@@ -235,3 +235,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -233,3 +233,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  		const name = product.nameShort;
 -		const packageJsonUpdates = { name, version };
 +		const release = packageJson.release;
 +		const packageJsonUpdates = { name, version, release };
  
-@@ -246,3 +247,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -244,3 +245,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  		const date = new Date().toISOString();
 -		const productJsonUpdate = { commit, date, checksums, version };
 +		const productJsonUpdate = { commit, date, checksums, version, release };
  
 diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index cdc8870..f6e4e09 100644
+index 90f75cc..275c958 100644
 --- a/build/gulpfile.vscode.linux.js
 +++ b/build/gulpfile.vscode.linux.js
 @@ -25,4 +25,2 @@ const commit = getVersion(root);
@@ -71,7 +71,7 @@ index 0d3abda..2606af5 100644
 +			RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`,
  			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
 diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index 61659d2..5cafa06 100644
+index 06b8549..3af1f45 100644
 --- a/resources/linux/rpm/code.spec.template
 +++ b/resources/linux/rpm/code.spec.template
 @@ -2,3 +2,3 @@ Name:     @@NAME@@
@@ -80,24 +80,24 @@ index 61659d2..5cafa06 100644
 +Release:  el7
  Summary:  Code editing. Redefined.
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index 7ec238b..9295018 100644
+index 2526747..73c6b7f 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
-@@ -34,2 +34,3 @@ export interface IProductConfiguration {
+@@ -58,2 +58,3 @@ export interface IProductConfiguration {
  	readonly version: string;
 +	readonly release: string;
  	readonly date?: string;
 diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
-index 561966b..30814a0 100644
+index 0be311f..d6c4a18 100644
 --- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
 +++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
-@@ -236,3 +236,3 @@ export class DiagnosticsService implements IDiagnosticsService {
+@@ -224,3 +224,3 @@ export class DiagnosticsService implements IDiagnosticsService {
  		const output: string[] = [];
 -		output.push(`Version:          ${this.productService.nameShort} ${this.productService.version} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
 +		output.push(`Version:          ${this.productService.nameShort} ${this.productService.version} ${this.productService.release || 'Release unknown'} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
  		output.push(`OS Version:       ${osLib.type()} ${osLib.arch()} ${osLib.release()}`);
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index ef798fa..cfa7866 100644
+index 51a55e1..26dfe7b 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
 @@ -43,6 +43,7 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
@@ -111,19 +111,19 @@ index ef798fa..cfa7866 100644
 +			release: pkg.release
  		});
 diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
-index 6a3768d..023eeed 100644
+index 1dbc24a..8385b70 100644
 --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
-@@ -21,2 +21,3 @@ import { MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/mar
- import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaultInputBoxStyles } from 'vs/platform/theme/browser/defaultStyles';
+@@ -22,2 +22,3 @@ import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaul
+ import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
 +import { getReleaseString } from 'vs/workbench/common/release';
  
-@@ -147,2 +148,4 @@ export class BrowserDialogHandler implements IDialogHandler {
+@@ -79,2 +80,4 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
  		const detailString = (useAgo: boolean): string => {
 +			const releaseString = getReleaseString();
 +
  			return localize('aboutDetail',
-@@ -153,3 +156,3 @@ export class BrowserDialogHandler implements IDialogHandler {
+@@ -85,3 +88,3 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
  				navigator.userAgent
 -			);
 +			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);
@@ -148,27 +148,19 @@ index 0000000..2a8ea57
 +export function getReleaseString(): string {
 +	return LABELS[language] ?? DEFAULT_LABEL;
 +}
-diff --git a/src/vs/workbench/contrib/issue/browser/issueService.ts b/src/vs/workbench/contrib/issue/browser/issueService.ts
-index dc7430b..23def01 100644
---- a/src/vs/workbench/contrib/issue/browser/issueService.ts
-+++ b/src/vs/workbench/contrib/issue/browser/issueService.ts
-@@ -67,2 +67,3 @@ export class WebIssueService implements IWorkbenchIssueService {
- Version: ${this.productService.version}
-+Release: ${this.productService.release ?? 'unknown'}
- Commit: ${this.productService.commit ?? 'unknown'}
 diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
-index f63b75f..2b77c1b 100644
+index dd166f1..f0a52c4 100644
 --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
-@@ -17,2 +17,3 @@ import { IProductService } from 'vs/platform/product/common/productService';
+@@ -14,2 +14,3 @@ import { IProductService } from 'vs/platform/product/common/productService';
  import { process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 +import { getReleaseString } from 'vs/workbench/common/release';
  
-@@ -166,2 +167,3 @@ export class NativeDialogHandler implements IDialogHandler {
+@@ -77,2 +78,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
  		const osProps = await this.nativeHostService.getOSProperties();
 +		const releaseString = getReleaseString();
  
-@@ -179,3 +181,3 @@ export class NativeDialogHandler implements IDialogHandler {
+@@ -90,3 +92,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
  				process.sandboxed ? 'Yes' : 'No' // TODO@bpasero remove me once sandbox is final
 -			);
 +			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);

patches/fix-build-linux.patch

@@ -1,14 +1,14 @@
 diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
-index af20828..f09ba66 100644
+index 0ea6699..c4524de 100644
 --- a/build/linux/dependencies-generator.js
 +++ b/build/linux/dependencies-generator.js
 @@ -22,3 +22,3 @@ const types_2 = require("./rpm/types");
  // are valid, are in dep-lists.ts
 -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
 +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
- // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/98.0.4758.109:chrome/installer/linux/BUILD.gn;l=64-80
+ // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/108.0.5359.215:chrome/installer/linux/BUILD.gn;l=64-80
 diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
-index 34573c4..91adb8f 100644
+index c0d8112..3bb0366 100644
 --- a/build/linux/dependencies-generator.ts
 +++ b/build/linux/dependencies-generator.ts
 @@ -23,3 +23,3 @@ import { isRpmArchString, RpmArchString } from './rpm/types';
@@ -17,10 +17,10 @@ index 34573c4..91adb8f 100644
 +const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
  
 diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index 61659d2..6331a67 100644
+index 06b8549..a7e3dfb 100644
 --- a/resources/linux/rpm/code.spec.template
 +++ b/resources/linux/rpm/code.spec.template
-@@ -78 +78,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
+@@ -81 +81,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
  %{_datadir}/zsh/site-functions/_%{name}
 +
 +%config(noreplace) /usr/share/%{name}/resources/app/product.json

patches/report-issue.patch

@@ -1,13 +1,16 @@
-diff --git a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
-index 33e66be..a7ade0a 100644
---- a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
-+++ b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
-@@ -468,3 +468,3 @@ export class IssueReporter extends Disposable {
+diff --git a/src/vs/code/electron-sandbox/issue/IssueReporterService.ts b/src/vs/code/electron-sandbox/issue/IssueReporterService.ts
+index d0c4789..9e6bfc5 100644
+--- a/src/vs/code/electron-sandbox/issue/IssueReporterService.ts
++++ b/src/vs/code/electron-sandbox/issue/IssueReporterService.ts
+@@ -455,5 +455,5 @@ export class IssueReporter extends Disposable {
+ 
+-	private searchVSCodeIssues(title: string, issueDescription?: string): void {
++	private searchVSCodeIssues(title: string, _issueDescription?: string): void {
  		if (title) {
 -			this.searchDuplicates(title, issueDescription);
 +			this.searchGitHub('VSCodium/vscodium', title);
  		} else {
-@@ -556,33 +556,2 @@ export class IssueReporter extends Disposable {
+@@ -549,33 +549,2 @@ export class IssueReporter extends Disposable {
  
 -	@debounce(300)
 -	private searchDuplicates(title: string, body?: string): void {
@@ -41,13 +44,13 @@ index 33e66be..a7ade0a 100644
 -	}
 -
  	private displaySearchResults(results: SearchResult[]) {
-@@ -674,3 +643,3 @@ export class IssueReporter extends Disposable {
+@@ -667,3 +636,3 @@ export class IssueReporter extends Disposable {
  		sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
 -		sourceSelect.append(this.makeOption('vscode', localize('vscode', "Visual Studio Code"), false));
 +		sourceSelect.append(this.makeOption('vscode', localize('vscode', "VSCodium"), false));
  		sourceSelect.append(this.makeOption('extension', localize('extension', "An extension"), false));
 diff --git a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
-index a58acca..1903a0c 100644
+index 98338df..6d2f581 100644
 --- a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
 +++ b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
 @@ -77,3 +77,3 @@ ${this._data.issueDescription}
@@ -56,7 +59,7 @@ index a58acca..1903a0c 100644
 +VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
  OS version: ${this._data.versionInfo && this._data.versionInfo.os}
 diff --git a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
-index 6467d66..d425016 100644
+index 0eedb21..c83e092 100644
 --- a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
 +++ b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
 @@ -17,3 +17,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
@@ -70,10 +73,10 @@ index 6467d66..d425016 100644
 +	'Before you report an issue here please <a href="https://github.com/VSCodium/vscodium/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>.'
  );
 diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
-index 20154ad..bca59b8 100644
+index 87839a6..49727fc 100644
 --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
 +++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
-@@ -148,3 +148,3 @@ class ReportExtensionSlowAction extends Action {
+@@ -153,3 +153,3 @@ class ReportExtensionSlowAction extends Action {
  - OS Version: \`${osVersion}\`
 -- VS Code version: \`${this._productService.version}\`\n\n${message}`);
 +- VSCodium version: \`${this._productService.version}\`\n\n${message}`);

patches/use-github-pat.patch

@@ -1,5 +1,5 @@
 diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts
-index dc7278f..a1adcf7 100644
+index 3662719..5bf55e0 100644
 --- a/extensions/github-authentication/src/githubServer.ts
 +++ b/extensions/github-authentication/src/githubServer.ts
 @@ -6,4 +6,2 @@
@@ -7,7 +7,7 @@ index dc7278f..a1adcf7 100644
 -import * as path from 'path';
 -import { PromiseAdapter, promiseFromEvent } from './common/utils';
  import { ExperimentationTelemetry } from './common/experimentationService';
-@@ -11,14 +9,7 @@ import { AuthProviderType, UriEventHandler } from './github';
+@@ -11,10 +9,5 @@ import { AuthProviderType, UriEventHandler } from './github';
  import { Log } from './common/logger';
 -import { isSupportedClient, isSupportedTarget } from './common/env';
 -import { LoopbackAuthServer } from './node/authServer';
@@ -17,13 +17,19 @@ index dc7278f..a1adcf7 100644
  
 -const CLIENT_ID = '01ab8ac9400c4e429b23';
 -const GITHUB_TOKEN_URL = 'https://vscode.dev/codeExchangeProxyEndpoints/github/login/oauth/access_token';
- const NETWORK_ERROR = 'network error';
+-
+ // This is the error message that we throw if the login was cancelled for any reason. Extensions
+@@ -23,3 +16,2 @@ const CANCELLATION_ERROR = 'Cancelled';
+ // These error messages are internal and should not be shown to the user in any way.
+-const TIMED_OUT_ERROR = 'Timed out';
+ const USER_CANCELLATION_ERROR = 'User Cancelled';
+@@ -27,5 +19,2 @@ const NETWORK_ERROR = 'network error';
  
 -const REDIRECT_URL_STABLE = 'https://vscode.dev/redirect';
 -const REDIRECT_URL_INSIDERS = 'https://insiders.vscode.dev/redirect';
 -
  export interface IGitHubServer {
-@@ -30,9 +21,2 @@ export interface IGitHubServer {
+@@ -37,9 +26,2 @@ export interface IGitHubServer {
  
 -interface IGitHubDeviceCodeResponse {
 -	device_code: string;
@@ -33,7 +39,7 @@ index dc7278f..a1adcf7 100644
 -}
 -
  async function getScopes(token: string, serverUri: vscode.Uri, logger: Log): Promise<string[]> {
-@@ -63,8 +47,4 @@ export class GitHubServer implements IGitHubServer {
+@@ -70,8 +52,4 @@ export class GitHubServer implements IGitHubServer {
  
 -	private readonly _pendingNonces = new Map<string, string[]>();
 -	private readonly _codeExchangePromises = new Map<string, { promise: Promise<string>; cancel: vscode.EventEmitter<void> }>();
@@ -42,13 +48,13 @@ index dc7278f..a1adcf7 100644
 -	private _redirectEndpoint: string | undefined;
 -
  	constructor(
-@@ -72,3 +52,5 @@ export class GitHubServer implements IGitHubServer {
+@@ -79,3 +57,5 @@ export class GitHubServer implements IGitHubServer {
  		private readonly _telemetryReporter: ExperimentationTelemetry,
 +		// @ts-ignore
  		private readonly _uriHandler: UriEventHandler,
 +		// @ts-ignore
  		private readonly _extensionKind: vscode.ExtensionKind,
-@@ -87,26 +69,2 @@ export class GitHubServer implements IGitHubServer {
+@@ -94,26 +74,2 @@ export class GitHubServer implements IGitHubServer {
  
 -	private async getRedirectEndpoint(): Promise<string> {
 -		if (this._redirectEndpoint) {
@@ -75,27 +81,27 @@ index dc7278f..a1adcf7 100644
 -	}
 -
  	// TODO@joaomoreno TODO@TylerLeonhardt
-@@ -122,71 +80,8 @@ export class GitHubServer implements IGitHubServer {
+@@ -129,68 +85,7 @@ export class GitHubServer implements IGitHubServer {
  		let userCancelled: boolean | undefined;
 -		const yes = vscode.l10n.t('Yes');
 -		const no = vscode.l10n.t('No');
--		const promptToContinue = async () => {
+-		const promptToContinue = async (mode: string) => {
 -			if (userCancelled === undefined) {
 -				// We haven't had a failure yet so wait to prompt
 -				return;
 -			}
 -			const message = userCancelled
--				? vscode.l10n.t('Having trouble logging in? Would you like to try a different way?')
--				: vscode.l10n.t('You have not yet finished authorizing this extension to use GitHub. Would you like to keep trying?');
+-				? vscode.l10n.t('Having trouble logging in? Would you like to try a different way? ({0})', mode)
+-				: vscode.l10n.t('You have not yet finished authorizing this extension to use GitHub. Would you like to try a different way? ({0})', mode);
 -			const result = await vscode.window.showWarningMessage(message, yes, no);
 -			if (result !== yes) {
--				throw new Error('Cancelled');
+-				throw new Error(CANCELLATION_ERROR);
 -			}
 -		};
 -
 -		const nonce: string = crypto.getRandomValues(new Uint32Array(2)).reduce((prev, curr) => prev += curr.toString(16), '');
 -		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate?nonce=${encodeURIComponent(nonce)}`));
- 
+-
 -		const supportedClient = isSupportedClient(callbackUri);
 -		const supportedTarget = isSupportedTarget(this._type, this._ghesUri);
 -		if (supportedClient && supportedTarget) {
@@ -103,7 +109,7 @@ index dc7278f..a1adcf7 100644
 -				return await this.doLoginWithoutLocalServer(scopes, nonce, callbackUri);
 -			} catch (e) {
 -				this._logger.error(e);
--				userCancelled = e.message ?? e === 'User Cancelled';
+-				userCancelled = e.message ?? e === USER_CANCELLATION_ERROR;
 -			}
 -		}
 -
@@ -117,42 +123,38 @@ index dc7278f..a1adcf7 100644
 -			supportedTarget
 -		) {
 -			try {
--				await promptToContinue();
+-				await promptToContinue(vscode.l10n.t('local server'));
 -				return await this.doLoginWithLocalServer(scopes);
 -			} catch (e) {
--				this._logger.error(e);
--				userCancelled = e.message ?? e === 'User Cancelled';
+-				userCancelled = this.processLoginError(e);
 -			}
 -		}
 -
 -		// We only can use the Device Code flow when we have a full node environment because of CORS.
 -		if (typeof navigator === 'undefined') {
 -			try {
--				await promptToContinue();
+-				await promptToContinue(vscode.l10n.t('device code'));
 -				return await this.doLoginDeviceCodeFlow(scopes);
 -			} catch (e) {
--				this._logger.error(e);
--				userCancelled = e.message ?? e === 'User Cancelled';
+-				userCancelled = this.processLoginError(e);
 -			}
 -		}
--
+ 
 -		// In a supported environment, we can't use PAT auth because we use this auth for Settings Sync and it doesn't support PATs.
 -		// With that said, GitHub Enterprise isn't used by Settings Sync so we can use PATs for that.
 -		if (!supportedClient || this._type === AuthProviderType.githubEnterprise) {
 -			try {
--				await promptToContinue();
+-				await promptToContinue(vscode.l10n.t('personal access token'));
 -				return await this.doLoginWithPat(scopes);
 -			} catch (e) {
--				this._logger.error(e);
--				userCancelled = e.message ?? e === 'User Cancelled';
+-				userCancelled = this.processLoginError(e);
 -			}
 +		try {
 +			return await this.doLoginWithPat(scopes);
 +		} catch (e) {
-+			this._logger.error(e);
-+			userCancelled = e.message ?? e === 'User Cancelled';
++			userCancelled = this.processLoginError(e);
  		}
-@@ -196,136 +91,2 @@ export class GitHubServer implements IGitHubServer {
+@@ -200,136 +95,2 @@ export class GitHubServer implements IGitHubServer {
  
 -	private async doLoginWithoutLocalServer(scopes: string, nonce: string, callbackUri: vscode.Uri): Promise<string> {
 -		this._logger.info(`Trying without local server... (${scopes})`);
@@ -192,8 +194,8 @@ index dc7278f..a1adcf7 100644
 -			try {
 -				return await Promise.race([
 -					codeExchangePromise.promise,
--					new Promise<string>((_, reject) => setTimeout(() => reject('Timed out'), 300_000)), // 5min timeout
--					promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise
+-					new Promise<string>((_, reject) => setTimeout(() => reject(TIMED_OUT_ERROR), 300_000)), // 5min timeout
+-					promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject(USER_CANCELLATION_ERROR); }).promise
 -				]);
 -			} finally {
 -				this._pendingNonces.delete(scopes);
@@ -233,8 +235,8 @@ index dc7278f..a1adcf7 100644
 -				vscode.env.openExternal(vscode.Uri.parse(`http://127.0.0.1:${port}/signin?nonce=${encodeURIComponent(server.nonce)}`));
 -				const { code } = await Promise.race([
 -					server.waitForOAuthResponse(),
--					new Promise<any>((_, reject) => setTimeout(() => reject('Timed out'), 300_000)), // 5min timeout
--					promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise
+-					new Promise<any>((_, reject) => setTimeout(() => reject(TIMED_OUT_ERROR), 300_000)), // 5min timeout
+-					promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject(USER_CANCELLATION_ERROR); }).promise
 -				]);
 -				codeToExchange = code;
 -			} finally {
@@ -277,7 +279,7 @@ index dc7278f..a1adcf7 100644
 -			}, button);
 -
 -		if (modalResult !== button) {
--			throw new Error('User Cancelled');
+-			throw new Error(USER_CANCELLATION_ERROR);
 -		}
 -
 -		await vscode.env.clipboard.writeText(json.user_code);
@@ -289,7 +291,7 @@ index dc7278f..a1adcf7 100644
 -	}
 -
  	private async doLoginWithPat(scopes: string): Promise<string> {
-@@ -369,123 +130,2 @@ export class GitHubServer implements IGitHubServer {
+@@ -373,124 +134,2 @@ export class GitHubServer implements IGitHubServer {
  
 -	private async waitForDeviceCodeAccessToken(
 -		json: IGitHubDeviceCodeResponse,
@@ -316,7 +318,7 @@ index dc7278f..a1adcf7 100644
 -			for (let i = 0; i < attempts; i++) {
 -				await new Promise(resolve => setTimeout(resolve, json.interval * 1000));
 -				if (token.isCancellationRequested) {
--					throw new Error('User Cancelled');
+-					throw new Error(USER_CANCELLATION_ERROR);
 -				}
 -				let accessTokenResult;
 -				try {
@@ -347,7 +349,7 @@ index dc7278f..a1adcf7 100644
 -				return accessTokenJson.access_token;
 -			}
 -
--			throw new Error('Cancelled');
+-			throw new Error(TIMED_OUT_ERROR);
 -		});
 -	}
 -
@@ -412,18 +414,19 @@ index dc7278f..a1adcf7 100644
 -			throw error;
 -		}
 -	}
- 
+-
+ 	private getServerUri(path: string = '') {
 diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-index 8c7e84a..2dd5cab 100644
+index ce04327..e66a7f5 100644
 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
 +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-@@ -309,3 +309,3 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
+@@ -355,3 +355,3 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
  
 -		if (providers.length && !menus.length) {
 +		if (!menus.length) {
  			const noAccountsAvailableAction = disposables.add(new Action('noAccountsAvailable', localize('noAccounts', "You are not signed in to any accounts"), undefined, false));
 diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts
-index 68fcc20..93484ee 100644
+index 5285663..08f9e42 100644
 --- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
 +++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
 @@ -274,12 +274,2 @@ export class AuthenticationService extends Disposable implements IAuthentication

product.json

@@ -81,7 +81,10 @@
       "quickPickSortByLabel",
       "testObserver",
       "envShellEvent",
-      "quickPickItemTooltip"
+      "quickPickItemTooltip",
+      "terminalDataWriteEvent",
+      "envCollectionWorkspace",
+      "saveEditor"
     ],
     "ms-dotnettools.dotnet-interactive-vscode": [
       "notebookMessaging"
@@ -103,8 +106,6 @@
       "textSearchProvider"
     ],
     "ms-vscode.remote-repositories": [
-      "contribEditorLineNumberMenu",
-      "contribEditorGutterMenu",
       "contribEditSessions",
       "contribRemoteHelp",
       "contribMenuBarHome",
@@ -164,11 +165,10 @@
       "documentFiltersExclusive"
     ],
     "GitHub.vscode-pull-request-github": [
-      "contribEditorLineNumberMenu",
-      "contribEditorGutterMenu",
       "contribCommentThreadAdditionalMenu",
       "tokenInformation",
       "contribShareMenu",
+      "fileComments",
       "contribCommentPeekContext",
       "treeItemCheckbox",
       "codiconDecoration",
@@ -207,7 +207,6 @@
       "contribNotebookStaticPreloads"
     ],
     "ms-toolsai.jupyter": [
-      "notebookControllerKind",
       "notebookDeprecated",
       "notebookMessaging",
       "notebookMime",
@@ -218,7 +217,8 @@
       "interactiveWindow",
       "notebookControllerAffinityHidden",
       "contribNotebookStaticPreloads",
-      "quickPickItemTooltip"
+      "quickPickItemTooltip",
+      "notebookExecution"
     ],
     "dbaeumer.vscode-eslint": [
       "notebookCellExecutionState"