Merge pull request #779 from garden-io/fix-spinner-pos

fix(logger): fix spinner pos
garden-io · May 20, 2019 · b7bf2ad · b7bf2ad
2 parents ec3b681 + 12d0dd4
commit b7bf2ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/garden-service/src/logger/renderers.ts b/garden-service/src/logger/renderers.ts
@@ -16,7 +16,6 @@ import {
   flow,
   isArray,
   isEmpty,
-  padStart,
   reduce,
   kebabCase,
   repeat,
@@ -75,7 +74,7 @@ export function printEmoji(emoji: EmojiName) {
 
 /*** RENDERERS ***/
 export function leftPad(entry: LogEntry): string {
-  return padStart("", (entry.opts.indent || 0) * 3)
+  return "".padStart((entry.opts.indent || 0) * 3)
 }
 
 export function renderEmoji(entry: LogEntry): string {

diff --git a/garden-service/src/logger/writers/fancy-terminal-writer.ts b/garden-service/src/logger/writers/fancy-terminal-writer.ts
@@ -93,12 +93,11 @@ export class FancyTerminalWriter extends Writer {
   private spin(entries: TerminalEntryWithSpinner[], totalLines: number): void {
     entries.forEach(e => {
       let out = ""
-      const [x, y] = e.spinnerCoords
-      const termX = x === 0 ? x : x + 1
-      const termY = -(totalLines - y - 1)
+      const x = e.spinnerCoords[0]
+      const y = -(totalLines - e.spinnerCoords[1] - 1)
       out += ansiEscapes.cursorSavePosition
       out += ansiEscapes.cursorTo(0) // Ensure cursor is to the left
-      out += ansiEscapes.cursorMove(termX, termY)
+      out += ansiEscapes.cursorMove(x, y)
       out += spinnerStyle(this.tickSpinner(e.key))
       out += ansiEscapes.cursorRestorePosition
       this.stream.write(out)