Merge branch 'master' into wither

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

74 files changed, 544 insertions, 346 deletions

diff --git a/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java
new file mode 100644
index 00000000..172ed298
--- /dev/null
+++ b/test/transform/resource/after-delombok/ConflictingStaticConstructorNames.java
@@ -0,0 +1,29 @@
+class ConflictingStaticConstructorNames {
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public boolean equals(final java.lang.Object o) {
+		if (o == this) return true;
+		if (!(o instanceof ConflictingStaticConstructorNames)) return false;
+		final ConflictingStaticConstructorNames other = (ConflictingStaticConstructorNames)o;
+		if (!other.canEqual((java.lang.Object)this)) return false;
+		return true;
+	}
+	@java.lang.SuppressWarnings("all")
+	public boolean canEqual(final java.lang.Object other) {
+		return other instanceof ConflictingStaticConstructorNames;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public int hashCode() {
+		int result = 1;
+		return result;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public java.lang.String toString() {
+		return "ConflictingStaticConstructorNames()";
+	}
+	@java.lang.SuppressWarnings("all")
+	public ConflictingStaticConstructorNames() {
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/Constructors.java b/test/transform/resource/after-delombok/Constructors.java
index db48b6b8..d4633dbc 100644
--- a/test/transform/resource/after-delombok/Constructors.java
+++ b/test/transform/resource/after-delombok/Constructors.java
@@ -58,4 +58,18 @@ class RequiredArgsConstructorStaticNameGenerics<T extends Number> {
 	public static <T extends Number> RequiredArgsConstructorStaticNameGenerics<T> of(final T x) {
 		return new RequiredArgsConstructorStaticNameGenerics<T>(x);
 	}
+}
+class RequiredArgsConstructorStaticNameGenerics2<T extends Number> {
+	final Class<T> x;
+	String name;
+	
+	@java.lang.SuppressWarnings("all")
+	private RequiredArgsConstructorStaticNameGenerics2(final Class<T> x) {
+		this.x = x;
+	}
+	
+	@java.lang.SuppressWarnings("all")
+	public static <T extends Number> RequiredArgsConstructorStaticNameGenerics2<T> of(final Class<T> x) {
+		return new RequiredArgsConstructorStaticNameGenerics2<T>(x);
+	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/DataPlain.java b/test/transform/resource/after-delombok/DataPlain.java
index cb002e07..a8cb37af 100644
--- a/test/transform/resource/after-delombok/DataPlain.java
+++ b/test/transform/resource/after-delombok/DataPlain.java
@@ -155,7 +155,6 @@ final class Data3 {
 final class Data4 extends java.util.Timer {
 	int x;
 	Data4() {
-		super();
 	}
 	@java.lang.SuppressWarnings("all")
 	public int getX() {
diff --git a/test/transform/resource/after-delombok/ExtensionMethodPlain.java b/test/transform/resource/after-delombok/ExtensionMethodPlain.java
new file mode 100644
index 00000000..707a0258
--- /dev/null
+++ b/test/transform/resource/after-delombok/ExtensionMethodPlain.java
@@ -0,0 +1,17 @@
+class ExtensionMethodPlain {
+	public String test() {
+		int[] intArray = {5, 3, 8, 2};
+		java.util.Arrays.sort(intArray);
+		String iAmNull = null;
+		return ExtensionMethodPlain.Extensions.or(iAmNull, ExtensionMethodPlain.Extensions.toTitleCase("hELlO, WORlD!"));
+	}
+	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();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/SneakyThrowsPlain.java b/test/transform/resource/after-delombok/SneakyThrowsPlain.java
index 5c0890b5..f712ab55 100644
--- a/test/transform/resource/after-delombok/SneakyThrowsPlain.java
+++ b/test/transform/resource/after-delombok/SneakyThrowsPlain.java
@@ -1,6 +1,5 @@
 class SneakyThrowsPlain {
 	SneakyThrowsPlain() {
-		super();
 		try {
 			System.out.println("constructor");
 		} catch (final java.lang.Throwable $ex) {
diff --git a/test/transform/resource/after-delombok/SynchronizedName.java b/test/transform/resource/after-delombok/SynchronizedName.java
index e7dd23ff..ab3c0431 100644
--- a/test/transform/resource/after-delombok/SynchronizedName.java
+++ b/test/transform/resource/after-delombok/SynchronizedName.java
@@ -1,19 +1,12 @@
 class SynchronizedName {
 	private Object read = new Object();
 	private static Object READ = new Object();
+	
 	void test1() {
 		synchronized (this.read) {
 			System.out.println("one");
 		}
 	}
-	void test2() {
-		System.out.println("two");
-	}
-	static void test3() {
-		synchronized (SynchronizedName.read) {
-			System.out.println("three");
-		}
-	}
 	void test4() {
 		synchronized (this.READ) {
 			System.out.println("four");
@@ -24,4 +17,4 @@ class SynchronizedName {
 			System.out.println("five");
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/SynchronizedNameNoSuchField.java b/test/transform/resource/after-delombok/SynchronizedNameNoSuchField.java
new file mode 100644
index 00000000..d252985f
--- /dev/null
+++ b/test/transform/resource/after-delombok/SynchronizedNameNoSuchField.java
@@ -0,0 +1,7 @@
+class SynchronizedNameNoSuchField {
+	private Object read = new Object();
+	private static Object READ = new Object();
+	void test2() {
+		System.out.println("two");
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/SynchronizedNameStaticToInstanceRef.java b/test/transform/resource/after-delombok/SynchronizedNameStaticToInstanceRef.java
new file mode 100644
index 00000000..8441570b
--- /dev/null
+++ b/test/transform/resource/after-delombok/SynchronizedNameStaticToInstanceRef.java
@@ -0,0 +1,9 @@
+class SynchronizedNameStaticToInstanceRef {
+	private Object read = new Object();
+	private static Object READ = new Object();
+	static void test3() {
+		synchronized (SynchronizedNameStaticToInstanceRef.read) {
+			System.out.println("three");
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java
index ae7eb0bb..292db928 100644
--- a/test/transform/resource/after-ecj/Accessors.java
+++ b/test/transform/resource/after-ecj/Accessors.java
@@ -1,5 +1,8 @@
 class AccessorsFluent {
   private @lombok.Getter @lombok.Setter @lombok.experimental.Accessors(fluent = true) String fieldName = "";
+  AccessorsFluent() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") String fieldName() {
     return this.fieldName;
   }
@@ -7,13 +10,13 @@ class AccessorsFluent {
     this.fieldName = fieldName;
     return this;
   }
-  AccessorsFluent() {
-    super();
-  }
 }
 @lombok.experimental.Accessors(fluent = true) @lombok.Getter class AccessorsFluentOnClass {
   private @lombok.Setter String fieldName = "";
   private @lombok.experimental.Accessors String otherFieldWithOverride = "";
+  AccessorsFluentOnClass() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") AccessorsFluentOnClass fieldName(final String fieldName) {
     this.fieldName = fieldName;
     return this;
@@ -24,45 +27,48 @@ class AccessorsFluent {
   public @java.lang.SuppressWarnings("all") String getOtherFieldWithOverride() {
     return this.otherFieldWithOverride;
   }
-  AccessorsFluentOnClass() {
-    super();
-  }
 }
 class AccessorsChain {
   private @lombok.Setter @lombok.experimental.Accessors(chain = true) boolean isRunning;
+  AccessorsChain() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") AccessorsChain setRunning(final boolean isRunning) {
     this.isRunning = isRunning;
     return this;
   }
-  AccessorsChain() {
-    super();
-  }
 }
 @lombok.experimental.Accessors(prefix = "f") class AccessorsPrefix {
   private @lombok.Setter String fieldName;
   private @lombok.Setter String fActualField;
-  public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) {
-    this.fActualField = fActualField;
-  }
   AccessorsPrefix() {
     super();
   }
+  public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) {
+    this.fActualField = fActualField;
+  }
 }
 @lombok.experimental.Accessors(prefix = {"f", ""}) class AccessorsPrefix2 {
   private @lombok.Setter String fieldName;
   private @lombok.Setter String fActualField;
+  AccessorsPrefix2() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") void setFieldName(final String fieldName) {
     this.fieldName = fieldName;
   }
   public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) {
     this.fActualField = fActualField;
   }
-  AccessorsPrefix2() {
-    super();
-  }
 }
 @lombok.experimental.Accessors(prefix = "f") @lombok.ToString @lombok.EqualsAndHashCode class AccessorsPrefix3 {
   private String fName;
+  AccessorsPrefix3() {
+    super();
+  }
+  private String getName() {
+    return fName;
+  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("AccessorsPrefix3(fName=" + this.getName()) + ")");
   }
@@ -90,40 +96,34 @@ class AccessorsChain {
     result = ((result * PRIME) + (($fName == null) ? 0 : $fName.hashCode()));
     return result;
   }
-  AccessorsPrefix3() {
-    super();
-  }
-  private String getName() {
-    return fName;
-  }
 }
 class AccessorsFluentGenerics<T extends Number> {
   private @lombok.Setter @lombok.experimental.Accessors(fluent = true) String name;
+  AccessorsFluentGenerics() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") AccessorsFluentGenerics<T> name(final String name) {
     this.name = name;
     return this;
   }
-  AccessorsFluentGenerics() {
-    super();
-  }
 }
 class AccessorsFluentNoChaining {
   private @lombok.Setter @lombok.experimental.Accessors(fluent = true,chain = false) String name;
-  public @java.lang.SuppressWarnings("all") void name(final String name) {
-    this.name = name;
-  }
   AccessorsFluentNoChaining() {
     super();
   }
+  public @java.lang.SuppressWarnings("all") void name(final String name) {
+    this.name = name;
+  }
 }
 class AccessorsFluentStatic<T extends Number> {
   private static @lombok.Setter @lombok.experimental.Accessors(fluent = true) String name;
   <clinit>() {
   }
-  public static @java.lang.SuppressWarnings("all") void name(final String name) {
-    AccessorsFluentStatic.name = name;
-  }
   AccessorsFluentStatic() {
     super();
   }
+  public static @java.lang.SuppressWarnings("all") void name(final String name) {
+    AccessorsFluentStatic.name = name;
+  }
 }
diff --git a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
index fb9df0ea..fdb6f122 100644
--- a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
+++ b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
@@ -1,9 +1,9 @@
 class GetFoo {
   private @lombok.Getter int foo;
-  public @java.lang.SuppressWarnings("all") int getFoo() {
-    return this.foo;
-  }
   GetFoo() {
     super();
   }
+  public @java.lang.SuppressWarnings("all") int getFoo() {
+    return this.foo;
+  }
 }
diff --git a/test/transform/resource/after-ecj/CommentsInterspersed.java b/test/transform/resource/after-ecj/CommentsInterspersed.java
index 60c69aed..d708ad72 100644
--- a/test/transform/resource/after-ecj/CommentsInterspersed.java
+++ b/test/transform/resource/after-ecj/CommentsInterspersed.java
@@ -2,11 +2,11 @@ import lombok.Getter;
 public class CommentsInterspersed {
   private int x;
   private @Getter String test = "foo";
-  public @java.lang.SuppressWarnings("all") String getTest() {
-    return this.test;
-  }
   public CommentsInterspersed() {
     super();
   }
   public native void gwtTest();
+  public @java.lang.SuppressWarnings("all") String getTest() {
+    return this.test;
+  }
 }
diff --git a/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java
new file mode 100644
index 00000000..8da11258
--- /dev/null
+++ b/test/transform/resource/after-ecj/ConflictingStaticConstructorNames.java
@@ -0,0 +1,25 @@
+@lombok.Data(staticConstructor = "of") @lombok.NoArgsConstructor class ConflictingStaticConstructorNames {
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.