diff --git a/src/vs/code/node/argv.ts b/src/vs/code/node/argv.ts index 973e1a23d66..a72b1835f98 100644 --- 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 = (process.stdout).isTTY ? (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 index f0c6a5f4adb..ee5beb41a03 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -21,7 +21,7 @@ export function main(args: string[]): TPromise { 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 index 50d899b3ca1..685ca737cf9 100644 --- a/src/vs/code/test/node/argv.test.ts +++ b/src/vs/code/test/node/argv.test.ts @@ -26,8 +26,8 @@ suite('formatOptions', () => { formatOptions({ 'foo': ('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', () => { @@ -35,7 +35,7 @@ suite('formatOptions', () => { formatOptions({ 'foo': ('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 '); }); });