IDEA-75547 Groovy move statement moves method if a line comment is selected together with statements

platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java

@@ -832,6 +832,13 @@ public class PsiTreeUtil {
     return prevLeaf;
   }
 
+  @Nullable
+  public static PsiElement nextVisibleLeaf(@NotNull final PsiElement element) {
+    PsiElement nextLeaf = nextLeaf(element, true);
+    while (nextLeaf != null && StringUtil.isEmptyOrSpaces(nextLeaf.getText())) nextLeaf = nextLeaf(nextLeaf, true);
+    return nextLeaf;
+  }
+
   @Nullable
   public static PsiElement nextLeaf(final PsiElement element, final boolean skipEmptyElements) {
     PsiElement nextLeaf = nextLeaf(element);

plugins/groovy/src/org/jetbrains/plugins/groovy/lang/editor/actions/GroovyStatementMover.java

@@ -113,6 +113,9 @@ public class GroovyStatementMover extends StatementUpDownMover {
         element = owner;
       }
     }
+    if (element instanceof PsiComment) {
+      element = PsiTreeUtil.nextVisibleLeaf(element);
+    }
 
     return (GroovyPsiElement)PsiTreeUtil.findFirstParent(element, new Condition<PsiElement>() {
       @Override

plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/updown/GroovyMoveStatementTest.java

@@ -99,6 +99,7 @@ public class GroovyMoveStatementTest extends LightCodeInsightFixtureTestCase {
   public void testStatementToEmptySpace3() throws Throwable { bothTest(); }
 
   public void testStatementsWithSemicolons() throws Throwable { bothTest(); }
+  public void testStatementsWithComments() throws Throwable { bothTest(); }
 
   private void bothTest() {
     final List<String> data = TestUtils.readInput(getTestDataPath() + getTestName(true) + ".test");

plugins/groovy/testdata/groovy/actions/moveStatement/statementsWithComments.test

@@ -0,0 +1,21 @@
+def bar() {
+
+}
+
+private boolean function() {
+    println 'hi'
+<selection>    //foo
+    println 'hi3'<caret></selection>
+    println 'hi2'
+}
+-----
+def bar() {
+
+}
+
+private boolean function() {
+<selection>    //foo
+    println 'hi3'<caret></selection>
+    println 'hi'
+    println 'hi2'
+}