From f95b56ab28c5f18150f30fbfa889a4f6ba0e50a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bargull?= Date: Fri, 9 Feb 2018 09:09:47 -0800 Subject: Revert "js-beautify: make all indentation consistent (depth & character) (#1409)" (#1412) This reverts commit a01de4a722d088055a7d84d8c691ddd7109edb34. --- test/built-ins/Object/preventExtensions/15.2.3.10-0-1.js | 2 +- test/built-ins/Object/preventExtensions/15.2.3.10-1-1.js | 2 +- test/built-ins/Object/preventExtensions/15.2.3.10-1-2.js | 2 +- test/built-ins/Object/preventExtensions/15.2.3.10-1-3.js | 2 +- test/built-ins/Object/preventExtensions/15.2.3.10-1-4.js | 2 +- test/built-ins/Object/preventExtensions/15.2.3.10-1.js | 2 +- test/built-ins/Object/preventExtensions/15.2.3.10-2-1.js | 16 ++++++++-------- test/built-ins/Object/preventExtensions/15.2.3.10-2.js | 6 +++--- test/built-ins/Object/preventExtensions/15.2.3.10-3-1.js | 6 +++--- .../built-ins/Object/preventExtensions/15.2.3.10-3-10.js | 1 + .../built-ins/Object/preventExtensions/15.2.3.10-3-11.js | 4 ++-- .../built-ins/Object/preventExtensions/15.2.3.10-3-12.js | 1 + .../built-ins/Object/preventExtensions/15.2.3.10-3-13.js | 2 +- .../built-ins/Object/preventExtensions/15.2.3.10-3-21.js | 4 ++-- .../built-ins/Object/preventExtensions/15.2.3.10-3-22.js | 10 ++++------ .../built-ins/Object/preventExtensions/15.2.3.10-3-23.js | 10 ++++------ .../built-ins/Object/preventExtensions/15.2.3.10-3-24.js | 14 +++++++------- test/built-ins/Object/preventExtensions/15.2.3.10-3-3.js | 2 +- test/built-ins/Object/preventExtensions/15.2.3.10-3-5.js | 10 ++++------ .../symbol-object-contains-symbol-properties-strict.js | 7 ++++--- 20 files changed, 51 insertions(+), 54 deletions(-) (limited to 'test/built-ins/Object/preventExtensions') diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-0-1.js b/test/built-ins/Object/preventExtensions/15.2.3.10-0-1.js index 74af3456d..8f3e64dc3 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-0-1.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-0-1.js @@ -6,6 +6,6 @@ es5id: 15.2.3.10-0-1 description: Object.preventExtensions must exist as a function ---*/ -var f = Object.preventExtensions; + var f = Object.preventExtensions; assert.sameValue(typeof(f), "function", 'typeof(f)'); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-1-1.js b/test/built-ins/Object/preventExtensions/15.2.3.10-1-1.js index e52f9af71..12e4a96cb 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-1-1.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-1-1.js @@ -8,4 +8,4 @@ description: > undefined ---*/ -Object.preventExtensions(undefined); + Object.preventExtensions(undefined); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-1-2.js b/test/built-ins/Object/preventExtensions/15.2.3.10-1-2.js index 0032e685e..908256f0d 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-1-2.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-1-2.js @@ -6,4 +6,4 @@ es5id: 15.2.3.10-1-2 description: Object.preventExtensions does not throw TypeError if 'O' is null ---*/ -Object.preventExtensions(null); + Object.preventExtensions(null); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-1-3.js b/test/built-ins/Object/preventExtensions/15.2.3.10-1-3.js index f65649363..19d939b75 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-1-3.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-1-3.js @@ -8,4 +8,4 @@ description: > boolean primitive value ---*/ -Object.preventExtensions(true); + Object.preventExtensions(true); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-1-4.js b/test/built-ins/Object/preventExtensions/15.2.3.10-1-4.js index 058bfb29d..a2b491530 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-1-4.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-1-4.js @@ -8,4 +8,4 @@ description: > string primitive value ---*/ -Object.preventExtensions("abc"); + Object.preventExtensions("abc"); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-1.js b/test/built-ins/Object/preventExtensions/15.2.3.10-1.js index 2781b8fac..08a98ccae 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-1.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-1.js @@ -8,4 +8,4 @@ description: > param is not Object ---*/ -Object.preventExtensions(0); + Object.preventExtensions(0); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-2-1.js b/test/built-ins/Object/preventExtensions/15.2.3.10-2-1.js index 765580072..a8e4b2e41 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-2-1.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-2-1.js @@ -8,16 +8,16 @@ description: > have no side effects ---*/ -var obj = {}; -var testResult1 = true; -var testResult2 = true; + var obj = {}; + var testResult1 = true; + var testResult2 = true; -var preCheck = Object.isExtensible(obj); + var preCheck = Object.isExtensible(obj); -Object.preventExtensions(obj); -testResult1 = Object.isExtensible(obj); -Object.preventExtensions(obj); -testResult2 = Object.isExtensible(obj); + Object.preventExtensions(obj); + testResult1 = Object.isExtensible(obj); + Object.preventExtensions(obj); + testResult2 = Object.isExtensible(obj); assert(preCheck, 'preCheck !== true'); assert.sameValue(testResult1, false, 'testResult1'); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-2.js b/test/built-ins/Object/preventExtensions/15.2.3.10-2.js index c3a60819f..f6507af2d 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-2.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-2.js @@ -9,10 +9,10 @@ description: > extensible property to false ---*/ -var o = {}; -var o2 = undefined; + var o = {}; + var o2 = undefined; -o2 = Object.preventExtensions(o); + o2 = Object.preventExtensions(o); assert.sameValue(o2, o, 'o2'); assert.sameValue(Object.isExtensible(o2), false, 'Object.isExtensible(o2)'); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-3-1.js b/test/built-ins/Object/preventExtensions/15.2.3.10-3-1.js index b42f94651..c9ee327e0 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-3-1.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-3-1.js @@ -8,9 +8,9 @@ description: > if arg is the returned object ---*/ -var obj = {}; -var preCheck = Object.isExtensible(obj); -Object.preventExtensions(obj); + var obj = {}; + var preCheck = Object.isExtensible(obj); + Object.preventExtensions(obj); assert(preCheck, 'preCheck !== true'); assert.sameValue(Object.isExtensible(obj), false, 'Object.isExtensible(obj)'); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-3-10.js b/test/built-ins/Object/preventExtensions/15.2.3.10-3-10.js index f58147ef4..49ec6fbd1 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-3-10.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-3-10.js @@ -18,3 +18,4 @@ assert(!Object.isExtensible(errObj)); verifyNotWritable(errObj, "0", "nocheck"); assert(!errObj.hasOwnProperty("0")); + diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-3-11.js b/test/built-ins/Object/preventExtensions/15.2.3.10-3-11.js index ba2145a1c..cdaafc240 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-3-11.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-3-11.js @@ -10,8 +10,8 @@ includes: [propertyHelper.js] ---*/ var argObj; -(function() { - argObj = arguments; +(function () { + argObj = arguments; }()); assert(Object.isExtensible(argObj)); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-3-12.js b/test/built-ins/Object/preventExtensions/15.2.3.10-3-12.js index 09778460e..071c01260 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-3-12.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-3-12.js @@ -18,3 +18,4 @@ assert(!Object.isExtensible(obj)); verifyNotWritable(obj, "exName", "nocheck"); assert(!obj.hasOwnProperty("exName")); + diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-3-13.js b/test/built-ins/Object/preventExtensions/15.2.3.10-3-13.js index 67c952a06..6bc3159ee 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-3-13.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-3-13.js @@ -9,7 +9,7 @@ description: > includes: [propertyHelper.js] ---*/ -var obj = function() {}; +var obj = function () { }; assert(Object.isExtensible(obj)); Object.preventExtensions(obj); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-3-21.js b/test/built-ins/Object/preventExtensions/15.2.3.10-3-21.js index 26d198d1e..560bec496 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-3-21.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-3-21.js @@ -10,8 +10,8 @@ includes: [propertyHelper.js] ---*/ var obj; -(function() { - obj = arguments; +(function () { + obj = arguments; }()); assert(Object.isExtensible(obj)); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-3-22.js b/test/built-ins/Object/preventExtensions/15.2.3.10-3-22.js index 02de9e3ba..f9c4d8b48 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-3-22.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-3-22.js @@ -8,13 +8,11 @@ description: > extensions have been prevented ---*/ -var obj = { - prop: 12 -}; -var preCheck = Object.isExtensible(obj); -Object.preventExtensions(obj); + var obj = { prop: 12 }; + var preCheck = Object.isExtensible(obj); + Object.preventExtensions(obj); -delete obj.prop; + delete obj.prop; assert(preCheck, 'preCheck !== true'); assert.sameValue(obj.hasOwnProperty("prop"), false, 'obj.hasOwnProperty("prop")'); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-3-23.js b/test/built-ins/Object/preventExtensions/15.2.3.10-3-23.js index b7c93c497..f857d410b 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-3-23.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-3-23.js @@ -8,13 +8,11 @@ description: > after extensions have been prevented ---*/ -var obj = { - prop: 12 -}; -var preCheck = Object.isExtensible(obj); -Object.preventExtensions(obj); + var obj = { prop: 12 }; + var preCheck = Object.isExtensible(obj); + Object.preventExtensions(obj); -obj.prop = -1; + obj.prop = -1; assert(preCheck, 'preCheck !== true'); assert.sameValue(obj.prop, -1, 'obj.prop'); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-3-24.js b/test/built-ins/Object/preventExtensions/15.2.3.10-3-24.js index b0f8796a5..7e8006326 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-3-24.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-3-24.js @@ -9,15 +9,15 @@ description: > from that prototype ---*/ -var proto = {}; -var preCheck = Object.isExtensible(proto); -Object.preventExtensions(proto); + var proto = {}; + var preCheck = Object.isExtensible(proto); + Object.preventExtensions(proto); -var ConstructFun = function() {}; -ConstructFun.prototype = proto; -var child = new ConstructFun(); + var ConstructFun = function () { }; + ConstructFun.prototype = proto; + var child = new ConstructFun(); -child.prop = 10; + child.prop = 10; assert(preCheck, 'preCheck !== true'); assert(child.hasOwnProperty("prop"), 'child.hasOwnProperty("prop") !== true'); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-3-3.js b/test/built-ins/Object/preventExtensions/15.2.3.10-3-3.js index 443c2a61e..f644100e6 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-3-3.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-3-3.js @@ -9,7 +9,7 @@ description: > includes: [propertyHelper.js] ---*/ -var obj = function() {}; +var obj = function () { }; assert(Object.isExtensible(obj)); Object.preventExtensions(obj); diff --git a/test/built-ins/Object/preventExtensions/15.2.3.10-3-5.js b/test/built-ins/Object/preventExtensions/15.2.3.10-3-5.js index f70509eca..def72f4f6 100644 --- a/test/built-ins/Object/preventExtensions/15.2.3.10-3-5.js +++ b/test/built-ins/Object/preventExtensions/15.2.3.10-3-5.js @@ -8,13 +8,11 @@ description: > a String object ---*/ -var strObj = new String(); -var preCheck = Object.isExtensible(strObj); -Object.preventExtensions(strObj); + var strObj = new String(); + var preCheck = Object.isExtensible(strObj); + Object.preventExtensions(strObj); assert.throws(TypeError, function() { - Object.defineProperty(strObj, "0", { - value: "c" - }); + Object.defineProperty(strObj, "0", { value: "c" }); }); assert(preCheck, 'preCheck !== true'); assert.sameValue(strObj.hasOwnProperty("0"), false, 'strObj.hasOwnProperty("0")'); diff --git a/test/built-ins/Object/preventExtensions/symbol-object-contains-symbol-properties-strict.js b/test/built-ins/Object/preventExtensions/symbol-object-contains-symbol-properties-strict.js index 9fb953b99..6bb4bdf18 100644 --- a/test/built-ins/Object/preventExtensions/symbol-object-contains-symbol-properties-strict.js +++ b/test/built-ins/Object/preventExtensions/symbol-object-contains-symbol-properties-strict.js @@ -20,12 +20,13 @@ assert.throws(TypeError, function() { }); assert.throws(TypeError, function() { - Object.defineProperty(obj, symC, { - value: 1 - }); + Object.defineProperty(obj, symC, { value: 1 }); }); assert.sameValue(obj[symA], 2, "The value of `obj[symA]` is `2`"); assert.sameValue(delete obj[symA], true, "`delete obj[symA]` is `true`"); assert.sameValue(obj[symB], undefined, "The value of `obj[symB]` is `undefined`"); assert.sameValue(obj[symC], undefined, "The value of `obj[symC]` is `undefined`"); + + + -- cgit v1.2.1