fix(1.65): update patches (#1001 )

enhance: move variables outside loop (#1002 )
Merge pull request #997 from dsm/master
2026-04-12 00:37:19 +10:00 · 2022-03-04 09:47:45 +01:00 · 2022-03-04 09:16:49 +01:00 · 2022-03-04 08:33:58 +01:00 · 2022-03-04 10:30:33 +03:00 · 2022-02-15 15:03:01 +03:00
8 changed files with 27 additions and 20 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -20,3 +20,6 @@ indent_size = 2
 [*.patch]
 trim_trailing_whitespace = false
 insert_final_newline = false
+
+[*.svg]
+insert_final_newline = false
--- a/patches/binary-name.patch
+++ b/patches/binary-name.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index df089a6..7aeb54b 100644
+index 2f5a931..ac3d7e6 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -286,7 +286,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -290,7 +290,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
 		} else if (platform === 'darwin') {
 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
@@ -12,19 +12,19 @@ index df089a6..7aeb54b 100644
 			all = es.merge(all, shortcut);
 		}
 diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
-index bd4dc01..02cbbc2 100644
+index 3bd0c57..d921c60 100644
 --- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
 +++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
-@@ -355,7 +355,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
+@@ -353,7 +353,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 	}
 
- 	private async getShellCommandLink(): Promise<{ readonly source: string, readonly target: string }> {
+ 	private async getShellCommandLink(): Promise<{ readonly source: string; readonly target: string }> {
 -		const target = resolve(this.environmentMainService.appRoot, 'bin', 'code');
 +		const target = resolve(this.environmentMainService.appRoot, 'bin', this.productService.applicationName);
 		const source = `/usr/local/bin/${this.productService.applicationName}`;
 
 		// Ensure source exists
-@@ -565,7 +565,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
+@@ -563,7 +563,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 		// macOS
 		if (this.environmentMainService.isBuilt) {
--- a/patches/custom-gallery.patch
+++ b/patches/custom-gallery.patch
@@ -1,8 +1,8 @@
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index 657b9c9..9b9b12e 100644
+index 1edc76f..4c0bf98 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
-@@ -70,6 +70,7 @@ export interface IProductConfiguration {
+@@ -69,6 +69,7 @@ export interface IProductConfiguration {
 
 	readonly extensionsGallery?: {
 		readonly serviceUrl: string;
@@ -11,7 +11,7 @@ index 657b9c9..9b9b12e 100644
 		readonly resourceUrlTemplate: string;
 		readonly controlUrl: string;
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index 5e38d35..12bb161 100644
+index e22b33e..98cec93 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
@@ -4,11 +4,12 @@
@@ -30,7 +30,7 @@ index 5e38d35..12bb161 100644
  * @deprecated You MUST use `IProductService` if possible.
@@ -34,6 +35,32 @@ else if (typeof require?.__$__nodeRequire === 'function') {
 	product = require.__$__nodeRequire(joinPath(rootPath, 'product.json').fsPath);
- 	const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string; };
+ 	const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string };
 
 +	// Merge user-customized product.json
 +	try {
@@ -61,7 +61,7 @@ index 5e38d35..12bb161 100644
 	// Running out of sources
 	if (env['VSCODE_DEV']) {
 		Object.assign(product, {
-@@ -43,6 +70,19 @@ else if (typeof require?.__$__nodeRequire === 'function') {
+@@ -44,6 +71,19 @@ else if (typeof require?.__$__nodeRequire === 'function') {
 		});
 	}
 
--- a/patches/use-github-pat.patch
+++ b/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 3002e937c81..9674d8d2089 100644
+index 92313d0..a69da37 100644
 --- a/extensions/github-authentication/src/githubServer.ts
 +++ b/extensions/github-authentication/src/githubServer.ts
@@ -3,41 +3,13 @@
@@ -66,7 +66,7 @@ index 3002e937c81..9674d8d2089 100644
 -	private _onDidManuallyProvideToken = new vscode.EventEmitter<string | undefined>();
 -
 -	private _pendingStates = new Map<string, string[]>();
-	private _codeExchangePromises = new Map<string, { promise: Promise<string>, cancel: vscode.EventEmitter<void> }>();
+-	private _codeExchangePromises = new Map<string, { promise: Promise<string>; cancel: vscode.EventEmitter<void> }>();
 -	private _statusBarCommandId = `${this.type}.provide-manually`;
 -	private _disposable: vscode.Disposable;
 -	private _uriHandler = new UriEventHandler(this._logger);
@@ -344,7 +344,7 @@ index 3002e937c81..9674d8d2089 100644
 -		this._uriHandler.handleUri(vscode.Uri.parse(uri.trim()));
 -	}
 -
- 	public getUserInfo(token: string): Promise<{ id: string, accountName: string }> {
+ 	public getUserInfo(token: string): Promise<{ id: string; accountName: string }> {
 		return getUserInfo(token, this.getServerUri('/user'), this._logger);
 	}
 
@@ -368,7 +368,7 @@ index 3002e937c81..9674d8d2089 100644
 -			});
 -
 -			if (result.ok) {
-				const json: { student: boolean, faculty: boolean } = await result.json();
+-				const json: { student: boolean; faculty: boolean } = await result.json();
 -
 -				/* __GDPR__
 -					"session" : {
--- a/release.sh
+++ b/release.sh
@@ -18,6 +18,10 @@ cd artifacts

 set +e

+OWNER="${GITHUB_REPOSITORY_OWNER:-"VSCodium"}"
+REPO_NAME="${GITHUB_REPOSITORY:(${#OWNER}+1)}"
+REPOSITORY="${REPO_NAME:-"vscodium"}"
+
 for FILE in *
 do
  if [[ -f "${FILE}" ]] && [[ "${FILE}" != *.sha1 ]] && [[ "${FILE}" != *.sha256 ]]; then
@@ -30,7 +34,7 @@ do
    if (( $EXIT_STATUS )); then
      for (( i=0; i<10; i++ ))
      do
-        github-release delete --owner VSCodium --repo vscodium --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
+        github-release delete --owner "${OWNER}" --repo "${REPOSITORY}" --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"

        sleep $(( 15 * (i + 1)))

@@ -49,7 +53,7 @@ do
      if (( $EXIT_STATUS )); then
        echo "'${FILE}' hasn't been uploaded!"

-        github-release delete --owner VSCodium --repo vscodium --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
+        github-release delete --owner "${OWNER}" --repo "${REPOSITORY}" --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"

        exit 1
      fi
--- a/src/src/vs/workbench/browser/parts/editor/media/letterpress-dark.svg
+++ b/src/src/vs/workbench/browser/parts/editor/media/letterpress-dark.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024px" height="1024px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="40" height="40" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 55 (78076) - https://sketchapp.com -->
    <title>codium_grey_dark_letterpress</title>
    <desc>Created with Sketch.</desc>
--- a/src/src/vs/workbench/browser/parts/editor/media/letterpress-hc.svg
+++ b/src/src/vs/workbench/browser/parts/editor/media/letterpress-hc.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024px" height="1024px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="40" height="40" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 55 (78076) - https://sketchapp.com -->
    <title>codium_grey_hc_letterpress</title>
    <desc>Created with Sketch.</desc>
--- a/src/src/vs/workbench/browser/parts/editor/media/letterpress.svg
+++ b/src/src/vs/workbench/browser/parts/editor/media/letterpress.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024px" height="1024px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="40" height="40" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 55 (78076) - https://sketchapp.com -->
    <title>codium_grey_letterpress</title>
    <desc>Created with Sketch.</desc>
Author	SHA1	Message	Date
Baptiste Augrain	5bd755a9cc	fix(1.65): update patches (#1001 )	2022-03-04 09:47:45 +01:00
Baptiste Augrain	1cbc6e55bf	enhance: move variables outside loop (#1002 )	2022-03-04 09:16:49 +01:00
Simon Sobisch	351460f992	Merge pull request #997 from dsm/master changed hardcoded owner	2022-03-04 08:33:58 +01:00
Muhammet Şükrü Demir	f7e1c11ea7	owner and repository pre-calculated added OWNER and REPOSITORY var using github env vars and if not available fallback option is available.	2022-03-04 10:30:33 +03:00
Muhammet Şükrü Demir	50197bbeef	changed hardcoded owner	2022-02-15 15:03:01 +03:00
Baptiste Augrain	b319b178ea	fix: update size of letterpress images (#992 )	2022-02-06 16:05:53 +01:00