diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java index 829fc43661d..218b48bec3e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java @@ -653,8 +653,9 @@ public class JetPsiUtil { JetTokens.ALL_ASSIGNMENTS.contains(((JetBinaryExpression) element).getOperationToken()); } - public static boolean isBranchedExpression(@Nullable PsiElement element) { - return element instanceof JetIfExpression || element instanceof JetWhenExpression; + public static boolean isOrdinaryAssignment(@NotNull PsiElement element) { + return element instanceof JetBinaryExpression && + ((JetBinaryExpression) element).getOperationToken().equals(JetTokens.EQ); } @Nullable @@ -705,17 +706,6 @@ public class JetPsiUtil { return false; } - @NotNull - public static > C getBlockVariableDeclarations(@NotNull JetBlockExpression block, @NotNull C collection) { - for (JetElement element : block.getStatements()) { - if (element instanceof JetVariableDeclaration) { - collection.add((JetVariableDeclaration) element); - } - } - - return collection; - } - public static boolean checkWhenExpressionHasSingleElse(@NotNull JetWhenExpression whenExpression) { int elseCount = 0; for (JetWhenEntry entry : whenExpression.getEntries()) {