Merge ../lombok-branch-master into nullness-annotations

1 files changed, 37 insertions, 7 deletions

diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
index 5eea980c..f8cde6c8 100644
--- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
+++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
@@ -95,6 +95,7 @@ import org.eclipse.jdt.internal.compiler.ast.TypeParameter;
 import org.eclipse.jdt.internal.compiler.ast.TypeReference;
 import org.eclipse.jdt.internal.compiler.ast.Wildcard;
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
+import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
 import org.eclipse.jdt.internal.compiler.lookup.Binding;
 import org.eclipse.jdt.internal.compiler.lookup.CaptureBinding;
 import org.eclipse.jdt.internal.compiler.lookup.ParameterizedTypeBinding;
@@ -337,6 +338,8 @@ public class EclipseHandlerUtil {
 		public static final Class<?> INTERSECTION_BINDING1, INTERSECTION_BINDING2;
 		public static final Field INTERSECTION_BINDING_TYPES1, INTERSECTION_BINDING_TYPES2;
 		public static final Field TYPE_DECLARATION_RECORD_COMPONENTS;
+		public static final Class<?> COMPILATION_UNIT;
+		public static final Method COMPILATION_UNIT_ORIGINAL_FROM_CLONE;
 		static {
 			STRING_LITERAL__LINE_NUMBER = getField(StringLiteral.class, "lineNumber");
 			ANNOTATION__MEMBER_VALUE_PAIR_NAME = getField(Annotation.class, "memberValuePairName");
@@ -346,6 +349,8 @@ public class EclipseHandlerUtil {
 			INTERSECTION_BINDING_TYPES1 = INTERSECTION_BINDING1 == null ? null : getField(INTERSECTION_BINDING1, "intersectingTypes");
 			INTERSECTION_BINDING_TYPES2 = INTERSECTION_BINDING2 == null ? null : getField(INTERSECTION_BINDING2, "intersectingTypes");
 			TYPE_DECLARATION_RECORD_COMPONENTS = getField(TypeDeclaration.class, "recordComponents");
+			COMPILATION_UNIT = getClass("org.eclipse.jdt.internal.core.CompilationUnit");
+			COMPILATION_UNIT_ORIGINAL_FROM_CLONE = COMPILATION_UNIT == null ? null : Permit.permissiveGetMethod(COMPILATION_UNIT, "originalFromClone");
 		}
 		
 		public static int reflectInt(Field f, Object o) {
@@ -1042,7 +1047,7 @@ public class EclipseHandlerUtil {
 		res[count] = name;
 		
 		n = parent;
-		while (n != null && n.getKind() == Kind.TYPE && n.get() instanceof TypeDeclaration) {
+		while (count > 0) {
 			TypeDeclaration td = (TypeDeclaration) n.get();
 			res[--count] = td.name;
 			n = n.up();
@@ -2052,11 +2057,7 @@ public class EclipseHandlerUtil {
 		}
 		
 		int pS = source.sourceStart, pE = source.sourceEnd;
-		long p = (long)pS << 32 | pE;
-		long[] poss = new long[annotationTypeFqn.length];
-		Arrays.fill(poss, p);
-		QualifiedTypeReference qualifiedType = new QualifiedTypeReference(annotationTypeFqn, poss);
-		setGeneratedBy(qualifiedType, source);
+		TypeReference qualifiedType = generateQualifiedTypeRef(source, annotationTypeFqn);
 		Annotation ann;
 		if (args != null && args.length == 1 && args[0] instanceof Expression) {
 			SingleMemberAnnotation sma = new SingleMemberAnnotation(qualifiedType, pS);
@@ -2636,6 +2637,13 @@ public class EclipseHandlerUtil {
 	}
 	
 	/**
+	 * Returns {@code true} if the provided node is an actual class, an enum or a record and not some other type declaration (so, not an annotation definition or interface).
+	 */
+	public static boolean isClassEnumOrRecord(EclipseNode typeNode) {
+		return isTypeAndDoesNotHaveFlags(typeNode, ClassFileConstants.AccInterface | ClassFileConstants.AccAnnotation);
+	}
+	
+	/**
 	 * Returns {@code true} if the provided node is a record declaration (so, not an annotation definition, interface, enum, or plain class).
 	 */
 	public static boolean isRecord(EclipseNode typeNode) {
@@ -2662,6 +2670,21 @@ public class EclipseHandlerUtil {
 		return (modifiers & flags) == 0;
 	}
 	
+	/**
+	 * Returns {@code true} if the provided node supports static methods and types (top level or static class)
+	 */
+	public static boolean isStaticAllowed(EclipseNode typeNode) {
+		boolean staticAllowed = true;
+		
+		while (typeNode.getKind() != Kind.COMPILATION_UNIT) {
+			if (!staticAllowed) return false;
+			
+			staticAllowed = typeNode.isStatic();
+			typeNode = typeNode.up();
+		}
+		return true;
+	}
+	
 	public static AbstractVariableDeclaration[] getRecordComponents(TypeDeclaration typeDeclaration) {
 		if (typeDeclaration == null || (typeDeclaration.modifiers & AccRecord) == 0) return null;
 		try {
@@ -2713,7 +2736,14 @@ public class EclipseHandlerUtil {
 	public static void setDocComment(CompilationUnitDeclaration cud, TypeDeclaration type, ASTNode node, String doc) {
 		if (doc == null) return;
 		
-		Map<String, String> docs = EcjAugments.CompilationUnit_javadoc.setIfAbsent(cud.compilationResult.compilationUnit, new HashMap<String, String>());
+		ICompilationUnit compilationUnit = cud.compilationResult.compilationUnit;
+		if (compilationUnit.getClass().equals(COMPILATION_UNIT)) {
+			try {
+				compilationUnit = (ICompilationUnit) Permit.invoke(COMPILATION_UNIT_ORIGINAL_FROM_CLONE, compilationUnit);
+			} catch (Throwable t) { }
+		}
+		
+		Map<String, String> docs = EcjAugments.CompilationUnit_javadoc.setIfAbsent(compilationUnit, new HashMap<String, String>());
 		if (node instanceof AbstractMethodDeclaration) {
 			AbstractMethodDeclaration methodDeclaration = (AbstractMethodDeclaration) node;
 			String signature = getSignature(type, methodDeclaration);