From c01b4156d83454880d372ecb6ec60b7800602464 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Thu, 6 Oct 2016 13:42:13 +0300
Subject: [PATCH] Minor. Rename methods in parser

Method that was called `parseControlStructureBody` is actually used for
loop bodies only, while `parseExpressionPreferringBlocks` used for
parsing body of control structure (i.e. it must be called
`parseControlStructureBody`)
---
 .../parsing/KotlinExpressionParsing.java      | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java
index 5a907cc7992..e459879f85a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java
@@ -880,11 +880,11 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
                     error("Expecting an element");
                 }
                 else {
-                    parseExpressionPreferringBlocks();
+                    parseControlStructureBody();
                 }
             }
             else if (at(LBRACE)) { // no arrow, probably it's simply missing
-                parseExpressionPreferringBlocks();
+                parseControlStructureBody();
             }
             else if (!atSet(WHEN_CONDITION_RECOVERY_SET)) {
                 errorAndAdvance("Expecting '->'");
@@ -914,7 +914,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
             error("Expecting an element");
         }
         else {
-            parseExpressionPreferringBlocks();
+            parseControlStructureBody();
         }
         // SEMI is consumed in parseWhenEntry
     }
@@ -1037,6 +1037,9 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
         parseFunctionLiteral(/* preferBlock = */false, /* collapse = */true);
     }
 
+    /**
+     * If it has no ->, it's a block, otherwise a function literal
+     */
     public void parseFunctionLiteral(boolean preferBlock, boolean collapse) {
         assert _at(LBRACE);
 
@@ -1330,7 +1333,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
         advance(); // DO_KEYWORD
 
         if (!at(WHILE_KEYWORD)) {
-            parseControlStructureBody();
+            parseLoopBody();
         }
 
         if (expect(WHILE_KEYWORD, "Expecting 'while' followed by a post-condition")) {
@@ -1354,7 +1357,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
 
         parseCondition();
 
-        parseControlStructureBody();
+        parseLoopBody();
 
         loop.done(WHILE);
     }
@@ -1414,15 +1417,12 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
             myBuilder.restoreNewlinesState();
         }
 
-        parseControlStructureBody();
+        parseLoopBody();
 
         loop.done(FOR);
     }
 
-    /**
-     * If it has no ->, it's a block, otherwise a function literal
-     */
-    private void parseExpressionPreferringBlocks() {
+    private void parseControlStructureBody() {
         if (!parseAnnotatedLambda(/* preferBlock = */true)) {
             parseExpression();
         }
@@ -1431,10 +1431,10 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
     /*
      * element
      */
-    private void parseControlStructureBody() {
+    private void parseLoopBody() {
         PsiBuilder.Marker body = mark();
         if (!at(SEMICOLON)) {
-            parseExpressionPreferringBlocks();
+            parseControlStructureBody();
         }
         body.done(BODY);
     }
@@ -1526,7 +1526,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
 
         PsiBuilder.Marker thenBranch = mark();
         if (!at(ELSE_KEYWORD) && !at(SEMICOLON)) {
-            parseExpressionPreferringBlocks();
+            parseControlStructureBody();
         }
         if (at(SEMICOLON) && lookahead(1) == ELSE_KEYWORD) {
             advance(); // SEMICOLON
@@ -1539,7 +1539,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
 
             PsiBuilder.Marker elseBranch = mark();
             if (!at(SEMICOLON)) {
-                parseExpressionPreferringBlocks();
+                parseControlStructureBody();
             }
             elseBranch.done(ELSE);
         }