Fix argv tests

Tyriar · Tyriar · commit e3fcbe6b6d1f · 2016-07-07T09:52:54.000-07:00
diff --git a/src/vs/code/node/argv.ts b/src/vs/code/node/argv.ts
@@ -5,7 +5,6 @@
 
 import * as os from 'os';
 import * as minimist from 'minimist';
-import pkg from 'vs/platform/package';
 import { localize } from 'vs/nls';
 
 export interface ParsedArgs extends minimist.ParsedArgs {
@@ -129,9 +128,9 @@ function wrapText(text: string, columns: number) : string[] {
 	return lines;
 }
 
-export function buildHelpMessage(): string {
+export function buildHelpMessage(version: string): string {
 	let columns = (<any>process.stdout).isTTY ? (<any>process.stdout).columns : 80;
-	return `Visual Studio Code v${ pkg.version }
+	return `Visual Studio Code v${ version }
 
 
 Usage: ${ executable } [arguments] [paths...]
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
@@ -21,7 +21,7 @@ export function main(args: string[]): TPromise<void> {
 	const argv = parseArgs(args);
 
 	if (argv.help) {
-		console.log(buildHelpMessage());
+		console.log(buildHelpMessage(pkg.version));
 	} else if (argv.version) {
 		console.log(pkg.version);
 	} else if (shouldSpawnCliProcess(argv)) {
diff --git a/src/vs/code/test/node/argv.test.ts b/src/vs/code/test/node/argv.test.ts
@@ -26,16 +26,16 @@ suite('formatOptions', () => {
 			formatOptions({
 				'foo': (<any>'bar ').repeat(9)
 			}, 40),
-				'  foo bar bar bar bar bar bar bar bar\n' +
-				'      bar');
+			'  foo bar bar bar bar bar bar bar bar\n' +
+			'      bar');
 	});
 
 	test('Text should revert to the condensed view when the terminal is too narrow', () => {
 		assert.equal(
 			formatOptions({
 				'foo': (<any>'bar ').repeat(9)
 			}, 30),
-				'  foo\n' +
-				'      bar bar bar bar bar bar bar bar bar ');
+			'  foo\n' +
+			'      bar bar bar bar bar bar bar bar bar ');
 	});
 });
