rename deparenthesize -> deparenthesizeWithNoTypeResolution

compiler/backend/src/org/jetbrains/jet/codegen/RangeCodegenUtil.java

@@ -56,7 +56,7 @@ public class RangeCodegenUtil {
         // Other binary operations will succeed too, but will be filtered out later (by examining a resolvedCall)
         JetExpression rangeExpression = forExpression.getLoopRange();
         assert rangeExpression != null;
-        JetExpression loopRange = JetPsiUtil.deparenthesize(rangeExpression);
+        JetExpression loopRange = JetPsiUtil.deparenthesizeWithNoTypeResolution(rangeExpression);
         if (loopRange instanceof JetQualifiedExpression) {
             // a.rangeTo(b)
             JetQualifiedExpression qualifiedExpression = (JetQualifiedExpression) loopRange;

compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java

@@ -185,7 +185,7 @@ public class JetControlFlowProcessor {
         }
 
         private void visitLabeledExpression(@NotNull String labelName, @NotNull JetExpression labeledExpression) {
-            JetExpression deparenthesized = JetPsiUtil.deparenthesize(labeledExpression);
+            JetExpression deparenthesized = JetPsiUtil.deparenthesizeWithNoTypeResolution(labeledExpression);
             if (deparenthesized != null) {
                 value(labeledExpression, inCondition);
             }
@@ -220,7 +220,7 @@ public class JetControlFlowProcessor {
                 }
             }
             else if (operationType == JetTokens.EQ) {
-                JetExpression left = JetPsiUtil.deparenthesize(expression.getLeft());
+                JetExpression left = JetPsiUtil.deparenthesizeWithNoTypeResolution(expression.getLeft());
                 if (right != null) {
                     value(right, false);
                 }
@@ -243,7 +243,7 @@ public class JetControlFlowProcessor {
                 }
             }
             else if (OperatorConventions.ASSIGNMENT_OPERATIONS.containsKey(operationType)) {
-                JetExpression left = JetPsiUtil.deparenthesize(expression.getLeft());
+                JetExpression left = JetPsiUtil.deparenthesizeWithNoTypeResolution(expression.getLeft());
                 if (left != null) {
                     value(left, false);
                 }

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java

@@ -51,7 +51,7 @@ public class JetPsiUtil {
     }
 
     @Nullable
-    public static JetExpression deparenthesize(@NotNull JetExpression expression) {
+    public static JetExpression deparenthesizeWithNoTypeResolution(@NotNull JetExpression expression) {
         if (expression instanceof JetBinaryExpressionWithTypeRHS) {
             JetSimpleNameExpression operationSign = ((JetBinaryExpressionWithTypeRHS) expression).getOperationSign();
             if (JetTokens.COLON.equals(operationSign.getReferencedNameElementType())) {
@@ -68,7 +68,7 @@ public class JetPsiUtil {
         }
         if (expression instanceof JetParenthesizedExpression) {
             JetExpression innerExpression = ((JetParenthesizedExpression) expression).getExpression();
-            return innerExpression != null ? deparenthesize(innerExpression) : null;
+            return innerExpression != null ? deparenthesizeWithNoTypeResolution(innerExpression) : null;
         }
         return expression;
     }
@@ -416,7 +416,7 @@ public class JetPsiUtil {
     }
 
     public static boolean isNullConstant(@NotNull JetExpression expression) {
-        JetExpression deparenthesized = deparenthesize(expression);
+        JetExpression deparenthesized = deparenthesizeWithNoTypeResolution(expression);
         return deparenthesized instanceof JetConstantExpression && deparenthesized.getNode().getElementType() == JetNodeTypes.NULL;
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java

@@ -1039,7 +1039,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
     }
 
     private void checkLValue(BindingTrace trace, JetExpression expressionWithParenthesis, boolean canBeThis) {
-        JetExpression expression = JetPsiUtil.deparenthesize(expressionWithParenthesis);
+        JetExpression expression = JetPsiUtil.deparenthesizeWithNoTypeResolution(expressionWithParenthesis);
         if (expression instanceof JetArrayAccessExpression) {
             checkLValue(trace, ((JetArrayAccessExpression) expression).getArrayExpression(), true);
             return;

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java

@@ -202,7 +202,7 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito
         JetType leftType = facade.getTypeInfo(expression.getLeft(), context).getType();
 
         JetExpression right = expression.getRight();
-        JetExpression left = JetPsiUtil.deparenthesize(expression.getLeft());
+        JetExpression left = JetPsiUtil.deparenthesizeWithNoTypeResolution(expression.getLeft());
         if (right == null || left == null) {
             temporaryBindingTrace.commit();
             return null;
@@ -262,7 +262,7 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito
 
     protected JetType visitAssignment(JetBinaryExpression expression, ExpressionTypingContext contextWithExpectedType) {
         ExpressionTypingContext context = contextWithExpectedType.replaceExpectedType(TypeUtils.NO_EXPECTED_TYPE);
-        JetExpression left = JetPsiUtil.deparenthesize(expression.getLeft());
+        JetExpression left = JetPsiUtil.deparenthesizeWithNoTypeResolution(expression.getLeft());
         JetExpression right = expression.getRight();
         if (left instanceof JetArrayAccessExpression) {
             JetArrayAccessExpression arrayAccessExpression = (JetArrayAccessExpression) left;

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java

@@ -41,7 +41,7 @@ public class LabelResolver {
     public LabelResolver() {}
 
     public void enterLabeledElement(@NotNull LabelName labelName, @NotNull JetExpression labeledExpression) {
-        JetExpression deparenthesized = JetPsiUtil.deparenthesize(labeledExpression);
+        JetExpression deparenthesized = JetPsiUtil.deparenthesizeWithNoTypeResolution(labeledExpression);
         if (deparenthesized != null) {
             Stack<JetElement> stack = labeledElements.get(labelName);
             if (stack == null) {
@@ -53,7 +53,7 @@ public class LabelResolver {
     }
 
     public void exitLabeledElement(@NotNull JetExpression expression) {
-        JetExpression deparenthesized = JetPsiUtil.deparenthesize(expression);
+        JetExpression deparenthesized = JetPsiUtil.deparenthesizeWithNoTypeResolution(expression);
         // TODO : really suboptimal
         for (Iterator<Map.Entry<LabelName,Stack<JetElement>>> mapIter = labeledElements.entrySet().iterator(); mapIter.hasNext(); ) {
             Map.Entry<LabelName, Stack<JetElement>> entry = mapIter.next();