Merge branch 'master' into wither

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java

6 files changed, 47 insertions, 6 deletions

diff --git a/test/transform/resource/before/ConflictingStaticConstructorNames.java b/test/transform/resource/before/ConflictingStaticConstructorNames.java
new file mode 100644
index 00000000..494e3cd6
--- /dev/null
+++ b/test/transform/resource/before/ConflictingStaticConstructorNames.java
@@ -0,0 +1,4 @@
+@lombok.Data(staticConstructor="of")
+@lombok.NoArgsConstructor
+class ConflictingStaticConstructorNames {
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/Constructors.java b/test/transform/resource/before/Constructors.java
index 272fa850..d3ed3504 100644
--- a/test/transform/resource/before/Constructors.java
+++ b/test/transform/resource/before/Constructors.java
@@ -22,3 +22,7 @@
 	final T x;
 	String name;
 }
+@lombok.RequiredArgsConstructor(staticName="of") class RequiredArgsConstructorStaticNameGenerics2<T extends Number> {
+	final Class<T> x;
+	String name;
+}
diff --git a/test/transform/resource/before/ExtensionMethodPlain.java b/test/transform/resource/before/ExtensionMethodPlain.java
new file mode 100644
index 00000000..8c2f369d
--- /dev/null
+++ b/test/transform/resource/before/ExtensionMethodPlain.java
@@ -0,0 +1,23 @@
+import lombok.experimental.ExtensionMethod;
+
+@ExtensionMethod({java.util.Arrays.class, ExtensionMethodPlain.Extensions.class})
+class ExtensionMethodPlain {
+  public String test() {
+    int[] intArray = {5, 3, 8, 2};
+    intArray.sort();
+    
+    String iAmNull = null;
+    return iAmNull.or("hELlO, WORlD!".toTitleCase());
+  }
+
+  static class Extensions {
+    public static <T> T or(T obj, T ifNull) {
+      return obj != null ? obj : ifNull;
+    }
+    
+    public static String toTitleCase(String in) {
+      if (in.isEmpty()) return in;
+      return "" + Character.toTitleCase(in.charAt(0)) + in.substring(1).toLowerCase();
+    }
+  }
+}
diff --git a/test/transform/resource/before/SynchronizedName.java b/test/transform/resource/before/SynchronizedName.java
index 5d074113..7553a8ce 100644
--- a/test/transform/resource/before/SynchronizedName.java
+++ b/test/transform/resource/before/SynchronizedName.java
@@ -5,12 +5,6 @@ class SynchronizedName {
 	@lombok.Synchronized("read") void test1() {
 		System.out.println("one");
 	}
-	@lombok.Synchronized("write") void test2() {
-		System.out.println("two");
-	}
-	@lombok.Synchronized("read") static void test3() {
-		System.out.println("three");
-	}	
 	@lombok.Synchronized("READ") void test4() {
 		System.out.println("four");
 	}	
diff --git a/test/transform/resource/before/SynchronizedNameNoSuchField.java b/test/transform/resource/before/SynchronizedNameNoSuchField.java
new file mode 100644
index 00000000..343ba6ae
--- /dev/null
+++ b/test/transform/resource/before/SynchronizedNameNoSuchField.java
@@ -0,0 +1,8 @@
+class SynchronizedNameNoSuchField {
+	private Object read = new Object();
+	private static Object READ = new Object();
+	
+	@lombok.Synchronized("write") void test2() {
+		System.out.println("two");
+	}
+}
diff --git a/test/transform/resource/before/SynchronizedNameStaticToInstanceRef.java b/test/transform/resource/before/SynchronizedNameStaticToInstanceRef.java
new file mode 100644
index 00000000..08f9dbf1
--- /dev/null
+++ b/test/transform/resource/before/SynchronizedNameStaticToInstanceRef.java
@@ -0,0 +1,8 @@
+class SynchronizedNameStaticToInstanceRef {
+	private Object read = new Object();
+	private static Object READ = new Object();
+	
+	@lombok.Synchronized("read") static void test3() {
+		System.out.println("three");
+	}	
+}