From 7bf2f5e1960840c305e7fcc2a5cab59dd398dcac Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 27 Sep 2024 11:13:04 +0200 Subject: [PATCH] esm - more typing to jsonc --- src/vs/base/common/jsonc.ts | 2 +- src/vs/code/electron-main/app.ts | 2 +- .../encryption/electron-sandbox/encryption.contribution.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/base/common/jsonc.ts b/src/vs/base/common/jsonc.ts index 5f88b2863ec..1862a28e725 100644 --- a/src/vs/base/common/jsonc.ts +++ b/src/vs/base/common/jsonc.ts @@ -52,7 +52,7 @@ export function stripComments(content: string): string { * @param content the content to strip comments from * @returns the parsed content as JSON */ -export function parse(content: string): any { +export function parse(content: string): T { const commentsStripped = stripComments(content); try { diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index 29429516496..ebf401ded8f 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -1423,7 +1423,7 @@ export class CodeApplication extends Disposable { try { const argvContent = await this.fileService.readFile(this.environmentMainService.argvResource); const argvString = argvContent.value.toString(); - const argvJSON = parse(argvString); + const argvJSON = parse<{ 'enable-crash-reporter'?: boolean }>(argvString); const telemetryLevel = getTelemetryLevel(this.configurationService); const enableCrashReporter = telemetryLevel >= TelemetryLevel.CRASH; diff --git a/src/vs/workbench/contrib/encryption/electron-sandbox/encryption.contribution.ts b/src/vs/workbench/contrib/encryption/electron-sandbox/encryption.contribution.ts index c6061279a7a..a530edf2bbf 100644 --- a/src/vs/workbench/contrib/encryption/electron-sandbox/encryption.contribution.ts +++ b/src/vs/workbench/contrib/encryption/electron-sandbox/encryption.contribution.ts @@ -34,7 +34,7 @@ class EncryptionContribution implements IWorkbenchContribution { } try { const content = await this.fileService.readFile(this.environmentService.argvResource); - const argv = parse(content.value.toString()); + const argv = parse<{ 'password-store'?: string }>(content.value.toString()); if (argv['password-store'] === 'gnome' || argv['password-store'] === 'gnome-keyring') { this.jsonEditingService.write(this.environmentService.argvResource, [{ path: ['password-store'], value: 'gnome-libsecret' }], true); }