argv: fix null checks

aeschli · aeschli · commit ddd17d938ffc · 2019-01-22T15:56:28.000+01:00
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
@@ -144,7 +144,7 @@ export function formatOptions(docOptions: Option[], columns: number): string[] {
 		return docOptions.reduce<string[]>((r, o, i) => r.concat([`  ${usageTexts[i]}`, `      ${o.description}`]), []);
 	}
 	let descriptionColumns = columns - argLength - 1;
-	let result = [];
+	let result: string[] = [];
 	docOptions.forEach((o, i) => {
 		let usage = usageTexts[i];
 		let wrappedDescription = wrapText(o.description!, descriptionColumns);
@@ -162,7 +162,7 @@ function indent(count: number): string {
 }
 
 function wrapText(text: string, columns: number): string[] {
-	let lines = [];
+	let lines: string[] = [];
 	while (text.length) {
 		let index = text.length < columns ? text.length : text.lastIndexOf(' ', columns);
 		let line = text.slice(0, index).trim();
@@ -198,8 +198,8 @@ export function buildHelpMessage(productName: string, executableName: string, ve
 	return help.join('\n');
 }
 
-export function buildVersionMessage(version: string, commit: string) {
-	return `${version || 'Unknown version'}\n${commit || 'Unknown commit'}\n${process.arch}`;
+export function buildVersionMessage(version: string | undefined, commit: string | undefined): string {
+	return `${version || localize('unknownVersion', "Unknown version")}\n${commit || localize('unknownCommit', "Unknown commit")}\n${process.arch}`;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ export function formatOptions(docOptions: Option[], columns: number): string[] {`
`144`	`144`	return docOptions.reduce<string[]>((r, o, i) => r.concat([` ${usageTexts[i]}`, ` ${o.description}`]), []);
`145`	`145`	`}`
`146`	`146`	`let descriptionColumns = columns - argLength - 1;`
`147`		`- let result = [];`
	`147`	`+ let result: string[] = [];`
`148`	`148`	`docOptions.forEach((o, i) => {`
`149`	`149`	`let usage = usageTexts[i];`
`150`	`150`	`let wrappedDescription = wrapText(o.description!, descriptionColumns);`
`@@ -162,7 +162,7 @@ function indent(count: number): string {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`function wrapText(text: string, columns: number): string[] {`
`165`		`- let lines = [];`
	`165`	`+ let lines: string[] = [];`
`166`	`166`	`while (text.length) {`
`167`	`167`	`let index = text.length < columns ? text.length : text.lastIndexOf(' ', columns);`
`168`	`168`	`let line = text.slice(0, index).trim();`
`@@ -198,8 +198,8 @@ export function buildHelpMessage(productName: string, executableName: string, ve`
`198`	`198`	`return help.join('\n');`
`199`	`199`	`}`
`200`	`200`
`201`		`-export function buildVersionMessage(version: string, commit: string) {`
`202`		- return `${version \|\| 'Unknown version'}\n${commit \|\| 'Unknown commit'}\n${process.arch}`;
	`201`	`+export function buildVersionMessage(version: string \| undefined, commit: string \| undefined): string {`
	`202`	+ return `${version \|\| localize('unknownVersion', "Unknown version")}\n${commit \|\| localize('unknownCommit', "Unknown commit")}\n${process.arch}`;
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`/**`