diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java index 7973c05ed74..6d8ca6af889 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java @@ -151,6 +151,9 @@ public class QuickFixes { actions.put(UNSAFE_CALL, ExclExclCallFix.introduceExclExclCall()); actions.put(UNNECESSARY_NOT_NULL_ASSERTION, ExclExclCallFix.removeExclExclCall()); + JetIntentionActionFactory removeProtectedModifierFactory = RemoveModifierFix.createRemoveModifierFromListOwnerFactory(PROTECTED_KEYWORD); + factories.put(PACKAGE_MEMBER_CANNOT_BE_PROTECTED, removeProtectedModifierFactory); + actions.put(PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE, new SpecifyTypeExplicitlyFix()); factories.put(ELSE_MISPLACED_IN_WHEN, MoveWhenElseBranchFix.createFactory()); diff --git a/idea/testData/quickfix/modifiers/afterPackageMemberCannotBeProtected.kt b/idea/testData/quickfix/modifiers/afterPackageMemberCannotBeProtected.kt new file mode 100644 index 00000000000..de0cdcad4a5 --- /dev/null +++ b/idea/testData/quickfix/modifiers/afterPackageMemberCannotBeProtected.kt @@ -0,0 +1,4 @@ +// "Remove 'protected' modifier" "true" +package test + +val a: Int = 0 diff --git a/idea/testData/quickfix/modifiers/beforePackageMemberCannotBeProtected.kt b/idea/testData/quickfix/modifiers/beforePackageMemberCannotBeProtected.kt new file mode 100644 index 00000000000..49ac940481c --- /dev/null +++ b/idea/testData/quickfix/modifiers/beforePackageMemberCannotBeProtected.kt @@ -0,0 +1,4 @@ +// "Remove 'protected' modifier" "true" +package test + +protected val a: Int = 0 diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java index 750effd8682..7cf0cf66228 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java @@ -433,6 +433,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { doTest("idea/testData/quickfix/modifiers/beforeOpenModifierInEnum.kt"); } + @TestMetadata("beforePackageMemberCannotBeProtected.kt") + public void testPackageMemberCannotBeProtected() throws Exception { + doTest("idea/testData/quickfix/modifiers/beforePackageMemberCannotBeProtected.kt"); + } + @TestMetadata("beforeRemoveIncompatibleModifier.kt") public void testRemoveIncompatibleModifier() throws Exception { doTest("idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt");