azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify function

Browse Source
This commit is contained in:
Alexey Sedunov
2014-01-31 15:39:26 +04:00
parent 95187cd035
commit d7f0e02b16
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt
+3 -5
View File
@@ -49,18 +49,16 @@ public fun PsiElement.canDeleteElement(): Boolean {
} }
fun PsiElement.removeOverrideModifier() { fun PsiElement.removeOverrideModifier() {
val modifier = when (this) { when (this) {
is JetNamedFunction, is JetProperty -> { is JetNamedFunction, is JetProperty -> {
(this as JetModifierListOwner).getModifierList()?.getModifier(JetTokens.OVERRIDE_KEYWORD) (this as JetModifierListOwner).getModifierList()?.getModifier(JetTokens.OVERRIDE_KEYWORD)?.delete()
} }
is PsiMethod -> { is PsiMethod -> {
getModifierList().getAnnotations().find { getModifierList().getAnnotations().find {
annotation -> annotation.getQualifiedName() == "java.lang.Override" annotation -> annotation.getQualifiedName() == "java.lang.Override"
} }?.delete()
} }
else -> null
} }
modifier?.let { modifier -> modifier.delete() }
} }
fun PsiMethod.cleanUpOverrides() { fun PsiMethod.cleanUpOverrides() {