fix: add newline before context

oclif · Jan 28, 2018 · 5ada0f5 · 5ada0f5
1 parent 8fd5a20
commit 5ada0f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/errors.ts b/src/errors.ts
@@ -32,6 +32,7 @@ function bangify(msg: string, c: string): string {
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i]
     lines[i] = c + line.substr(2, line.length)
+    lines[i] = lines[i].trimRight()
   }
   return lines.join('\n')
 }
@@ -60,7 +61,7 @@ export function getErrorMessage(err: any, opts: {stack?: boolean} = {}): string
   // Unhandled error
   if (err.message) message = err.message
   if (context && !_.isEmpty(context)) {
-    message += '\n' + stripAnsi(indent(styledObject(err['cli-ux'].context), 4))
+    message += '\n\n' + stripAnsi(indent(styledObject(err['cli-ux'].context), 4))
   }
   message = message || inspect(err)
 

diff --git a/test/errors.test.ts b/test/errors.test.ts
@@ -22,9 +22,9 @@ describe('errors', () => {
     cli.config.context = {foo: 'bar'}
     cli.warn('foobar')
     if (process.platform === 'win32') {
-      expect(output.stderr).to.equal(' !    Warning: foobar\n !    foo: bar\n')
+      expect(output.stderr).to.equal(' !    Warning: foobar\n !\n !    foo: bar\n')
     } else {
-      expect(output.stderr).to.equal(' ▸    Warning: foobar\n ▸    foo: bar\n')
+      expect(output.stderr).to.equal(' ▸    Warning: foobar\n ▸\n ▸    foo: bar\n')
     }
   })