From 9660f06b25a4210ba0deade3854f9f9433814463 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Tue, 2 May 2017 11:39:21 -0700
Subject: [PATCH] Don't add 'shorthand' property to ObjectMethod (#506)

---
 src/parser/expression.js                      |  3 +-
 .../basic/shebang-object/expected.json        |  2 +-
 .../core/uncategorised/22/expected.json       |  2 +-
 .../core/uncategorised/23/expected.json       |  2 +-
 .../core/uncategorised/24/expected.json       |  2 +-
 .../core/uncategorised/25/expected.json       |  2 +-
 .../core/uncategorised/26/expected.json       |  2 +-
 .../core/uncategorised/27/expected.json       |  2 +-
 .../core/uncategorised/275/expected.json      |  2 +-
 .../core/uncategorised/28/expected.json       |  4 +-
 .../core/uncategorised/29/expected.json       |  1 -
 .../core/uncategorised/30/expected.json       |  1 -
 .../core/uncategorised/31/expected.json       |  1 -
 .../core/uncategorised/32/expected.json       |  1 -
 .../core/uncategorised/33/expected.json       |  1 -
 .../core/uncategorised/335/expected.json      |  2 +-
 .../core/uncategorised/338/expected.json      |  2 +-
 .../core/uncategorised/34/expected.json       |  1 -
 .../core/uncategorised/35/expected.json       |  1 -
 .../core/uncategorised/36/expected.json       |  1 -
 .../core/uncategorised/37/expected.json       |  1 -
 .../core/uncategorised/38/expected.json       |  1 -
 .../core/uncategorised/39/expected.json       |  1 -
 .../core/uncategorised/40/expected.json       |  1 -
 .../core/uncategorised/41/expected.json       |  1 -
 .../core/uncategorised/42/expected.json       |  1 -
 .../core/uncategorised/43/expected.json       |  1 -
 .../core/uncategorised/44/expected.json       |  2 +-
 .../core/uncategorised/45/expected.json       |  2 +-
 .../core/uncategorised/546/expected.json      |  2 +-
 .../core/uncategorised/549/expected.json      |  2 +-
 .../with-object/expected.json                 |  2 +-
 .../object-rest-spread/expected.json          |  2 +-
 .../call-expression/expected.json             |  2 +-
 .../expected.json                             | 52 +++++++++----------
 .../es2015/regression/186/expected.json       |  4 +-
 .../es2015/uncategorised/103/expected.json    |  1 -
 .../es2015/uncategorised/141/expected.json    |  2 +-
 .../es2015/uncategorised/142/expected.json    |  2 +-
 .../es2015/uncategorised/143/expected.json    |  2 +-
 .../es2015/uncategorised/144/expected.json    |  4 +-
 .../es2015/uncategorised/145/expected.json    |  2 -
 .../es2015/uncategorised/146/expected.json    |  1 -
 .../es2015/uncategorised/147/expected.json    |  4 +-
 .../es2015/uncategorised/148/expected.json    |  2 +-
 .../es2015/uncategorised/149/expected.json    |  1 -
 .../es2015/uncategorised/153/expected.json    |  4 +-
 .../es2015/uncategorised/154/expected.json    |  4 +-
 .../es2015/uncategorised/155/expected.json    |  6 +--
 .../es2015/uncategorised/156/expected.json    |  5 +-
 .../es2015/uncategorised/157/expected.json    |  4 +-
 .../es2015/uncategorised/158/expected.json    |  4 +-
 .../es2015/uncategorised/161/expected.json    |  2 +-
 .../es2015/uncategorised/162/expected.json    |  1 -
 .../es2015/uncategorised/165/expected.json    |  4 +-
 .../es2015/uncategorised/166/expected.json    |  2 +-
 .../es2015/uncategorised/168/expected.json    |  8 +--
 .../es2015/uncategorised/170/expected.json    |  4 +-
 .../es2015/uncategorised/172/expected.json    |  8 +--
 .../es2015/uncategorised/173/expected.json    |  1 -
 .../es2015/uncategorised/174/expected.json    |  1 -
 .../es2015/uncategorised/175/expected.json    |  9 ++--
 .../es2015/uncategorised/178/expected.json    |  2 +-
 .../es2015/uncategorised/179/expected.json    |  2 +-
 .../es2015/uncategorised/182/expected.json    |  2 +-
 .../es2015/uncategorised/183/expected.json    |  4 +-
 .../es2015/uncategorised/186/expected.json    |  4 +-
 .../es2015/uncategorised/190/expected.json    |  4 +-
 .../es2015/uncategorised/26/expected.json     |  4 +-
 .../es2015/uncategorised/279/expected.json    |  2 +-
 .../es2015/uncategorised/303/expected.json    |  2 +-
 .../es2015/uncategorised/304/expected.json    |  2 +-
 .../es2015/uncategorised/305/expected.json    |  2 +-
 .../es2015/uncategorised/307/expected.json    |  2 +-
 .../es2015/uncategorised/308/expected.json    |  2 +-
 .../es2015/uncategorised/309/expected.json    |  4 +-
 .../es2015/uncategorised/310/expected.json    |  2 +-
 .../es2015/uncategorised/313/expected.json    |  2 +-
 .../es2015/uncategorised/321/expected.json    |  2 +-
 .../es2015/uncategorised/33/expected.json     |  2 +-
 .../es2015/uncategorised/350/expected.json    |  4 +-
 .../es2015/uncategorised/351/expected.json    |  3 +-
 .../es2015/uncategorised/352/expected.json    |  3 +-
 .../es2015/uncategorised/355/expected.json    |  2 +-
 .../es2015/uncategorised/360/expected.json    |  2 +-
 .../es2015/uncategorised/362/expected.json    |  2 +-
 .../es2015/uncategorised/393/expected.json    |  2 +-
 .../es2015/uncategorised/52/expected.json     |  1 -
 .../es2015/uncategorised/53/expected.json     |  1 -
 .../es2015/uncategorised/54/expected.json     |  1 -
 .../es2015/uncategorised/55/expected.json     |  1 -
 .../es2015/uncategorised/56/expected.json     |  1 -
 .../es2015/uncategorised/61/expected.json     |  4 +-
 .../es2015/uncategorised/63/expected.json     |  2 +-
 .../es2015/uncategorised/65/expected.json     |  2 +-
 .../es2015/uncategorised/67/expected.json     |  2 +-
 .../es2015/uncategorised/69/expected.json     |  2 +-
 .../es2015/uncategorised/70/expected.json     |  2 +-
 .../es2015/uncategorised/71/expected.json     |  2 +-
 .../es2017/async-functions/15/expected.json   |  3 +-
 .../es2017/async-functions/23/expected.json   |  2 +-
 .../es2017/async-functions/24/expected.json   |  1 -
 .../es2017/async-functions/27/expected.json   |  2 +-
 .../es2017/async-functions/28/expected.json   |  2 +-
 .../es2017/async-functions/29/expected.json   |  2 +-
 .../es2017/async-functions/30/expected.json   |  2 +-
 .../es2017/async-functions/31/expected.json   |  2 +-
 .../es2017/async-functions/32/expected.json   |  2 +-
 .../es2017/async-functions/33/expected.json   |  2 +-
 .../es2017/async-functions/34/expected.json   |  2 +-
 .../es2017/async-functions/37/expected.json   |  2 +-
 .../es2017/async-functions/38/expected.json   |  2 +-
 .../es2017/async-functions/7/expected.json    |  2 +-
 .../es2017/async-functions/8/expected.json    |  2 +-
 .../patterned-catch/expected.json             |  8 +--
 .../with-object-pattern/expected.json         |  2 +-
 .../migrated_0005/expected.json               |  2 +-
 .../migrated_0002/expected.json               |  2 +-
 .../nested-cover-grammar/expected.json        |  2 +-
 .../nested-cover-grammar/expected.json        |  2 +-
 .../object-pattern-assignment/expected.json   | 14 ++---
 .../export-default-object/expected.json       |  2 +-
 .../for-of-object-pattern-const/expected.json |  4 +-
 .../for-of-object-pattern/expected.json       |  4 +-
 .../expected.json                             |  1 -
 .../expected.json                             |  1 -
 .../expected.json                             |  1 -
 .../expected.json                             |  1 -
 .../expected.json                             |  1 -
 .../generator-method-with-yield/expected.json |  1 -
 .../generator-method/expected.json            |  1 -
 .../migrated_0000/expected.json               |  1 -
 .../migrated_0001/expected.json               |  1 -
 .../migrated_0002/expected.json               |  1 -
 .../migrated_0003/expected.json               |  1 -
 .../migrated_0004/expected.json               |  1 -
 .../expected.json                             |  4 +-
 .../proto-identifier-getter/expected.json     |  3 +-
 .../proto-identifier-method/expected.json     |  3 +-
 .../proto-identifier-setter/expected.json     |  3 +-
 .../proto-literal-getter-setter/expected.json |  4 +-
 .../proto-literal-getter/expected.json        |  3 +-
 .../proto-literal-method/expected.json        |  3 +-
 .../proto-literal-setter/expected.json        |  3 +-
 .../migrated_0000/expected.json               |  4 +-
 .../elision/expected.json                     |  2 +-
 .../nested/expected.json                      |  2 +-
 .../properties/expected.json                  | 10 ++--
 .../object-method/expected.json               |  2 +-
 .../object-shorthand-method/expected.json     |  1 -
 .../yield-binding-element/expected.json       |  2 +-
 .../yield-binding-property/expected.json      |  2 +-
 .../yield-generator-method/expected.json      |  1 -
 .../expected.json                             |  2 +-
 .../es2015-yield/yield-method/expected.json   |  1 -
 .../expected.json                             |  2 +-
 .../expected.json                             |  2 +-
 .../yield-strict-method/expected.json         |  1 -
 .../arrow-rest-parameter-object/expected.json |  2 +-
 .../invalid-setter-rest/expected.json         |  1 -
 .../object-method/expected.json               |  2 +-
 .../object-shorthand-method/expected.json     |  1 -
 .../rest-parameter-object/expected.json       |  2 +-
 .../migrated_0002/expected.json               |  2 +-
 .../estree/object-method/basic/expected.json  |  1 -
 .../object-property/basic/expected.json       |  2 +-
 .../object-default-params/expected.json       |  2 +-
 .../object-method/expected.json               |  1 -
 .../class-method-parameter/expected.json      |  2 +-
 .../expected.json                             |  2 +-
 .../expected.json                             |  2 +-
 .../expected.json                             |  2 +-
 .../object-method-parameter/expected.json     |  3 +-
 .../object-rest-spread/10/expected.json       |  4 +-
 .../object-rest-spread/16/expected.json       |  4 +-
 .../object-rest-spread/17/expected.json       |  4 +-
 .../object-rest-spread/2/expected.json        |  2 +-
 .../object-rest-spread/3/expected.json        |  2 +-
 .../object-rest-spread/5/expected.json        |  2 +-
 .../object-rest-spread/6/expected.json        |  6 +--
 .../uncategorised/39/expected.json            |  2 +-
 .../uncategorised/49/expected.json            |  2 +-
 .../flow/regression/issue-264/expected.json   |  2 +-
 .../flow/type-annotations/107/expected.json   |  2 +-
 .../flow/type-annotations/108/expected.json   | 24 ++++-----
 .../flow/type-annotations/20/expected.json    |  1 -
 .../flow/type-annotations/21/expected.json    |  1 -
 .../flow/type-annotations/22/expected.json    |  1 -
 .../flow/type-annotations/23/expected.json    |  1 -
 .../flow/type-annotations/24/expected.json    |  1 -
 .../flow/type-annotations/25/expected.json    |  1 -
 .../flow/type-annotations/26/expected.json    |  1 -
 .../flow/type-annotations/60/expected.json    |  4 +-
 .../flow/type-annotations/61/expected.json    |  4 +-
 .../flow/type-annotations/63/expected.json    |  2 +-
 .../flow/type-annotations/97/expected.json    |  2 +-
 .../flow/type-generics/1/expected.json        |  2 +-
 .../expected.json                             |  1 -
 .../object-reserved-word/expected.json        |  4 --
 test/fixtures/flow/typecasts/2/expected.json  |  4 +-
 test/fixtures/jsx/regression/3/expected.json  |  2 +-
 .../expected.json                             |  6 +--
 .../expected.json                             |  2 +-
 .../expected.json                             |  2 +-
 .../expected.json                             |  2 +-
 .../expected.json                             |  6 +--
 .../expected.json                             |  6 +--
 .../expected.json                             |  6 +--
 .../expected.json                             | 12 ++---
 .../expected.json                             |  6 +--
 .../expected.json                             |  2 +-
 .../expected.json                             |  2 +-
 .../expected.json                             |  2 +-
 .../expected.json                             |  4 +-
 .../expected.json                             |  2 +-
 215 files changed, 264 insertions(+), 340 deletions(-)

diff --git a/src/parser/expression.js b/src/parser/expression.js
index 168e595415..9afb11da4c 100644
--- a/src/parser/expression.js
+++ b/src/parser/expression.js
@@ -772,7 +772,6 @@ export default class ExpressionParser extends LValParser {
       }
 
       prop.method = false;
