From d317eda711f2b07bdbac15bc9652ae9816e4517b Mon Sep 17 00:00:00 2001
From: Bulgakov Alexander <abulgakov@at-consulting.ru>
Date: Fri, 11 Nov 2016 19:54:39 +0300
Subject: fix for the issue 1228. @NoArgsConstructor(force = true) fails on
 primitive arrays in Eclipse

---
 src/core/lombok/eclipse/handlers/HandleConstructor.java    |  3 +++
 .../resource/after-delombok/NoArgsConstructorForce.java    | 14 ++++++++++++++
 .../resource/after-ecj/NoArgsConstructorForce.java         | 12 ++++++++++++
 test/transform/resource/before/NoArgsConstructorForce.java |  8 ++++++++
 4 files changed, 37 insertions(+)
 create mode 100644 test/transform/resource/after-delombok/NoArgsConstructorForce.java
 create mode 100644 test/transform/resource/after-ecj/NoArgsConstructorForce.java
 create mode 100644 test/transform/resource/before/NoArgsConstructorForce.java

diff --git a/src/core/lombok/eclipse/handlers/HandleConstructor.java b/src/core/lombok/eclipse/handlers/HandleConstructor.java
index 85d1d4ed..a3b0585d 100644
--- a/src/core/lombok/eclipse/handlers/HandleConstructor.java
+++ b/src/core/lombok/eclipse/handlers/HandleConstructor.java
@@ -48,6 +48,7 @@ import org.eclipse.jdt.internal.compiler.ast.AllocationExpression;
 import org.eclipse.jdt.internal.compiler.ast.Annotation;
 import org.eclipse.jdt.internal.compiler.ast.Argument;
 import org.eclipse.jdt.internal.compiler.ast.ArrayInitializer;
+import org.eclipse.jdt.internal.compiler.ast.ArrayTypeReference;
 import org.eclipse.jdt.internal.compiler.ast.Assignment;
 import org.eclipse.jdt.internal.compiler.ast.CharLiteral;
 import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
@@ -381,6 +382,8 @@ public class HandleConstructor {
 	}
 	
 	private static Expression getDefaultExpr(TypeReference type, int s, int e) {
+		boolean array = type instanceof ArrayTypeReference;
+		if (array) return new NullLiteral(s, e);
 		char[] lastToken = type.getLastToken();
 		if (Arrays.equals(TypeConstants.BOOLEAN, lastToken)) return new FalseLiteral(s, e);
 		if (Arrays.equals(TypeConstants.CHAR, lastToken)) return new CharLiteral(new char[] {'\'', '\\', '0', '\''}, s, e);
diff --git a/test/transform/resource/after-delombok/NoArgsConstructorForce.java b/test/transform/resource/after-delombok/NoArgsConstructorForce.java
new file mode 100644
index 00000000..c1127c7c
--- /dev/null
+++ b/test/transform/resource/after-delombok/NoArgsConstructorForce.java
@@ -0,0 +1,14 @@
+
+public class NoArgsConstructorForce {
+	private final int[] i;
+	private final Object[] o;
+	private final java.util.List<?>[] fullQualifiedList;
+	
+	@java.lang.SuppressWarnings("all")
+	@javax.annotation.Generated("lombok")
+	public NoArgsConstructorForce() {
+		this.i = null;
+		this.o = null;
+		this.fullQualifiedList = null;
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/NoArgsConstructorForce.java b/test/transform/resource/after-ecj/NoArgsConstructorForce.java
new file mode 100644
index 00000000..d0e69b0d
--- /dev/null
+++ b/test/transform/resource/after-ecj/NoArgsConstructorForce.java
@@ -0,0 +1,12 @@
+import lombok.NoArgsConstructor;
+public @NoArgsConstructor(force = true) class NoArgsConstructorForce {
+  private final int[] i;
+  private final Object[] o;
+  private final java.util.List<?>[] fullQualifiedList;
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoArgsConstructorForce() {
+    super();
+    this.i = null;
+    this.o = null;
+    this.fullQualifiedList = null;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/NoArgsConstructorForce.java b/test/transform/resource/before/NoArgsConstructorForce.java
new file mode 100644
index 00000000..48df1a37
--- /dev/null
+++ b/test/transform/resource/before/NoArgsConstructorForce.java
@@ -0,0 +1,8 @@
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(force = true)
+public class NoArgsConstructorForce {
+	private final int[] i;
+	private final Object[] o;
+	private final java.util.List<?>[] fullQualifiedList;
+}
\ No newline at end of file
-- 
cgit