From a778ce24e7ea39ccb3e5800e0f79efc43f246199 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 12 Apr 2013 20:40:56 +0400 Subject: [PATCH] Rename method --- .../BranchedUnfoldingUtils.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java index 5d0ddab68b8..9a6969d4e4f 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java @@ -45,7 +45,7 @@ public class BranchedUnfoldingUtils { return checkUnfoldableAssignment(root) || checkUnfoldableReturn(root); } - private static JetExpression unwrapBranch(@Nullable JetExpression expression) { + private static JetExpression getOutermostLastBlockElement(@Nullable JetExpression expression) { return (JetExpression) JetPsiUtil.getOutermostLastBlockElement(expression, null); } @@ -59,8 +59,8 @@ public class BranchedUnfoldingUtils { ifExpression = (JetIfExpression)assignment.replace(ifExpression); - JetExpression thenExpr = unwrapBranch(ifExpression.getThen()); - JetExpression elseExpr = unwrapBranch(ifExpression.getElse()); + JetExpression thenExpr = getOutermostLastBlockElement(ifExpression.getThen()); + JetExpression elseExpr = getOutermostLastBlockElement(ifExpression.getElse()); assert thenExpr != null; assert elseExpr != null; @@ -80,7 +80,7 @@ public class BranchedUnfoldingUtils { whenExpression = (JetWhenExpression)assignment.replace(whenExpression); for (JetWhenEntry entry : whenExpression.getEntries()) { - JetExpression currExpr = unwrapBranch(entry.getExpression()); + JetExpression currExpr = getOutermostLastBlockElement(entry.getExpression()); assert currExpr != null; @@ -96,8 +96,8 @@ public class BranchedUnfoldingUtils { ifExpression = (JetIfExpression)returnExpression.replace(ifExpression); - JetExpression thenExpr = unwrapBranch(ifExpression.getThen()); - JetExpression elseExpr = unwrapBranch(ifExpression.getElse()); + JetExpression thenExpr = getOutermostLastBlockElement(ifExpression.getThen()); + JetExpression elseExpr = getOutermostLastBlockElement(ifExpression.getElse()); assert thenExpr != null; assert elseExpr != null; @@ -115,7 +115,7 @@ public class BranchedUnfoldingUtils { whenExpression = (JetWhenExpression)returnExpression.replace(whenExpression); for (JetWhenEntry entry : whenExpression.getEntries()) { - JetExpression currExpr = unwrapBranch(entry.getExpression()); + JetExpression currExpr = getOutermostLastBlockElement(entry.getExpression()); assert currExpr != null;