-      prop.shorthand = false;
 
       if (isPattern || refShorthandDefaultPos) {
         startPos = this.state.start;
@@ -870,6 +869,8 @@ export default class ExpressionParser extends LValParser {
   }
 
   parseObjectProperty(prop, startPos, startLoc, isPattern, refShorthandDefaultPos) {
+    prop.shorthand = false;
+
     if (this.eat(tt.colon)) {
       prop.value = isPattern ? this.parseMaybeDefault(this.state.start, this.state.startLoc) : this.parseMaybeAssign(false, refShorthandDefaultPos);
 
diff --git a/test/fixtures/comments/basic/shebang-object/expected.json b/test/fixtures/comments/basic/shebang-object/expected.json
index 1d5ab8aced..ba246f1e89 100644
--- a/test/fixtures/comments/basic/shebang-object/expected.json
+++ b/test/fixtures/comments/basic/shebang-object/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -107,6 +106,7 @@
                     "name": "spawn",
                     "leadingComments": null
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 33,
diff --git a/test/fixtures/core/uncategorised/22/expected.json b/test/fixtures/core/uncategorised/22/expected.json
index bc44d62df8..8a57b4b290 100644
--- a/test/fixtures/core/uncategorised/22/expected.json
+++ b/test/fixtures/core/uncategorised/22/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "answer"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 14,
diff --git a/test/fixtures/core/uncategorised/23/expected.json b/test/fixtures/core/uncategorised/23/expected.json
index 8373348ba7..36656a5a0c 100644
--- a/test/fixtures/core/uncategorised/23/expected.json
+++ b/test/fixtures/core/uncategorised/23/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "if"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 10,
diff --git a/test/fixtures/core/uncategorised/24/expected.json b/test/fixtures/core/uncategorised/24/expected.json
index 723c8db2a5..bf9211c537 100644
--- a/test/fixtures/core/uncategorised/24/expected.json
+++ b/test/fixtures/core/uncategorised/24/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "true"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 12,
diff --git a/test/fixtures/core/uncategorised/25/expected.json b/test/fixtures/core/uncategorised/25/expected.json
index 1245b12ad3..72b5293e2e 100644
--- a/test/fixtures/core/uncategorised/25/expected.json
+++ b/test/fixtures/core/uncategorised/25/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "false"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 13,
diff --git a/test/fixtures/core/uncategorised/26/expected.json b/test/fixtures/core/uncategorised/26/expected.json
index 17acbb207e..b3d2471ea3 100644
--- a/test/fixtures/core/uncategorised/26/expected.json
+++ b/test/fixtures/core/uncategorised/26/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "null"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 12,
diff --git a/test/fixtures/core/uncategorised/27/expected.json b/test/fixtures/core/uncategorised/27/expected.json
index df92c26e13..390c389545 100644
--- a/test/fixtures/core/uncategorised/27/expected.json
+++ b/test/fixtures/core/uncategorised/27/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "StringLiteral",
@@ -126,6 +125,7 @@
                   },
                   "value": "answer"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 16,
diff --git a/test/fixtures/core/uncategorised/275/expected.json b/test/fixtures/core/uncategorised/275/expected.json
index e0ef904785..9c4a377caa 100644
--- a/test/fixtures/core/uncategorised/275/expected.json
+++ b/test/fixtures/core/uncategorised/275/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "message"
               },
+              "shorthand": false,
               "value": {
                 "type": "StringLiteral",
                 "start": 17,
diff --git a/test/fixtures/core/uncategorised/28/expected.json b/test/fixtures/core/uncategorised/28/expected.json
index c3ee0acf14..96b5b5d4b5 100644
--- a/test/fixtures/core/uncategorised/28/expected.json
+++ b/test/fixtures/core/uncategorised/28/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "x"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 9,
@@ -159,7 +159,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -178,6 +177,7 @@
                   },
                   "name": "x"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 15,
diff --git a/test/fixtures/core/uncategorised/29/expected.json b/test/fixtures/core/uncategorised/29/expected.json
index 057f1cf08d..f586ae626b 100644
--- a/test/fixtures/core/uncategorised/29/expected.json
+++ b/test/fixtures/core/uncategorised/29/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/core/uncategorised/30/expected.json b/test/fixtures/core/uncategorised/30/expected.json
index b2a8bf8168..e925ad0daf 100644
--- a/test/fixtures/core/uncategorised/30/expected.json
+++ b/test/fixtures/core/uncategorised/30/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/core/uncategorised/31/expected.json b/test/fixtures/core/uncategorised/31/expected.json
index 5b18965177..c5b5923ef9 100644
--- a/test/fixtures/core/uncategorised/31/expected.json
+++ b/test/fixtures/core/uncategorised/31/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/core/uncategorised/32/expected.json b/test/fixtures/core/uncategorised/32/expected.json
index 5ed0dee78e..338f19fb67 100644
--- a/test/fixtures/core/uncategorised/32/expected.json
+++ b/test/fixtures/core/uncategorised/32/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/core/uncategorised/33/expected.json b/test/fixtures/core/uncategorised/33/expected.json
index a0a3fa12fd..316ceff9fd 100644
--- a/test/fixtures/core/uncategorised/33/expected.json
+++ b/test/fixtures/core/uncategorised/33/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/core/uncategorised/335/expected.json b/test/fixtures/core/uncategorised/335/expected.json
index 7ecc877cd8..ebb58af9d2 100644
--- a/test/fixtures/core/uncategorised/335/expected.json
+++ b/test/fixtures/core/uncategorised/335/expected.json
@@ -100,7 +100,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -119,6 +118,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ArrayExpression",
                     "start": 5,
diff --git a/test/fixtures/core/uncategorised/338/expected.json b/test/fixtures/core/uncategorised/338/expected.json
index fe0875e9a4..625cf5776e 100644
--- a/test/fixtures/core/uncategorised/338/expected.json
+++ b/test/fixtures/core/uncategorised/338/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "NumericLiteral",
@@ -94,6 +93,7 @@
                 },
                 "value": 1
               },
+              "shorthand": false,
               "value": {
                 "type": "BinaryExpression",
                 "start": 5,
diff --git a/test/fixtures/core/uncategorised/34/expected.json b/test/fixtures/core/uncategorised/34/expected.json
index 5ccdf34d1e..ec8a378624 100644
--- a/test/fixtures/core/uncategorised/34/expected.json
+++ b/test/fixtures/core/uncategorised/34/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/core/uncategorised/35/expected.json b/test/fixtures/core/uncategorised/35/expected.json
index 36830ddf37..0a96220824 100644
--- a/test/fixtures/core/uncategorised/35/expected.json
+++ b/test/fixtures/core/uncategorised/35/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "StringLiteral",
diff --git a/test/fixtures/core/uncategorised/36/expected.json b/test/fixtures/core/uncategorised/36/expected.json
index dfbd42e884..de643d969a 100644
--- a/test/fixtures/core/uncategorised/36/expected.json
+++ b/test/fixtures/core/uncategorised/36/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "NumericLiteral",
diff --git a/test/fixtures/core/uncategorised/37/expected.json b/test/fixtures/core/uncategorised/37/expected.json
index 821787cfd7..43b7edb9d1 100644
--- a/test/fixtures/core/uncategorised/37/expected.json
+++ b/test/fixtures/core/uncategorised/37/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/core/uncategorised/38/expected.json b/test/fixtures/core/uncategorised/38/expected.json
index 8b525fb80c..e7c0af7521 100644
--- a/test/fixtures/core/uncategorised/38/expected.json
+++ b/test/fixtures/core/uncategorised/38/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/core/uncategorised/39/expected.json b/test/fixtures/core/uncategorised/39/expected.json
index 6d693c7fb0..bb18e63d32 100644
--- a/test/fixtures/core/uncategorised/39/expected.json
+++ b/test/fixtures/core/uncategorised/39/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/core/uncategorised/40/expected.json b/test/fixtures/core/uncategorised/40/expected.json
index 226cdce5f6..e14dc5c87f 100644
--- a/test/fixtures/core/uncategorised/40/expected.json
+++ b/test/fixtures/core/uncategorised/40/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/core/uncategorised/41/expected.json b/test/fixtures/core/uncategorised/41/expected.json
index 6fb466dce4..20b7295274 100644
--- a/test/fixtures/core/uncategorised/41/expected.json
+++ b/test/fixtures/core/uncategorised/41/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/core/uncategorised/42/expected.json b/test/fixtures/core/uncategorised/42/expected.json
index c0d601a0c6..3156d2e2ff 100644
--- a/test/fixtures/core/uncategorised/42/expected.json
+++ b/test/fixtures/core/uncategorised/42/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "StringLiteral",
diff --git a/test/fixtures/core/uncategorised/43/expected.json b/test/fixtures/core/uncategorised/43/expected.json
index ef2d3f1eb7..5dcdec165e 100644
--- a/test/fixtures/core/uncategorised/43/expected.json
+++ b/test/fixtures/core/uncategorised/43/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "NumericLiteral",
diff --git a/test/fixtures/core/uncategorised/44/expected.json b/test/fixtures/core/uncategorised/44/expected.json
index da5e30670e..b77f8b4535 100644
--- a/test/fixtures/core/uncategorised/44/expected.json
+++ b/test/fixtures/core/uncategorised/44/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "get"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 11,
diff --git a/test/fixtures/core/uncategorised/45/expected.json b/test/fixtures/core/uncategorised/45/expected.json
index 36c20d4050..904dcf5112 100644
--- a/test/fixtures/core/uncategorised/45/expected.json
+++ b/test/fixtures/core/uncategorised/45/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "set"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 11,
diff --git a/test/fixtures/core/uncategorised/546/expected.json b/test/fixtures/core/uncategorised/546/expected.json
index 9f7364ea93..de77ab2b95 100644
--- a/test/fixtures/core/uncategorised/546/expected.json
+++ b/test/fixtures/core/uncategorised/546/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "public"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 8,
diff --git a/test/fixtures/core/uncategorised/549/expected.json b/test/fixtures/core/uncategorised/549/expected.json
index b604724403..088ba6a7ad 100644
--- a/test/fixtures/core/uncategorised/549/expected.json
+++ b/test/fixtures/core/uncategorised/549/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "arguments"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 8,
diff --git a/test/fixtures/es2015/array-rest-spread/with-object/expected.json b/test/fixtures/es2015/array-rest-spread/with-object/expected.json
index bf10b699ac..b278aa92ef 100644
--- a/test/fixtures/es2015/array-rest-spread/with-object/expected.json
+++ b/test/fixtures/es2015/array-rest-spread/with-object/expected.json
@@ -116,7 +116,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": true,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -135,6 +134,7 @@
                           },
                           "name": "length"
                         },
+                        "shorthand": true,
                         "value": {
                           "type": "Identifier",
                           "start": 9,
diff --git a/test/fixtures/es2015/arrow-functions/object-rest-spread/expected.json b/test/fixtures/es2015/arrow-functions/object-rest-spread/expected.json
index 718795d103..0357f6b22e 100644
--- a/test/fixtures/es2015/arrow-functions/object-rest-spread/expected.json
+++ b/test/fixtures/es2015/arrow-functions/object-rest-spread/expected.json
@@ -123,7 +123,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -142,6 +141,7 @@
                         },
                         "name": "title"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "Identifier",
                         "start": 14,
diff --git a/test/fixtures/es2015/computed-properties/call-expression/expected.json b/test/fixtures/es2015/computed-properties/call-expression/expected.json
index 876a6855b0..779c7b6849 100644
--- a/test/fixtures/es2015/computed-properties/call-expression/expected.json
+++ b/test/fixtures/es2015/computed-properties/call-expression/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": true,
                   "key": {
                     "type": "CallExpression",
@@ -139,6 +138,7 @@
                     },
                     "arguments": []
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "StringLiteral",
                     "start": 23,
diff --git a/test/fixtures/es2015/modules/duplicate-named-export-destructuring/expected.json b/test/fixtures/es2015/modules/duplicate-named-export-destructuring/expected.json
index 7b3fa80cce..e8a01c593c 100644
--- a/test/fixtures/es2015/modules/duplicate-named-export-destructuring/expected.json
+++ b/test/fixtures/es2015/modules/duplicate-named-export-destructuring/expected.json
@@ -103,7 +103,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -122,6 +121,7 @@
                       },
                       "name": "foo"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "Identifier",
                       "start": 15,
@@ -242,7 +242,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -261,6 +260,7 @@
                       },
                       "name": "foo"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "Identifier",
                       "start": 48,
@@ -378,7 +378,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -397,6 +396,7 @@
                       },
                       "name": "foo"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "ObjectPattern",
                       "start": 82,
@@ -427,7 +427,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": true,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -446,6 +445,7 @@
                             },
                             "name": "baz"
                           },
+                          "shorthand": true,
                           "value": {
                             "type": "Identifier",
                             "start": 84,
@@ -569,7 +569,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -588,6 +587,7 @@
                       },
                       "name": "foo"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "ObjectPattern",
                       "start": 119,
@@ -618,7 +618,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": false,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -637,6 +636,7 @@
                             },
                             "name": "baz"
                           },
+                          "shorthand": false,
                           "value": {
                             "type": "ObjectPattern",
                             "start": 127,
@@ -667,7 +667,6 @@
                                   }
                                 },
                                 "method": false,
-                                "shorthand": true,
                                 "computed": false,
                                 "key": {
                                   "type": "Identifier",
@@ -686,6 +685,7 @@
                                   },
                                   "name": "qux"
                                 },
+                                "shorthand": true,
                                 "value": {
                                   "type": "Identifier",
                                   "start": 129,
@@ -812,7 +812,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -831,6 +830,7 @@
                       },
                       "name": "foo"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "ObjectPattern",
                       "start": 166,
@@ -861,7 +861,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": false,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -880,6 +879,7 @@
                             },
                             "name": "baz"
                           },
+                          "shorthand": false,
                           "value": {
                             "type": "ObjectPattern",
                             "start": 174,
@@ -910,7 +910,6 @@
                                   }
                                 },
                                 "method": false,
-                                "shorthand": true,
                                 "computed": false,
                                 "key": {
                                   "type": "Identifier",
@@ -929,6 +928,7 @@
                                   },
                                   "name": "qux2"
                                 },
+                                "shorthand": true,
                                 "value": {
                                   "type": "Identifier",
                                   "start": 176,
@@ -971,7 +971,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -990,6 +989,7 @@
                       },
                       "name": "foo3"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "Identifier",
                       "start": 186,
@@ -1344,7 +1344,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": false,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -1363,6 +1362,7 @@
                           },
                           "name": "foo"
                         },
+                        "shorthand": false,
                         "value": {
                           "type": "ArrayPattern",
                           "start": 277,
@@ -1430,7 +1430,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": false,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -1449,6 +1448,7 @@
                           },
                           "name": "foo2"
                         },
+                        "shorthand": false,
                         "value": {
                           "type": "ArrayPattern",
                           "start": 295,
@@ -1585,7 +1585,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -1604,6 +1603,7 @@
                       },
                       "name": "foo"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "ObjectPattern",
                       "start": 332,
@@ -1634,7 +1634,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": false,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -1653,6 +1652,7 @@
                             },
                             "name": "baz"
                           },
+                          "shorthand": false,
                           "value": {
                             "type": "ObjectPattern",
                             "start": 339,
@@ -1683,7 +1683,6 @@
                                   }
                                 },
                                 "method": false,
-                                "shorthand": true,
                                 "computed": false,
                                 "key": {
                                   "type": "Identifier",
@@ -1702,6 +1701,7 @@
                                   },
                                   "name": "qux3"
                                 },
+                                "shorthand": true,
                                 "value": {
                                   "type": "Identifier",
                                   "start": 341,
@@ -1744,7 +1744,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -1763,6 +1762,7 @@
                       },
                       "name": "foo2"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "ObjectPattern",
                       "start": 357,
@@ -1793,7 +1793,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": false,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -1812,6 +1811,7 @@
                             },
                             "name": "baz2"
                           },
+                          "shorthand": false,
                           "value": {
                             "type": "ArrayPattern",
                             "start": 365,
@@ -1949,7 +1949,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -1968,6 +1967,7 @@
                       },
                       "name": "foo"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "ObjectPattern",
                       "start": 402,
@@ -1998,7 +1998,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": false,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -2017,6 +2016,7 @@
                             },
                             "name": "baz"
                           },
+                          "shorthand": false,
                           "value": {
                             "type": "ObjectPattern",
                             "start": 409,
@@ -2047,7 +2047,6 @@
                                   }
                                 },
                                 "method": false,
