From 8375a127331fea70f5e76517f6dbd5cc159d9028 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 10 Jun 2019 16:44:32 +0300
Subject: [PATCH] New J2K: properly remove redundant modifiers in
 post-processing as #KT-30804 is fixed

---
 .../processings/inspeсtionLikeProcessings.kt             | 4 ++--
 .../org/jetbrains/kotlin/nj2k/postProcessing/utils.kt    | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt
index f474062f631..9cd9bb07d37 100644
--- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt
@@ -352,7 +352,7 @@ class RemoveRedundantModalityModifierProcessing : ApplicabilityBasedInspectionLi
     }
 
     override fun apply(element: KtDeclaration) {
-        element.removeModifierSmart(element.modalityModifierType()!!)
+        element.removeModifier(element.modalityModifierType()!!)
     }
 }
 
@@ -371,7 +371,7 @@ class RemoveRedundantVisibilityModifierProcessing : ApplicabilityBasedInspection
     }
 
     override fun apply(element: KtDeclaration) {
-        element.removeModifierSmart(element.visibilityModifierType()!!)
+        element.removeModifier(element.visibilityModifierType()!!)
     }
 }
 
diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/utils.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/utils.kt
index a71c304c4ae..d41c3c52efa 100644
--- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/utils.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/utils.kt
@@ -75,14 +75,5 @@ fun KtElement.hasUsagesOutsideOf(inElement: KtElement, outsideElements: List<KtE
         outsideElements.none { it.isAncestor(reference.element) }
     }
 
-
-//hack until KT-30804 is fixed
-fun KtModifierListOwner.removeModifierSmart(modifierToken: KtModifierKeywordToken) {
-    val newElement = copy() as KtModifierListOwner
-    newElement.removeModifier(modifierToken)
-    replace(newElement)
-    containingFile.commitAndUnblockDocument()
-}
-
 inline fun <reified T : PsiElement> List<PsiElement>.descendantsOfType(): List<T> =
     flatMap { it.collectDescendantsOfType() }
\ No newline at end of file