[configuration] Merge branch 'master' as we work on configuration.

* Conflict due to adding topic() feature to logger in master, and 'field name' feature in config branch.
* master has since updated to shiny new eclipse dep versions and the 'ant eclipseForDebugging' feature, but this branch added deps. Addressed that.
* Renamed 'loggerCategory' to 'loggerTopic'. I know, that wasn't exactly right to do in a merge, but, there you have it.
* Test infrastructure changed in configuration branch, and tests had been added in master branch.

Conflicts:
	build.xml
	buildScripts/ivy.xml
	src/core/lombok/eclipse/handlers/HandleLog.java
	src/core/lombok/extern/apachecommons/CommonsLog.java
	src/core/lombok/extern/java/Log.java
	src/core/lombok/extern/log4j/Log4j.java
	src/core/lombok/extern/log4j/Log4j2.java
	src/core/lombok/javac/handlers/HandleLog.java
	test/transform/resource/after-ecj/ValInTryWithResources.java

2 files changed, 25 insertions, 7 deletions

diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java b/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java
index d4b8c763..2370d3ff 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java
@@ -256,10 +256,7 @@ public class PatchFixes {
 			org.eclipse.jdt.internal.compiler.ast.ASTNode internalNode) throws Exception {
 		if (internalNode == null || domNode == null) return;
 		boolean isGenerated = internalNode.getClass().getField("$generatedBy").get(internalNode) != null;
-		if (isGenerated) {
-			domNode.getClass().getField("$isGenerated").set(domNode, true);
-			domNode.setFlags(domNode.getFlags() & ~org.eclipse.jdt.core.dom.ASTNode.ORIGINAL);
-		}
+		if (isGenerated) domNode.getClass().getField("$isGenerated").set(domNode, true);
 	}
 	
 	public static void setIsGeneratedFlagForName(org.eclipse.jdt.core.dom.Name name, Object internalNode) throws Exception {
diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java
index 16f11769..59fbe9d0 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java
@@ -53,12 +53,20 @@ public class PatchVal {
 	
 	public static TypeBinding skipResolveInitializerIfAlreadyCalled(Expression expr, BlockScope scope) {
 		if (expr.resolvedType != null) return expr.resolvedType;
-		return expr.resolveType(scope);
+		try {
+			return expr.resolveType(scope);
+		} catch (NullPointerException e) {
+			return null;
+		}
 	}
 	
 	public static TypeBinding skipResolveInitializerIfAlreadyCalled2(Expression expr, BlockScope scope, LocalDeclaration decl) {
 		if (decl != null && LocalDeclaration.class.equals(decl.getClass()) && expr.resolvedType != null) return expr.resolvedType;
-		return expr.resolveType(scope);
+		try {
+			return expr.resolveType(scope);
+		} catch (NullPointerException e) {
+			return null;
+		}
 	}
 	
 	public static boolean matches(String key, char[] array) {
@@ -143,7 +151,20 @@ public class PatchVal {
 		TypeReference replacement = null;
 		
 		if (init != null) {
-			TypeBinding resolved = decomponent ? getForEachComponentType(init, scope) : init.resolveType(scope);
+			if (init.getClass().getName().equals("org.eclipse.jdt.internal.compiler.ast.LambdaExpression")) {
+				return false;
+			}
+			
+			TypeBinding resolved = null;
+			try {
+				resolved = decomponent ? getForEachComponentType(init, scope) : init.resolveType(scope);
+			} catch (NullPointerException e) {
+				// This definitely occurs if as part of resolving the initializer expression, a
+				// lambda expression in it must also be resolved (such as when lambdas are part of
+				// a ternary expression). This can't result in a viable 'val' matching, so, we
+				// just go with 'Object' and let the IDE print the appropriate errors.
+				resolved = null;
+			}
 			if (resolved != null) {
 				replacement = makeType(resolved, local.type, false);
 			}