-                                "shorthand": true,
                                 "computed": false,
                                 "key": {
                                   "type": "Identifier",
@@ -2066,6 +2065,7 @@
                                   },
                                   "name": "qux5"
                                 },
+                                "shorthand": true,
                                 "value": {
                                   "type": "Identifier",
                                   "start": 411,
@@ -2108,7 +2108,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -2127,6 +2126,7 @@
                       },
                       "name": "foo2"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "ObjectPattern",
                       "start": 427,
@@ -2157,7 +2157,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": false,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -2176,6 +2175,7 @@
                             },
                             "name": "baz2"
                           },
+                          "shorthand": false,
                           "value": {
                             "type": "ArrayPattern",
                             "start": 435,
@@ -2221,7 +2221,6 @@
                                       }
                                     },
                                     "method": false,
-                                    "shorthand": true,
                                     "computed": false,
                                     "key": {
                                       "type": "Identifier",
@@ -2240,6 +2239,7 @@
                                       },
                                       "name": "qux6"
                                     },
+                                    "shorthand": true,
                                     "value": {
                                       "type": "Identifier",
                                       "start": 437,
@@ -2368,7 +2368,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -2387,6 +2386,7 @@
                       },
                       "name": "Foo"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "Identifier",
                       "start": 469,
@@ -2507,7 +2507,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -2526,6 +2525,7 @@
                       },
                       "name": "foo"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "ArrayPattern",
                       "start": 502,
diff --git a/test/fixtures/es2015/regression/186/expected.json b/test/fixtures/es2015/regression/186/expected.json
index 080e9bbb8d..49b6d1aab0 100644
--- a/test/fixtures/es2015/regression/186/expected.json
+++ b/test/fixtures/es2015/regression/186/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "key": {
                     "type": "Identifier",
                     "start": 11,
@@ -123,6 +122,7 @@
                     "name": "async"
                   },
                   "computed": false,
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 11,
@@ -159,7 +159,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -178,6 +177,7 @@
                     },
                     "name": "bar"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 18,
diff --git a/test/fixtures/es2015/uncategorised/103/expected.json b/test/fixtures/es2015/uncategorised/103/expected.json
index fc3feab5f7..23040e20d4 100644
--- a/test/fixtures/es2015/uncategorised/103/expected.json
+++ b/test/fixtures/es2015/uncategorised/103/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
diff --git a/test/fixtures/es2015/uncategorised/141/expected.json b/test/fixtures/es2015/uncategorised/141/expected.json
index eddaee3cad..fd69ba0ca6 100644
--- a/test/fixtures/es2015/uncategorised/141/expected.json
+++ b/test/fixtures/es2015/uncategorised/141/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": true,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "x"
               },
+              "shorthand": false,
               "value": {
                 "type": "NumericLiteral",
                 "start": 7,
diff --git a/test/fixtures/es2015/uncategorised/142/expected.json b/test/fixtures/es2015/uncategorised/142/expected.json
index 15b8f684ff..15acdfd1ee 100644
--- a/test/fixtures/es2015/uncategorised/142/expected.json
+++ b/test/fixtures/es2015/uncategorised/142/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": true,
               "key": {
                 "type": "BinaryExpression",
@@ -130,6 +129,7 @@
                   "value": "y"
                 }
               },
+              "shorthand": false,
               "value": {
                 "type": "NumericLiteral",
                 "start": 15,
diff --git a/test/fixtures/es2015/uncategorised/143/expected.json b/test/fixtures/es2015/uncategorised/143/expected.json
index aaa1c78fe5..6852b7e74c 100644
--- a/test/fixtures/es2015/uncategorised/143/expected.json
+++ b/test/fixtures/es2015/uncategorised/143/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": true,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "x"
               },
+              "shorthand": false,
               "value": {
                 "type": "FunctionExpression",
                 "start": 7,
diff --git a/test/fixtures/es2015/uncategorised/144/expected.json b/test/fixtures/es2015/uncategorised/144/expected.json
index 3e8c0bd2cf..c484ee3622 100644
--- a/test/fixtures/es2015/uncategorised/144/expected.json
+++ b/test/fixtures/es2015/uncategorised/144/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": true,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "x"
               },
+              "shorthand": false,
               "value": {
                 "type": "NumericLiteral",
                 "start": 7,
@@ -127,7 +127,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -146,6 +145,7 @@
                 },
                 "name": "y"
               },
+              "shorthand": false,
               "value": {
                 "type": "NumericLiteral",
                 "start": 14,
diff --git a/test/fixtures/es2015/uncategorised/145/expected.json b/test/fixtures/es2015/uncategorised/145/expected.json
index 39d0f02fc4..b57ffb2797 100644
--- a/test/fixtures/es2015/uncategorised/145/expected.json
+++ b/test/fixtures/es2015/uncategorised/145/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": true,
               "key": {
                 "type": "Identifier",
@@ -130,7 +129,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": true,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/es2015/uncategorised/146/expected.json b/test/fixtures/es2015/uncategorised/146/expected.json
index 7c8df52528..5aab5e9622 100644
--- a/test/fixtures/es2015/uncategorised/146/expected.json
+++ b/test/fixtures/es2015/uncategorised/146/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": true,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/es2015/uncategorised/147/expected.json b/test/fixtures/es2015/uncategorised/147/expected.json
index 3605b59b78..9b0cfcecac 100644
--- a/test/fixtures/es2015/uncategorised/147/expected.json
+++ b/test/fixtures/es2015/uncategorised/147/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": true,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 10,
@@ -156,7 +156,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -175,6 +174,7 @@
                     },
                     "name": "y"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 16,
diff --git a/test/fixtures/es2015/uncategorised/148/expected.json b/test/fixtures/es2015/uncategorised/148/expected.json
index dfea488504..35aa9b82e9 100644
--- a/test/fixtures/es2015/uncategorised/148/expected.json
+++ b/test/fixtures/es2015/uncategorised/148/expected.json
@@ -93,7 +93,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": true,
                 "key": {
                   "type": "Identifier",
@@ -112,6 +111,7 @@
                   },
                   "name": "x"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "Identifier",
                   "start": 17,
diff --git a/test/fixtures/es2015/uncategorised/149/expected.json b/test/fixtures/es2015/uncategorised/149/expected.json
index 531feae88a..1bb1bd74da 100644
--- a/test/fixtures/es2015/uncategorised/149/expected.json
+++ b/test/fixtures/es2015/uncategorised/149/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "computed": true,
                   "key": {
                     "type": "Identifier",
diff --git a/test/fixtures/es2015/uncategorised/153/expected.json b/test/fixtures/es2015/uncategorised/153/expected.json
index 2876aa00ee..a371840ab6 100644
--- a/test/fixtures/es2015/uncategorised/153/expected.json
+++ b/test/fixtures/es2015/uncategorised/153/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 12,
@@ -179,7 +179,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -198,6 +197,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "NumericLiteral",
                     "start": 21,
diff --git a/test/fixtures/es2015/uncategorised/154/expected.json b/test/fixtures/es2015/uncategorised/154/expected.json
index 47be23ad0b..5138fc882b 100644
--- a/test/fixtures/es2015/uncategorised/154/expected.json
+++ b/test/fixtures/es2015/uncategorised/154/expected.json
@@ -137,7 +137,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -156,6 +155,7 @@
                         },
                         "name": "x"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "Identifier",
                         "start": 14,
@@ -209,7 +209,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": false,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -228,6 +227,7 @@
                         },
                         "name": "x"
                       },
+                      "shorthand": false,
                       "value": {
                         "type": "NumericLiteral",
                         "start": 23,
diff --git a/test/fixtures/es2015/uncategorised/155/expected.json b/test/fixtures/es2015/uncategorised/155/expected.json
index 40fd9771cf..a35b2d27f2 100644
--- a/test/fixtures/es2015/uncategorised/155/expected.json
+++ b/test/fixtures/es2015/uncategorised/155/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "f"
               },
+              "shorthand": false,
               "value": {
                 "type": "FunctionExpression",
                 "start": 5,
@@ -154,7 +154,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": true,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -173,6 +172,7 @@
                             },
                             "name": "x"
                           },
+                          "shorthand": true,
                           "value": {
                             "type": "Identifier",
                             "start": 15,
@@ -226,7 +226,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": false,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -245,6 +244,7 @@
                             },
                             "name": "x"
                           },
+                          "shorthand": false,
                           "value": {
                             "type": "NumericLiteral",
                             "start": 24,
diff --git a/test/fixtures/es2015/uncategorised/156/expected.json b/test/fixtures/es2015/uncategorised/156/expected.json
index 287d7e8771..f023b81a28 100644
--- a/test/fixtures/es2015/uncategorised/156/expected.json
+++ b/test/fixtures/es2015/uncategorised/156/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -141,7 +140,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": true,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -160,6 +158,7 @@
                           },
                           "name": "x"
                         },
+                        "shorthand": true,
                         "value": {
                           "type": "Identifier",
                           "start": 5,
@@ -213,7 +212,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": false,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -232,6 +230,7 @@
                           },
                           "name": "x"
                         },
+                        "shorthand": false,
                         "value": {
                           "type": "NumericLiteral",
                           "start": 14,
diff --git a/test/fixtures/es2015/uncategorised/157/expected.json b/test/fixtures/es2015/uncategorised/157/expected.json
index 6075b1827f..2964c59783 100644
--- a/test/fixtures/es2015/uncategorised/157/expected.json
+++ b/test/fixtures/es2015/uncategorised/157/expected.json
@@ -156,7 +156,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": true,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -175,6 +174,7 @@
                             },
                             "name": "x"
                           },
+                          "shorthand": true,
                           "value": {
                             "type": "Identifier",
                             "start": 11,
@@ -228,7 +228,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": false,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -247,6 +246,7 @@
                             },
                             "name": "x"
                           },
+                          "shorthand": false,
                           "value": {
                             "type": "NumericLiteral",
                             "start": 20,
diff --git a/test/fixtures/es2015/uncategorised/158/expected.json b/test/fixtures/es2015/uncategorised/158/expected.json
index 88d65a30fb..a94e42c1d7 100644
--- a/test/fixtures/es2015/uncategorised/158/expected.json
+++ b/test/fixtures/es2015/uncategorised/158/expected.json
@@ -105,7 +105,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -124,6 +123,7 @@
                       },
                       "name": "x"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "Identifier",
                       "start": 3,
@@ -177,7 +177,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -196,6 +195,7 @@
                       },
                       "name": "x"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "NumericLiteral",
                       "start": 12,
diff --git a/test/fixtures/es2015/uncategorised/161/expected.json b/test/fixtures/es2015/uncategorised/161/expected.json
index 9d6157c40e..ef6bf56941 100644
--- a/test/fixtures/es2015/uncategorised/161/expected.json
+++ b/test/fixtures/es2015/uncategorised/161/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "f"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "FunctionExpression",
                   "start": 9,
diff --git a/test/fixtures/es2015/uncategorised/162/expected.json b/test/fixtures/es2015/uncategorised/162/expected.json
index 7d167b78cf..11d3f9a875 100644
--- a/test/fixtures/es2015/uncategorised/162/expected.json
+++ b/test/fixtures/es2015/uncategorised/162/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/es2015/uncategorised/165/expected.json b/test/fixtures/es2015/uncategorised/165/expected.json
index f6be853aa4..c48f8c98ce 100644
--- a/test/fixtures/es2015/uncategorised/165/expected.json
+++ b/test/fixtures/es2015/uncategorised/165/expected.json
@@ -93,7 +93,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -112,6 +111,7 @@
                   },
                   "name": "a"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 13,
@@ -148,7 +148,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -167,6 +166,7 @@
                   },
                   "name": "b"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 16,
diff --git a/test/fixtures/es2015/uncategorised/166/expected.json b/test/fixtures/es2015/uncategorised/166/expected.json
index 4d1f380f71..5327aa282f 100644
--- a/test/fixtures/es2015/uncategorised/166/expected.json
+++ b/test/fixtures/es2015/uncategorised/166/expected.json
@@ -110,7 +110,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -129,6 +128,7 @@
                   },
                   "name": "a"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 16,
diff --git a/test/fixtures/es2015/uncategorised/168/expected.json b/test/fixtures/es2015/uncategorised/168/expected.json
index 009f02d6c5..3fb28437fb 100644
--- a/test/fixtures/es2015/uncategorised/168/expected.json
+++ b/test/fixtures/es2015/uncategorised/168/expected.json
@@ -93,7 +93,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -112,6 +111,7 @@
                   },
                   "name": "a"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "ObjectPattern",
                   "start": 16,
@@ -142,7 +142,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -161,6 +160,7 @@
                         },
                         "name": "w"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "Identifier",
                         "start": 18,
@@ -197,7 +197,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -216,6 +215,7 @@
                         },
                         "name": "x"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "Identifier",
                         "start": 21,
@@ -255,7 +255,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -274,6 +273,7 @@
                   },
                   "name": "b"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "ArrayPattern",
                   "start": 29,
diff --git a/test/fixtures/es2015/uncategorised/170/expected.json b/test/fixtures/es2015/uncategorised/170/expected.json
index 4053df70fa..6449d5ba66 100644
--- a/test/fixtures/es2015/uncategorised/170/expected.json
+++ b/test/fixtures/es2015/uncategorised/170/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 14,
@@ -162,7 +162,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -181,6 +180,7 @@
                     },
                     "name": "b"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 17,
diff --git a/test/fixtures/es2015/uncategorised/172/expected.json b/test/fixtures/es2015/uncategorised/172/expected.json
index 3f75c7c880..8e42ea2ca2 100644
--- a/test/fixtures/es2015/uncategorised/172/expected.json
+++ b/test/fixtures/es2015/uncategorised/172/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ObjectPattern",
                     "start": 17,
@@ -156,7 +156,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": true,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -175,6 +174,7 @@
                           },
                           "name": "w"
                         },
+                        "shorthand": true,
                         "value": {
                           "type": "Identifier",
                           "start": 19,
@@ -211,7 +211,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": true,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -230,6 +229,7 @@
                           },
                           "name": "x"
                         },
+                        "shorthand": true,
                         "value": {
                           "type": "Identifier",
                           "start": 22,
@@ -269,7 +269,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -288,6 +287,7 @@
                     },
                     "name": "b"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ArrayPattern",
                     "start": 30,
