提交 b7b1088b 编写于 作者: M Matt Bierner

Strict null check cliProcessMain

上级 113733ce
...@@ -170,6 +170,7 @@ ...@@ -170,6 +170,7 @@
"./vs/code/electron-main/sharedProcess.ts", "./vs/code/electron-main/sharedProcess.ts",
"./vs/code/electron-main/theme.ts", "./vs/code/electron-main/theme.ts",
"./vs/code/node/cli.ts", "./vs/code/node/cli.ts",
"./vs/code/node/cliProcessMain.ts",
"./vs/code/node/paths.ts", "./vs/code/node/paths.ts",
"./vs/code/node/shellEnv.ts", "./vs/code/node/shellEnv.ts",
"./vs/code/node/wait.ts", "./vs/code/node/wait.ts",
...@@ -670,6 +671,7 @@ ...@@ -670,6 +671,7 @@
"./vs/workbench/parts/terminal/node/terminalProcess.ts", "./vs/workbench/parts/terminal/node/terminalProcess.ts",
"./vs/workbench/parts/terminal/node/terminalProcessExtHostProxy.ts", "./vs/workbench/parts/terminal/node/terminalProcessExtHostProxy.ts",
"./vs/workbench/parts/terminal/node/windowsShellHelper.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/terminal/test/node/terminalCommandTracker.test.ts",
"./vs/workbench/parts/url/electron-browser/url.contribution.ts", "./vs/workbench/parts/url/electron-browser/url.contribution.ts",
"./vs/workbench/parts/webview/electron-browser/webviewProtocols.ts", "./vs/workbench/parts/webview/electron-browser/webviewProtocols.ts",
...@@ -792,8 +794,7 @@ ...@@ -792,8 +794,7 @@
"./vs/workbench/services/title/common/titleService.ts", "./vs/workbench/services/title/common/titleService.ts",
"./vs/workbench/services/workspace/common/workspaceEditing.ts", "./vs/workbench/services/workspace/common/workspaceEditing.ts",
"./vs/workbench/test/common/editor/editorOptions.test.ts", "./vs/workbench/test/common/editor/editorOptions.test.ts",
"./vs/workbench/test/electron-browser/api/mock.ts", "./vs/workbench/test/electron-browser/api/mock.ts"
"./vs/workbench/parts/terminal/test/electron-browser/terminalColorRegistry.test.ts"
], ],
"exclude": [ "exclude": [
"./typings/require-monaco.d.ts" "./typings/require-monaco.d.ts"
......
...@@ -53,7 +53,7 @@ function getId(manifest: IExtensionManifest, withVersion?: boolean): string { ...@@ -53,7 +53,7 @@ function getId(manifest: IExtensionManifest, withVersion?: boolean): string {
const EXTENSION_ID_REGEX = /^([^.]+\..+)@(\d+\.\d+\.\d+(-.*)?)$/; 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); const matches = EXTENSION_ID_REGEX.exec(id);
if (matches && matches[1]) { if (matches && matches[1]) {
return [adoptToGalleryExtensionId(matches[1]), matches[2]]; return [adoptToGalleryExtensionId(matches[1]), matches[2]];
...@@ -77,7 +77,7 @@ class Main { ...@@ -77,7 +77,7 @@ class Main {
await this.setInstallSource(argv['install-source']); await this.setInstallSource(argv['install-source']);
} else if (argv['list-extensions']) { } else if (argv['list-extensions']) {
await this.listExtensions(argv['show-versions']); await this.listExtensions(!!argv['show-versions']);
} else if (argv['install-extension']) { } else if (argv['install-extension']) {
const arg = argv['install-extension']; const arg = argv['install-extension'];
......
...@@ -8,7 +8,7 @@ import * as os from 'os'; ...@@ -8,7 +8,7 @@ import * as os from 'os';
import * as uuid from 'vs/base/common/uuid'; import * as uuid from 'vs/base/common/uuid';
import { readFile } from 'vs/base/node/pfs'; 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); const result: { [name: string]: string | undefined; } = Object.create(null);
// __GDPR__COMMON__ "common.machineId" : { "endPoint": "MacAddressHash", "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" } // __GDPR__COMMON__ "common.machineId" : { "endPoint": "MacAddressHash", "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" }
result['common.machineId'] = machineId; result['common.machineId'] = machineId;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册