From b7b1088bde048d405e6cad4728d03699cf335495 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Mon, 17 Dec 2018 14:46:59 -0800 Subject: [PATCH] Strict null check cliProcessMain --- src/tsconfig.strictNullChecks.json | 5 +++-- src/vs/code/node/cliProcessMain.ts | 4 ++-- src/vs/platform/telemetry/node/commonProperties.ts | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json index 5ce1076a04b..7aa5f175c70 100644 --- a/src/tsconfig.strictNullChecks.json +++ b/src/tsconfig.strictNullChecks.json @@ -170,6 +170,7 @@ "./vs/code/electron-main/sharedProcess.ts", "./vs/code/electron-main/theme.ts", "./vs/code/node/cli.ts", + "./vs/code/node/cliProcessMain.ts", "./vs/code/node/paths.ts", "./vs/code/node/shellEnv.ts", "./vs/code/node/wait.ts", @@ -670,6 +671,7 @@ "./vs/workbench/parts/terminal/node/terminalProcess.ts", "./vs/workbench/parts/terminal/node/terminalProcessExtHostProxy.ts", "./vs/workbench/parts/terminal/node/windowsShellHelper.ts", + "./vs/workbench/parts/terminal/test/electron-browser/terminalColorRegistry.test.ts", "./vs/workbench/parts/terminal/test/node/terminalCommandTracker.test.ts", "./vs/workbench/parts/url/electron-browser/url.contribution.ts", "./vs/workbench/parts/webview/electron-browser/webviewProtocols.ts", @@ -792,8 +794,7 @@ "./vs/workbench/services/title/common/titleService.ts", "./vs/workbench/services/workspace/common/workspaceEditing.ts", "./vs/workbench/test/common/editor/editorOptions.test.ts", - "./vs/workbench/test/electron-browser/api/mock.ts", - "./vs/workbench/parts/terminal/test/electron-browser/terminalColorRegistry.test.ts" + "./vs/workbench/test/electron-browser/api/mock.ts" ], "exclude": [ "./typings/require-monaco.d.ts" diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index 67fe22445f5..4c33ff46c83 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -53,7 +53,7 @@ function getId(manifest: IExtensionManifest, withVersion?: boolean): string { const EXTENSION_ID_REGEX = /^([^.]+\..+)@(\d+\.\d+\.\d+(-.*)?)$/; -export function getIdAndVersion(id: string): [string, string] { +export function getIdAndVersion(id: string): [string, string | undefined] { const matches = EXTENSION_ID_REGEX.exec(id); if (matches && matches[1]) { return [adoptToGalleryExtensionId(matches[1]), matches[2]]; @@ -77,7 +77,7 @@ class Main { await this.setInstallSource(argv['install-source']); } else if (argv['list-extensions']) { - await this.listExtensions(argv['show-versions']); + await this.listExtensions(!!argv['show-versions']); } else if (argv['install-extension']) { const arg = argv['install-extension']; diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/node/commonProperties.ts index 64b965661ad..ecf7d4e9559 100644 --- a/src/vs/platform/telemetry/node/commonProperties.ts +++ b/src/vs/platform/telemetry/node/commonProperties.ts @@ -8,7 +8,7 @@ import * as os from 'os'; import * as uuid from 'vs/base/common/uuid'; import { readFile } from 'vs/base/node/pfs'; -export function resolveCommonProperties(commit: string | undefined, version: string, machineId: string, installSourcePath: string): Promise<{ [name: string]: string | undefined; }> { +export function resolveCommonProperties(commit: string | undefined, version: string, machineId: string | undefined, installSourcePath: string): Promise<{ [name: string]: string | undefined; }> { const result: { [name: string]: string | undefined; } = Object.create(null); // __GDPR__COMMON__ "common.machineId" : { "endPoint": "MacAddressHash", "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" } result['common.machineId'] = machineId; -- GitLab