Merge branch 'insider'

.github/workflows/insider-linux.yml

@@ -135,9 +135,9 @@ jobs:
         - vscode_arch: pp64le
           npm_arch: ppc64le
           image: vscodium/vscodium-linux-build-agent:bionic-ppc64le
-        # - vscode_arch: armhf
-        #   npm_arch: armv7l
-        #   image: vscodium/vscodium-linux-build-agent:buster-armhf
+        - vscode_arch: armhf
+          npm_arch: arm
+          image: vscodium/vscodium-linux-build-agent:buster-armhf
     container:
       image: ${{ matrix.image }}
       env:

.github/workflows/insider-windows.yml

@@ -41,7 +41,7 @@ jobs:
       matrix:
         vscode_arch:
           - x64
-          # - ia32
+          - ia32
           - arm64
     outputs:
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}

insider.json

@@ -1,4 +1,4 @@
 {
-  "tag": "1.78.0",
-  "commit": "2da5a0024fe2ca407f741f19340f1a10f4d692af"
+  "tag": "1.79.0",
+  "commit": "b380da4ef1ee00e224a15c1d4d9793e27c2b6302"
 }

patches/build-version.patch

@@ -1,21 +1,21 @@
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 2e8ef58..6870416 100644
+index 2a0c236..9fea722 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -251,4 +251,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -250,4 +250,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 }));
 
-@@ -257,3 +258,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -256,3 +257,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 3d3eee9..964dd18 100644
+index 0ca2cfd..3fb21d5 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
 @@ -225,3 +225,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
@@ -60,7 +60,7 @@ index 90f75cc..275c958 100644
 +			.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
  			// Possible run-on values https://snapcraft.io/docs/architectures
 diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
-index 0d3abda..2606af5 100644
+index 6e9a6f3..9d80b6b 100644
 --- a/build/gulpfile.vscode.win32.js
 +++ b/build/gulpfile.vscode.win32.js
 @@ -94,4 +94,4 @@ function buildWin32Setup(arch, target) {
@@ -80,7 +80,7 @@ index 06b8549..3af1f45 100644
 +Release:  el7
  Summary:  Code editing. Redefined.
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index 2526747..73c6b7f 100644
+index ac9cd5d..87b6105 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
 @@ -58,2 +58,3 @@ export interface IProductConfiguration {
@@ -111,7 +111,7 @@ index 51a55e1..26dfe7b 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 1dbc24a..8385b70 100644
+index 4b320bb..6619c75 100644
 --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
 @@ -22,2 +22,3 @@ import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaul
@@ -149,7 +149,7 @@ index 0000000..2a8ea57
 +	return LABELS[language] ?? DEFAULT_LABEL;
 +}
 diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
-index dd166f1..f0a52c4 100644
+index 575bde3..f427833 100644
 --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
 @@ -14,2 +14,3 @@ import { IProductService } from 'vs/platform/product/common/productService';
@@ -160,8 +160,8 @@ index dd166f1..f0a52c4 100644
  		const osProps = await this.nativeHostService.getOSProperties();
 +		const releaseString = getReleaseString();
 
-@@ -90,3 +92,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
- 				process.sandboxed ? 'Yes' : 'No' // TODO@bpasero remove me once sandbox is final
+@@ -89,3 +91,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
+ 				`${osProps.type} ${osProps.arch} ${osProps.release}${isLinuxSnap ? ' snap' : ''}`
 -			);
 +			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);
  		};

patches/feat-announcements.patch

