From 78c02a1f137655e27f3137e1d07a274e482baf6b Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 8 Nov 2022 14:55:07 -0700
Subject: [PATCH] fixup: support this.args.log as string

Seems like upstream now uses a string[] for this. For now, support
string.

See
https://github.com/microsoft/vscode/commit/2b50ab06b1636a38f6bec3dfb2c8f471374a2cba
---
 patches/integration.diff | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/patches/integration.diff b/patches/integration.diff
index dc585f4ed..54f50dc8c 100644
--- a/patches/integration.diff
+++ b/patches/integration.diff
@@ -272,3 +272,21 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
  				embedderIdentifier: 'server-distro',
  				extensionsGallery: this._webExtensionResourceUrlTemplate ? {
  					...this._productService.extensionsGallery,
+Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
+===================================================================
+--- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts
++++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
+@@ -223,7 +223,12 @@ export abstract class AbstractNativeEnvi
+ 	get verbose(): boolean { return !!this.args.verbose; }
+ 
+ 	@memoize
+-	get logLevel(): string | undefined { return this.args.log?.find(entry => !EXTENSION_IDENTIFIER_WITH_LOG_REGEX.test(entry)); }
++	get logLevel(): string | undefined {
++		if (typeof this.args.log === "string") {
++			return this.args.log
++		}
++		return this.args.log?.find(entry => !EXTENSION_IDENTIFIER_WITH_LOG_REGEX.test(entry));
++	}
+ 	@memoize
+ 	get extensionLogLevel(): [string, string][] | undefined {
+ 		const result: [string, string][] = [];