Revert "js-beautify: make all indentation consistent (depth & character) (#1409)" (#1412)

This reverts commit a01de4a722d088055a7d84d8c691ddd7109edb34.

24 files changed, 123 insertions, 203 deletions

diff --git a/test/built-ins/Array/from/Array.from_forwards-length-for-array-likes.js b/test/built-ins/Array/from/Array.from_forwards-length-for-array-likes.js
index 311bc7780..4718751cb 100644
--- a/test/built-ins/Array/from/Array.from_forwards-length-for-array-likes.js
+++ b/test/built-ins/Array/from/Array.from_forwards-length-for-array-likes.js
@@ -28,9 +28,7 @@ function MyCollection() {
   this.args = arguments;
 }
 
-result = Array.from.call(MyCollection, {
-  length: 42
-});
+result = Array.from.call(MyCollection, {length: 42});
 
 assert.sameValue(result.args.length, 1);
 assert.sameValue(result.args[0], 42);
diff --git a/test/built-ins/Array/from/calling-from-valid-1-noStrict.js b/test/built-ins/Array/from/calling-from-valid-1-noStrict.js
index eb0d24aa4..201736051 100644
--- a/test/built-ins/Array/from/calling-from-valid-1-noStrict.js
+++ b/test/built-ins/Array/from/calling-from-valid-1-noStrict.js
@@ -34,7 +34,7 @@ var list = {
 };
 var calls = [];
 
-function mapFn(value) {
+function mapFn (value) {
   calls.push({
     args: arguments,
     thisArg: this
diff --git a/test/built-ins/Array/from/calling-from-valid-1-onlyStrict.js b/test/built-ins/Array/from/calling-from-valid-1-onlyStrict.js
index 68abe0f44..8415045f7 100644
--- a/test/built-ins/Array/from/calling-from-valid-1-onlyStrict.js
+++ b/test/built-ins/Array/from/calling-from-valid-1-onlyStrict.js
@@ -34,7 +34,7 @@ var list = {
 };
 var calls = [];
 
-function mapFn(value) {
+function mapFn (value) {
   calls.push({
     args: arguments,
     thisArg: this
diff --git a/test/built-ins/Array/from/calling-from-valid-2.js b/test/built-ins/Array/from/calling-from-valid-2.js
index 139c9818c..50be8469c 100644
--- a/test/built-ins/Array/from/calling-from-valid-2.js
+++ b/test/built-ins/Array/from/calling-from-valid-2.js
@@ -35,7 +35,7 @@ var list = {
 var calls = [];
 var thisArg = {};
 
-function mapFn(value) {
+function mapFn (value) {
   calls.push({
     args: arguments,
     thisArg: this
diff --git a/test/built-ins/Array/from/elements-added-after.js b/test/built-ins/Array/from/elements-added-after.js
index a8ff21a0c..9aafe597a 100644
--- a/test/built-ins/Array/from/elements-added-after.js
+++ b/test/built-ins/Array/from/elements-added-after.js
@@ -10,24 +10,23 @@ es6id: 22.1.2.1
 var arrayIndex = -1;
 var originalLength = 7;
 var obj = {
-  length: originalLength,
-  0: 2,
-  1: 4,
-  2: 8,
-  3: 16,
-  4: 32,
-  5: 64,
-  6: 128
+    length: originalLength,
+    0: 2,
+    1: 4,
+    2: 8,
+    3: 16,
+    4: 32,
+    5: 64,
+    6: 128
 };
-var array = [2, 4, 8, 16, 32, 64, 128];
-
+var array = [ 2, 4, 8, 16, 32, 64, 128 ];
 function mapFn(value, index) {
-  arrayIndex++;
-  assert.sameValue(value, obj[arrayIndex], "Value mismatch in mapFn at index " + index + ".");
-  assert.sameValue(index, arrayIndex, "Index mismatch in mapFn.");
-  obj[originalLength + arrayIndex] = 2 * arrayIndex + 1;
+    arrayIndex++;
+    assert.sameValue(value, obj[arrayIndex], "Value mismatch in mapFn at index " + index + ".");
+    assert.sameValue(index, arrayIndex, "Index mismatch in mapFn.");
+    obj[originalLength + arrayIndex] = 2 * arrayIndex + 1;
 
-  return obj[arrayIndex];
+    return obj[arrayIndex];
 }
 
 
@@ -35,5 +34,5 @@ var a = Array.from(obj, mapFn);
 assert.sameValue(a.length, array.length, "Length mismatch.");
 
 for (var j = 0; j < a.length; j++) {
-  assert.sameValue(a[j], array[j], "Element mismatch for array at index " + j + ".");
+    assert.sameValue(a[j], array[j], "Element mismatch for array at index " + j + ".");
 }
diff --git a/test/built-ins/Array/from/elements-deleted-after.js b/test/built-ins/Array/from/elements-deleted-after.js
index 02f745329..d2d72e51e 100644
--- a/test/built-ins/Array/from/elements-deleted-after.js
+++ b/test/built-ins/Array/from/elements-deleted-after.js
@@ -9,18 +9,17 @@ esid: sec-array.from
 es6id: 22.1.2.1
 ---*/
 
-var originalArray = [0, 1, -2, 4, -8, 16];
-var array = [0, 1, -2, 4, -8, 16];
+var originalArray = [ 0, 1, -2, 4, -8, 16 ];
+var array = [ 0, 1, -2, 4, -8, 16 ];
 var a = [];
 var arrayIndex = -1;
-
 function mapFn(value, index) {
-  this.arrayIndex++;
-  assert.sameValue(value, array[this.arrayIndex], "Value mismatch in mapFn at index " + index + ".");
-  assert.sameValue(index, this.arrayIndex, "Index mismatch in mapFn.");
+    this.arrayIndex++;
+    assert.sameValue(value, array[this.arrayIndex], "Value mismatch in mapFn at index " + index + ".");
+    assert.sameValue(index, this.arrayIndex, "Index mismatch in mapFn.");
 
-  array.splice(array.length - 1, 1);
-  return 127;
+    array.splice(array.length - 1, 1);
+    return 127;
 }
 
 
@@ -29,5 +28,5 @@ a = Array.from(array, mapFn, this);
 assert.sameValue(a.length, originalArray.length / 2, "Length mismatch. Old array : " + (originalArray.length / 2) + ". array : " + a.length + ".");
 
 for (var j = 0; j < originalArray.length / 2; j++) {
-  assert.sameValue(a[j], 127, "Element mismatch for mapped array at index " + j + ".");
+    assert.sameValue(a[j], 127, "Element mismatch for mapped array at index " + j + ".");
 }
diff --git a/test/built-ins/Array/from/elements-updated-after.js b/test/built-ins/Array/from/elements-updated-after.js
index 358e94b46..6c859e23a 100644
--- a/test/built-ins/Array/from/elements-updated-after.js
+++ b/test/built-ins/Array/from/elements-updated-after.js
@@ -7,22 +7,21 @@ esid: sec-array.from
 es6id: 22.1.2.1
 ---*/
 
-var array = [127, 4, 8, 16, 32, 64, 128];
+var array = [ 127, 4, 8, 16, 32, 64, 128 ];
 var arrayIndex = -1;
-
 function mapFn(value, index) {
-  arrayIndex++;
-  if (index + 1 < array.length) {
-    array[index + 1] = 127;
-  }
-  assert.sameValue(value, 127, "Value mismatch in mapFn at index " + index + ".");
-  assert.sameValue(index, arrayIndex, "Index mismatch in mapFn.");
+    arrayIndex++;
+    if (index + 1 < array.length) {
+        array[index + 1] = 127;
+    }
+    assert.sameValue(value, 127, "Value mismatch in mapFn at index " + index + ".");
+    assert.sameValue(index, arrayIndex, "Index mismatch in mapFn.");
 
-  return value;
+    return value;
 }
 
 var a = Array.from(array, mapFn);
 assert.sameValue(a.length, array.length, "Length mismatch.");
 for (var j = 0; j < a.length; j++) {
-  assert.sameValue(a[j], 127, "Element mismatch for mapped array.");
+    assert.sameValue(a[j], 127, "Element mismatch for mapped array.");
 }
diff --git a/test/built-ins/Array/from/iter-cstm-ctor.js b/test/built-ins/Array/from/iter-cstm-ctor.js
index d9a137695..dfd64566f 100644
--- a/test/built-ins/Array/from/iter-cstm-ctor.js
+++ b/test/built-ins/Array/from/iter-cstm-ctor.js
@@ -27,9 +27,7 @@ var items = {};
 items[Symbol.iterator] = function() {
   return {
     next: function() {
-      return {
-        done: true
-      };
+      return { done: true };
     }
   };
 };
diff --git a/test/built-ins/Array/from/iter-map-fn-args.js b/test/built-ins/Array/from/iter-map-fn-args.js
index 56097d708..f63fec612 100644
--- a/test/built-ins/Array/from/iter-map-fn-args.js
+++ b/test/built-ins/Array/from/iter-map-fn-args.js
@@ -26,14 +26,8 @@ features: [Symbol.iterator]
 ---*/
 
 var args = [];
-var firstResult = {
-  done: false,
-  value: {}
-};
-var secondResult = {
-  done: false,
-  value: {}
-};
+var firstResult = { done: false, value: {} };
+var secondResult = { done: false, value: {} };
 var mapFn = function(value, idx) {
   args.push(arguments);
 };
@@ -46,9 +40,7 @@ items[Symbol.iterator] = function() {
     next: function() {
       var result = nextResult;
       nextResult = nextNextResult;
-      nextNextResult = {
-        done: true
-      };
+      nextNextResult = { done: true };
 
       return result;
     }
diff --git a/test/built-ins/Array/from/iter-map-fn-return.js b/test/built-ins/Array/from/iter-map-fn-return.js
index 484ce7174..58e175048 100644
--- a/test/built-ins/Array/from/iter-map-fn-return.js
+++ b/test/built-ins/Array/from/iter-map-fn-return.js
@@ -25,14 +25,8 @@ features: [Symbol.iterator]
 ---*/
 
 var thisVals = [];
-var nextResult = {
-  done: false,
-  value: {}
-};
-var nextNextResult = {
-  done: false,
-  value: {}
-};
+var nextResult = { done: false, value: {} };
+var nextNextResult = { done: false, value: {} };
 var firstReturnVal = {};
 var secondReturnVal = {};
 var mapFn = function(value, idx) {
@@ -51,9 +45,7 @@ items[Symbol.iterator] = function() {
     next: function() {
       var result = nextResult;
       nextResult = nextNextResult;
-      nextNextResult = {
-        done: true
-      };
+      nextNextResult = { done: true };
 
       return result;
     }
diff --git a/test/built-ins/Array/from/iter-map-fn-this-arg.js b/test/built-ins/Array/from/iter-map-fn-this-arg.js
index d10e9f862..5e12157bb 100644
--- a/test/built-ins/Array/from/iter-map-fn-this-arg.js
+++ b/test/built-ins/Array/from/iter-map-fn-this-arg.js
@@ -23,14 +23,8 @@ features: [Symbol.iterator]
 ---*/
 
 var thisVals = [];
-var nextResult = {
-  done: false,
-  value: {}
-};
-var nextNextResult = {
-  done: false,
-  value: {}
-};
+var nextResult = { done: false, value: {} };
+var nextNextResult = { done: false, value: {} };
 var mapFn = function() {
   thisVals.push(this);
 };
@@ -42,9 +36,7 @@ items[Symbol.iterator] = function() {
     next: function() {
       var result = nextResult;
       nextResult = nextNextResult;
-      nextNextResult = {
-        done: true
-      };
+      nextNextResult = { done: true };
 
       return result;
     }
diff --git a/test/built-ins/Array/from/iter-map-fn-this-non-strict.js b/test/built-ins/Array/from/iter-map-fn-this-non-strict.js
index 0bb30453e..81022307a 100644
--- a/test/built-ins/Array/from/iter-map-fn-this-non-strict.js
+++ b/test/built-ins/Array/from/iter-map-fn-this-non-strict.js
@@ -24,30 +24,20 @@ flags: [noStrict]
 ---*/
 
 var thisVals = [];
-var nextResult = {
-  done: false,
-  value: {}
-};
-var nextNextResult = {
-  done: false,
-  value: {}
-};
+var nextResult = { done: false, value: {} };
+var nextNextResult = { done: false, value: {} };
 var mapFn = function() {
   thisVals.push(this);
 };
 var items = {};
-var global = function() {
-  return this;
-}();
+var global = function() { return this; }();
 
 items[Symbol.iterator] = function() {
   return {
     next: function() {
       var result = nextResult;
       nextResult = nextNextResult;
-      nextNextResult = {
-        done: true
-      };
+      nextNextResult = { done: true };
 
       return result;
     }
diff --git a/test/built-ins/Array/from/iter-map-fn-this-strict.js b/test/built-ins/Array/from/iter-map-fn-this-strict.js
index d9a62dabc..cfe576a5b 100644
--- a/test/built-ins/Array/from/iter-map-fn-this-strict.js
+++ b/test/built-ins/Array/from/iter-map-fn-this-strict.js
@@ -24,14 +24,8 @@ flags: [onlyStrict]
 ---*/
 
 var thisVals = [];
-var nextResult = {
-  done: false,
-  value: {}
-};
-var nextNextResult = {
-  done: false,
-  value: {}
-};
+var nextResult = { done: false, value: {} };
+var nextNextResult = { done: false, value: {} };
 var mapFn = function() {
   thisVals.push(this);
 };
@@ -42,9 +36,7 @@ items[Symbol.iterator] = function() {
     next: function() {
       var result = nextResult;
       nextResult = nextNextResult;
-      nextNextResult = {
-        done: true
-      };
+      nextNextResult = { done: true };
 
       return result;
     }
diff --git a/test/built-ins/Array/from/iter-set-elem-prop-err.js b/test/built-ins/Array/from/iter-set-elem-prop-err.js
index 2f23b4f0c..07f2c5942 100644
--- a/test/built-ins/Array/from/iter-set-elem-prop-err.js
+++ b/test/built-ins/Array/from/iter-set-elem-prop-err.js
@@ -18,15 +18,11 @@ features: [Symbol.iterator]
 ---*/
 
 var C = function() {
-  Object.defineProperty(this, '0', {
-    configurable: false
-  });
+  Object.defineProperty(this, '0', { configurable: false });
 };
 var closeCount = 0;
 var items = {};
-var nextResult = {
-  done: false
-};
+var nextResult = { done: false };
 
 items[Symbol.iterator] = function() {
   return {
@@ -36,9 +32,7 @@ items[Symbol.iterator] = function() {
     next: function() {
       var result = nextResult;
 
-      nextResult = {
-        done: true
-      };
+      nextResult = { done: true };
 
       return result;
     }
diff --git a/test/built-ins/Array/from/iter-set-elem-prop.js b/test/built-ins/Array/from/iter-set-elem-prop.js
index 6f56116db..7658bdd13 100644
--- a/test/built-ins/Array/from/iter-set-elem-prop.js
+++ b/test/built-ins/Array/from/iter-set-elem-prop.js
@@ -16,18 +16,9 @@ features: [Symbol.iterator]
 ---*/
 
 var items = {};
-var firstIterResult = {
-  done: false,
-  value: {}
-};
-var secondIterResult = {
-  done: false,
-  value: {}
-};
-var thirdIterResult = {
-  done: true,
-  value: {}
-};
+var firstIterResult = { done: false, value: {} };
+var secondIterResult = { done: false, value: {} };
+var thirdIterResult = { done: true, value: {} };
 var nextIterResult = firstIterResult;
 var nextNextIterResult = secondIterResult;
 var result;
diff --git a/test/built-ins/Array/from/iter-set-length-err.js b/test/built-ins/Array/from/iter-set-length-err.js
index 4cd0e0001..d15631db9 100644
--- a/test/built-ins/Array/from/iter-set-length-err.js
+++ b/test/built-ins/Array/from/iter-set-length-err.js
@@ -25,11 +25,7 @@ Object.defineProperty(C.prototype, 'length', {
 });
 items[Symbol.iterator] = function() {
   return {
-    next: function() {
-      return {
-        done: true
-      };
-    }
+    next: function() { return { done: true }; }
   };
 };
 
diff --git a/test/built-ins/Array/from/iter-set-length.js b/test/built-ins/Array/from/iter-set-length.js
index c00ac5698..ab0e221bf 100644
--- a/test/built-ins/Array/from/iter-set-length.js
+++ b/test/built-ins/Array/from/iter-set-length.js
@@ -29,19 +29,13 @@ items[Symbol.iterator] = function() {
   };
 };
 
-nextIterResult = lastIterResult = {
-  done: true
-};
+nextIterResult = lastIterResult = { done: true };
 result = Array.from(items);
 
 assert.sameValue(result.length, 0);
 
-nextIterResult = {
-  done: false
-};
-lastIterResult = {
-  done: true
-};
+nextIterResult = { done: false };
+lastIterResult = { done: true };
 result = Array.from(items);
 
 assert.sameValue(result.length, 1);
diff --git a/test/built-ins/Array/from/mapfn-throws-exception.js b/test/built-ins/Array/from/mapfn-throws-exception.js
index a87898bf8..a65512672 100644
--- a/test/built-ins/Array/from/mapfn-throws-exception.js
+++ b/test/built-ins/Array/from/mapfn-throws-exception.js
@@ -7,12 +7,9 @@ esid: sec-array.from
 es6id: 22.1.2.1
 ---*/
 
-var array = [2, 4, 8, 16, 32, 64, 128];
-
+var array = [ 2, 4, 8, 16, 32, 64, 128 ];
 function mapFn(value, index, obj) {
-  throw new Test262Error();
+    throw new Test262Error();
 }
 
-assert.throws(Test262Error, function() {
-  Array.from(array, mapFn);
-});
+assert.throws(Test262Error, function(){Array.from(array, mapFn);});
diff --git a/test/built-ins/Array/from/source-array-boundary.js b/test/built-ins/Array/from/source-array-boundary.js
index 9dad81729..4c0587a32 100644
--- a/test/built-ins/Array/from/source-array-boundary.js
+++ b/test/built-ins/Array/from/source-array-boundary.js
@@ -7,15 +7,14 @@ esid: sec-array.from
 es6id: 22.1.2.1
 ---*/
 
-var array = [Number.MAX_VALUE, Number.MIN_VALUE, Number.NaN, Number.NEGATIVE_INFINITY, Number.POSITIVE_INFINITY];
+var array = [ Number.MAX_VALUE, Number.MIN_VALUE, Number.NaN, Number.NEGATIVE_INFINITY, Number.POSITIVE_INFINITY ];
 var arrayIndex = -1;
-
 function mapFn(value, index) {
-  this.arrayIndex++;
-  assert.sameValue(value, array[this.arrayIndex], "Value mismatch in mapFn at index " + index + ".");
-  assert.sameValue(index, this.arrayIndex, "Index mismatch in mapFn.");
+    this.arrayIndex++;
+    assert.sameValue(value, array[this.arrayIndex], "Value mismatch in mapFn at index " + index + ".");
+    assert.sameValue(index, this.arrayIndex, "Index mismatch in mapFn.");
 
-  return value;
+    return value;
 }
 
 var a = Array.from(array, mapFn, this);
diff --git a/test/built-ins/Array/from/source-object-iterator-1.js b/test/built-ins/Array/from/source-object-iterator-1.js
index 6ac364ac5..94834b5cf 100644
--- a/test/built-ins/Array/from/source-object-iterator-1.js
+++ b/test/built-ins/Array/from/source-object-iterator-1.js
@@ -8,25 +8,23 @@ es6id: 22.1.2.1
 features: [Symbol.iterator]
 ---*/
 
-var array = [2, 4, 8, 16, 32, 64, 128];
+var array = [ 2, 4, 8, 16, 32, 64, 128 ];
 var obj = {
-  [Symbol.iterator]() {
-    return {
-      index: 0,
-      next() {
-        throw new Test262Error();
-      },
-      isDone: false,
-      get val() {
-        this.index++;
-        if (this.index > 7) {
-          this.isDone = true;
-        }
-        return 1 << this.index;
-      }
-    };
-  }
+    [Symbol.iterator]() {
+        return {
+            index: 0,
+            next() {
+                throw new Test262Error();
+            },
+            isDone : false,
+            get val() {
+                this.index++;
+                if (this.index > 7) {
+                    this.isDone = true;
+                }
+                return 1 << this.index;
+            }
+        };
+    }
 };
-assert.throws(Test262Error, function() {
-  Array.from(obj);
-});
+assert.throws(Test262Error, function(){Array.from(obj);});
diff --git a/test/built-ins/Array/from/source-object-iterator-2.js b/test/built-ins/Array/from/source-object-iterator-2.js
index 619405c34..9bcd57053 100644
--- a/test/built-ins/Array/from/source-object-iterator-2.js
+++ b/test/built-ins/Array/from/source-object-iterator-2.js
@@ -8,30 +8,30 @@ es6id: 22.1.2.1
 features: [Symbol.iterator]
 ---*/
 
-var array = [2, 4, 8, 16, 32, 64, 128];
+var array = [ 2, 4, 8, 16, 32, 64, 128 ];
 var obj = {
-  [Symbol.iterator]() {
-    return {
-      index: 0,
-      next() {
+    [Symbol.iterator]() {
         return {
-          value: this.val,
-          done: this.isDone
+            index: 0,
+            next() {
+                return {
+                    value: this.val,
+                    done: this.isDone
+                };
+            },
+            isDone : false,
+            get val() {
+                this.index++;
+                if (this.index > 7) {
+                    this.isDone = true;
+                }
+                return 1 << this.index;
+            }
         };
-      },
-      isDone: false,
-      get val() {
-        this.index++;
-        if (this.index > 7) {
-          this.isDone = true;
-        }
-        return 1 << this.index;
-      }
-    };
-  }
+    }
 };
 var a = Array.from.call(Object, obj);
 assert.sameValue(typeof a, typeof {}, "The returned type is expected to be object.");
 for (var j = 0; j < a.length; j++) {
-  assert.sameValue(a[j], array[j], "Elements mismatch at " + j + ".");
+    assert.sameValue(a[j], array[j], "Elements mismatch at " + j + ".");
 }
diff --git a/test/built-ins/Array/from/source-object-length.js b/test/built-ins/Array/from/source-object-length.js
index 4127f5ec0..75c46dfc4 100644
--- a/test/built-ins/Array/from/source-object-length.js
+++ b/test/built-ins/Array/from/source-object-length.js
@@ -12,14 +12,14 @@ es6id: 22.1.2.1
 var array = [2, 4, 0, 16];
 var expectedArray = [2, 4, , 16];
 var obj = {
-  length: 4,
-  0: 2,
-  1: 4,
-  2: 0,
-  3: 16
+    length : 4,
+    0 : 2,
+    1 : 4,
+    2 : 0,
+    3 : 16
 };
 delete obj[2];
 var a = Array.from(obj);
 for (var j = 0; j < expectedArray.length; j++) {
-  assert.sameValue(a[j], expectedArray[j], "Elements mismatch at " + j + ".");
+    assert.sameValue(a[j], expectedArray[j], "Elements mismatch at " + j + ".");
 }
diff --git a/test/built-ins/Array/from/source-object-missing.js b/test/built-ins/Array/from/source-object-missing.js
index 3c55030da..ad5a6055d 100644
--- a/test/built-ins/Array/from/source-object-missing.js
+++ b/test/built-ins/Array/from/source-object-missing.js
@@ -9,14 +9,14 @@ es6id: 22.1.2.1
 
 var array = [2, 4, , 16];
 var obj = {
-  length: 4,
-  0: 2,
-  1: 4,
-  3: 16
+    length: 4,
+    0: 2,
+    1: 4,
+    3: 16
 };
 
 var a = Array.from.call(Object, obj);
 assert.sameValue(typeof a, "object", "The returned type is expected to be object.");
 for (var j = 0; j < a.length; j++) {
-  assert.sameValue(a[j], array[j], "Elements mismatch at " + j + ".");
+    assert.sameValue(a[j], array[j], "Elements mismatch at " + j + ".");
 }
diff --git a/test/built-ins/Array/from/source-object-without.js b/test/built-ins/Array/from/source-object-without.js
index fbb187782..96ec31c25 100644
--- a/test/built-ins/Array/from/source-object-without.js
+++ b/test/built-ins/Array/from/source-object-without.js
@@ -8,10 +8,10 @@ es6id: 22.1.2.1
 ---*/
 
 var obj = {
-  0: 2,
-  1: 4,
-  2: 8,
-  3: 16
+    0: 2,
+    1: 4,
+    2: 8,
+    3: 16
 }
 
 var a = Array.from(obj);