From 784ba69b7afe3a37b96dc60304aa25054f25b4ec Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Fri, 6 Sep 2019 13:15:57 +0900
Subject: [PATCH] "Cleanup code": remove 'final' keyword for overridden
 function with non-canonical modifiers order

#KT-33060 Fixed
---
 .../kotlin/idea/inspections/SortModifiersInspection.kt   | 5 +++--
 idea/testData/inspections/cleanup/cleanup.kt             | 9 +++++++++
 idea/testData/inspections/cleanup/cleanup.kt.after       | 9 +++++++++
 .../idea/inspections/KotlinCleanupInspectionTest.kt      | 2 ++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/SortModifiersInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/SortModifiersInspection.kt
index eeb2bab19af..506b1c1abf6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/SortModifiersInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/SortModifiersInspection.kt
@@ -73,10 +73,11 @@ private class SortModifiersFix(private val modifiers: List<KtModifierKeywordToke
         val list = descriptor.psiElement as? KtModifierList ?: return
         val owner = list.parent as? KtModifierListOwner ?: return
 
-        modifiers.forEach { owner.removeModifier(it) }
+        val existingModifiers = modifiers.filter { owner.hasModifier(it) }
+        existingModifiers.forEach { owner.removeModifier(it) }
         // We add visibility / modality modifiers after all others,
         // because they can be redundant or not depending on others (e.g. override)
-        modifiers
+        existingModifiers
             .partition { it in KtTokens.VISIBILITY_MODIFIERS || it in KtTokens.MODALITY_MODIFIERS }
             .let { it.second + it.first }
             .forEach { owner.addModifier(it) }
diff --git a/idea/testData/inspections/cleanup/cleanup.kt b/idea/testData/inspections/cleanup/cleanup.kt
index 8ff1bbb730f..ec07a892d37 100644
--- a/idea/testData/inspections/cleanup/cleanup.kt
+++ b/idea/testData/inspections/cleanup/cleanup.kt
@@ -112,3 +112,12 @@ object X {
 header class Expected
 
 impl class Actual
+
+// KT-33060
+interface AA {
+    fun foo(key: Any)
+}
+
+class A1 : AA {
+    override final fun foo(key: Any) {}
+}
\ No newline at end of file
diff --git a/idea/testData/inspections/cleanup/cleanup.kt.after b/idea/testData/inspections/cleanup/cleanup.kt.after
index ea3faca153d..182c9ab34ed 100644
--- a/idea/testData/inspections/cleanup/cleanup.kt.after
+++ b/idea/testData/inspections/cleanup/cleanup.kt.after
@@ -112,3 +112,12 @@ object X {
 expect class Expected
 
 actual class Actual
+
+// KT-33060
+interface AA {
+    fun foo(key: Any)
+}
+
+class A1 : AA {
+    override fun foo(key: Any) {}
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt
index 2c4259ef31e..d497912bc6e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt
@@ -25,6 +25,8 @@ class KotlinCleanupInspectionTest(): KotlinLightCodeInsightFixtureTestCase() {
 
     private fun doTest(result: String, vararg files: String) {
         myFixture.enableInspections(KotlinCleanupInspection::class.java)
+        myFixture.enableInspections(SortModifiersInspection::class.java)
+        myFixture.enableInspections(RedundantModalityModifierInspection::class.java)
         myFixture.configureByFiles(*files)
 
         val project = myFixture.project