diff --git a/test/fixtures/es2015/uncategorised/173/expected.json b/test/fixtures/es2015/uncategorised/173/expected.json
index 8cbad3c24a..f7c8cd58cb 100644
--- a/test/fixtures/es2015/uncategorised/173/expected.json
+++ b/test/fixtures/es2015/uncategorised/173/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/es2015/uncategorised/174/expected.json b/test/fixtures/es2015/uncategorised/174/expected.json
index f430150fa0..17308d92ca 100644
--- a/test/fixtures/es2015/uncategorised/174/expected.json
+++ b/test/fixtures/es2015/uncategorised/174/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/es2015/uncategorised/175/expected.json b/test/fixtures/es2015/uncategorised/175/expected.json
index 04aba9b49f..45eb4b22ff 100644
--- a/test/fixtures/es2015/uncategorised/175/expected.json
+++ b/test/fixtures/es2015/uncategorised/175/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,7 +126,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": false,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -146,6 +144,7 @@
                         },
                         "name": "a"
                       },
+                      "shorthand": false,
                       "value": {
                         "type": "ObjectPattern",
                         "start": 10,
@@ -176,7 +175,6 @@
                               }
                             },
                             "method": false,
-                            "shorthand": true,
                             "computed": false,
                             "key": {
                               "type": "Identifier",
@@ -195,6 +193,7 @@
                               },
                               "name": "w"
                             },
+                            "shorthand": true,
                             "value": {
                               "type": "Identifier",
                               "start": 12,
@@ -231,7 +230,6 @@
                               }
                             },
                             "method": false,
-                            "shorthand": true,
                             "computed": false,
                             "key": {
                               "type": "Identifier",
@@ -250,6 +248,7 @@
                               },
                               "name": "x"
                             },
+                            "shorthand": true,
                             "value": {
                               "type": "Identifier",
                               "start": 15,
@@ -289,7 +288,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": false,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -308,6 +306,7 @@
                         },
                         "name": "b"
                       },
+                      "shorthand": false,
                       "value": {
                         "type": "ArrayPattern",
                         "start": 23,
diff --git a/test/fixtures/es2015/uncategorised/178/expected.json b/test/fixtures/es2015/uncategorised/178/expected.json
index 1019f36221..ab295e9001 100644
--- a/test/fixtures/es2015/uncategorised/178/expected.json
+++ b/test/fixtures/es2015/uncategorised/178/expected.json
@@ -91,7 +91,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -110,6 +109,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 3,
diff --git a/test/fixtures/es2015/uncategorised/179/expected.json b/test/fixtures/es2015/uncategorised/179/expected.json
index 1483adeab3..db8d1a1658 100644
--- a/test/fixtures/es2015/uncategorised/179/expected.json
+++ b/test/fixtures/es2015/uncategorised/179/expected.json
@@ -91,7 +91,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -110,6 +109,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 3,
diff --git a/test/fixtures/es2015/uncategorised/182/expected.json b/test/fixtures/es2015/uncategorised/182/expected.json
index 403a007d36..6d952744d2 100644
--- a/test/fixtures/es2015/uncategorised/182/expected.json
+++ b/test/fixtures/es2015/uncategorised/182/expected.json
@@ -91,7 +91,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -110,6 +109,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ArrayPattern",
                     "start": 6,
diff --git a/test/fixtures/es2015/uncategorised/183/expected.json b/test/fixtures/es2015/uncategorised/183/expected.json
index e6a04cd66b..3acabbe14d 100644
--- a/test/fixtures/es2015/uncategorised/183/expected.json
+++ b/test/fixtures/es2015/uncategorised/183/expected.json
@@ -91,7 +91,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -110,6 +109,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 6,
@@ -143,7 +143,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -162,6 +161,7 @@
                     },
                     "name": "c"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 9,
diff --git a/test/fixtures/es2015/uncategorised/186/expected.json b/test/fixtures/es2015/uncategorised/186/expected.json
index 6164999ca8..b8a5b0f64f 100644
--- a/test/fixtures/es2015/uncategorised/186/expected.json
+++ b/test/fixtures/es2015/uncategorised/186/expected.json
@@ -102,7 +102,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -121,6 +120,7 @@
                       },
                       "name": "a"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "Identifier",
                       "start": 3,
@@ -157,7 +157,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -176,6 +175,7 @@
                       },
                       "name": "b"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "Identifier",
                       "start": 6,
diff --git a/test/fixtures/es2015/uncategorised/190/expected.json b/test/fixtures/es2015/uncategorised/190/expected.json
index 2968812946..ac1a13b3c2 100644
--- a/test/fixtures/es2015/uncategorised/190/expected.json
+++ b/test/fixtures/es2015/uncategorised/190/expected.json
@@ -102,7 +102,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -121,6 +120,7 @@
                         },
                         "name": "a"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "Identifier",
                         "start": 7,
@@ -157,7 +157,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -176,6 +175,7 @@
                         },
                         "name": "b"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "Identifier",
                         "start": 10,
diff --git a/test/fixtures/es2015/uncategorised/26/expected.json b/test/fixtures/es2015/uncategorised/26/expected.json
index b4c0e8bc2d..f5757a32bf 100644
--- a/test/fixtures/es2015/uncategorised/26/expected.json
+++ b/test/fixtures/es2015/uncategorised/26/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ObjectExpression",
                     "start": 12,
@@ -136,7 +136,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": false,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -155,6 +154,7 @@
                           },
                           "name": "y"
                         },
+                        "shorthand": false,
                         "value": {
                           "type": "NumericLiteral",
                           "start": 16,
diff --git a/test/fixtures/es2015/uncategorised/279/expected.json b/test/fixtures/es2015/uncategorised/279/expected.json
index e2a39dc8b2..5703482a9a 100644
--- a/test/fixtures/es2015/uncategorised/279/expected.json
+++ b/test/fixtures/es2015/uncategorised/279/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 16,
diff --git a/test/fixtures/es2015/uncategorised/303/expected.json b/test/fixtures/es2015/uncategorised/303/expected.json
index 935f87201b..668070027b 100644
--- a/test/fixtures/es2015/uncategorised/303/expected.json
+++ b/test/fixtures/es2015/uncategorised/303/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "get"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 5,
diff --git a/test/fixtures/es2015/uncategorised/304/expected.json b/test/fixtures/es2015/uncategorised/304/expected.json
index 28602311f9..1f0a81aa3a 100644
--- a/test/fixtures/es2015/uncategorised/304/expected.json
+++ b/test/fixtures/es2015/uncategorised/304/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "propName"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "AssignmentPattern",
                     "start": 15,
diff --git a/test/fixtures/es2015/uncategorised/305/expected.json b/test/fixtures/es2015/uncategorised/305/expected.json
index 2da5b72f13..65a3330a86 100644
--- a/test/fixtures/es2015/uncategorised/305/expected.json
+++ b/test/fixtures/es2015/uncategorised/305/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "propName"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "AssignmentPattern",
                     "start": 5,
diff --git a/test/fixtures/es2015/uncategorised/307/expected.json b/test/fixtures/es2015/uncategorised/307/expected.json
index b4df0a2a30..26e8370e1b 100644
--- a/test/fixtures/es2015/uncategorised/307/expected.json
+++ b/test/fixtures/es2015/uncategorised/307/expected.json
@@ -87,7 +87,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -106,6 +105,7 @@
                   },
                   "name": "x"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "AssignmentPattern",
                   "start": 2,
diff --git a/test/fixtures/es2015/uncategorised/308/expected.json b/test/fixtures/es2015/uncategorised/308/expected.json
index a983e9498e..b7295cf418 100644
--- a/test/fixtures/es2015/uncategorised/308/expected.json
+++ b/test/fixtures/es2015/uncategorised/308/expected.json
@@ -91,7 +91,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -110,6 +109,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "AssignmentPattern",
                     "start": 2,
diff --git a/test/fixtures/es2015/uncategorised/309/expected.json b/test/fixtures/es2015/uncategorised/309/expected.json
index adf09ef4d3..195565514b 100644
--- a/test/fixtures/es2015/uncategorised/309/expected.json
+++ b/test/fixtures/es2015/uncategorised/309/expected.json
@@ -119,7 +119,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -138,6 +137,7 @@
                       },
                       "name": "b"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "ObjectPattern",
                       "start": 8,
@@ -168,7 +168,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": true,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -187,6 +186,7 @@
                             },
                             "name": "c"
                           },
+                          "shorthand": true,
                           "value": {
                             "type": "AssignmentPattern",
                             "start": 9,
diff --git a/test/fixtures/es2015/uncategorised/310/expected.json b/test/fixtures/es2015/uncategorised/310/expected.json
index 2e3b4faf28..59105c1b3f 100644
--- a/test/fixtures/es2015/uncategorised/310/expected.json
+++ b/test/fixtures/es2015/uncategorised/310/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": true,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "x"
               },
+              "shorthand": true,
               "value": {
                 "type": "AssignmentPattern",
                 "start": 6,
diff --git a/test/fixtures/es2015/uncategorised/313/expected.json b/test/fixtures/es2015/uncategorised/313/expected.json
index 67a25aed7f..6c8963e87e 100644
--- a/test/fixtures/es2015/uncategorised/313/expected.json
+++ b/test/fixtures/es2015/uncategorised/313/expected.json
@@ -103,7 +103,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -122,6 +121,7 @@
                   },
                   "name": "message"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 15,
diff --git a/test/fixtures/es2015/uncategorised/321/expected.json b/test/fixtures/es2015/uncategorised/321/expected.json
index 0aed7ab433..2a3b5211e8 100644
--- a/test/fixtures/es2015/uncategorised/321/expected.json
+++ b/test/fixtures/es2015/uncategorised/321/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 5,
diff --git a/test/fixtures/es2015/uncategorised/33/expected.json b/test/fixtures/es2015/uncategorised/33/expected.json
index 0931f56cf1..e493220b5c 100644
--- a/test/fixtures/es2015/uncategorised/33/expected.json
+++ b/test/fixtures/es2015/uncategorised/33/expected.json
@@ -109,7 +109,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -128,6 +127,7 @@
                   },
                   "name": "property"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 18,
diff --git a/test/fixtures/es2015/uncategorised/350/expected.json b/test/fixtures/es2015/uncategorised/350/expected.json
index e0f955220c..6c8ba6c0c7 100644
--- a/test/fixtures/es2015/uncategorised/350/expected.json
+++ b/test/fixtures/es2015/uncategorised/350/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": true,
               "key": {
                 "type": "StringLiteral",
@@ -94,6 +93,7 @@
                 },
                 "value": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NumericLiteral",
                 "start": 18,
@@ -130,7 +130,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -149,6 +148,7 @@
                 },
                 "name": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NumericLiteral",
                 "start": 32,
diff --git a/test/fixtures/es2015/uncategorised/351/expected.json b/test/fixtures/es2015/uncategorised/351/expected.json
index 2c0aacecab..40fd874fe3 100644
--- a/test/fixtures/es2015/uncategorised/351/expected.json
+++ b/test/fixtures/es2015/uncategorised/351/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -166,7 +165,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -185,6 +183,7 @@
                 },
                 "name": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NumericLiteral",
                 "start": 40,
diff --git a/test/fixtures/es2015/uncategorised/352/expected.json b/test/fixtures/es2015/uncategorised/352/expected.json
index 8fc9a7d3a2..9430a3ea5b 100644
--- a/test/fixtures/es2015/uncategorised/352/expected.json
+++ b/test/fixtures/es2015/uncategorised/352/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -166,7 +165,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -185,6 +183,7 @@
                 },
                 "name": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NumericLiteral",
                 "start": 44,
diff --git a/test/fixtures/es2015/uncategorised/355/expected.json b/test/fixtures/es2015/uncategorised/355/expected.json
index f916983e29..0081764853 100644
--- a/test/fixtures/es2015/uncategorised/355/expected.json
+++ b/test/fixtures/es2015/uncategorised/355/expected.json
@@ -93,7 +93,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -112,6 +111,7 @@
                   },
                   "name": "set"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "AssignmentPattern",
                   "start": 13,
diff --git a/test/fixtures/es2015/uncategorised/360/expected.json b/test/fixtures/es2015/uncategorised/360/expected.json
index 7afc6719a9..cfee130b5b 100644
--- a/test/fixtures/es2015/uncategorised/360/expected.json
+++ b/test/fixtures/es2015/uncategorised/360/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "await"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 8,
diff --git a/test/fixtures/es2015/uncategorised/362/expected.json b/test/fixtures/es2015/uncategorised/362/expected.json
index 03eb6643e3..2f746e5bd4 100644
--- a/test/fixtures/es2015/uncategorised/362/expected.json
+++ b/test/fixtures/es2015/uncategorised/362/expected.json
@@ -93,7 +93,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -112,6 +111,7 @@
                   },
                   "name": "await"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 15,
diff --git a/test/fixtures/es2015/uncategorised/393/expected.json b/test/fixtures/es2015/uncategorised/393/expected.json
index 8a7f651b62..519d3d0d90 100644
--- a/test/fixtures/es2015/uncategorised/393/expected.json
+++ b/test/fixtures/es2015/uncategorised/393/expected.json
@@ -91,7 +91,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -110,6 +109,7 @@
                     },
                     "name": "set"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "AssignmentPattern",
                     "start": 2,
diff --git a/test/fixtures/es2015/uncategorised/52/expected.json b/test/fixtures/es2015/uncategorised/52/expected.json
index ce0016fdc3..9415c4be2b 100644
--- a/test/fixtures/es2015/uncategorised/52/expected.json
+++ b/test/fixtures/es2015/uncategorised/52/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/es2015/uncategorised/53/expected.json b/test/fixtures/es2015/uncategorised/53/expected.json
index 403f65e101..d5e9eb555e 100644
--- a/test/fixtures/es2015/uncategorised/53/expected.json
+++ b/test/fixtures/es2015/uncategorised/53/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/es2015/uncategorised/54/expected.json b/test/fixtures/es2015/uncategorised/54/expected.json
index cc11812169..879d54f7ee 100644
--- a/test/fixtures/es2015/uncategorised/54/expected.json
+++ b/test/fixtures/es2015/uncategorised/54/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "StringLiteral",
diff --git a/test/fixtures/es2015/uncategorised/55/expected.json b/test/fixtures/es2015/uncategorised/55/expected.json
index a8769bfc25..a1a2904802 100644
--- a/test/fixtures/es2015/uncategorised/55/expected.json
+++ b/test/fixtures/es2015/uncategorised/55/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/es2015/uncategorised/56/expected.json b/test/fixtures/es2015/uncategorised/56/expected.json
index 98450690a7..947e572d5e 100644
--- a/test/fixtures/es2015/uncategorised/56/expected.json
+++ b/test/fixtures/es2015/uncategorised/56/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/es2015/uncategorised/61/expected.json b/test/fixtures/es2015/uncategorised/61/expected.json
index 17d1d997d4..620e423e0a 100644
--- a/test/fixtures/es2015/uncategorised/61/expected.json
+++ b/test/fixtures/es2015/uncategorised/61/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "y"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 6,
@@ -159,7 +159,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -178,6 +177,7 @@
                   },
                   "name": "z"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 9,
