Merge branch 'master' of git@git.labs.intellij.net:idea/community

java/java-tests/testData/refactoring/extractMethod/CodeDuplicatesVarargsShouldNotChangeReturnType.java

@@ -0,0 +1,12 @@
+class Test {
+    void foo() {
+        bar(<selection>String.valueOf(1)</selection>);
+        baz(String.valueOf(1));
+    }
+
+    private void bar(String s) {
+    }
+
+    private void baz(String... s) {
+    }
+}

java/java-tests/testData/refactoring/extractMethod/CodeDuplicatesVarargsShouldNotChangeReturnType_after.java

@@ -0,0 +1,16 @@
+class Test {
+    void foo() {
+        bar(newMethod());
+        baz(newMethod());
+    }
+
+    private String newMethod() {
+        return String.valueOf(1);
+    }
+
+    private void bar(String s) {
+    }
+
+    private void baz(String... s) {
+    }
+}

java/java-tests/testData/refactoring/methodDuplicatesMisc/ParametersModification.java

@@ -0,0 +1,24 @@
+class Test {
+  private double d<caret>d1(int index, double compVal, int numDays) {
+    double aveSlope = 0;
+
+    for (int i = 0; condition(index, numDays, i); i++) {
+      --index;
+      aveSlope = comminSending(index, compVal, aveSlope, i);
+    }
+    return aveSlope;
+  }
+
+  private double ss2(int index, double compVal, int numDays) {
+    double aveSlope = 0;
+
+    for (int i = 0; condition(index, numDays, i); i++) {
+      --index;
+      aveSlope = comminSending(index, compVal, aveSlope, i);
+    }
+    return aveSlope;
+  }
+
+  private boolean condition(int idx, int n, int i){return false;}
+  private double comminSending(int idx, double d, double a, int i){return 0;}
+}

java/java-tests/testData/refactoring/methodDuplicatesMisc/ParametersModification.java.after

@@ -0,0 +1,19 @@
+class Test {
+  private double dd1(int index, double compVal, int numDays) {
+    double aveSlope = 0;
+
+    for (int i = 0; condition(index, numDays, i); i++) {
+      --index;
+      aveSlope = comminSending(index, compVal, aveSlope, i);
+    }
+    return aveSlope;
+  }
+
+  private double ss2(int index, double compVal, int numDays) {
+      double aveSlope = dd1(index, compVal, numDays);
+    return aveSlope;
+  }
+
+  private boolean condition(int idx, int n, int i){return false;}
+  private double comminSending(int idx, double d, double a, int i){return 0;}
+}