From 578f48134b4113fef6040ec779efd6548b1482ef Mon Sep 17 00:00:00 2001 From: Logan Smyth Date: Tue, 26 Apr 2016 09:22:27 -0700 Subject: [PATCH] Remove removeLast usage. --- packages/babel-generator/src/buffer.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/babel-generator/src/buffer.js b/packages/babel-generator/src/buffer.js index bd7ab81b0f..3edee6eeec 100644 --- a/packages/babel-generator/src/buffer.js +++ b/packages/babel-generator/src/buffer.js @@ -103,7 +103,8 @@ export default class Buffer { */ rightBrace() { - this.newline(true); + if (!this.endsWith("\n")) this.newline(); + if (this.format.minified && !this._lastPrintedIsEmptyStatement) { this._removeLast(";"); } @@ -212,10 +213,9 @@ export default class Buffer { /** * Add a newline (or many newlines), maintaining formatting. - * Strips multiple newlines if removeLast is true. */ - newline(i?: boolean | number, removeLast?: boolean) { + newline(i?: number) { if (this.format.retainLines || this.format.compact) return; if (this.format.concise) { @@ -226,18 +226,12 @@ export default class Buffer { // never allow more than two lines if (this.endsWith("\n\n")) return; - if (typeof i === "boolean") removeLast = i; if (typeof i !== "number") i = 1; i = Math.min(2, i); if (this.endsWith("{\n") || this.endsWith(":\n")) i--; if (i <= 0) return; - // remove the last newline - if (removeLast) { - this.removeLast("\n"); - } - this._removeSpacesAfterLastNewline(); for (let j = 0; j < i; j++) { this.push("\n");