diff --git a/test/fixtures/es2015/uncategorised/63/expected.json b/test/fixtures/es2015/uncategorised/63/expected.json
index b52b7efed4..32c1f441a1 100644
--- a/test/fixtures/es2015/uncategorised/63/expected.json
+++ b/test/fixtures/es2015/uncategorised/63/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 7,
diff --git a/test/fixtures/es2015/uncategorised/65/expected.json b/test/fixtures/es2015/uncategorised/65/expected.json
index 8f76a24663..1903ed8773 100644
--- a/test/fixtures/es2015/uncategorised/65/expected.json
+++ b/test/fixtures/es2015/uncategorised/65/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 5,
diff --git a/test/fixtures/es2015/uncategorised/67/expected.json b/test/fixtures/es2015/uncategorised/67/expected.json
index f166d30898..553cd0a7b1 100644
--- a/test/fixtures/es2015/uncategorised/67/expected.json
+++ b/test/fixtures/es2015/uncategorised/67/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 5,
diff --git a/test/fixtures/es2015/uncategorised/69/expected.json b/test/fixtures/es2015/uncategorised/69/expected.json
index d4b8dda2a4..87c594fbad 100644
--- a/test/fixtures/es2015/uncategorised/69/expected.json
+++ b/test/fixtures/es2015/uncategorised/69/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 9,
diff --git a/test/fixtures/es2015/uncategorised/70/expected.json b/test/fixtures/es2015/uncategorised/70/expected.json
index 6ae7f4bf7f..f19653b31b 100644
--- a/test/fixtures/es2015/uncategorised/70/expected.json
+++ b/test/fixtures/es2015/uncategorised/70/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 7,
diff --git a/test/fixtures/es2015/uncategorised/71/expected.json b/test/fixtures/es2015/uncategorised/71/expected.json
index 2175291efc..62072bc52e 100644
--- a/test/fixtures/es2015/uncategorised/71/expected.json
+++ b/test/fixtures/es2015/uncategorised/71/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 7,
diff --git a/test/fixtures/es2017/async-functions/15/expected.json b/test/fixtures/es2017/async-functions/15/expected.json
index fe07c7f6de..6e44684aa0 100644
--- a/test/fixtures/es2017/async-functions/15/expected.json
+++ b/test/fixtures/es2017/async-functions/15/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -123,6 +122,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "NumericLiteral",
                     "start": 13,
@@ -159,7 +159,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
diff --git a/test/fixtures/es2017/async-functions/23/expected.json b/test/fixtures/es2017/async-functions/23/expected.json
index 3890646e01..f645821c7e 100644
--- a/test/fixtures/es2017/async-functions/23/expected.json
+++ b/test/fixtures/es2017/async-functions/23/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "key": {
                     "type": "Identifier",
                     "start": 12,
@@ -123,6 +122,7 @@
                     "name": "async"
                   },
                   "computed": false,
+                  "shorthand": false,
                   "value": {
                     "type": "StringLiteral",
                     "start": 19,
diff --git a/test/fixtures/es2017/async-functions/24/expected.json b/test/fixtures/es2017/async-functions/24/expected.json
index bdd29cecde..9f0d18451f 100644
--- a/test/fixtures/es2017/async-functions/24/expected.json
+++ b/test/fixtures/es2017/async-functions/24/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "key": {
                     "type": "Identifier",
                     "start": 12,
diff --git a/test/fixtures/es2017/async-functions/27/expected.json b/test/fixtures/es2017/async-functions/27/expected.json
index 1e70bd9615..c22d0e642a 100644
--- a/test/fixtures/es2017/async-functions/27/expected.json
+++ b/test/fixtures/es2017/async-functions/27/expected.json
@@ -123,7 +123,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "key": {
                         "type": "Identifier",
                         "start": 15,
@@ -142,6 +141,7 @@
                         "name": "async"
                       },
                       "computed": false,
+                      "shorthand": true,
                       "value": {
                         "type": "AssignmentPattern",
                         "start": 15,
diff --git a/test/fixtures/es2017/async-functions/28/expected.json b/test/fixtures/es2017/async-functions/28/expected.json
index d90f600a88..5542a1f7d0 100644
--- a/test/fixtures/es2017/async-functions/28/expected.json
+++ b/test/fixtures/es2017/async-functions/28/expected.json
@@ -123,7 +123,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": false,
                       "key": {
                         "type": "Identifier",
                         "start": 15,
@@ -142,6 +141,7 @@
                         "name": "async"
                       },
                       "computed": false,
+                      "shorthand": false,
                       "value": {
                         "type": "Identifier",
                         "start": 22,
diff --git a/test/fixtures/es2017/async-functions/29/expected.json b/test/fixtures/es2017/async-functions/29/expected.json
index 2b1b294507..993df81280 100644
--- a/test/fixtures/es2017/async-functions/29/expected.json
+++ b/test/fixtures/es2017/async-functions/29/expected.json
@@ -123,7 +123,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -142,6 +141,7 @@
                         },
                         "name": "async"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "AssignmentPattern",
                         "start": 23,
diff --git a/test/fixtures/es2017/async-functions/30/expected.json b/test/fixtures/es2017/async-functions/30/expected.json
index 1aea157ede..0bb8a17387 100644
--- a/test/fixtures/es2017/async-functions/30/expected.json
+++ b/test/fixtures/es2017/async-functions/30/expected.json
@@ -123,7 +123,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": false,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -142,6 +141,7 @@
                         },
                         "name": "async"
                       },
+                      "shorthand": false,
                       "value": {
                         "type": "Identifier",
                         "start": 30,
diff --git a/test/fixtures/es2017/async-functions/31/expected.json b/test/fixtures/es2017/async-functions/31/expected.json
index b4f0aea8b8..1284053864 100644
--- a/test/fixtures/es2017/async-functions/31/expected.json
+++ b/test/fixtures/es2017/async-functions/31/expected.json
@@ -123,7 +123,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": false,
                       "key": {
                         "type": "Identifier",
                         "start": 21,
@@ -142,6 +141,7 @@
                         "name": "async"
                       },
                       "computed": false,
+                      "shorthand": false,
                       "value": {
                         "type": "Identifier",
                         "start": 28,
diff --git a/test/fixtures/es2017/async-functions/32/expected.json b/test/fixtures/es2017/async-functions/32/expected.json
index 7cdfabffe3..7bdc1b1cbc 100644
--- a/test/fixtures/es2017/async-functions/32/expected.json
+++ b/test/fixtures/es2017/async-functions/32/expected.json
@@ -123,7 +123,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "key": {
                         "type": "Identifier",
                         "start": 21,
@@ -142,6 +141,7 @@
                         "name": "async"
                       },
                       "computed": false,
+                      "shorthand": true,
                       "value": {
                         "type": "AssignmentPattern",
                         "start": 21,
diff --git a/test/fixtures/es2017/async-functions/33/expected.json b/test/fixtures/es2017/async-functions/33/expected.json
index a12a5ebf50..26698d24e6 100644
--- a/test/fixtures/es2017/async-functions/33/expected.json
+++ b/test/fixtures/es2017/async-functions/33/expected.json
@@ -123,7 +123,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": false,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -142,6 +141,7 @@
                         },
                         "name": "async"
                       },
+                      "shorthand": false,
                       "value": {
                         "type": "Identifier",
                         "start": 36,
diff --git a/test/fixtures/es2017/async-functions/34/expected.json b/test/fixtures/es2017/async-functions/34/expected.json
index ba2325893d..fe65e72356 100644
--- a/test/fixtures/es2017/async-functions/34/expected.json
+++ b/test/fixtures/es2017/async-functions/34/expected.json
@@ -123,7 +123,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -142,6 +141,7 @@
                         },
                         "name": "async"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "AssignmentPattern",
                         "start": 29,
diff --git a/test/fixtures/es2017/async-functions/37/expected.json b/test/fixtures/es2017/async-functions/37/expected.json
index 38c3a3e6f3..9904051f7a 100644
--- a/test/fixtures/es2017/async-functions/37/expected.json
+++ b/test/fixtures/es2017/async-functions/37/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "async"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "AssignmentPattern",
                     "start": 8,
diff --git a/test/fixtures/es2017/async-functions/38/expected.json b/test/fixtures/es2017/async-functions/38/expected.json
index 8980e6eb41..ac62e0ad35 100644
--- a/test/fixtures/es2017/async-functions/38/expected.json
+++ b/test/fixtures/es2017/async-functions/38/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "async"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 15,
diff --git a/test/fixtures/es2017/async-functions/7/expected.json b/test/fixtures/es2017/async-functions/7/expected.json
index a896663d5d..f4392f7f53 100644
--- a/test/fixtures/es2017/async-functions/7/expected.json
+++ b/test/fixtures/es2017/async-functions/7/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "key": {
                     "type": "Identifier",
                     "start": 6,
@@ -123,6 +122,7 @@
                     "name": "async"
                   },
                   "computed": false,
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 6,
diff --git a/test/fixtures/es2017/async-functions/8/expected.json b/test/fixtures/es2017/async-functions/8/expected.json
index b1aba60ea4..7f51e9a3eb 100644
--- a/test/fixtures/es2017/async-functions/8/expected.json
+++ b/test/fixtures/es2017/async-functions/8/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "async"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 7,
diff --git a/test/fixtures/esprima/es2015-array-pattern/patterned-catch/expected.json b/test/fixtures/esprima/es2015-array-pattern/patterned-catch/expected.json
index c9f2745187..7dfea8e34d 100644
--- a/test/fixtures/esprima/es2015-array-pattern/patterned-catch/expected.json
+++ b/test/fixtures/esprima/es2015-array-pattern/patterned-catch/expected.json
@@ -152,7 +152,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -171,6 +170,7 @@
                       },
                       "name": "c"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "Identifier",
                       "start": 21,
@@ -207,7 +207,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -226,6 +225,7 @@
                       },
                       "name": "d"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "AssignmentPattern",
                       "start": 26,
@@ -294,7 +294,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": true,
                     "key": {
                       "type": "Identifier",
@@ -313,6 +312,7 @@
                       },
                       "name": "f"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "AssignmentPattern",
                       "start": 35,
@@ -381,7 +381,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -400,6 +399,7 @@
                       },
                       "name": "h"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "AssignmentPattern",
                       "start": 40,
diff --git a/test/fixtures/esprima/es2015-array-pattern/with-object-pattern/expected.json b/test/fixtures/esprima/es2015-array-pattern/with-object-pattern/expected.json
index 7b5862ff98..dea5d68b0e 100644
--- a/test/fixtures/esprima/es2015-array-pattern/with-object-pattern/expected.json
+++ b/test/fixtures/esprima/es2015-array-pattern/with-object-pattern/expected.json
@@ -102,7 +102,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -121,6 +120,7 @@
                         },
                         "name": "a"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "Identifier",
                         "start": 6,
diff --git a/test/fixtures/esprima/es2015-arrow-function/migrated_0005/expected.json b/test/fixtures/esprima/es2015-arrow-function/migrated_0005/expected.json
index 0931f56cf1..e493220b5c 100644
--- a/test/fixtures/esprima/es2015-arrow-function/migrated_0005/expected.json
+++ b/test/fixtures/esprima/es2015-arrow-function/migrated_0005/expected.json
@@ -109,7 +109,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -128,6 +127,7 @@
                   },
                   "name": "property"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 18,
diff --git a/test/fixtures/esprima/es2015-default-parameter-value/migrated_0002/expected.json b/test/fixtures/esprima/es2015-default-parameter-value/migrated_0002/expected.json
index 9d6157c40e..ef6bf56941 100644
--- a/test/fixtures/esprima/es2015-default-parameter-value/migrated_0002/expected.json
+++ b/test/fixtures/esprima/es2015-default-parameter-value/migrated_0002/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "f"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "FunctionExpression",
                   "start": 9,
diff --git a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-cover-grammar/expected.json b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-cover-grammar/expected.json
index fc37f6abce..df55dfe4df 100644
--- a/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-cover-grammar/expected.json
+++ b/test/fixtures/esprima/es2015-destructuring-assignment-array-pattern/nested-cover-grammar/expected.json
@@ -102,7 +102,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -121,6 +120,7 @@
                       },
                       "name": "a"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "AssignmentPattern",
                       "start": 2,
diff --git a/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/nested-cover-grammar/expected.json b/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/nested-cover-grammar/expected.json
index 327467fdf6..ffcd88b46a 100644
--- a/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/nested-cover-grammar/expected.json
+++ b/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/nested-cover-grammar/expected.json
@@ -387,7 +387,6 @@
                                                                                                   }
                                                                                                 },
                                                                                                 "method": false,
-                                                                                                "shorthand": true,
                                                                                                 "computed": false,
                                                                                                 "key": {
                                                                                                   "type": "Identifier",
@@ -406,6 +405,7 @@
                                                                                                   },
                                                                                                   "name": "a"
                                                                                                 },
+                                                                                                "shorthand": true,
                                                                                                 "value": {
                                                                                                   "type": "AssignmentPattern",
                                                                                                   "start": 21,
diff --git a/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/object-pattern-assignment/expected.json b/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/object-pattern-assignment/expected.json
index 7bd635bfb1..14b57f257c 100644
--- a/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/object-pattern-assignment/expected.json
+++ b/test/fixtures/esprima/es2015-destructuring-assignment-object-pattern/object-pattern-assignment/expected.json
@@ -87,7 +87,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -106,6 +105,7 @@
                   },
                   "name": "a"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 7,
@@ -142,7 +142,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -161,6 +160,7 @@
                   },
                   "name": "a"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "Identifier",
                   "start": 16,
@@ -194,7 +194,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -213,6 +212,7 @@
                   },
                   "name": "a"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "AssignmentPattern",
                   "start": 25,
@@ -278,7 +278,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": true,
                 "key": {
                   "type": "Identifier",
@@ -297,6 +296,7 @@
                   },
                   "name": "a"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "ObjectPattern",
                   "start": 38,
@@ -327,7 +327,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -346,6 +345,7 @@
                         },
                         "name": "a"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "Identifier",
                         "start": 39,
@@ -385,7 +385,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -404,6 +403,7 @@
                   },
                   "name": "a"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "MemberExpression",
                   "start": 49,
@@ -486,7 +486,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -505,6 +504,7 @@
                   },
                   "name": "a"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "MemberExpression",
                   "start": 71,
diff --git a/test/fixtures/esprima/es2015-export-declaration/export-default-object/expected.json b/test/fixtures/esprima/es2015-export-declaration/export-default-object/expected.json
index f9028639b0..e9316ee54f 100644
--- a/test/fixtures/esprima/es2015-export-declaration/export-default-object/expected.json
+++ b/test/fixtures/esprima/es2015-export-declaration/export-default-object/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "foo"
               },
