From ff328b0d5411c34b7507a6a5b405f4bcfabc077e Mon Sep 17 00:00:00 2001
From: Cyrus Najmabadi <cyrusn@microsoft.com>
Date: Tue, 2 Dec 2014 22:12:50 -0800
Subject: [PATCH] Merge property assignment parsing code.

---
 src/compiler/parser.ts | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 6f578433beb..615f472aaa5 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -3166,8 +3166,14 @@ module ts {
             return finishNode(node);
         }
 
-        function parseShortOrLonghandPropertyAssignment(): PropertyAssignment {
+        function parsePropertyAssignment(): PropertyAssignment {
             var nodePos = scanner.getStartPos();
+            var initialToken = token;
+
+            if (parseContextualModifier(SyntaxKind.GetKeyword) || parseContextualModifier(SyntaxKind.SetKeyword)) {
+                var kind = initialToken === SyntaxKind.GetKeyword ? SyntaxKind.GetAccessor : SyntaxKind.SetAccessor;
+                return parseAccessorDeclaration(kind, nodePos, /*modifiers*/undefined);
+            }
 
             var asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
             var tokenIsIdentifier = isIdentifier();
@@ -3208,16 +3214,6 @@ module ts {
             }
         }
 
-        function parsePropertyAssignment(): PropertyAssignment {
-            var initialPos = getNodePos();
-            var initialToken = token;
-            if (parseContextualModifier(SyntaxKind.GetKeyword) || parseContextualModifier(SyntaxKind.SetKeyword)) {
-                var kind = initialToken === SyntaxKind.GetKeyword ? SyntaxKind.GetAccessor : SyntaxKind.SetAccessor;
-                return parseAccessorDeclaration(kind, initialPos, /*modifiers*/ undefined);
-            }
-            return parseShortOrLonghandPropertyAssignment();
-        }
-
         function parseObjectLiteralExpression(): ObjectLiteralExpression {
             var node = <ObjectLiteralExpression>createNode(SyntaxKind.ObjectLiteralExpression);
             parseExpected(SyntaxKind.OpenBraceToken);