From a4e5b2a1012e83868598227a57b24411f21eba91 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Tue, 16 Aug 2022 23:37:20 +0200
Subject: [PATCH] fix: update issue reporter (#1206)

---
 patch.sh                    | 15 +++++++++++++++
 patches/build-version.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100755 patch.sh

diff --git a/patch.sh b/patch.sh
new file mode 100755
index 0000000..0a11bad
--- /dev/null
+++ b/patch.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+FILE="../patches/${1}.patch"
+
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
+
+git apply --reject "${FILE}"
+
+read -p "Press any key when the conflict have been resolved..." -n1 -s
+
+git diff -U1 > "${FILE}"
+
+cd ..
+
+echo "The patch has been generated."
diff --git a/patches/build-version.patch b/patches/build-version.patch
index 85877fe..3884db6 100644
--- a/patches/build-version.patch
+++ b/patches/build-version.patch
@@ -107,6 +107,32 @@ index 1ae8079..0dad6ac 100644
  	readonly date?: string;
  	readonly quality?: string;
  	readonly commit?: string;
+diff --git a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
+index 046cb39..3271b6c 100644
+--- a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
++++ b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
+@@ -75,7 +75,7 @@ export class IssueReporter extends Disposable {
+ 		this.issueReporterModel = new IssueReporterModel({
+ 			issueType: configuration.data.issueType || IssueType.Bug,
+ 			versionInfo: {
+-				vscodeVersion: `${configuration.product.nameShort} ${!!configuration.product.darwinUniversalAssetId ? `${configuration.product.version} (Universal)` : configuration.product.version} (${configuration.product.commit || 'Commit unknown'}, ${configuration.product.date || 'Date unknown'})`,
++				vscodeVersion: `${configuration.product.nameShort} ${!!configuration.product.darwinUniversalAssetId ? `${configuration.product.version} (Universal)` : configuration.product.version} ${configuration.product.release || 'Release unknown'} (${configuration.product.commit || 'Commit unknown'}, ${configuration.product.date || 'Date unknown'})`,
+ 				os: `${this.configuration.os.type} ${this.configuration.os.arch} ${this.configuration.os.release}${isLinuxSnap ? ' snap' : ''}`
+ 			},
+ 			extensionsDisabled: !!configuration.disableExtensions,
+diff --git a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
+index b0cc736..035c5cb 100644
+--- a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
++++ b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
+@@ -74,7 +74,7 @@ Type: <b>${this.getIssueTypeTitle()}</b>
+ 
+ ${this._data.issueDescription}
+ ${this.getExtensionVersion()}
+-VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
++VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
+ OS version: ${this._data.versionInfo && this._data.versionInfo.os}
+ Modes:${modes.length ? ' ' + modes.join(', ') : ''}
+ ${this.getRemoteOSes()}
 diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
 index e1c60a3..a12d52c 100644
 --- a/src/vs/platform/diagnostics/node/diagnosticsService.ts