Merge remote-tracking branch 'remotes/upstream/master'

6 files changed, 123 insertions, 38 deletions

diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
index f49fff7f..e36e80bc 100644
--- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
+++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2017 The Project Lombok Authors.
+ * Copyright (C) 2009-2018 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -197,17 +197,36 @@ public class EclipseHandlerUtil {
 		
 		TypeResolver resolver = new TypeResolver(node.getImportList());
 		return resolver.typeMatches(node, type.getName(), typeName);
+	}
+	
+	/**
+	 * Checks if the given TypeReference node is likely to be a reference to the provided class.
+	 * 
+	 * @param type An actual type. This method checks if {@code typeNode} is likely to be a reference to this type.
+	 * @param node A Lombok AST node. Any node in the appropriate compilation unit will do (used to get access to import statements).
+	 * @param typeRef A type reference to check.
+	 */
+	public static boolean typeMatches(String type, EclipseNode node, TypeReference typeRef) {
+		if (typeRef == null || typeRef.getTypeName() == null || typeRef.getTypeName().length == 0) return false;
+		String lastPartA = new String(typeRef.getTypeName()[typeRef.getTypeName().length -1]);
+		int lastIndex = type.lastIndexOf('.');
+		String lastPartB = lastIndex == -1 ? type : type.substring(lastIndex + 1);
+		if (!lastPartA.equals(lastPartB)) return false;
+		String typeName = toQualifiedName(typeRef.getTypeName());
 		
+		TypeResolver resolver = new TypeResolver(node.getImportList());
+		return resolver.typeMatches(node, type, typeName);
 	}
 	
 	public static void sanityCheckForMethodGeneratingAnnotationsOnBuilderClass(EclipseNode typeNode, EclipseNode errorNode) {
 		List<String> disallowed = null;
 		for (EclipseNode child : typeNode.down()) {
 			if (child.getKind() != Kind.ANNOTATION) continue;
-			for (Class<? extends java.lang.annotation.Annotation> annType : INVALID_ON_BUILDERS) {
+			for (String annType : INVALID_ON_BUILDERS) {
 				if (annotationTypeMatches(annType, child)) {
 					if (disallowed == null) disallowed = new ArrayList<String>();
-					disallowed.add(annType.getSimpleName());
+					int lastIndex = annType.lastIndexOf('.');
+					disallowed.add(lastIndex == -1 ? annType : annType.substring(lastIndex + 1));
 				}
 			}
 		}
@@ -444,6 +463,24 @@ public class EclipseHandlerUtil {
 		}
 	}
 	
+	public static boolean hasAnnotation(String type, EclipseNode node) {
+		if (node == null) return false;
+		if (type == null) return false;
+		switch (node.getKind()) {
+		case ARGUMENT:
+		case FIELD:
+		case LOCAL:
+		case TYPE:
+		case METHOD:
+			for (EclipseNode child : node.down()) {
+				if (annotationTypeMatches(type, child)) return true;
+			}
+			// intentional fallthrough
+		default:
+			return false;
+		}
+	}
+	
 	public static EclipseNode findAnnotation(Class<? extends java.lang.annotation.Annotation> type, EclipseNode node) {
 		if (node == null) return null;
 		if (type == null) return null;
@@ -472,6 +509,16 @@ public class EclipseHandlerUtil {
 		return typeMatches(type, node, ((Annotation) node.get()).type);
 	}
 	
+	/**
+	 * Checks if the provided annotation type is likely to be the intended type for the given annotation node.
+	 * 
+	 * This is a guess, but a decent one.
+	 */
+	public static boolean annotationTypeMatches(String type, EclipseNode node) {
+		if (node.getKind() != Kind.ANNOTATION) return false;
+		return typeMatches(type, node, ((Annotation) node.get()).type);
+	}
+	
 	public static TypeReference cloneSelfType(EclipseNode context) {
 		return cloneSelfType(context, null);
 	}
diff --git a/src/core/lombok/eclipse/handlers/HandleBuilder.java b/src/core/lombok/eclipse/handlers/HandleBuilder.java
index 12b8f6bc..dd862393 100644
--- a/src/core/lombok/eclipse/handlers/HandleBuilder.java
+++ b/src/core/lombok/eclipse/handlers/HandleBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 The Project Lombok Authors.
+ * Copyright (C) 2013-2018 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -185,8 +185,7 @@ public class HandleBuilder extends EclipseAnnotationHandler<Builder> {
 			TypeDeclaration td = (TypeDeclaration) tdParent.get();
 			
 			List<EclipseNode> allFields = new ArrayList<EclipseNode>();
-			@SuppressWarnings("deprecation")
-			boolean valuePresent = (hasAnnotation(lombok.Value.class, parent) || hasAnnotation(lombok.experimental.Value.class, parent));
+			boolean valuePresent = (hasAnnotation(lombok.Value.class, parent) || hasAnnotation("lombok.experimental.Value", parent));
 			for (EclipseNode fieldNode : HandleConstructor.findAllFields(tdParent, true)) {
 				FieldDeclaration fd = (FieldDeclaration) fieldNode.get();
 				EclipseNode isDefault = findAnnotation(Builder.Default.class, fieldNode);
diff --git a/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java b/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java
index da184d0b..be2b986d 100644
--- a/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java
+++ b/src/core/lombok/eclipse/handlers/HandleBuilderDefault.java
@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2017-2018 The Project Lombok Authors.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 package lombok.eclipse.handlers;
 
 import static lombok.eclipse.handlers.EclipseHandlerUtil.*;
@@ -18,7 +39,7 @@ public class HandleBuilderDefault extends EclipseAnnotationHandler<Builder.Defau
 		EclipseNode annotatedField = annotationNode.up();
 		if (annotatedField.getKind() != Kind.FIELD) return;
 		EclipseNode classWithAnnotatedField = annotatedField.up();
-		if (!hasAnnotation(Builder.class, classWithAnnotatedField)) {
+		if (!hasAnnotation(Builder.class, classWithAnnotatedField) && !hasAnnotation("lombok.experimental.Builder", classWithAnnotatedField)) {
 			annotationNode.addWarning("@Builder.Default requires @Builder on the class for it to mean anything.");
 		}
 	}
diff --git a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
index 0d0f51db..75339f7c 100644
--- a/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
+++ b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
@@ -475,47 +475,62 @@ public class HandleEqualsAndHashCode extends EclipseAnnotationHandler<EqualsAndH
 	public TypeReference createTypeReference(EclipseNode type, long p, ASTNode source, boolean addWildcards) {
 		int pS = source.sourceStart; int pE = source.sourceEnd;
 		List<String> list = new ArrayList<String>();
+		List<Integer> genericsCount = addWildcards ? new ArrayList<Integer>() : null;
+		
 		list.add(type.getName());
+		if (addWildcards) genericsCount.add(arraySizeOf(((TypeDeclaration) type.get()).typeParameters));
+		boolean staticContext = (((TypeDeclaration) type.get()).modifiers & Modifier.STATIC) != 0;
 		EclipseNode tNode = type.up();
+		
 		while (tNode != null && tNode.getKind() == Kind.TYPE) {
 			list.add(tNode.getName());
+			if (addWildcards) genericsCount.add(staticContext ? 0 : arraySizeOf(((TypeDeclaration) tNode.get()).typeParameters));
+			if (!staticContext) staticContext = (((TypeDeclaration) tNode.get()).modifiers & Modifier.STATIC) != 0;
 			tNode = tNode.up();
 		}
 		Collections.reverse(list);
-		
-		TypeDeclaration typeDecl = (TypeDeclaration) type.get();
-		int typeParamCount = typeDecl.typeParameters == null ? 0 : typeDecl.typeParameters.length;
-		if (typeParamCount == 0) addWildcards = false;
-		TypeReference[] typeArgs = null;
-		if (addWildcards) {
-			typeArgs = new TypeReference[typeParamCount];
-			for (int i = 0; i < typeParamCount; i++) {
-				typeArgs[i] = new Wildcard(Wildcard.UNBOUND);
-				typeArgs[i].sourceStart = pS; typeArgs[i].sourceEnd = pE;
-				setGeneratedBy(typeArgs[i], source);
-			}
-		}
+		if (addWildcards) Collections.reverse(genericsCount);
 		
 		if (list.size() == 1) {
-			if (addWildcards) {
-				return new ParameterizedSingleTypeReference(list.get(0).toCharArray(), typeArgs, 0, p);
-			} else {
+			if (!addWildcards || genericsCount.get(0) == 0) {
 				return new SingleTypeReference(list.get(0).toCharArray(), p);
+			} else {
+				return new ParameterizedSingleTypeReference(list.get(0).toCharArray(), wildcardify(pS, pE, source, genericsCount.get(0)), 0, p);
 			}
 		}
+		
+		if (addWildcards) {
+			addWildcards = false;
+			for (int i : genericsCount) if (i > 0) addWildcards = true;
+		}
+		
 		long[] ps = new long[list.size()];
 		char[][] tokens = new char[list.size()][];
 		for (int i = 0; i < list.size(); i++) {
 			ps[i] = p;
 			tokens[i] = list.get(i).toCharArray();
 		}
-		if (addWildcards) {
-			TypeReference[][] typeArgs2 = new TypeReference[tokens.length][];
-			typeArgs2[typeArgs2.length - 1] = typeArgs;
-			return new ParameterizedQualifiedTypeReference(tokens, typeArgs2, 0, ps);
-		} else {
-			return new QualifiedTypeReference(tokens, ps);
+		
+		if (!addWildcards) return new QualifiedTypeReference(tokens, ps);
+		TypeReference[][] typeArgs2 = new TypeReference[tokens.length][];
+		for (int i = 0; i < tokens.length; i++) typeArgs2[i] = wildcardify(pS, pE, source, genericsCount.get(i));
+		return new ParameterizedQualifiedTypeReference(tokens, typeArgs2, 0, ps);
+	}
+	
+	private TypeReference[] wildcardify(int pS, int pE, ASTNode source, int count) {
+		if (count == 0) return null;
+		TypeReference[] typeArgs = new TypeReference[count];
+		for (int i = 0; i < count; i++) {
+			typeArgs[i] = new Wildcard(Wildcard.UNBOUND);
+			typeArgs[i].sourceStart = pS; typeArgs[i].sourceEnd = pE;
+			setGeneratedBy(typeArgs[i], source);
 		}
+		
+		return typeArgs;
+	}
+	
+	private int arraySizeOf(Object[] arr) {
+		return arr == null ? 0 : arr.length;
 	}
 	
 	public MethodDeclaration createEquals(EclipseNode type, Collection<EclipseNode> fields, boolean callSuper, ASTNode source, FieldAccess fieldAccess, boolean needsCanEqual, List<Annotation> onParam) {
@@ -683,7 +698,7 @@ public class HandleEqualsAndHashCode extends EclipseAnnotationHandler<EqualsAndH
 				} else /* objects */ {
 					/* final java.lang.Object this$fieldName = this.fieldName; */
 					/* final java.lang.Object other$fieldName = other.fieldName; */
-					/* if (this$fieldName == null ? other$fieldName != null : !this$fieldName.equals(other$fieldName)) return false;; */
+					/* if (this$fieldName == null ? other$fieldName != null : !this$fieldName.equals(other$fieldName)) return false; */
 					char[] thisDollarFieldName = ("this$" + field.getName()).toCharArray();
 					char[] otherDollarFieldName = ("other$" + field.getName()).toCharArray();
 					
diff --git a/src/core/lombok/eclipse/handlers/HandleVal.java b/src/core/lombok/eclipse/handlers/HandleVal.java
index d8901067..3742ac00 100644
--- a/src/core/lombok/eclipse/handlers/HandleVal.java
+++ b/src/core/lombok/eclipse/handlers/HandleVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2016 The Project Lombok Authors.
+ * Copyright (C) 2010-2018 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +25,14 @@ import static lombok.core.handlers.HandlerUtil.handleFlagUsage;
 import static lombok.eclipse.handlers.EclipseHandlerUtil.typeMatches;
 import lombok.ConfigurationKeys;
 import lombok.val;
+import lombok.var;
 import lombok.core.HandlerPriority;
 import lombok.eclipse.DeferUntilPostDiet;
 import lombok.eclipse.EclipseASTAdapter;
 import lombok.eclipse.EclipseASTVisitor;
 import lombok.eclipse.EclipseNode;
-import lombok.experimental.var;
 
+import org.eclipse.jdt.internal.compiler.ast.ASTNode;
 import org.eclipse.jdt.internal.compiler.ast.ArrayInitializer;
 import org.eclipse.jdt.internal.compiler.ast.ForStatement;
 import org.eclipse.jdt.internal.compiler.ast.ForeachStatement;
@@ -74,11 +75,18 @@ public class HandleVal extends EclipseASTAdapter {
 			return;
 		}
 		
-		if (isVal && localNode.directUp().get() instanceof ForStatement) {
+		ASTNode parentRaw = localNode.directUp().get();
+		
+		if (isVal && parentRaw instanceof ForStatement) {
 			localNode.addError("'val' is not allowed in old-style for loops");
 			return;
 		}
 		
+		if (parentRaw instanceof ForStatement && ((ForStatement) parentRaw).initializations != null && ((ForStatement) parentRaw).initializations.length > 1) {
+			localNode.addError("'var' is not allowed in old-style for loops if there is more than 1 initializer");
+			return;
+		}
+		
 		if (local.initialization != null && local.initialization.getClass().getName().equals("org.eclipse.jdt.internal.compiler.ast.LambdaExpression")) {
 			localNode.addError("'" + annotation + "' is not allowed with lambda expressions.");
 			return;
diff --git a/src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java b/src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java
index b42761f4..89964914 100644
--- a/src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java
+++ b/src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java
@@ -369,11 +369,6 @@ public final class SetGeneratedByVisitor extends ASTVisitor {
 		return super.visit(node, scope);
 	}
 	
-	@Override public boolean visit(ArrayInitializer node, ClassScope scope) {
-		fixPositions(setGeneratedBy(node, source));
-		return super.visit(node, scope);
-	}
-	
 	@Override public boolean visit(ArrayQualifiedTypeReference node, BlockScope scope) {
 		fixPositions(setGeneratedBy(node, source));
 		return super.visit(node, scope);