Skip to content

Commit 78c02a1

Browse files
committed
fixup: support this.args.log as string
Seems like upstream now uses a string[] for this. For now, support string. See microsoft/vscode@2b50ab0
1 parent b53ca8a commit 78c02a1

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

patches/integration.diff

+18
Original file line numberDiff line numberDiff line change
@@ -272,3 +272,21 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
272272
embedderIdentifier: 'server-distro',
273273
extensionsGallery: this._webExtensionResourceUrlTemplate ? {
274274
...this._productService.extensionsGallery,
275+
Index: code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
276+
===================================================================
277+
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/environmentService.ts
278+
+++ code-server/lib/vscode/src/vs/platform/environment/common/environmentService.ts
279+
@@ -223,7 +223,12 @@ export abstract class AbstractNativeEnvi
280+
get verbose(): boolean { return !!this.args.verbose; }
281+
282+
@memoize
283+
- get logLevel(): string | undefined { return this.args.log?.find(entry => !EXTENSION_IDENTIFIER_WITH_LOG_REGEX.test(entry)); }
284+
+ get logLevel(): string | undefined {
285+
+ if (typeof this.args.log === "string") {
286+
+ return this.args.log
287+
+ }
288+
+ return this.args.log?.find(entry => !EXTENSION_IDENTIFIER_WITH_LOG_REGEX.test(entry));
289+
+ }
290+
@memoize
291+
get extensionLogLevel(): [string, string][] | undefined {
292+
const result: [string, string][] = [];

0 commit comments

Comments
 (0)