Merge branch 'master' of git@github.com:rzwitserloot/lombok

2 files changed, 52 insertions, 12 deletions

diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
index a2867c39..4d397a3c 100644
--- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
+++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
@@ -506,6 +506,27 @@ public class EclipseHandlerUtil {
 		method.annotations = createSuppressWarningsAll(method, method.annotations);
 		TypeDeclaration parent = (TypeDeclaration) type.get();
 		
+		if (parent.scope != null && method.scope == null) {
+			// We think this means heisenbug #164 is about to happen later in some other worker thread.
+			// To improve our ability to figure out what the heck is going on, let's generate a log so we can ask those who stumble on this about it,
+			// and thus see a far more useful stack trace.
+			boolean report = true;
+			for (StackTraceElement elem : Thread.currentThread().getStackTrace()) {
+				// We intentionally hook into the middle of ClassScope filling in BlockScopes for PatchDelegate,
+				// meaning that will trigger a false positive. Detect it and do not report the occurence of #164 if so.
+				if ("lombok.eclipse.agent.PatchDelegate".equals(elem.getClassName())) {
+					report = false;
+					break;
+				}
+			}
+			
+			if (report) {
+				Eclipse.warning("We believe you may have just stumbled on lombok issue #164. Please " +
+						"report the stack trace associated with this message at:\n" +
+						"http://code.google.com/p/projectlombok/issues/detail?id=164", new Throwable());
+			}
+		}
+		
 		if (parent.methods == null) {
 			parent.methods = new AbstractMethodDeclaration[1];
 			parent.methods[0] = method;
diff --git a/src/core/lombok/eclipse/handlers/HandleCleanup.java b/src/core/lombok/eclipse/handlers/HandleCleanup.java
index 964653bc..9a63ce47 100644
--- a/src/core/lombok/eclipse/handlers/HandleCleanup.java
+++ b/src/core/lombok/eclipse/handlers/HandleCleanup.java
@@ -42,6 +42,7 @@ import org.eclipse.jdt.internal.compiler.ast.CastExpression;
 import org.eclipse.jdt.internal.compiler.ast.EqualExpression;
 import org.eclipse.jdt.internal.compiler.ast.Expression;
 import org.eclipse.jdt.internal.compiler.ast.IfStatement;
+import org.eclipse.jdt.internal.compiler.ast.IntLiteral;
 import org.eclipse.jdt.internal.compiler.ast.LocalDeclaration;
 import org.eclipse.jdt.internal.compiler.ast.MemberValuePair;
 import org.eclipse.jdt.internal.compiler.ast.MessageSend;
@@ -174,16 +175,7 @@ public class HandleCleanup implements EclipseAnnotationHandler<Cleanup> {
 		NullLiteral nullLiteral = new NullLiteral(pS, pE);
 		Eclipse.setGeneratedBy(nullLiteral, ast);
 		
-		MessageSend preventNullAnalysis = new MessageSend();
-		Eclipse.setGeneratedBy(preventNullAnalysis, ast);
-
-		preventNullAnalysis.receiver = createNameReference("lombok.Lombok", ast);
-		preventNullAnalysis.selector = "preventNullAnalysis".toCharArray();
-		
-		preventNullAnalysis.arguments = new Expression[] { varName };
-		preventNullAnalysis.nameSourcePosition = p;
-		preventNullAnalysis.sourceStart = pS;
-		preventNullAnalysis.sourceEnd = preventNullAnalysis.statementEnd = pE;
+		MessageSend preventNullAnalysis = preventNullAnalysis(ast, varName);
 		
 		EqualExpression equalExpression = new EqualExpression(preventNullAnalysis, nullLiteral, OperatorIds.NOT_EQUAL);
 		equalExpression.sourceStart = pS; equalExpression.sourceEnd = pE;
@@ -195,8 +187,6 @@ public class HandleCleanup implements EclipseAnnotationHandler<Cleanup> {
 		Eclipse.setGeneratedBy(closeBlock, ast);
 		IfStatement ifStatement = new IfStatement(equalExpression, closeBlock, 0, 0);
 		Eclipse.setGeneratedBy(ifStatement, ast);
-
-		
 		
 		finallyBlock[0] = ifStatement;
 		tryStatement.finallyBlock = new Block(0);
@@ -219,6 +209,35 @@ public class HandleCleanup implements EclipseAnnotationHandler<Cleanup> {
 		return true;
 	}
 	
+	private MessageSend preventNullAnalysis(Annotation ast, Expression expr) {
+		MessageSend singletonList = new MessageSend();
+		Eclipse.setGeneratedBy(singletonList, ast);
+		
+		int pS = ast.sourceStart, pE = ast.sourceEnd;
+		long p = (long)pS << 32 | pE;
+		
+		singletonList.receiver = createNameReference("java.util.Collections", ast);
+		singletonList.selector = "singletonList".toCharArray();
+		
+		singletonList.arguments = new Expression[] { expr };
+		singletonList.nameSourcePosition = p;
+		singletonList.sourceStart = pS;
+		singletonList.sourceEnd = singletonList.statementEnd = pE;
+		
+		MessageSend preventNullAnalysis = new MessageSend();
+		Eclipse.setGeneratedBy(preventNullAnalysis, ast);
+		
+		preventNullAnalysis.receiver = singletonList;
+		preventNullAnalysis.selector = "get".toCharArray();
+		
+		preventNullAnalysis.arguments = new Expression[] { new IntLiteral(new char[] { '0' }, pS, pE) };
+		preventNullAnalysis.nameSourcePosition = p;
+		preventNullAnalysis.sourceStart = pS;
+		preventNullAnalysis.sourceEnd = singletonList.statementEnd = pE;
+		
+		return preventNullAnalysis;
+	}
+	
 	private void doAssignmentCheck(EclipseNode node, Statement[] tryBlock, char[] varName) {
 		for (Statement statement : tryBlock) doAssignmentCheck0(node, statement, varName);
 	}