cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Standardize on .endsWith

Browse Source
This commit is contained in:
Logan Smyth 2016-04-13 02:06:38 -07:00
parent 2f790889eb
commit 680fcc16d7
3 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/babel-generator/src/buffer.js
View File

@ -129,7 +129,7 @@ export default class Buffer {
space() {
if (this.format.compact) return;
if (this.buf && !this.isLast(" ") && !this.isLast("\n")) {
if (this.buf && !this.endsWith(" ") && !this.endsWith("\n")) {
this.push(" ");
}
}
@ -144,7 +144,7 @@ export default class Buffer {
}
_removeLast(cha: string) {
if (!this._isLast(cha)) return;
if (!this.endsWith(cha)) return;
this.buf = this.buf.slice(0, -1);
this.last = this.buf[this.buf.length - 1];
this.position.unshift(cha);
@ -280,7 +280,7 @@ export default class Buffer {
str = str.replace(/\n/g, `\n${indent}`);
// we've got a newline before us so prepend on the indentation
if (this.isLast("\n")) this._push(indent);
if (this.endsWith("\n")) this._push(indent);
}
this._push(str);
@ -327,6 +327,8 @@ export default class Buffer {
*/
endsWith(str: string): boolean {
if (Array.isArray(str)) return str.some((s) => this.endsWith(s));
if (str.length === 1) {
return this.last === str;
} else {
@ -334,22 +336,4 @@ export default class Buffer {
}
}
/**
* Test if a character is last in the buffer.
*/
isLast(cha: string): boolean {
if (this.format.compact) return false;
return this._isLast(cha);
}
_isLast(cha: string): boolean {
let last = this.last;
if (Array.isArray(cha)) {
return cha.indexOf(last) >= 0;
} else {
return cha === last;
}
}
}

2
packages/babel-generator/src/generators/statements.js
View File

@ -34,7 +34,7 @@ export function IfStatement(node: Object) {
}
if (node.alternate) {
if (this.isLast("}")) this.space();
if (this.endsWith("}")) this.space();
this.push("else ");
this.printAndIndentOnComments(node.alternate, node);
}

2
packages/babel-generator/src/printer.js
View File

@ -290,7 +290,7 @@ export default class Printer extends Buffer {
let column = this.position.column;
let val = this.generateComment(comment);
if (column && !this.isLast(["\n", " ", "[", "{"])) {
if (column && !this.endsWith(["\n", " ", "[", "{"])) {
this._push(" ");
column++;
}