Snapshot 4a019151cb9b5542ea5ba9ed2f07b29cee0951f0 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: I2fd287fc46a5378a4c437af4c884c3a3be94c330

14 files changed, 126 insertions, 21 deletions

diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Array.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Array.after.java
new file mode 100644
index 000000000000..4e22a390bd59
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Array.after.java
@@ -0,0 +1,7 @@
+package com.siyeh.igfixes.style.replace_with_string;
+
+class Array {
+  String array(char[] cs) {
+    return String.valueOf(cs) + String.valueOf(cs, 0, 10);
+  }
+}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Array.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Array.java
new file mode 100644
index 000000000000..e745b8230ab9
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Array.java
@@ -0,0 +1,7 @@
+package com.siyeh.igfixes.style.replace_with_string;
+
+class Array {
+  String array(char[] cs) {
+    return new <caret>StringBuilder().append(cs).append(cs, 0, 10).toString();
+  }
+}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Marathon.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Marathon.after.java
new file mode 100644
index 000000000000..4251dbd9ab30
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Marathon.after.java
@@ -0,0 +1,8 @@
+package com.siyeh.igfixes.style.replace_with_string;
+
+class Marathon {
+
+  private static void test(boolean marathon) {
+    String s1 = (marathon ? "AAA" : "BBB") + "CCC";
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Marathon.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Marathon.java
new file mode 100644
index 000000000000..a85d91f5f169
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/Marathon.java
@@ -0,0 +1,8 @@
+package com.siyeh.igfixes.style.replace_with_string;
+
+class Marathon {
+
+  private static void test(boolean marathon) {
+    String s1 = new <caret>StringBuilder(marathon ? "AAA": "BBB").append("CCC").toString();
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/NonString1.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/NonString1.after.java
index b1d2560216d3..f9b434eeefb8 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/NonString1.after.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/NonString1.after.java
@@ -3,6 +3,6 @@ package com.siyeh.igfixes.style.replace_with_string;
 class NonString1 {
 
   String foo(CharSequence text) {
-    return text.toString();
+    return String.valueOf(text); // no toString() because of NPEs
   }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/NonString1.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/NonString1.java
index 373df173bf70..63bb491c7b32 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/NonString1.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/NonString1.java
@@ -3,6 +3,6 @@ package com.siyeh.igfixes.style.replace_with_string;
 class NonString1 {
 
   String foo(CharSequence text) {
-    return new <caret>StringBuilder(text).toString();
+    return new <caret>StringBuilder(text).toString(); // no toString() because of NPEs
   }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBufferVariable.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBufferVariable.after.java
index 9f7b9e2af3a0..7b471c42f7ec 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBufferVariable.after.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBufferVariable.after.java
@@ -1,6 +1,5 @@
 class StringBufferVariable {
   void foo() {
-    String sb = "asdf" + "asdf";
-    System.out.println(sb.toString());
+      System.out.println("asdf" + "asdf");
   }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBufferVariable2.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBufferVariable2.after.java
index 01c7a312d7c9..d5a48b08e19c 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBufferVariable2.after.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBufferVariable2.after.java
@@ -1,6 +1,5 @@
 class StringBufferVariable2 {
   void foo() {
-    String sb = "";
-    System.out.println(sb.toString());
+      System.out.println("");
   }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/assignment/assignment_used_as_condition/AssignmentUsedAsCondition.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/assignment/assignment_used_as_condition/AssignmentUsedAsCondition.java
new file mode 100644
index 000000000000..6042e6a3b80f
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/assignment/assignment_used_as_condition/AssignmentUsedAsCondition.java
@@ -0,0 +1,23 @@
+package com.siyeh.igtest.assignment.assignment_used_as_condition;
+
+public class AssignmentUsedAsCondition {
+
+  void foo(boolean b) {
+    if (b = fossa()) {
+
+    }
+  }
+
+  boolean fossa() {
+    return true;
+  }
+
+  public static void main(String[] args) {
+    boolean b = false;
+    if (b != = true) {
+
+    }
+    int i = 1;
+    if (i = 8);
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/assignment/assignment_used_as_condition/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/assignment/assignment_used_as_condition/expected.xml
new file mode 100644
index 000000000000..26f182965a7f
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/assignment/assignment_used_as_condition/expected.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<problems>
+  <problem>
+    <file>AssignmentUsedAsCondition.java</file>
+    <line>6</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Assignment used as condition</problem_class>
+    <description>&lt;code&gt;b = fossa()&lt;/code&gt; used as condition #loc</description>
+  </problem>
+
+  <problem>
+    <file>AssignmentUsedAsCondition.java</file>
+    <line>21</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Assignment used as condition</problem_class>
+    <description>&lt;code&gt;i = 8&lt;/code&gt; used as condition #loc</description>
+  </problem>
+</problems>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/subtraction_in_compare_to/SubtractionInCompareTo.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/subtraction_in_compare_to/SubtractionInCompareTo.java
index 581308d9d8de..afed9c8ef243 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/subtraction_in_compare_to/SubtractionInCompareTo.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/subtraction_in_compare_to/SubtractionInCompareTo.java
@@ -1,6 +1,6 @@
 package com.siyeh.igtest.bugs.subtraction_in_compare_to;
 
-public class SubtractionInCompareTo
+public class SubtractionInCompareTo implements java.util.Comparator<SubtractionInCompareTo>
 {
     private int m_foo = 3;
 
@@ -9,4 +9,10 @@ public class SubtractionInCompareTo
         final int temp = m_foo + ((SubtractionInCompareTo)foo).m_foo;
         return m_foo - ((SubtractionInCompareTo)foo).m_foo;
     }
+
+
+    @Override
+    public int compare(SubtractionInCompareTo o1, SubtractionInCompareTo o2) {
+        return o1.m_foo - o2.m_foo;
+    }
 }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/subtraction_in_compare_to/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/subtraction_in_compare_to/expected.xml
index 9f8af8639964..dcb448de9f77 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/subtraction_in_compare_to/expected.xml
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/subtraction_in_compare_to/expected.xml
@@ -6,4 +6,11 @@
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Subtraction in 'compareTo()'</problem_class>
     <description>Subtraction &lt;code&gt;m_foo - ((SubtractionInCompareTo)foo).m_foo&lt;/code&gt; in 'compareTo()' may result in overflow errors #loc</description>
   </problem>
+
+  <problem>
+    <file>SubtractionInCompareTo.java</file>
+    <line>16</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Subtraction in 'compareTo()'</problem_class>
+    <description>Subtraction &lt;code&gt;o1.m_foo - o2.m_foo&lt;/code&gt; in 'compareTo()' may result in overflow errors #loc</description>
+  </problem>
 </problems>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/string_buffer_replaceable_by_string/StringBufferReplaceableByString.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/string_buffer_replaceable_by_string/StringBufferReplaceableByString.java
index 35d89c2387a0..fad106d1f318 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/string_buffer_replaceable_by_string/StringBufferReplaceableByString.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/string_buffer_replaceable_by_string/StringBufferReplaceableByString.java
@@ -29,4 +29,34 @@ public class StringBufferReplaceableByString {
     StringBuilder b = new StringBuilder();
     String s = new StringBuilder().append(pcdata, 0, i).toString();
   }
+
+  public void multiStatement() {
+    StringBuilder b = new StringBuilder();
+    b.append("eh");
+    b.append(" yeah").append("thus...");
+    System.out.println(b.toString());
+  }
+
+  public void assignment(int p) {
+    StringBuilder b = new StringBuilder();
+    b.append(p);
+    p++;
+    System.out.println(b.toString());
+    StringBuilder c = new StringBuilder();
+    c.append(p);
+    p = 2;
+    System.out.println(c.toString());
+
+    StringBuilder d = new StringBuilder();
+    d.append(p);
+    System.out.println(d.toString());
+  }
+
+  void clean() {
+    StringBuilder a = new StringBuilder(); // 'StringBuilder a' can be replaced with String
+    StringBuilder b = new StringBuilder(); // 'StringBuilder b' can be replaced with String
+
+    (Math.random() < 0.5 ? a : b).append("BLA");
+    System.out.println(a + "/" + b);
+  }
 }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/string_buffer_replaceable_by_string/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/string_buffer_replaceable_by_string/expected.xml
index 0a8ee53cc05e..9d6c57a431fb 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/string_buffer_replaceable_by_string/expected.xml
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/string_buffer_replaceable_by_string/expected.xml
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <problems>
-  <problem>
-    <file>StringBufferReplaceableByString.java</file>
-    <line>6</line>
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'StringBuffer' can be replaced with 'String'</problem_class>
-    <description>&lt;code&gt;StringBuilder builder&lt;/code&gt; can be replaced with 'String' #loc</description>
-  </problem>
-
-  <problem>
-    <file>StringBufferReplaceableByString.java</file>
-    <line>7</line>
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'StringBuffer' can be replaced with 'String'</problem_class>
-    <description>&lt;code&gt;StringBuffer buffer&lt;/code&gt; can be replaced with 'String' #loc</description>
-  </problem>
 
   <problem>
     <file>StringBufferReplaceableByString.java</file>
@@ -37,8 +24,16 @@
 
   <problem>
     <file>StringBufferReplaceableByString.java</file>
-    <line>29</line>
+    <line>34</line>
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'StringBuffer' can be replaced with 'String'</problem_class>
     <description>&lt;code&gt;StringBuilder b&lt;/code&gt; can be replaced with 'String' #loc</description>
   </problem>
+
+  <problem>
+    <file>StringBufferReplaceableByString.java</file>
+    <line>50</line>
+    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'StringBuffer' can be replaced with 'String'</problem_class>
+    <description>&lt;code&gt;StringBuilder d&lt;/code&gt; can be replaced with 'String' #loc</description>
+  </problem>
+
 </problems>
\ No newline at end of file