From 5b09114b8539dfdfe18bd4911c5564318f40d3ab Mon Sep 17 00:00:00 2001
From: Sindre Sorhus <sindresorhus@gmail.com>
Date: Tue, 17 Feb 2015 10:50:30 +0700
Subject: [PATCH] modularize `util.trimRight`

https://github.com/sindresorhus/trim-right
---
 lib/babel/generation/buffer.js | 8 ++++----
 lib/babel/util.js              | 4 ----
 package.json                   | 3 ++-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/babel/generation/buffer.js b/lib/babel/generation/buffer.js
index 004eec950f..4a2e45e985 100644
--- a/lib/babel/generation/buffer.js
+++ b/lib/babel/generation/buffer.js
@@ -3,10 +3,10 @@
 module.exports = Buffer;
 
 var repeating = require("repeating");
+var trimRight = require("trim-right");
 var isBoolean = require("lodash/lang/isBoolean");
 var includes  = require("lodash/collection/includes");
 var isNumber  = require("lodash/lang/isNumber");
-var util      = require("../util");
 
 function Buffer(position, format) {
   this.position = position;
@@ -16,7 +16,7 @@ function Buffer(position, format) {
 }
 
 Buffer.prototype.get = function () {
-  return util.trimRight(this.buf);
+  return trimRight(this.buf);
 };
 
 Buffer.prototype.getIndent = function () {
@@ -154,9 +154,9 @@ Buffer.prototype.endsWith = function (str) {
   return d >= 0 && this.buf.lastIndexOf(str) === d;
 };
 
-Buffer.prototype.isLast = function (cha, trimRight) {
+Buffer.prototype.isLast = function (cha, shouldTrimRight) {
   var buf = this.buf;
-  if (trimRight) buf = util.trimRight(buf);
+  if (shouldTrimRight) buf = trimRight(buf);
   var last = buf[buf.length - 1];
 
   if (Array.isArray(cha)) {
diff --git a/lib/babel/util.js b/lib/babel/util.js
index 1a6292a620..861d6b1b32 100644
--- a/lib/babel/util.js
+++ b/lib/babel/util.js
@@ -46,10 +46,6 @@ exports.resolve = function (loc) {
   }
 };
 
-exports.trimRight = function (str) {
-  return str.replace(/[\n\s]+$/g, "");
-};
-
 exports.list = function (val) {
   return val ? val.split(",") : [];
 };
diff --git a/package.json b/package.json
index 3f784c5242..7db66f2148 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,8 @@
     "repeating": "^1.1.2",
     "source-map": "^0.1.43",
     "source-map-support": "^0.2.9",
-    "source-map-to-comment": "^1.0.0"
+    "source-map-to-comment": "^1.0.0",
+    "trim-right": "^1.0.0"
   },
   "devDependencies": {
     "browserify": "^8.1.3",