[fixes #3416] Ignore annotations during array detection

src/core/lombok/javac/handlers/HandleToString.java

@@ -206,7 +206,7 @@ public class HandleToString extends JavacAnnotationHandler<ToString> {
 				memberAccessor = createFieldAccessor(maker, memberNode, fieldAccess);
 			}
 			
-			JCExpression memberType = getFieldType(memberNode, fieldAccess);
+			JCExpression memberType = removeTypeUseAnnotations(getFieldType(memberNode, fieldAccess));
 			
 			// The distinction between primitive and object will be useful if we ever add a 'hideNulls' option.
 			@SuppressWarnings("unused")

test/transform/resource/after-delombok/ToStringArray.java

@@ -0,0 +1,13 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+public class ToStringArray {
+	int[] primitiveArray;
+	Object[] objectArray;
+
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public java.lang.String toString() {
+		return "ToStringArray(primitiveArray=" + java.util.Arrays.toString(this.primitiveArray) + ", objectArray=" + java.util.Arrays.deepToString(this.objectArray) + ")";
+	}
+}

test/transform/resource/after-delombok/ToStringArrayTypeAnnotations.java

@@ -0,0 +1,22 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+public class ToStringArrayTypeAnnotations {
+	@TA
+	int[] primitiveArray1;
+	int @TA [] primitiveArray2;
+	@TA
+	Object[] objectArray1;
+	Object @TA [] objectArray2;
+
+
+	@Target({ElementType.TYPE_USE})
+	@interface TA {
+	}
+
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public java.lang.String toString() {
+		return "ToStringArrayTypeAnnotations(primitiveArray1=" + java.util.Arrays.toString(this.primitiveArray1) + ", primitiveArray2=" + java.util.Arrays.toString(this.primitiveArray2) + ", objectArray1=" + java.util.Arrays.deepToString(this.objectArray1) + ", objectArray2=" + java.util.Arrays.deepToString(this.objectArray2) + ")";
+	}
+}

test/transform/resource/after-ecj/ToStringArray.java

@@ -0,0 +1,12 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+public @lombok.ToString class ToStringArray {
+  int[] primitiveArray;
+  Object[] objectArray;
+  public ToStringArray() {
+    super();
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (((("ToStringArray(primitiveArray=" + java.util.Arrays.toString(this.primitiveArray)) + ", objectArray=") + java.util.Arrays.deepToString(this.objectArray)) + ")");
+  }
+}

test/transform/resource/after-ecj/ToStringArrayTypeAnnotations.java

@@ -0,0 +1,16 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+public @lombok.ToString class ToStringArrayTypeAnnotations {
+  @Target({ElementType.TYPE_USE}) @interface TA {
+  }
+  @TA int[] primitiveArray1;
+  int @TA [] primitiveArray2;
+  @TA Object[] objectArray1;
+  Object @TA [] objectArray2;
+  public ToStringArrayTypeAnnotations() {
+    super();
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (((((((("ToStringArrayTypeAnnotations(primitiveArray1=" + java.util.Arrays.toString(this.primitiveArray1)) + ", primitiveArray2=") + java.util.Arrays.toString(this.primitiveArray2)) + ", objectArray1=") + java.util.Arrays.deepToString(this.objectArray1)) + ", objectArray2=") + java.util.Arrays.deepToString(this.objectArray2)) + ")");
+  }
+}

test/transform/resource/before/ToStringArray.java

@@ -0,0 +1,9 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@lombok.ToString
+public class ToStringArray {
+	int[] primitiveArray;
+	
+	Object[] objectArray;
+}

test/transform/resource/before/ToStringArrayTypeAnnotations.java

@@ -0,0 +1,15 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@lombok.ToString
+public class ToStringArrayTypeAnnotations {
+	@TA int[] primitiveArray1;
+	int @TA [] primitiveArray2;
+	
+	@TA Object[] objectArray1;
+	Object @TA [] objectArray2;
+	
+	@Target({ElementType.TYPE_USE})
+	@interface TA {
+	}
+}