From d7f0e02b160809e9c89461ee1e2aca48951bf86f Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Fri, 31 Jan 2014 15:39:26 +0400
Subject: [PATCH] Simplify function

---
 .../jetbrains/jet/plugin/refactoring/safeDelete/utils.kt  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt
index d1892819d4d..c776c20ad3a 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt
@@ -49,18 +49,16 @@ public fun PsiElement.canDeleteElement(): Boolean {
 }
 
 fun PsiElement.removeOverrideModifier() {
-    val modifier = when (this) {
+    when (this) {
         is JetNamedFunction, is JetProperty -> {
-            (this as JetModifierListOwner).getModifierList()?.getModifier(JetTokens.OVERRIDE_KEYWORD)
+            (this as JetModifierListOwner).getModifierList()?.getModifier(JetTokens.OVERRIDE_KEYWORD)?.delete()
         }
         is PsiMethod -> {
             getModifierList().getAnnotations().find {
                 annotation -> annotation.getQualifiedName() == "java.lang.Override"
-            }
+            }?.delete()
         }
-        else -> null
     }
-    modifier?.let { modifier -> modifier.delete() }
 }
 
 fun PsiMethod.cleanUpOverrides() {