+              "shorthand": false,
               "value": {
                 "type": "NumericLiteral",
                 "start": 22,
diff --git a/test/fixtures/esprima/es2015-for-of/for-of-object-pattern-const/expected.json b/test/fixtures/esprima/es2015-for-of/for-of-object-pattern-const/expected.json
index 2f0291d7fa..f39a7f0e1d 100644
--- a/test/fixtures/esprima/es2015-for-of/for-of-object-pattern-const/expected.json
+++ b/test/fixtures/esprima/es2015-for-of/for-of-object-pattern-const/expected.json
@@ -102,7 +102,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -121,6 +120,7 @@
                       },
                       "name": "x"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "Identifier",
                       "start": 12,
@@ -157,7 +157,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -176,6 +175,7 @@
                       },
                       "name": "y"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "Identifier",
                       "start": 15,
diff --git a/test/fixtures/esprima/es2015-for-of/for-of-object-pattern/expected.json b/test/fixtures/esprima/es2015-for-of/for-of-object-pattern/expected.json
index a9ec1dc8a2..b0e0c85061 100644
--- a/test/fixtures/esprima/es2015-for-of/for-of-object-pattern/expected.json
+++ b/test/fixtures/esprima/es2015-for-of/for-of-object-pattern/expected.json
@@ -73,7 +73,6 @@
                 }
               },
               "method": false,
-              "shorthand": true,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -92,6 +91,7 @@
                 },
                 "name": "x"
               },
+              "shorthand": true,
               "value": {
                 "type": "Identifier",
                 "start": 6,
@@ -128,7 +128,6 @@
                 }
               },
               "method": false,
-              "shorthand": true,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -147,6 +146,7 @@
                 },
                 "name": "y"
               },
+              "shorthand": true,
               "value": {
                 "type": "Identifier",
                 "start": 9,
diff --git a/test/fixtures/esprima/es2015-generator/generator-method-with-computed-name/expected.json b/test/fixtures/esprima/es2015-generator/generator-method-with-computed-name/expected.json
index 820bf5831b..66422a0b0a 100644
--- a/test/fixtures/esprima/es2015-generator/generator-method-with-computed-name/expected.json
+++ b/test/fixtures/esprima/es2015-generator/generator-method-with-computed-name/expected.json
@@ -120,7 +120,6 @@
                         }
                       },
                       "method": true,
-                      "shorthand": false,
                       "computed": true,
                       "key": {
                         "type": "YieldExpression",
diff --git a/test/fixtures/esprima/es2015-generator/generator-method-with-params/expected.json b/test/fixtures/esprima/es2015-generator/generator-method-with-params/expected.json
index 74705225ac..a45b9ad7f9 100644
--- a/test/fixtures/esprima/es2015-generator/generator-method-with-params/expected.json
+++ b/test/fixtures/esprima/es2015-generator/generator-method-with-params/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-delegate/expected.json b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-delegate/expected.json
index e002528905..2180fdc787 100644
--- a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-delegate/expected.json
+++ b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-delegate/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-expression/expected.json b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-expression/expected.json
index bbadbbe669..93a78ef520 100644
--- a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-expression/expected.json
+++ b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-expression/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-line-terminator/expected.json b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-line-terminator/expected.json
index d700b2546d..8d7abdba4a 100644
--- a/test/fixtures/esprima/es2015-generator/generator-method-with-yield-line-terminator/expected.json
+++ b/test/fixtures/esprima/es2015-generator/generator-method-with-yield-line-terminator/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-generator/generator-method-with-yield/expected.json b/test/fixtures/esprima/es2015-generator/generator-method-with-yield/expected.json
index addc5c802c..f4a5aa5272 100644
--- a/test/fixtures/esprima/es2015-generator/generator-method-with-yield/expected.json
+++ b/test/fixtures/esprima/es2015-generator/generator-method-with-yield/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-generator/generator-method/expected.json b/test/fixtures/esprima/es2015-generator/generator-method/expected.json
index 9b2aa0b7c9..808a6a8397 100644
--- a/test/fixtures/esprima/es2015-generator/generator-method/expected.json
+++ b/test/fixtures/esprima/es2015-generator/generator-method/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-method-definition/migrated_0000/expected.json b/test/fixtures/esprima/es2015-method-definition/migrated_0000/expected.json
index ce0016fdc3..9415c4be2b 100644
--- a/test/fixtures/esprima/es2015-method-definition/migrated_0000/expected.json
+++ b/test/fixtures/esprima/es2015-method-definition/migrated_0000/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-method-definition/migrated_0001/expected.json b/test/fixtures/esprima/es2015-method-definition/migrated_0001/expected.json
index 403f65e101..d5e9eb555e 100644
--- a/test/fixtures/esprima/es2015-method-definition/migrated_0001/expected.json
+++ b/test/fixtures/esprima/es2015-method-definition/migrated_0001/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-method-definition/migrated_0002/expected.json b/test/fixtures/esprima/es2015-method-definition/migrated_0002/expected.json
index cc11812169..879d54f7ee 100644
--- a/test/fixtures/esprima/es2015-method-definition/migrated_0002/expected.json
+++ b/test/fixtures/esprima/es2015-method-definition/migrated_0002/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "StringLiteral",
diff --git a/test/fixtures/esprima/es2015-method-definition/migrated_0003/expected.json b/test/fixtures/esprima/es2015-method-definition/migrated_0003/expected.json
index a8769bfc25..a1a2904802 100644
--- a/test/fixtures/esprima/es2015-method-definition/migrated_0003/expected.json
+++ b/test/fixtures/esprima/es2015-method-definition/migrated_0003/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-method-definition/migrated_0004/expected.json b/test/fixtures/esprima/es2015-method-definition/migrated_0004/expected.json
index 98450690a7..947e572d5e 100644
--- a/test/fixtures/esprima/es2015-method-definition/migrated_0004/expected.json
+++ b/test/fixtures/esprima/es2015-method-definition/migrated_0004/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter-setter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter-setter/expected.json
index 194bb1af4a..dbb75d94ab 100644
--- a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter-setter/expected.json
+++ b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter-setter/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NullLiteral",
                 "start": 14,
@@ -122,7 +122,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -180,7 +179,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter/expected.json
index 0cce78e2c4..cbfcf5f82e 100644
--- a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter/expected.json
+++ b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-getter/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NullLiteral",
                 "start": 14,
@@ -122,7 +122,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-method/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-method/expected.json
index afab4b37f8..df65cc7cd9 100644
--- a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-method/expected.json
+++ b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-method/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NullLiteral",
                 "start": 14,
@@ -122,7 +122,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-setter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-setter/expected.json
index 920dce0155..0186c1bc41 100644
--- a/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-setter/expected.json
+++ b/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-setter/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NullLiteral",
                 "start": 14,
@@ -122,7 +122,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter-setter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter-setter/expected.json
index 82b235c2bb..e0fb06eef1 100644
--- a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter-setter/expected.json
+++ b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter-setter/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "StringLiteral",
@@ -94,6 +93,7 @@
                 },
                 "value": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NullLiteral",
                 "start": 16,
@@ -125,7 +125,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -183,7 +182,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter/expected.json
index d5af9e236d..895e87a678 100644
--- a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter/expected.json
+++ b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-getter/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "StringLiteral",
@@ -94,6 +93,7 @@
                 },
                 "value": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NullLiteral",
                 "start": 16,
@@ -125,7 +125,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-method/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-method/expected.json
index b77f23777c..bb7f43d8a5 100644
--- a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-method/expected.json
+++ b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-method/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "StringLiteral",
@@ -94,6 +93,7 @@
                 },
                 "value": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NullLiteral",
                 "start": 16,
@@ -125,7 +125,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-setter/expected.json b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-setter/expected.json
index 7efe87207c..3d984cf804 100644
--- a/test/fixtures/esprima/es2015-object-initialiser/proto-literal-setter/expected.json
+++ b/test/fixtures/esprima/es2015-object-initialiser/proto-literal-setter/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "StringLiteral",
@@ -94,6 +93,7 @@
                 },
                 "value": "__proto__"
               },
+              "shorthand": false,
               "value": {
                 "type": "NullLiteral",
                 "start": 16,
@@ -125,7 +125,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-object-literal-property-value-shorthand/migrated_0000/expected.json b/test/fixtures/esprima/es2015-object-literal-property-value-shorthand/migrated_0000/expected.json
index 17d1d997d4..620e423e0a 100644
--- a/test/fixtures/esprima/es2015-object-literal-property-value-shorthand/migrated_0000/expected.json
+++ b/test/fixtures/esprima/es2015-object-literal-property-value-shorthand/migrated_0000/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "y"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 6,
@@ -159,7 +159,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -178,6 +177,7 @@
                   },
                   "name": "z"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 9,
diff --git a/test/fixtures/esprima/es2015-object-pattern/elision/expected.json b/test/fixtures/esprima/es2015-object-pattern/elision/expected.json
index 567e7248c2..6dcfe66427 100644
--- a/test/fixtures/esprima/es2015-object-pattern/elision/expected.json
+++ b/test/fixtures/esprima/es2015-object-pattern/elision/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 5,
diff --git a/test/fixtures/esprima/es2015-object-pattern/nested/expected.json b/test/fixtures/esprima/es2015-object-pattern/nested/expected.json
index e4bc4272b8..5e1855da28 100644
--- a/test/fixtures/esprima/es2015-object-pattern/nested/expected.json
+++ b/test/fixtures/esprima/es2015-object-pattern/nested/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ObjectPattern",
                     "start": 7,
diff --git a/test/fixtures/esprima/es2015-object-pattern/properties/expected.json b/test/fixtures/esprima/es2015-object-pattern/properties/expected.json
index 4fff32b6b5..8dde30d848 100644
--- a/test/fixtures/esprima/es2015-object-pattern/properties/expected.json
+++ b/test/fixtures/esprima/es2015-object-pattern/properties/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 5,
@@ -142,7 +142,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -161,6 +160,7 @@
                     },
                     "name": "b"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "AssignmentPattern",
                     "start": 7,
@@ -232,7 +232,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -251,6 +250,7 @@
                     },
                     "name": "c"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 13,
@@ -284,7 +284,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -303,6 +302,7 @@
                     },
                     "name": "e"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "AssignmentPattern",
                     "start": 17,
@@ -371,7 +371,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": true,
                   "key": {
                     "type": "Identifier",
@@ -390,6 +389,7 @@
                     },
                     "name": "g"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ArrayPattern",
                     "start": 25,
diff --git a/test/fixtures/esprima/es2015-rest-parameter/object-method/expected.json b/test/fixtures/esprima/es2015-rest-parameter/object-method/expected.json
index 44a231cab5..220cb767a5 100644
--- a/test/fixtures/esprima/es2015-rest-parameter/object-method/expected.json
+++ b/test/fixtures/esprima/es2015-rest-parameter/object-method/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "f"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "FunctionExpression",
                   "start": 9,
diff --git a/test/fixtures/esprima/es2015-rest-parameter/object-shorthand-method/expected.json b/test/fixtures/esprima/es2015-rest-parameter/object-shorthand-method/expected.json
index 2d6b8d4961..158fdcac2a 100644
--- a/test/fixtures/esprima/es2015-rest-parameter/object-shorthand-method/expected.json
+++ b/test/fixtures/esprima/es2015-rest-parameter/object-shorthand-method/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-yield/yield-binding-element/expected.json b/test/fixtures/esprima/es2015-yield/yield-binding-element/expected.json
index 3cf2edca58..21e8a75108 100644
--- a/test/fixtures/esprima/es2015-yield/yield-binding-element/expected.json
+++ b/test/fixtures/esprima/es2015-yield/yield-binding-element/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 9,
diff --git a/test/fixtures/esprima/es2015-yield/yield-binding-property/expected.json b/test/fixtures/esprima/es2015-yield/yield-binding-property/expected.json
index 0799aa00f4..185e1b80fc 100644
--- a/test/fixtures/esprima/es2015-yield/yield-binding-property/expected.json
+++ b/test/fixtures/esprima/es2015-yield/yield-binding-property/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "yield"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 13,
diff --git a/test/fixtures/esprima/es2015-yield/yield-generator-method/expected.json b/test/fixtures/esprima/es2015-yield/yield-generator-method/expected.json
index 9625fd5709..79c30e517e 100644
--- a/test/fixtures/esprima/es2015-yield/yield-generator-method/expected.json
+++ b/test/fixtures/esprima/es2015-yield/yield-generator-method/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-yield/yield-generator-parameter-object-pattern/expected.json b/test/fixtures/esprima/es2015-yield/yield-generator-parameter-object-pattern/expected.json
index ac7d7b8b51..4ede8e5d8e 100644
--- a/test/fixtures/esprima/es2015-yield/yield-generator-parameter-object-pattern/expected.json
+++ b/test/fixtures/esprima/es2015-yield/yield-generator-parameter-object-pattern/expected.json
@@ -93,7 +93,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -112,6 +111,7 @@
                   },
                   "name": "yield"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "Identifier",
                   "start": 20,
diff --git a/test/fixtures/esprima/es2015-yield/yield-method/expected.json b/test/fixtures/esprima/es2015-yield/yield-method/expected.json
index b10ddb8590..0e9ebaaa33 100644
--- a/test/fixtures/esprima/es2015-yield/yield-method/expected.json
+++ b/test/fixtures/esprima/es2015-yield/yield-method/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/es2015-yield/yield-parameter-object-pattern/expected.json b/test/fixtures/esprima/es2015-yield/yield-parameter-object-pattern/expected.json
index b5c586eeee..e16e19c653 100644
--- a/test/fixtures/esprima/es2015-yield/yield-parameter-object-pattern/expected.json
+++ b/test/fixtures/esprima/es2015-yield/yield-parameter-object-pattern/expected.json
@@ -93,7 +93,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -112,6 +111,7 @@
                   },
                   "name": "yield"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "Identifier",
                   "start": 19,
diff --git a/test/fixtures/esprima/es2015-yield/yield-strict-binding-property/expected.json b/test/fixtures/esprima/es2015-yield/yield-strict-binding-property/expected.json
index d88ed08060..0a5773facc 100644
--- a/test/fixtures/esprima/es2015-yield/yield-strict-binding-property/expected.json
+++ b/test/fixtures/esprima/es2015-yield/yield-strict-binding-property/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "yield"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 27,
diff --git a/test/fixtures/esprima/es2015-yield/yield-strict-method/expected.json b/test/fixtures/esprima/es2015-yield/yield-strict-method/expected.json
index bf006185f0..e3f77abfeb 100644
--- a/test/fixtures/esprima/es2015-yield/yield-strict-method/expected.json
+++ b/test/fixtures/esprima/es2015-yield/yield-strict-method/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": true,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
diff --git a/test/fixtures/esprima/rest-parameter/arrow-rest-parameter-object/expected.json b/test/fixtures/esprima/rest-parameter/arrow-rest-parameter-object/expected.json
index ea2b1244f6..3ab154002e 100644
--- a/test/fixtures/esprima/rest-parameter/arrow-rest-parameter-object/expected.json
+++ b/test/fixtures/esprima/rest-parameter/arrow-rest-parameter-object/expected.json
@@ -122,7 +122,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -141,6 +140,7 @@
                       },
                       "name": "b"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "Identifier",
                       "start": 8,
