Snapshot idea/138.2210 from git://git.jetbrains.org/idea/community.git

Change-Id: I8f0204d7887ee78cf1fd8c09f936c5afff0edd2f

20 files changed, 212 insertions, 2 deletions

diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Argument.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Argument.java
new file mode 100644
index 000000000000..766ea62ea51d
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Argument.java
@@ -0,0 +1,12 @@
+public class Argument  {
+
+  void m(A a) {}
+  void n() {
+    m(new A<caret>() {{ setI(1); setJ(2); }});
+  }
+
+  class A {
+    void setI(int i) {}
+    void setJ(int j) {}
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Field.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Field.after.java
new file mode 100644
index 000000000000..804a5e59d66b
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Field.after.java
@@ -0,0 +1,12 @@
+import java.util.ArrayList;
+import java.util.List;
+
+public class Field {
+  static final List<Integer> list = new ArrayList<Integer>();
+
+    static {
+        for (int i = 0; i < 10; i++) {
+          list.add(i);
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Field.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Field.java
new file mode 100644
index 000000000000..4f75edf20f18
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Field.java
@@ -0,0 +1,10 @@
+import java.util.ArrayList;
+import java.util.List;
+
+public class Field {
+  static final List<Integer> list = new <caret>ArrayList<Integer>() {{
+    for (int i = 0; i < 10; i++) {
+      add(i);
+    }
+  }};
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/LocalVariable.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/LocalVariable.after.java
new file mode 100644
index 000000000000..92f47c31f39c
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/LocalVariable.after.java
@@ -0,0 +1,13 @@
+import java.util.HashMap;
+
+public class LocalVariable {
+
+  void m() {
+    final HashMap<String, String> map = new HashMap();// comment
+      map.put("a", "b");
+      map.put("a", "b");
+      map.put("a", "b");
+      map.put("a", "b");
+
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/LocalVariable.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/LocalVariable.java
new file mode 100644
index 000000000000..12b6f415a4a9
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/LocalVariable.java
@@ -0,0 +1,14 @@
+import java.util.HashMap;
+
+public class LocalVariable {
+
+  void m() {
+    final HashMap<String, String> map = new HashMap<caret>() {{
+      // comment
+      put("a", "b");
+      put("a", "b");
+      put("a", "b");
+      put("a", "b");
+    }};
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/inner_class_static/Simple.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/memory/inner_class_static/Simple.after.java
index 973bfc5b6e06..2b2ebd86b79a 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/inner_class_static/Simple.after.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/memory/inner_class_static/Simple.after.java
@@ -1,4 +1,4 @@
-package performance.inner_class_static;
+package memory.inner_class_static;
 
 class Simple {
   static class Inner {}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/inner_class_static/Simple.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/memory/inner_class_static/Simple.java
index c183bdb0986f..e08255ca8562 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/inner_class_static/Simple.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/memory/inner_class_static/Simple.java
@@ -1,4 +1,4 @@
-package performance.inner_class_static;
+package memory.inner_class_static;
 
 class Simple {
   class Inner<caret> {}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/FieldWithWhitespace.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/FieldWithWhitespace.after.java
new file mode 100644
index 000000000000..3a3984b1a64c
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/FieldWithWhitespace.after.java
@@ -0,0 +1,4 @@
+class FieldWithWhitespace {
+
+    String[] s;
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/FieldWithWhitespace.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/FieldWithWhitespace.java
new file mode 100644
index 000000000000..1f02831d6632
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/FieldWithWhitespace.java
@@ -0,0 +1,4 @@
+class FieldWithWhitespace {
+
+  String s<caret> [];
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/SimpleMethod.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/SimpleMethod.after.java
new file mode 100644
index 000000000000..0b918a955215
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/SimpleMethod.after.java
@@ -0,0 +1,6 @@
+public class SimpleMethod {
+
+  public String[] ohGod(String[] a) {
+    return a;
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/SimpleMethod.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/SimpleMethod.java
new file mode 100644
index 000000000000..5d0ac265b2fc
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/SimpleMethod.java
@@ -0,0 +1,6 @@
+public class SimpleMethod {
+
+  public String ohGod<caret>(String[] a)[] {
+    return a;
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/make_field_volatile/Simple.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/make_field_volatile/Simple.after.java
new file mode 100644
index 000000000000..f33e30331623
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/make_field_volatile/Simple.after.java
@@ -0,0 +1,19 @@
+public class Simple
+{
+  private static volatile Object s_instance;
+
+  public static Object foo()
+  {
+    if(s_instance == null)
+    {
+      synchronized(Simple.class)
+      {
+        if(s_instance == null)
+        {
+          s_instance = new Object();
+        }
+      }
+    }
+    return s_instance;
+  }
+}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/make_field_volatile/Simple.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/make_field_volatile/Simple.java
new file mode 100644
index 000000000000..b514dc20378a
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/make_field_volatile/Simple.java
@@ -0,0 +1,19 @@
+public class Simple
+{
+  private static Object s_instance;
+
+  public static Object foo()
+  {
+    if<caret>(s_instance == null)
+    {
+      synchronized(Simple.class)
+      {
+        if(s_instance == null)
+        {
+          s_instance = new Object();
+        }
+      }
+    }
+    return s_instance;
+  }
+}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/InstanceVariableReferenced.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/InstanceVariableReferenced.java
new file mode 100644
index 000000000000..f72c45f2f395
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/InstanceVariableReferenced.java
@@ -0,0 +1,16 @@
+public class InstanceVariableReferenced {
+
+  private static Object example;
+  private String s = "yes";
+
+  public Object getInstance() {
+    if (example == null) {
+      example<caret> = getString(s);
+    }
+    return example
+  }
+
+  private static String getString(String s) {
+    return new String(s);
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/LocalVariableReferenced.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/LocalVariableReferenced.java
new file mode 100644
index 000000000000..929994a18ffe
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/LocalVariableReferenced.java
@@ -0,0 +1,11 @@
+public class LocalVariableReferenced {
+
+  private static Object o;
+
+  public static Object getInstance(int i) {
+    if (o == null) {
+      o<caret> = "" + i;
+    }
+    return o;
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/NestedAssignment.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/NestedAssignment.java
new file mode 100644
index 000000000000..89f229fbd3f0
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/NestedAssignment.java
@@ -0,0 +1,12 @@
+public class NestedAssignment {
+
+  private static Object o;
+
+  public static Object getInstance() {
+    Object local = null;
+    if (o == null) {
+      local = o<caret> = new Object();
+    }
+    return o;
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/Normal.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/Normal.after.java
new file mode 100644
index 000000000000..c4eefd2315d1
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/Normal.after.java
@@ -0,0 +1,10 @@
+public class Normal {
+
+    private static class ExampleHolder {
+        private static final Object example = new Object();
+    }
+
+    public static Object getInstance() {
+        return ExampleHolder.example
+    }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/Normal.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/Normal.java
new file mode 100644
index 000000000000..44587c1653bc
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/Normal.java
@@ -0,0 +1,10 @@
+public class Normal {
+    private static Object example;
+
+    public static Object getInstance() {
+        if (example == null) {
+            example<caret> = new Object();
+        }
+        return example
+    }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/StaticVariableReferenced.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/StaticVariableReferenced.after.java
new file mode 100644
index 000000000000..0120971b7081
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/StaticVariableReferenced.after.java
@@ -0,0 +1,16 @@
+public class StaticVariableReferenced {
+
+    private static String s = "yes";
+
+    private static class ExampleHolder {
+        private static final Object example = getString(s);
+    }
+
+    public static Object getInstance() {
+        return ExampleHolder.example
+  }
+
+  private static String getString(String s) {
+    return new String(s);
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/StaticVariableReferenced.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/StaticVariableReferenced.java
new file mode 100644
index 000000000000..a13113785c0d
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igfixes/threading/non_thread_safe_lazy_initialization/StaticVariableReferenced.java
@@ -0,0 +1,16 @@
+public class StaticVariableReferenced {
+
+  private static Object example;
+  private static String s = "yes";
+
+  public static Object getInstance() {
+    if (example == null) {
+      example<caret> = getString(s);
+    }
+    return example
+  }
+
+  private static String getString(String s) {
+    return new String(s);
+  }
+}
\ No newline at end of file