@@ -1,8 +1,8 @@
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-index 3ef5ca1..a634a9f 100644
+index 8c2aa42..18b0975 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-@@ -301,2 +301,8 @@ configurationRegistry.registerConfiguration({
+@@ -300,2 +300,8 @@ configurationRegistry.registerConfiguration({
  		},
 +		'workbench.welcomePage.extraAnnouncements': {
 +			scope: ConfigurationScope.MACHINE,
@@ -12,10 +12,10 @@ index 3ef5ca1..a634a9f 100644
 +		},
  		'workbench.startupEditor': {
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-index 46949b2..174e65f 100644
+index 9dd5330..9e2b6a2 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-@@ -118,4 +118,8 @@ type GettingStartedActionEvent = {
+@@ -117,4 +117,8 @@ type GettingStartedActionEvent = {
  type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string };
 +type AnnouncementEntry = { id: string, title: string, url: string };
 
@@ -24,26 +24,26 @@ index 46949b2..174e65f 100644
 +const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */];
 +
  export class GettingStartedPage extends EditorPane {
-@@ -152,2 +156,4 @@ export class GettingStartedPage extends EditorPane {
+@@ -153,2 +157,4 @@ export class GettingStartedPage extends EditorPane {
  	private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
 +	private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
 +	private announcementData?: AnnouncementEntry[];
  	private featuredExtensionsList?: GettingStartedIndexList<IFeaturedExtension>;
-@@ -804,2 +810,3 @@ export class GettingStartedPage extends EditorPane {
+@@ -774,2 +780,3 @@ export class GettingStartedPage extends EditorPane {
  		const gettingStartedList = this.buildGettingStartedWalkthroughsList();
 +		const announcementList = await this.buildAnnouncementList();
 
-@@ -815,3 +822,3 @@ export class GettingStartedPage extends EditorPane {
+@@ -784,3 +791,3 @@ export class GettingStartedPage extends EditorPane {
  				this.container.classList.remove('noWalkthroughs');
--				reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
-+				reset(leftColumn, startList.getDomElement(), recentList.getDomElement(), announcementList.getDomElement());
- 				reset(rightColumn, featuredExtensionList.getDomElement(), gettingStartedList.getDomElement());
-@@ -820,3 +827,3 @@ export class GettingStartedPage extends EditorPane {
+-				reset(rightColumn, featuredExtensionList.getDomElement(), gettingStartedList.getDomElement());
++				reset(rightColumn, featuredExtensionList.getDomElement(), gettingStartedList.getDomElement(), announcementList.getDomElement());
+ 			}
+@@ -788,3 +795,3 @@ export class GettingStartedPage extends EditorPane {
  				this.container.classList.add('noWalkthroughs');
--				reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
-+				reset(leftColumn, startList.getDomElement(), announcementList.getDomElement());
- 				reset(rightColumn, featuredExtensionList.getDomElement());
-@@ -982,2 +989,55 @@ export class GettingStartedPage extends EditorPane {
+-				reset(rightColumn, featuredExtensionList.getDomElement());
++				reset(rightColumn, featuredExtensionList.getDomElement(), announcementList.getDomElement());
+ 			}
+@@ -946,2 +953,55 @@ export class GettingStartedPage extends EditorPane {
 
 +	private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
 +		const renderAnnouncement = (announcement: AnnouncementEntry) => {

patches/helper/settings.patch

@@ -16,7 +16,8 @@ index 7ae8bce..724b9ad 100644
 -	"files.insertFinalNewline": true,
 +	// "files.insertFinalNewline": true,
  	"[plaintext]": {
-@@ -91,3 +91,3 @@
+@@ -91,4 +91,4 @@
+ 	"[javascript]": {
  		"editor.defaultFormatter": "vscode.typescript-language-features",
 -		"editor.formatOnSave": true
 +		// "editor.formatOnSave": true

patches/insider/add-remote-url.patch

@@ -1,17 +1,17 @@
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index ae33cc9..06c2a67 100644
+index 2a0c236..0f10f17 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -251,3 +251,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -256,3 +256,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 -			.pipe(json({ commit, date, version, release }));
 +			.pipe(json({ commit, date, version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }));
 
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 938943d..2d84a15 100644
+index 0ca2cfd..9bf83a7 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -245,3 +245,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -244,3 +244,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  		const date = new Date().toISOString();
 -		const productJsonUpdate = { commit, date, checksums, version, release };
 +		const productJsonUpdate = { commit, date, checksums, version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' };

patches/custom-gallery.patch → patches/merge-user-product.patch

@@ -1,21 +1,37 @@
+diff --git a/src/main.js b/src/main.js
+index d986fee..1ad0ef0 100644
+--- a/src/main.js
++++ b/src/main.js
+@@ -18,2 +18,3 @@ perf.mark('code/didStartMain');
+ const path = require('path');
++const { fileURLToPath } = require('url');
+ const fs = require('fs');
+@@ -149,2 +150,14 @@ app.once('ready', function () {
+
++function resolveUserProduct() {
++	const userDataPath = getUserDataPath({}, product.nameShort ?? 'code-oss-dev');
++	const userProductPath = `file:///${userDataPath}/product.json`;
++
++	try {
++		// Assign the product configuration to the global scope
++		const productPath = require(fileURLToPath(userProductPath));
++		global["_VSCODE_USER_PRODUCT_JSON"] = productPath;
++	} catch (ex) {
++	}
++}
++
+ /**
+@@ -160,2 +173,3 @@ function startup(codeCachePath, nlsConfig) {
+ 	process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || '';
++	resolveUserProduct();
+
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index ef798fa..5a0550b 100644
+index 51a55e1..e2af375 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
-@@ -5,3 +5,4 @@
-
--import { globals } from 'vs/base/common/platform';
-+import { AppResourcePath, FileAccess } from 'vs/base/common/network';
-+import { globals, isWindows } from 'vs/base/common/platform';
- import { env } from 'vs/base/common/process';
-@@ -9,2 +10,3 @@ import { IProductConfiguration } from 'vs/base/common/product';
- import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
-+import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
+@@ -29,2 +29,36 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
 
-@@ -29,2 +31,40 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
-
-+	// Set user-defined extension gallery
-+	const { serviceUrl, searchUrl, itemUrl, controlUrl } = product.extensionsGallery || {}
++	const { serviceUrl, searchUrl, itemUrl, controlUrl } = product.extensionsGallery || {};
 +
 +	Object.assign(product, {
 +		extensionsGallery: {
@@ -24,7 +40,7 @@ index ef798fa..5a0550b 100644
 +			itemUrl: env['VSCODE_GALLERY_ITEM_URL'] || itemUrl,
 +			controlUrl: env['VSCODE_GALLERY_CONTROL_URL'] || controlUrl,
 +		}
-+	})
++	});
 +
 +	// Merge user-customized product.json
 +	try {
@@ -43,10 +59,7 @@ index ef798fa..5a0550b 100644
 +				return result;
 +			}, {}) as any;
 +
-+		const userDataPath = getUserDataPath({} as any, product.nameShort);
-+		const userProductPath = isWindows ? `file:///${userDataPath}/product.json` : `file://${userDataPath}/product.json`;
-+
-+		const userProduct = require.__$__nodeRequire(FileAccess.asFileUri(userProductPath as AppResourcePath).fsPath);
++		const userProduct = (globalThis as Record<string, any>)._VSCODE_USER_PRODUCT_JSON || {};
 +
 +		product = merge(product, userProduct);
 +	} catch (ex) {

patches/report-issue.patch

@@ -1,7 +1,7 @@
-diff --git a/src/vs/code/electron-sandbox/issue/IssueReporterService.ts b/src/vs/code/electron-sandbox/issue/IssueReporterService.ts
+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
+--- 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 {

patches/update-cache-path.patch

@@ -1,13 +1,9 @@
 diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
-index 93424ca..133657e 100644
+index d45291e..74d4080 100644
 --- a/src/vs/platform/update/electron-main/updateService.win32.ts
 +++ b/src/vs/platform/update/electron-main/updateService.win32.ts
-@@ -53,7 +53,7 @@ export class Win32UpdateService extends AbstractUpdateService {
-
- 	@memoize
+@@ -55,3 +55,3 @@ export class Win32UpdateService extends AbstractUpdateService {
  	get cachePath(): Promise<string> {
--		const result = path.join(tmpdir(), `vscode-update-${this.productService.target}-${process.arch}`);
-+		const result = path.join(tmpdir(), `${this.productService.applicationName}-update-${this.productService.target}-${process.arch}`);
+-		const result = path.join(tmpdir(), `vscode-${this.productService.quality}-${this.productService.target}-${process.arch}`);
++		const result = path.join(tmpdir(), `${this.productService.applicationName}-${this.productService.quality}-${this.productService.target}-${process.arch}`);
  		return pfs.Promises.mkdir(result, { recursive: true }).then(() => result);
- 	}
-

patches/update-msi.patch

@@ -9,7 +9,7 @@ index 7cd4a84..7cbdf21 100644
 +	WindowsInstaller,
  }
 diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
-index caecd71..4c02afa 100644
+index d45291e..4d8c5df 100644
 --- a/src/vs/platform/update/electron-main/updateService.win32.ts
 +++ b/src/vs/platform/update/electron-main/updateService.win32.ts
 @@ -41,5 +41,9 @@ function getUpdateType(): UpdateType {
@@ -45,7 +45,7 @@ index caecd71..4c02afa 100644
  		}
 @@ -243,6 +254,14 @@ export class Win32UpdateService extends AbstractUpdateService {
  		} else {
--			spawn(this.availableUpdate.packagePath, ['/silent', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
+-			spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
 -				detached: true,
 -				stdio: ['ignore', 'ignore', 'ignore']
 -			});
@@ -56,7 +56,7 @@ index caecd71..4c02afa 100644
 +					stdio: ['ignore', 'ignore', 'ignore']
 +				});
 +			} else {
-+				spawn(this.availableUpdate.packagePath, ['/silent', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
++				spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
 +					detached: true,
 +					stdio: ['ignore', 'ignore', 'ignore']
 +				});