Simplify function

2014-01-31 15:39:26 +04:00
parent 95187cd035
commit d7f0e02b16
1 changed files with 3 additions and 5 deletions
@@ -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() {