IDEA-52721: 'Make Groovy method public' escalating shouldn't put explicit 'public...

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
index b573c33c0433c503af6428eb69c28866cba8da18..a2ef22ec72d55e621ab2e0a6f6c7f6eebc92b3b8 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
@@ -208,7 +208,12 @@ public class GrModifierListImpl extends GroovyBaseElementImpl<GrModifierListStub
         setModifierPropertyInternal(GrModifier.PRIVATE, false);
       }
     }
-    if (!GrModifier.PACKAGE_LOCAL.equals(name)) {
+    if (GrModifier.PACKAGE_LOCAL.equals(name) || GrModifier.PUBLIC.equals(name)) {
+      if (getModifiers().length == 0) {
+        setModifierProperty(GrModifier.DEF, true);
+      }
+    }
+    else {
       setModifierPropertyInternal(name, doSet);
     }
   }