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

This reverts commit a01de4a722d088055a7d84d8c691ddd7109edb34.

5 files changed, 60 insertions, 110 deletions

diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js
index adc678581..4b8dbcca1 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.1_T1.js
@@ -19,38 +19,38 @@ var count = 0;
 var indexP;
 var indexO = 0;
 
-l:
-  for (var index = 0x0000; index <= 0x007F; index++) {
-    count++;
-    var str = String.fromCharCode(index);
-    for (var indexC = 0; indexC < uriReserved.length; indexC++) {
-      if (uriReserved[indexC] === str) continue l;
-    }
-    for (indexC = 0; indexC < uriUnescaped.length; indexC++) {
-      if (uriUnescaped[indexC] === str) continue l;
-    }
-    if ("#" === str) continue l;
-    if (encodeURI(str).toUpperCase() === decimalToPercentHexString(index)) continue l;
+l :
+for (var index = 0x0000; index <= 0x007F; index++) {
+  count++;
+  var str = String.fromCharCode(index);
+  for (var indexC = 0; indexC < uriReserved.length; indexC++) {
+    if (uriReserved[indexC] === str) continue l;
+  }
+   for (indexC = 0; indexC < uriUnescaped.length; indexC++) {
+    if (uriUnescaped[indexC] === str) continue l;
+  }
+  if ("#" === str) continue l;
+  if (encodeURI(str).toUpperCase() === decimalToPercentHexString(index)) continue l;
 
-    if (indexO === 0) {
-      indexO = index;
-    } else {
-      if ((index - indexP) !== 1) {
-        if ((indexP - indexO) !== 0) {
-          var hexP = decimalToHexString(indexP);
-          var hexO = decimalToHexString(indexO);
-          $ERROR('#' + hexO + '-' + hexP + ' ');
-        }
-        else {
-          var hexP = decimalToHexString(indexP);
-          $ERROR('#' + hexP + ' ');
-        }
-        indexO = index;
+  if (indexO === 0) {
+    indexO = index;
+  } else {
+    if ((index - indexP) !== 1) {
+      if ((indexP - indexO) !== 0) {
+        var hexP = decimalToHexString(indexP);
+        var hexO = decimalToHexString(indexO);
+        $ERROR('#' + hexO + '-' + hexP + ' ');
+      }
+      else {
+        var hexP = decimalToHexString(indexP);
+        $ERROR('#' + hexP + ' ');
       }
+      indexO = index;
     }
-    indexP = index;
-    errorCount++;
   }
+  indexP = index;
+  errorCount++;
+}
 
 if (errorCount > 0) {
   if ((indexP - indexO) !== 0) {
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js
index 7dfba5982..95460bf13 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A2.2_T1.js
@@ -17,32 +17,32 @@ var count = 0;
 var indexP;
 var indexO = 0;
 l:
-  for (var index = 0x0080; index <= 0x07FF; index++) {
-    count++;
-    var hex1 = decimalToPercentHexString(0x0080 + (index & 0x003F));
-    var hex2 = decimalToPercentHexString(0x00C0 + (index & 0x07C0) / 0x0040);
-    var str = String.fromCharCode(index);
-    if (encodeURI(str).toUpperCase() === hex2 + hex1) continue;
+for (var index = 0x0080; index <= 0x07FF; index++) {
+  count++;
+  var hex1 = decimalToPercentHexString(0x0080 + (index & 0x003F));
+  var hex2 = decimalToPercentHexString(0x00C0 + (index & 0x07C0) / 0x0040);
+  var str = String.fromCharCode(index);
+  if (encodeURI(str).toUpperCase() === hex2 + hex1) continue;
 
-    if (indexO === 0) {
-      indexO = index;
-    } else {
-      if ((index - indexP) !== 1) {
-        if ((indexP - indexO) !== 0) {
-          var hexP = decimalToHexString(indexP);
-          var hexO = decimalToHexString(indexO);
-          $ERROR('#' + hexO + '-' + hexP + ' ');
-        }
-        else {
-          var hexP = decimalToHexString(indexP);
-          $ERROR('#' + hexP + ' ');
-        }
-        indexO = index;
+  if (indexO === 0) {
+    indexO = index;
+  } else {
+    if ((index - indexP) !== 1) {
+      if ((indexP - indexO) !== 0) {
+        var hexP = decimalToHexString(indexP);
+        var hexO = decimalToHexString(indexO);
+        $ERROR('#' + hexO + '-' + hexP + ' ');
+      }
+      else {
+        var hexP = decimalToHexString(indexP);
+        $ERROR('#' + hexP + ' ');
       }
+      indexO = index;
     }
-    indexP = index;
-    errorCount++;
   }
+  indexP = index;
+  errorCount++;
+}
 
 if (errorCount > 0) {
   if ((indexP - indexO) !== 0) {
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A5.1.js b/test/built-ins/encodeURI/S15.1.3.3_A5.1.js
index 57fdbecfa..5dad9e2d7 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A5.1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A5.1.js
@@ -16,7 +16,7 @@ if (encodeURI.propertyIsEnumerable('length') !== false) {
 
 //CHECK#2
 var result = true;
-for (var p in encodeURI) {
+for (var p in encodeURI){
   if (p === "length") {
     result = false;
   }
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A5.5.js b/test/built-ins/encodeURI/S15.1.3.3_A5.5.js
index 196f9bab0..6a99e8337 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A5.5.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A5.5.js
@@ -16,7 +16,7 @@ if (this.propertyIsEnumerable('encodeURI') !== false) {
 
 //CHECK#2
 var result = true;
-for (var p in this) {
+for (var p in this){
   if (p === "encodeURI") {
     result = false;
   }
diff --git a/test/built-ins/encodeURI/S15.1.3.3_A6_T1.js b/test/built-ins/encodeURI/S15.1.3.3_A6_T1.js
index bc7c7fc8e..955a4038b 100644
--- a/test/built-ins/encodeURI/S15.1.3.3_A6_T1.js
+++ b/test/built-ins/encodeURI/S15.1.3.3_A6_T1.js
@@ -10,51 +10,26 @@ description: If Type(value) is Object, evaluate ToPrimitive(value, String)
 ---*/
 
 //CHECK#1
-var object = {
-  valueOf: function() {
-    return "^"
-  }
-};
+var object = {valueOf: function() {return "^"}};
 if (encodeURI(object) !== "%5Bobject%20Object%5D") {
   $ERROR('#1: var object = {valueOf: function() {return "^"}}; encodeURI(object) === %5Bobject%20Object%5D. Actual: ' + (encodeURI(object)));
 }
 
 //CHECK#2
-var object = {
-  valueOf: function() {
-    return ""
-  },
-  toString: function() {
-    return "^"
-  }
-};
+var object = {valueOf: function() {return ""}, toString: function() {return "^"}};
 if (encodeURI(object) !== "%5E") {
   $ERROR('#2: var object = {valueOf: function() {return ""}, toString: function() {return "^"}}; encodeURI(object) === "%5E". Actual: ' + (encodeURI(object)));
 }
 
 //CHECK#3
-var object = {
-  valueOf: function() {
-    return "^"
-  },
-  toString: function() {
-    return {}
-  }
-};
+var object = {valueOf: function() {return "^"}, toString: function() {return {}}};
 if (encodeURI(object) !== "%5E") {
   $ERROR('#3: var object = {valueOf: function() {return "^"}, toString: function() {return {}}}; encodeURI(object) === "%5E". Actual: ' + (encodeURI(object)));
 }
 
 //CHECK#4
 try {
-  var object = {
-    valueOf: function() {
-      throw "error"
-    },
-    toString: function() {
-      return "^"
-    }
-  };
+  var object = {valueOf: function() {throw "error"}, toString: function() {return "^"}};
   if (encodeURI(object) !== "%5E") {
     $ERROR('#4.1: var object = {valueOf: function() {throw "error"}, toString: function() {return "^"}}; encodeURI(object) === "%5E". Actual: ' + (encodeURI(object)));
   }
@@ -68,38 +43,20 @@ catch (e) {
 }
 
 //CHECK#5
-var object = {
-  toString: function() {
-    return "^"
-  }
-};
+var object = {toString: function() {return "^"}};
 if (encodeURI(object) !== "%5E") {
   $ERROR('#5: var object = {toString: function() {return "^"}}; encodeURI(object) === "%5E". Actual: ' + (encodeURI(object)));
 }
 
 //CHECK#6
-var object = {
-  valueOf: function() {
-    return {}
-  },
-  toString: function() {
-    return "^"
-  }
-}
+var object = {valueOf: function() {return {}}, toString: function() {return "^"}}
 if (encodeURI(object) !== "%5E") {
   $ERROR('#6: var object = {valueOf: function() {return {}}, toString: function() {return "^"}}; encodeURI(object) === "%5E". Actual: ' + (encodeURI(object)));
 }
 
 //CHECK#7
 try {
-  var object = {
-    valueOf: function() {
-      return "^"
-    },
-    toString: function() {
-      throw "error"
-    }
-  };
+  var object = {valueOf: function() {return "^"}, toString: function() {throw "error"}};
   encodeURI(object);
   $ERROR('#7.1: var object = {valueOf: function() {return "^"}, toString: function() {throw "error"}}; encodeURI(object) throw "error". Actual: ' + (encodeURI(object)));
 }
@@ -111,14 +68,7 @@ catch (e) {
 
 //CHECK#8
 try {
-  var object = {
-    valueOf: function() {
-      return {}
-    },
-    toString: function() {
-      return {}
-    }
-  };
+  var object = {valueOf: function() {return {}}, toString: function() {return {}}};
   encodeURI(object);
   $ERROR('#8.1: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; encodeURI(object) throw TypeError. Actual: ' + (encodeURI(object)));
 }