From 50eaca1ac4d5132e24a77c2c44c7d2cfc4c6b429 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 29 Dec 2017 17:17:38 +0300
Subject: [PATCH] Add modifier fix: improve style a bit

---
 .../kotlin/idea/quickfix/AddModifierFix.kt    | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
index aca34772e43..8156ed1dd82 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
@@ -106,23 +106,25 @@ open class AddModifierFix(
         }
 
         fun createIfApplicable(modifierListOwner: KtModifierListOwner, modifier: KtModifierKeywordToken): AddModifierFix? {
-            if (modifier == ABSTRACT_KEYWORD || modifier == OPEN_KEYWORD) {
-                if (modifierListOwner is KtObjectDeclaration) return null
-                if (modifierListOwner is KtEnumEntry) return null
-                if (modifierListOwner is KtDeclaration && modifierListOwner !is KtClass) {
-                    val parentClassOrObject = modifierListOwner.containingClassOrObject ?: return null
-                    if (parentClassOrObject is KtObjectDeclaration) return null
-                    if (parentClassOrObject is KtEnumEntry) return null
+            when (modifier) {
+                ABSTRACT_KEYWORD, OPEN_KEYWORD -> {
+                    if (modifierListOwner is KtObjectDeclaration) return null
+                    if (modifierListOwner is KtEnumEntry) return null
+                    if (modifierListOwner is KtDeclaration && modifierListOwner !is KtClass) {
+                        val parentClassOrObject = modifierListOwner.containingClassOrObject ?: return null
+                        if (parentClassOrObject is KtObjectDeclaration) return null
+                        if (parentClassOrObject is KtEnumEntry) return null
+                    }
                 }
-            }
-            if (modifier == INNER_KEYWORD) {
-                if (modifierListOwner is KtObjectDeclaration) return null
-                if (modifierListOwner is KtClass) {
-                    if (modifierListOwner.isInterface() ||
-                        modifierListOwner.isSealed() ||
-                        modifierListOwner.isEnum() ||
-                        modifierListOwner.isData() ||
-                        modifierListOwner.isAnnotation()) return null
+                INNER_KEYWORD -> {
+                    if (modifierListOwner is KtObjectDeclaration) return null
+                    if (modifierListOwner is KtClass) {
+                        if (modifierListOwner.isInterface() ||
+                            modifierListOwner.isSealed() ||
+                            modifierListOwner.isEnum() ||
+                            modifierListOwner.isData() ||
+                            modifierListOwner.isAnnotation()) return null
+                    }
                 }
             }
             return AddModifierFix(modifierListOwner, modifier)