From a9c91099a469c370dba54a5300a6116290ae0ffe Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Mon, 23 Jul 2018 13:50:39 +0300
Subject: [PATCH] Correct "Redundant override" inspection message #KT-25608
 Fixed

---
 idea/src/META-INF/plugin.xml                                  | 2 +-
 idea/src/META-INF/plugin.xml.172                              | 2 +-
 idea/src/META-INF/plugin.xml.173                              | 2 +-
 idea/src/META-INF/plugin.xml.182                              | 2 +-
 idea/src/META-INF/plugin.xml.as31                             | 2 +-
 idea/src/META-INF/plugin.xml.as32                             | 2 +-
 idea/src/META-INF/plugin.xml.as33                             | 2 +-
 .../idea/inspections/KotlinRedundantOverrideInspection.kt     | 4 ++--
 idea/testData/inspectionsLocal/redundantOverride/basic.kt     | 2 ++
 .../inspectionsLocal/redundantOverride/basic.kt.after         | 2 ++
 10 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index f98b192cba1..9c8ec8bf849 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -2582,7 +2582,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
                      level="WEAK WARNING"/>
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinRedundantOverrideInspection"
-                     displayName="Redundant override"
+                     displayName="Redundant overriding method"
                      groupPath="Kotlin"
                      groupName="Redundant constructs"
                      enabledByDefault="true"
diff --git a/idea/src/META-INF/plugin.xml.172 b/idea/src/META-INF/plugin.xml.172
index b8e025b5a26..7dccfb5dd26 100644
--- a/idea/src/META-INF/plugin.xml.172
+++ b/idea/src/META-INF/plugin.xml.172
@@ -2579,7 +2579,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
                      level="WEAK WARNING"/>
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinRedundantOverrideInspection"
-                     displayName="Redundant override"
+                     displayName="Redundant overriding method"
                      groupPath="Kotlin"
                      groupName="Redundant constructs"
                      enabledByDefault="true"
diff --git a/idea/src/META-INF/plugin.xml.173 b/idea/src/META-INF/plugin.xml.173
index 6b98e57b183..25264cd00d5 100644
--- a/idea/src/META-INF/plugin.xml.173
+++ b/idea/src/META-INF/plugin.xml.173
@@ -2582,7 +2582,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
                      level="WEAK WARNING"/>
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinRedundantOverrideInspection"
-                     displayName="Redundant override"
+                     displayName="Redundant overriding method"
                      groupPath="Kotlin"
                      groupName="Redundant constructs"
                      enabledByDefault="true"
diff --git a/idea/src/META-INF/plugin.xml.182 b/idea/src/META-INF/plugin.xml.182
index 27ece1ce3cf..38082ec46a7 100644
--- a/idea/src/META-INF/plugin.xml.182
+++ b/idea/src/META-INF/plugin.xml.182
@@ -2583,7 +2583,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
                      level="WEAK WARNING"/>
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinRedundantOverrideInspection"
-                     displayName="Redundant override"
+                     displayName="Redundant overriding method"
                      groupPath="Kotlin"
                      groupName="Redundant constructs"
                      enabledByDefault="true"
diff --git a/idea/src/META-INF/plugin.xml.as31 b/idea/src/META-INF/plugin.xml.as31
index cf5643075c4..f82df681c0a 100644
--- a/idea/src/META-INF/plugin.xml.as31
+++ b/idea/src/META-INF/plugin.xml.as31
@@ -2582,7 +2582,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
                      level="WEAK WARNING"/>
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinRedundantOverrideInspection"
-                     displayName="Redundant override"
+                     displayName="Redundant overriding method"
                      groupPath="Kotlin"
                      groupName="Redundant constructs"
                      enabledByDefault="true"
diff --git a/idea/src/META-INF/plugin.xml.as32 b/idea/src/META-INF/plugin.xml.as32
index c0857b38221..1025c0decb1 100644
--- a/idea/src/META-INF/plugin.xml.as32
+++ b/idea/src/META-INF/plugin.xml.as32
@@ -2582,7 +2582,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
                      level="WEAK WARNING"/>
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinRedundantOverrideInspection"
-                     displayName="Redundant override"
+                     displayName="Redundant overriding method"
                      groupPath="Kotlin"
                      groupName="Redundant constructs"
                      enabledByDefault="true"
diff --git a/idea/src/META-INF/plugin.xml.as33 b/idea/src/META-INF/plugin.xml.as33
index f07399e6157..fd07393a2f6 100644
--- a/idea/src/META-INF/plugin.xml.as33
+++ b/idea/src/META-INF/plugin.xml.as33
@@ -2581,7 +2581,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
                      level="WEAK WARNING"/>
 
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.KotlinRedundantOverrideInspection"
-                     displayName="Redundant override"
+                     displayName="Redundant overriding method"
                      groupPath="Kotlin"
                      groupName="Redundant constructs"
                      enabledByDefault="true"
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinRedundantOverrideInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinRedundantOverrideInspection.kt
index 34a960a229c..0386e3482df 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinRedundantOverrideInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinRedundantOverrideInspection.kt
@@ -54,7 +54,7 @@ class KotlinRedundantOverrideInspection : AbstractKotlinInspection(), CleanupLoc
                 val descriptor = holder.manager.createProblemDescriptor(
                         function,
                         TextRange(modifierList.startOffsetInParent, funKeyword.endOffset - function.startOffset),
-                        "Redundant override",
+                        "Redundant overriding method",
                         ProblemHighlightType.LIKE_UNUSED_SYMBOL,
                         isOnTheFly,
                         RedundantOverrideFix()
@@ -77,7 +77,7 @@ class KotlinRedundantOverrideInspection : AbstractKotlinInspection(), CleanupLoc
     }
 
     private class RedundantOverrideFix : LocalQuickFix {
-        override fun getName() = "Remove redundant override"
+        override fun getName() = "Remove redundant overriding method"
         override fun getFamilyName() = name
 
         override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
diff --git a/idea/testData/inspectionsLocal/redundantOverride/basic.kt b/idea/testData/inspectionsLocal/redundantOverride/basic.kt
index fa3fd15fcfc..1fffc00054e 100644
--- a/idea/testData/inspectionsLocal/redundantOverride/basic.kt
+++ b/idea/testData/inspectionsLocal/redundantOverride/basic.kt
@@ -1,3 +1,5 @@
+// PROBLEM: Redundant overriding method
+// FIX: Remove redundant overriding method
 open class Foo {
     open fun simple() {
     }
diff --git a/idea/testData/inspectionsLocal/redundantOverride/basic.kt.after b/idea/testData/inspectionsLocal/redundantOverride/basic.kt.after
index 0731ec2a389..964762fabeb 100644
--- a/idea/testData/inspectionsLocal/redundantOverride/basic.kt.after
+++ b/idea/testData/inspectionsLocal/redundantOverride/basic.kt.after
@@ -1,3 +1,5 @@
+// PROBLEM: Redundant overriding method
+// FIX: Remove redundant overriding method
 open class Foo {
     open fun simple() {
     }