From 4d0e044c2f5d2aa835ea2b069fe7b15ee46f4d57 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Wed, 30 Mar 2016 09:05:51 +0200
Subject: [PATCH] allow to move left/right more java constructs

---
 .../JavaMoveLeftRightHandler.java             | 14 ++++++++++
 .../MoveElementLeftRightTest.java             | 26 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/moveLeftRight/JavaMoveLeftRightHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/moveLeftRight/JavaMoveLeftRightHandler.java
index 9f0ecca280d4..54045d011043 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/moveLeftRight/JavaMoveLeftRightHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/moveLeftRight/JavaMoveLeftRightHandler.java
@@ -41,6 +41,20 @@ public class JavaMoveLeftRightHandler extends MoveElementLeftRightHandler {
         return enumConstants;
       }
     }
+    else if (element instanceof PsiReferenceList) {
+      return ((PsiReferenceList)element).getReferenceElements();
+    }
+    else if (element instanceof PsiTypeElement) {
+      final PsiTypeElement[] result = PsiTreeUtil.getChildrenOfType(element, PsiTypeElement.class);
+      return result == null ? PsiElement.EMPTY_ARRAY : result;
+    }
+    else if (element instanceof PsiResourceList) {
+      final PsiElement[] result = PsiTreeUtil.getChildrenOfType(element, PsiResourceListElement.class);
+      return result == null ? PsiElement.EMPTY_ARRAY : result;
+    }
+    else if (element instanceof PsiPolyadicExpression) {
+      return ((PsiPolyadicExpression)element).getOperands();
+    }
     return PsiElement.EMPTY_ARRAY;
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/MoveElementLeftRightTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/MoveElementLeftRightTest.java
index d3926e0e3cc1..40881411b329 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/MoveElementLeftRightTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/editorActions/MoveElementLeftRightTest.java
@@ -80,6 +80,32 @@ public class MoveElementLeftRightTest extends AbstractMoveElementLeftRightTest {
                           "@SomeAnnotation(p2 = \"2\", p1=<caret>1) class C {}");
   }
 
+  public void testMoveThrowsExceptions() throws Exception {
+    doTestFromLeftToRight("class C { void m() throws RuntimeExceptio<caret>n, Exception {} }",
+                          "class C { void m() throws Exception, RuntimeExceptio<caret>n {} }");
+  }
+
+  public void testMoveImplementsClause() throws Exception {
+    doTestFromLeftToRight("class C implements Cl<caret>oneable, java.io.Serializable {}",
+                          "class C implements java.io.Serializable, Cl<caret>oneable {}");
+  }
+
+  public void testMoveMulticatch() throws Exception {
+    doTestFromLeftToRight("class C { void m() { try {} catch (Runtime<caret>Exception | Exception e) {}",
+                          "class C { void m() { try {} catch (Exception | Runtime<caret>Exception e) {}");
+  }
+
+  public void testMoveTryResource() throws Exception {
+    doTestFromLeftToRight("class C { void m(AutoCloseable a) { try (Auto<caret>Closeable b = a; AutoCloseable c = null) {} } }",
+                          "class C { void m(AutoCloseable a) { try (AutoCloseable c = null; Auto<caret>Closeable b = a) {} } }");
+  }
+
+  public void testMovePolyadicExpressionOperand() throws Exception {
+    doTestFromLeftToRight("class C { int i = <caret>1 + 2 + 3; }",
+                          "class C { int i = 2 + <caret>1 + 3; }",
+                          "class C { int i = 2 + 3 + <caret>1; }");
+  }
+
   @Override
   protected void configureEditor(String contents) throws Exception {
     init(contents, TestFileType.JAVA);