Separate out if expression body

Author: tomgasson

src/napkin_core.ml

@@ -3014,11 +3014,7 @@ and parseElseBranch p =
   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;
+and parseIfBody startPos p =
   let conditionExpr = parseIfCondition p in
   let thenExpr = parseIfBranch p in
   let elseExpr = match p.Parser.token with
@@ -3029,7 +3025,8 @@ and parseIfExpression p =
     Parser.beginRegion p;
     let elseExpr = match p.token with
     | If ->
-      parseIfExpression p
+      Parser.next p;
+      parseIfBody startPos p
     | _ ->
       parseElseBranch p
     in
@@ -3041,9 +3038,17 @@ and parseIfExpression p =
     None
   in
   let loc = mkLoc startPos p.prevEndPos in
-  Parser.eatBreadcrumb p;
   Ast_helper.Exp.ifthenelse ~loc conditionExpr thenExpr elseExpr
 
+and parseIfExpression p =
+  Parser.beginRegion p;
+  Parser.leaveBreadcrumb p Grammar.ExprIf;
+  let startPos = p.Parser.startPos in
+  Parser.expect If p;
+  let ifBody = parseIfBody startPos p in
+  Parser.eatBreadcrumb p;
+  ifBody;
+
 and parseForRest hasOpeningParen pattern startPos p =
   Parser.expect In p;
   let e1 = parseExpr p in