Separate out parseIfExpression parts

Author: tomgasson

src/napkin_core.ml

@@ -2993,20 +2993,34 @@ and parseTryExpression p =
   let loc = mkLoc startPos p.prevEndPos in
   Ast_helper.Exp.try_ ~loc expr cases
 
-and parseIfExpression p =
-  Parser.beginRegion p;
-  Parser.leaveBreadcrumb p Grammar.ExprIf;
-  let startPos = p.Parser.startPos in
-  Parser.expect If p;
+and parseIfCondition p =
   Parser.leaveBreadcrumb p Grammar.IfCondition;
   (* doesn't make sense to try es6 arrow here? *)
   let conditionExpr = parseExpr ~context:WhenExpr p in
   Parser.eatBreadcrumb p;
+  conditionExpr
+
+and parseIfBranch p =
   Parser.leaveBreadcrumb p IfBranch;
   Parser.expect Lbrace p;
   let thenExpr = parseExprBlock p in
   Parser.expect Rbrace p;
   Parser.eatBreadcrumb p;
+  thenExpr
+
+and parseElseBranch p =
+  Parser.expect Lbrace p;
+  let blockExpr = parseExprBlock p in
+  Parser.expect Rbrace p;
+  blockExpr;
+
+and parseIfExpression p =
+  Parser.beginRegion p;
+  Parser.leaveBreadcrumb p Grammar.ExprIf;
+  let startPos = p.Parser.startPos in
+  Parser.expect If p;
+  let conditionExpr = parseIfCondition p in
+  let thenExpr = parseIfBranch p in
   let elseExpr = match p.Parser.token with
   | Else ->
     Parser.endRegion p;
@@ -3017,10 +3031,7 @@ and parseIfExpression p =
     | If ->
       parseIfExpression p
     | _ ->
-      Parser.expect  Lbrace p;
-      let blockExpr = parseExprBlock p in
-      Parser.expect Rbrace p;
-      blockExpr
+      parseElseBranch p
     in
     Parser.eatBreadcrumb p;
     Parser.endRegion p;