From f8cf0f2ab921870afe30946691084cce9b7bad3f Mon Sep 17 00:00:00 2001 From: Toshiaki Kameyama Date: Tue, 18 Jul 2017 18:59:22 +0900 Subject: [PATCH] Misleading quick fix message for an 'open' modifier on an interface member #KT-18738 Fixed --- .../src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt | 2 +- idea/testData/quickfix/modifiers/redundantOpenInInterface.kt | 2 +- .../quickfix/modifiers/redundantOpenInInterface.kt.after | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt index dfb5543977c..242c2f29ec5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -108,7 +108,7 @@ class QuickFixRegistrar : QuickFixContributor { val removeRedundantModifierFactory = RemoveModifierFix.createRemoveModifierFactory(true) REDUNDANT_MODIFIER.registerFactory(removeRedundantModifierFactory) - REDUNDANT_OPEN_IN_INTERFACE.registerFactory(RemoveModifierFix.createRemoveModifierFromListOwnerFactory(OPEN_KEYWORD)) + REDUNDANT_OPEN_IN_INTERFACE.registerFactory(RemoveModifierFix.createRemoveModifierFromListOwnerFactory(OPEN_KEYWORD, true)) UNNECESSARY_LATEINIT.registerFactory(RemoveModifierFix.createRemoveModifierFromListOwnerFactory(LATEINIT_KEYWORD)) REDUNDANT_PROJECTION.registerFactory(RemoveModifierFix.createRemoveProjectionFactory(true)) diff --git a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt index f4e61dba4f8..86656df35d3 100644 --- a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt +++ b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt @@ -1,4 +1,4 @@ -// "Make 'foo' not open" "true" +// "Remove redundant 'open' modifier" "true" interface My { open fun foo() diff --git a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after index f3f6a9867b9..378d19a8e62 100644 --- a/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after +++ b/idea/testData/quickfix/modifiers/redundantOpenInInterface.kt.after @@ -1,4 +1,4 @@ -// "Make 'foo' not open" "true" +// "Remove redundant 'open' modifier" "true" interface My { fun foo()