diff --git a/test/fixtures/esprima/rest-parameter/invalid-setter-rest/expected.json b/test/fixtures/esprima/rest-parameter/invalid-setter-rest/expected.json
index 06e1f71eea..7ca9b46fe2 100644
--- a/test/fixtures/esprima/rest-parameter/invalid-setter-rest/expected.json
+++ b/test/fixtures/esprima/rest-parameter/invalid-setter-rest/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/esprima/rest-parameter/object-method/expected.json b/test/fixtures/esprima/rest-parameter/object-method/expected.json
index 44a231cab5..220cb767a5 100644
--- a/test/fixtures/esprima/rest-parameter/object-method/expected.json
+++ b/test/fixtures/esprima/rest-parameter/object-method/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "f"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "FunctionExpression",
                   "start": 9,
diff --git a/test/fixtures/esprima/rest-parameter/object-shorthand-method/expected.json b/test/fixtures/esprima/rest-parameter/object-shorthand-method/expected.json
index 2d6b8d4961..158fdcac2a 100644
--- a/test/fixtures/esprima/rest-parameter/object-shorthand-method/expected.json
+++ b/test/fixtures/esprima/rest-parameter/object-shorthand-method/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/esprima/rest-parameter/rest-parameter-object/expected.json b/test/fixtures/esprima/rest-parameter/rest-parameter-object/expected.json
index 2d0c8bee41..42ce27cb2a 100644
--- a/test/fixtures/esprima/rest-parameter/rest-parameter-object/expected.json
+++ b/test/fixtures/esprima/rest-parameter/rest-parameter-object/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 15,
diff --git a/test/fixtures/esprima/statement-throw/migrated_0002/expected.json b/test/fixtures/esprima/statement-throw/migrated_0002/expected.json
index e0ef904785..9c4a377caa 100644
--- a/test/fixtures/esprima/statement-throw/migrated_0002/expected.json
+++ b/test/fixtures/esprima/statement-throw/migrated_0002/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "message"
               },
+              "shorthand": false,
               "value": {
                 "type": "StringLiteral",
                 "start": 17,
diff --git a/test/fixtures/estree/object-method/basic/expected.json b/test/fixtures/estree/object-method/basic/expected.json
index 03f4b2182c..b432d8ad2d 100644
--- a/test/fixtures/estree/object-method/basic/expected.json
+++ b/test/fixtures/estree/object-method/basic/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
diff --git a/test/fixtures/estree/object-property/basic/expected.json b/test/fixtures/estree/object-property/basic/expected.json
index 650d82af47..c2051e303a 100644
--- a/test/fixtures/estree/object-property/basic/expected.json
+++ b/test/fixtures/estree/object-property/basic/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -123,6 +122,7 @@
                     },
                     "name": "foo"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Literal",
                     "start": 17,
diff --git a/test/fixtures/experimental/async-functions/object-default-params/expected.json b/test/fixtures/experimental/async-functions/object-default-params/expected.json
index cc01a02977..300d135dc2 100644
--- a/test/fixtures/experimental/async-functions/object-default-params/expected.json
+++ b/test/fixtures/experimental/async-functions/object-default-params/expected.json
@@ -123,7 +123,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -142,6 +141,7 @@
                         },
                         "name": "bar"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "AssignmentPattern",
                         "start": 18,
diff --git a/test/fixtures/experimental/async-generators/object-method/expected.json b/test/fixtures/experimental/async-generators/object-method/expected.json
index 79413a2d47..24a82e11c9 100644
--- a/test/fixtures/experimental/async-generators/object-method/expected.json
+++ b/test/fixtures/experimental/async-generators/object-method/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
diff --git a/test/fixtures/experimental/decorators/class-method-parameter/expected.json b/test/fixtures/experimental/decorators/class-method-parameter/expected.json
index 4a401fa758..4fa42e9a70 100644
--- a/test/fixtures/experimental/decorators/class-method-parameter/expected.json
+++ b/test/fixtures/experimental/decorators/class-method-parameter/expected.json
@@ -274,7 +274,6 @@
                                   }
                                 },
                                 "method": false,
-                                "shorthand": false,
                                 "computed": false,
                                 "key": {
                                   "type": "Identifier",
@@ -293,6 +292,7 @@
                                   },
                                   "name": "a"
                                 },
+                                "shorthand": false,
                                 "value": {
                                   "type": "NumericLiteral",
                                   "start": 46,
diff --git a/test/fixtures/experimental/decorators/export-default-declaration-function-declaration-parameter/expected.json b/test/fixtures/experimental/decorators/export-default-declaration-function-declaration-parameter/expected.json
index a936f5fee4..e52e8cbb64 100644
--- a/test/fixtures/experimental/decorators/export-default-declaration-function-declaration-parameter/expected.json
+++ b/test/fixtures/experimental/decorators/export-default-declaration-function-declaration-parameter/expected.json
@@ -237,7 +237,6 @@
                               }
                             },
                             "method": false,
-                            "shorthand": false,
                             "computed": false,
                             "key": {
                               "type": "Identifier",
@@ -256,6 +255,7 @@
                               },
                               "name": "a"
                             },
+                            "shorthand": false,
                             "value": {
                               "type": "NumericLiteral",
                               "start": 49,
diff --git a/test/fixtures/experimental/decorators/function-declaration-parameter/expected.json b/test/fixtures/experimental/decorators/function-declaration-parameter/expected.json
index 2949fbdb5c..2c9ec156dd 100644
--- a/test/fixtures/experimental/decorators/function-declaration-parameter/expected.json
+++ b/test/fixtures/experimental/decorators/function-declaration-parameter/expected.json
@@ -223,7 +223,6 @@
                             }
                           },
                           "method": false,
-                          "shorthand": false,
                           "computed": false,
                           "key": {
                             "type": "Identifier",
@@ -242,6 +241,7 @@
                             },
                             "name": "a"
                           },
+                          "shorthand": false,
                           "value": {
                             "type": "NumericLiteral",
                             "start": 34,
diff --git a/test/fixtures/experimental/decorators/function-expression-parameter/expected.json b/test/fixtures/experimental/decorators/function-expression-parameter/expected.json
index 652a728e04..32b529a664 100644
--- a/test/fixtures/experimental/decorators/function-expression-parameter/expected.json
+++ b/test/fixtures/experimental/decorators/function-expression-parameter/expected.json
@@ -253,7 +253,6 @@
                                   }
                                 },
                                 "method": false,
-                                "shorthand": false,
                                 "computed": false,
                                 "key": {
                                   "type": "Identifier",
@@ -272,6 +271,7 @@
                                   },
                                   "name": "a"
                                 },
+                                "shorthand": false,
                                 "value": {
                                   "type": "NumericLiteral",
                                   "start": 43,
diff --git a/test/fixtures/experimental/decorators/object-method-parameter/expected.json b/test/fixtures/experimental/decorators/object-method-parameter/expected.json
index 5a22cd58ee..d0ec8b5295 100644
--- a/test/fixtures/experimental/decorators/object-method-parameter/expected.json
+++ b/test/fixtures/experimental/decorators/object-method-parameter/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -289,7 +288,6 @@
                                       }
                                     },
                                     "method": false,
-                                    "shorthand": false,
                                     "computed": false,
                                     "key": {
                                       "type": "Identifier",
@@ -308,6 +306,7 @@
                                       },
                                       "name": "a"
                                     },
+                                    "shorthand": false,
                                     "value": {
                                       "type": "NumericLiteral",
                                       "start": 41,
diff --git a/test/fixtures/experimental/object-rest-spread/10/expected.json b/test/fixtures/experimental/object-rest-spread/10/expected.json
index bce210e65b..169e1ee02d 100644
--- a/test/fixtures/experimental/object-rest-spread/10/expected.json
+++ b/test/fixtures/experimental/object-rest-spread/10/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 6,
@@ -142,7 +142,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -161,6 +160,7 @@
                     },
                     "name": "y"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 9,
diff --git a/test/fixtures/experimental/object-rest-spread/16/expected.json b/test/fixtures/experimental/object-rest-spread/16/expected.json
index cd68bed7a3..317f0a9f5d 100644
--- a/test/fixtures/experimental/object-rest-spread/16/expected.json
+++ b/test/fixtures/experimental/object-rest-spread/16/expected.json
@@ -116,7 +116,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": true,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -135,6 +134,7 @@
                           },
                           "name": "z"
                         },
+                        "shorthand": true,
                         "value": {
                           "type": "Identifier",
                           "start": 9,
@@ -191,7 +191,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -210,6 +209,7 @@
                     },
                     "name": "z"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "NumericLiteral",
                     "start": 20,
diff --git a/test/fixtures/experimental/object-rest-spread/17/expected.json b/test/fixtures/experimental/object-rest-spread/17/expected.json
index c6d9695d8b..a37ac1e771 100644
--- a/test/fixtures/experimental/object-rest-spread/17/expected.json
+++ b/test/fixtures/experimental/object-rest-spread/17/expected.json
@@ -116,7 +116,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": true,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -135,6 +134,7 @@
                           },
                           "name": "x"
                         },
+                        "shorthand": true,
                         "value": {
                           "type": "AssignmentPattern",
                           "start": 11,
@@ -226,7 +226,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -245,6 +244,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "NumericLiteral",
                     "start": 28,
diff --git a/test/fixtures/experimental/object-rest-spread/2/expected.json b/test/fixtures/experimental/object-rest-spread/2/expected.json
index 77ad59f8cb..f03eed64e8 100644
--- a/test/fixtures/experimental/object-rest-spread/2/expected.json
+++ b/test/fixtures/experimental/object-rest-spread/2/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 5,
diff --git a/test/fixtures/experimental/object-rest-spread/3/expected.json b/test/fixtures/experimental/object-rest-spread/3/expected.json
index bb0cd7a162..4de6807268 100644
--- a/test/fixtures/experimental/object-rest-spread/3/expected.json
+++ b/test/fixtures/experimental/object-rest-spread/3/expected.json
@@ -91,7 +91,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -110,6 +109,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 11,
diff --git a/test/fixtures/experimental/object-rest-spread/5/expected.json b/test/fixtures/experimental/object-rest-spread/5/expected.json
index efbc0e3f05..edfb47e37b 100644
--- a/test/fixtures/experimental/object-rest-spread/5/expected.json
+++ b/test/fixtures/experimental/object-rest-spread/5/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -123,6 +122,7 @@
                   },
                   "name": "x"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 5,
diff --git a/test/fixtures/experimental/object-rest-spread/6/expected.json b/test/fixtures/experimental/object-rest-spread/6/expected.json
index 0584ebbbe7..b6b781d209 100644
--- a/test/fixtures/experimental/object-rest-spread/6/expected.json
+++ b/test/fixtures/experimental/object-rest-spread/6/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": true,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "x"
               },
+              "shorthand": true,
               "value": {
                 "type": "Identifier",
                 "start": 2,
@@ -159,7 +159,6 @@
                 }
               },
               "method": false,
-              "shorthand": true,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -178,6 +177,7 @@
                 },
                 "name": "a"
               },
+              "shorthand": true,
               "value": {
                 "type": "Identifier",
                 "start": 11,
@@ -246,7 +246,6 @@
                 }
               },
               "method": false,
-              "shorthand": true,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -265,6 +264,7 @@
                 },
                 "name": "c"
               },
+              "shorthand": true,
               "value": {
                 "type": "Identifier",
                 "start": 20,
diff --git a/test/fixtures/experimental/uncategorised/39/expected.json b/test/fixtures/experimental/uncategorised/39/expected.json
index 29893aa8b2..3988cde402 100644
--- a/test/fixtures/experimental/uncategorised/39/expected.json
+++ b/test/fixtures/experimental/uncategorised/39/expected.json
@@ -153,7 +153,6 @@
                         }
                       ],
                       "method": false,
-                      "shorthand": false,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -172,6 +171,7 @@
                         },
                         "name": "foo"
                       },
+                      "shorthand": false,
                       "value": {
                         "type": "StringLiteral",
                         "start": 17,
diff --git a/test/fixtures/experimental/uncategorised/49/expected.json b/test/fixtures/experimental/uncategorised/49/expected.json
index a339588287..a222166ebe 100644
--- a/test/fixtures/experimental/uncategorised/49/expected.json
+++ b/test/fixtures/experimental/uncategorised/49/expected.json
@@ -138,7 +138,6 @@
                     }
                   ],
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -157,6 +156,7 @@
                     },
                     "name": "bar"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "StringLiteral",
                     "start": 22,
diff --git a/test/fixtures/flow/regression/issue-264/expected.json b/test/fixtures/flow/regression/issue-264/expected.json
index ca0f1791c7..ae189190fc 100644
--- a/test/fixtures/flow/regression/issue-264/expected.json
+++ b/test/fixtures/flow/regression/issue-264/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": true,
                   "key": {
                     "type": "BinaryExpression",
@@ -159,6 +158,7 @@
                       "value": 17
                     }
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "StringLiteral",
                     "start": 30,
diff --git a/test/fixtures/flow/type-annotations/107/expected.json b/test/fixtures/flow/type-annotations/107/expected.json
index 9f972ee738..c077e69e8d 100644
--- a/test/fixtures/flow/type-annotations/107/expected.json
+++ b/test/fixtures/flow/type-annotations/107/expected.json
@@ -137,7 +137,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": true,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -156,6 +155,7 @@
                           },
                           "name": "a"
                         },
+                        "shorthand": true,
                         "value": {
                           "type": "Identifier",
                           "start": 11,
diff --git a/test/fixtures/flow/type-annotations/108/expected.json b/test/fixtures/flow/type-annotations/108/expected.json
index 54aad24d12..9e8df837d4 100644
--- a/test/fixtures/flow/type-annotations/108/expected.json
+++ b/test/fixtures/flow/type-annotations/108/expected.json
@@ -241,7 +241,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -260,6 +259,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "NumericLiteral",
                     "start": 42,
@@ -296,7 +296,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -315,6 +314,7 @@
                     },
                     "name": "y"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "StringLiteral",
                     "start": 48,
@@ -555,7 +555,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -574,6 +573,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "NumericLiteral",
                     "start": 100,
@@ -610,7 +610,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -629,6 +628,7 @@
                     },
                     "name": "y"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "StringLiteral",
                     "start": 106,
@@ -1076,7 +1076,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -1095,6 +1094,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ObjectExpression",
                     "start": 196,
@@ -1125,7 +1125,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": false,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -1144,6 +1143,7 @@
                           },
                           "name": "x"
                         },
+                        "shorthand": false,
                         "value": {
                           "type": "NumericLiteral",
                           "start": 201,
@@ -1180,7 +1180,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": false,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -1199,6 +1198,7 @@
                           },
                           "name": "y"
                         },
