From 5b3a4ed7e06e314a2b8d563453933bf198521854 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 22 Oct 2014 19:12:40 +0400
Subject: [PATCH] Make JetOperationExpression an inheritor of JetExpression

---
 .../src/org/jetbrains/jet/lang/psi/JetOperationExpression.java | 3 +--
 .../intentions/SimplifyNegatedBinaryExpressionIntention.kt     | 2 +-
 .../plugin/intentions/ConvertToForEachFunctionCallIntention.kt | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetOperationExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetOperationExpression.java
index 0bdf9cf4d3a..54f68828c26 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetOperationExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetOperationExpression.java
@@ -16,10 +16,9 @@
 
 package org.jetbrains.jet.lang.psi;
 
-import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 
-public interface JetOperationExpression extends PsiElement {
+public interface JetOperationExpression extends JetExpression {
     @NotNull
     JetSimpleNameExpression getOperationReference();
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
index 9d5f792a65a..c2a5d465d1b 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt
@@ -88,7 +88,7 @@ public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntentio
                             expression.getRight()
                     )
                     else -> throw IllegalStateException(
-                         "Expression is neither a JetIsExpression or JetBinaryExpression (checked by isApplicableTo): ${(expression : PsiElement).getText()}"
+                         "Expression is neither a JetIsExpression or JetBinaryExpression (checked by isApplicableTo): ${expression.getText()}"
                     )
                 }
         )
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachFunctionCallIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachFunctionCallIntention.kt
index 614ed1c5379..7a0bc8396c8 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachFunctionCallIntention.kt
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachFunctionCallIntention.kt
@@ -23,7 +23,6 @@ import org.jetbrains.jet.lang.psi.JetBlockExpression
 import org.jetbrains.jet.lang.psi.JetElement
 import org.jetbrains.jet.lang.psi.JetParameter
 import org.jetbrains.jet.lang.psi.JetOperationExpression
-import com.intellij.psi.PsiElement
 
 public class ConvertToForEachFunctionCallIntention : JetSelfTargetingIntention<JetForExpression>("convert.to.for.each.function.call.intention", javaClass()) {
     override fun isApplicableTo(element: JetForExpression): Boolean {
@@ -50,7 +49,7 @@ public class ConvertToForEachFunctionCallIntention : JetSelfTargetingIntention<J
             val loopRange = element.getLoopRange()!!
 
             return when (loopRange) {
-                is JetOperationExpression -> "(${(loopRange : PsiElement).getText()})"
+                is JetOperationExpression -> "(${loopRange.getText()})"
                 else -> loopRange.getText() ?: throw AssertionError("LoopRange in ForExpression shouldn't be empty: expressionText = ${element.getText()}")
             }
         }