+                        "shorthand": false,
                         "value": {
                           "type": "StringLiteral",
                           "start": 207,
@@ -1238,7 +1238,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -1257,6 +1256,7 @@
                     },
                     "name": "b"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "BooleanLiteral",
                     "start": 219,
@@ -1600,7 +1600,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -1619,6 +1618,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ObjectExpression",
                     "start": 289,
@@ -1649,7 +1649,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": false,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -1668,6 +1667,7 @@
                           },
                           "name": "x"
                         },
+                        "shorthand": false,
                         "value": {
                           "type": "NumericLiteral",
                           "start": 294,
@@ -1704,7 +1704,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": false,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -1723,6 +1722,7 @@
                           },
                           "name": "y"
                         },
+                        "shorthand": false,
                         "value": {
                           "type": "StringLiteral",
                           "start": 300,
@@ -1762,7 +1762,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -1781,6 +1780,7 @@
                     },
                     "name": "b"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "BooleanLiteral",
                     "start": 312,
diff --git a/test/fixtures/flow/type-annotations/20/expected.json b/test/fixtures/flow/type-annotations/20/expected.json
index cf418c1dd4..9290cd973c 100644
--- a/test/fixtures/flow/type-annotations/20/expected.json
+++ b/test/fixtures/flow/type-annotations/20/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/flow/type-annotations/21/expected.json b/test/fixtures/flow/type-annotations/21/expected.json
index c5d4df45b5..ea57e98499 100644
--- a/test/fixtures/flow/type-annotations/21/expected.json
+++ b/test/fixtures/flow/type-annotations/21/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/flow/type-annotations/22/expected.json b/test/fixtures/flow/type-annotations/22/expected.json
index 3cbd6273d8..e9eb17db9d 100644
--- a/test/fixtures/flow/type-annotations/22/expected.json
+++ b/test/fixtures/flow/type-annotations/22/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/flow/type-annotations/23/expected.json b/test/fixtures/flow/type-annotations/23/expected.json
index 05b77ef383..590ac53b43 100644
--- a/test/fixtures/flow/type-annotations/23/expected.json
+++ b/test/fixtures/flow/type-annotations/23/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/flow/type-annotations/24/expected.json b/test/fixtures/flow/type-annotations/24/expected.json
index ffb6d1e92c..b42844e0b6 100644
--- a/test/fixtures/flow/type-annotations/24/expected.json
+++ b/test/fixtures/flow/type-annotations/24/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/flow/type-annotations/25/expected.json b/test/fixtures/flow/type-annotations/25/expected.json
index cdf03fcf78..b3c441c97f 100644
--- a/test/fixtures/flow/type-annotations/25/expected.json
+++ b/test/fixtures/flow/type-annotations/25/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
diff --git a/test/fixtures/flow/type-annotations/26/expected.json b/test/fixtures/flow/type-annotations/26/expected.json
index 9a5cf1d754..920a06a06b 100644
--- a/test/fixtures/flow/type-annotations/26/expected.json
+++ b/test/fixtures/flow/type-annotations/26/expected.json
@@ -104,7 +104,6 @@
                   }
                 },
                 "method": true,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "NumericLiteral",
diff --git a/test/fixtures/flow/type-annotations/60/expected.json b/test/fixtures/flow/type-annotations/60/expected.json
index 7bcec9cc23..8dfba881ef 100644
--- a/test/fixtures/flow/type-annotations/60/expected.json
+++ b/test/fixtures/flow/type-annotations/60/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 5,
@@ -245,7 +245,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -264,6 +263,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "StringLiteral",
                     "start": 30,
diff --git a/test/fixtures/flow/type-annotations/61/expected.json b/test/fixtures/flow/type-annotations/61/expected.json
index d67405b5b2..37f870ae0d 100644
--- a/test/fixtures/flow/type-annotations/61/expected.json
+++ b/test/fixtures/flow/type-annotations/61/expected.json
@@ -87,7 +87,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -106,6 +105,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 5,
@@ -245,7 +245,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -264,6 +263,7 @@
                     },
                     "name": "x"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "StringLiteral",
                     "start": 29,
diff --git a/test/fixtures/flow/type-annotations/63/expected.json b/test/fixtures/flow/type-annotations/63/expected.json
index 9317604671..7b384938b2 100644
--- a/test/fixtures/flow/type-annotations/63/expected.json
+++ b/test/fixtures/flow/type-annotations/63/expected.json
@@ -93,7 +93,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": true,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -112,6 +111,7 @@
                   },
                   "name": "x"
                 },
+                "shorthand": true,
                 "value": {
                   "type": "Identifier",
                   "start": 14,
diff --git a/test/fixtures/flow/type-annotations/97/expected.json b/test/fixtures/flow/type-annotations/97/expected.json
index 6021547089..a65d8fd551 100644
--- a/test/fixtures/flow/type-annotations/97/expected.json
+++ b/test/fixtures/flow/type-annotations/97/expected.json
@@ -72,7 +72,6 @@
                 }
               },
               "method": false,
-              "shorthand": false,
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -91,6 +90,7 @@
                 },
                 "name": "f"
               },
+              "shorthand": false,
               "value": {
                 "type": "FunctionExpression",
                 "start": 5,
diff --git a/test/fixtures/flow/type-generics/1/expected.json b/test/fixtures/flow/type-generics/1/expected.json
index 40dcb01fe0..0efdcd9066 100644
--- a/test/fixtures/flow/type-generics/1/expected.json
+++ b/test/fixtures/flow/type-generics/1/expected.json
@@ -123,7 +123,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": false,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -142,6 +141,7 @@
                       },
                       "name": "id"
                     },
+                    "shorthand": false,
                     "value": {
                       "type": "ArrowFunctionExpression",
                       "start": 55,
diff --git a/test/fixtures/flow/type-parameter-declaration/object-method-type-param-jsx/expected.json b/test/fixtures/flow/type-parameter-declaration/object-method-type-param-jsx/expected.json
index 07d8e1ebe8..cd52fb7e74 100644
--- a/test/fixtures/flow/type-parameter-declaration/object-method-type-param-jsx/expected.json
+++ b/test/fixtures/flow/type-parameter-declaration/object-method-type-param-jsx/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
diff --git a/test/fixtures/flow/type-parameter-declaration/object-reserved-word/expected.json b/test/fixtures/flow/type-parameter-declaration/object-reserved-word/expected.json
index c89615b382..934c0fddb3 100644
--- a/test/fixtures/flow/type-parameter-declaration/object-reserved-word/expected.json
+++ b/test/fixtures/flow/type-parameter-declaration/object-reserved-word/expected.json
@@ -104,7 +104,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -196,7 +195,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -288,7 +286,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -380,7 +377,6 @@
                     }
                   },
                   "method": true,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
diff --git a/test/fixtures/flow/typecasts/2/expected.json b/test/fixtures/flow/typecasts/2/expected.json
index e41a4f7b34..ac27cb40c4 100644
--- a/test/fixtures/flow/typecasts/2/expected.json
+++ b/test/fixtures/flow/typecasts/2/expected.json
@@ -86,7 +86,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -105,6 +104,7 @@
                   },
                   "name": "xxx"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "NumericLiteral",
                   "start": 7,
@@ -141,7 +141,6 @@
                   }
                 },
                 "method": false,
-                "shorthand": false,
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -160,6 +159,7 @@
                   },
                   "name": "yyy"
                 },
+                "shorthand": false,
                 "value": {
                   "type": "StringLiteral",
                   "start": 15,
diff --git a/test/fixtures/jsx/regression/3/expected.json b/test/fixtures/jsx/regression/3/expected.json
index e952ae4a2b..d314d03df0 100644
--- a/test/fixtures/jsx/regression/3/expected.json
+++ b/test/fixtures/jsx/regression/3/expected.json
@@ -165,7 +165,6 @@
                       }
                     },
                     "method": false,
-                    "shorthand": true,
                     "computed": false,
                     "key": {
                       "type": "Identifier",
@@ -184,6 +183,7 @@
                       },
                       "name": "a"
                     },
+                    "shorthand": true,
                     "value": {
                       "type": "Identifier",
                       "start": 8,
diff --git a/test/fixtures/test262/rest-parameter/array-pattern-multi-element-with-object/expected.json b/test/fixtures/test262/rest-parameter/array-pattern-multi-element-with-object/expected.json
index 1159886da3..e46cd87e8d 100644
--- a/test/fixtures/test262/rest-parameter/array-pattern-multi-element-with-object/expected.json
+++ b/test/fixtures/test262/rest-parameter/array-pattern-multi-element-with-object/expected.json
@@ -122,7 +122,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": false,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -141,6 +140,7 @@
                         },
                         "name": "p"
                       },
+                      "shorthand": false,
                       "value": {
                         "type": "Identifier",
                         "start": 40,
@@ -191,7 +191,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -210,6 +209,7 @@
                         },
                         "name": "r"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "Identifier",
                         "start": 45,
@@ -263,7 +263,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": true,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -282,6 +281,7 @@
                         },
                         "name": "s"
                       },
+                      "shorthand": true,
                       "value": {
                         "type": "AssignmentPattern",
                         "start": 50,
diff --git a/test/fixtures/test262/rest-parameter/array-pattern-single-element-with-object/expected.json b/test/fixtures/test262/rest-parameter/array-pattern-single-element-with-object/expected.json
index 2731def325..ad6ee909e9 100644
--- a/test/fixtures/test262/rest-parameter/array-pattern-single-element-with-object/expected.json
+++ b/test/fixtures/test262/rest-parameter/array-pattern-single-element-with-object/expected.json
@@ -122,7 +122,6 @@
                         }
                       },
                       "method": false,
-                      "shorthand": false,
                       "computed": false,
                       "key": {
                         "type": "Identifier",
@@ -141,6 +140,7 @@
                         },
                         "name": "p"
                       },
+                      "shorthand": false,
                       "value": {
                         "type": "Identifier",
                         "start": 41,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-empty-with-array/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-empty-with-array/expected.json
index ce6d9fc36e..d16c7b6b46 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-empty-with-array/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-empty-with-array/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "p"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ArrayPattern",
                     "start": 31,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-empty-with-object/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-empty-with-object/expected.json
index 732c68014c..4977ba0df5 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-empty-with-object/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-empty-with-object/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "p"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ObjectPattern",
                     "start": 32,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-array/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-array/expected.json
index b455a94709..4b32aef8fb 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-array/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-array/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "p"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ArrayPattern",
                     "start": 38,
@@ -176,7 +176,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": true,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -195,6 +194,7 @@
                     },
                     "name": "b"
                   },
+                  "shorthand": true,
                   "value": {
                     "type": "Identifier",
                     "start": 43,
@@ -231,7 +231,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -250,6 +249,7 @@
                     },
                     "name": "q"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ArrayPattern",
                     "start": 49,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-initializer/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-initializer/expected.json
index f497d59bd3..00fb663d0e 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-initializer/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-initializer/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "AssignmentPattern",
                     "start": 44,
@@ -194,7 +194,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -213,6 +212,7 @@
                     },
                     "name": "b"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 54,
@@ -246,7 +246,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -265,6 +264,7 @@
                     },
                     "name": "c"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "AssignmentPattern",
                     "start": 60,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-leading/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-leading/expected.json
index 52d43f0153..fd80d529d9 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-leading/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-leading/expected.json
@@ -141,7 +141,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -160,6 +159,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 46,
@@ -193,7 +193,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -212,6 +211,7 @@
                     },
                     "name": "b"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 52,
@@ -245,7 +245,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -264,6 +263,7 @@
                     },
                     "name": "c"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 58,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-object/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-object/expected.json
index 6c5d7cf14f..0a51e17c59 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-object/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-multi-element-with-object/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ObjectPattern",
                     "start": 39,
@@ -156,7 +156,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": false,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -175,6 +174,7 @@
                           },
                           "name": "p"
                         },
+                        "shorthand": false,
                         "value": {
                           "type": "Identifier",
                           "start": 43,
@@ -211,7 +211,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -230,6 +229,7 @@
                     },
                     "name": "b"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ObjectPattern",
                     "start": 50,
@@ -260,7 +260,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": true,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -279,6 +278,7 @@
                           },
                           "name": "r"
                         },
+                        "shorthand": true,
                         "value": {
                           "type": "Identifier",
                           "start": 51,
@@ -318,7 +318,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -337,6 +336,7 @@
                     },
                     "name": "c"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ObjectPattern",
                     "start": 58,
@@ -367,7 +367,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": true,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -386,6 +385,7 @@
                           },
                           "name": "s"
                         },
+                        "shorthand": true,
                         "value": {
                           "type": "AssignmentPattern",
                           "start": 59,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-multi-element/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-multi-element/expected.json
index b95a4b6234..e79b67a273 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-multi-element/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-multi-element/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 29,
@@ -159,7 +159,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -178,6 +177,7 @@
                     },
                     "name": "b"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 35,
@@ -211,7 +211,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -230,6 +229,7 @@
                     },
                     "name": "c"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 41,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-array/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-array/expected.json
index e9c4c2859a..f3e9810813 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-array/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-array/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "p"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ArrayPattern",
                     "start": 39,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-initializer/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-initializer/expected.json
index 9faf97f761..ff62b03d63 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-initializer/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-initializer/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "AssignmentPattern",
                     "start": 45,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-leading/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-leading/expected.json
index dc7c07c735..554a4ebf3d 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-leading/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-leading/expected.json
@@ -124,7 +124,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -143,6 +142,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 44,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-object/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-object/expected.json
index 35be5a85ee..92b741d8a9 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-object/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-single-element-with-object/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "p"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "ObjectPattern",
                     "start": 40,
@@ -156,7 +156,6 @@
                           }
                         },
                         "method": false,
-                        "shorthand": false,
                         "computed": false,
                         "key": {
                           "type": "Identifier",
@@ -175,6 +174,7 @@
                           },
                           "name": "a"
                         },
+                        "shorthand": false,
                         "value": {
                           "type": "Identifier",
                           "start": 44,
diff --git a/test/fixtures/test262/rest-parameter/object-pattern-single-element/expected.json b/test/fixtures/test262/rest-parameter/object-pattern-single-element/expected.json
index f7e75584e0..3685c479ca 100644
--- a/test/fixtures/test262/rest-parameter/object-pattern-single-element/expected.json
+++ b/test/fixtures/test262/rest-parameter/object-pattern-single-element/expected.json
@@ -107,7 +107,6 @@
                     }
                   },
                   "method": false,
-                  "shorthand": false,
                   "computed": false,
                   "key": {
                     "type": "Identifier",
@@ -126,6 +125,7 @@
                     },
                     "name": "a"
                   },
+                  "shorthand": false,
                   "value": {
                     "type": "Identifier",
                     "start": 30,