Merge branch 'bulgakovalexander-feature/typeInferenceImprovements'

3 files changed, 50 insertions, 13 deletions

diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
index c8e7b60a..463990d1 100644
--- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
+++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
@@ -114,6 +114,7 @@ import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
 import org.eclipse.jdt.internal.compiler.lookup.Binding;
 import org.eclipse.jdt.internal.compiler.lookup.CaptureBinding;
 import org.eclipse.jdt.internal.compiler.lookup.ParameterizedTypeBinding;
+import org.eclipse.jdt.internal.compiler.lookup.RawTypeBinding;
 import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
 import org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
 import org.eclipse.jdt.internal.compiler.lookup.TypeConstants;
@@ -844,7 +845,6 @@ public class EclipseHandlerUtil {
 	}
 	
 	public static TypeReference makeType(TypeBinding binding, ASTNode pos, boolean allowCompound) {
-		
 		if (binding.getClass() == EclipseReflectiveMembers.INTERSECTION_BINDING) {
 			Object[] arr = (Object[]) EclipseReflectiveMembers.reflect(EclipseReflectiveMembers.INTERSECTION_BINDING_TYPES, binding);
 			binding = (TypeBinding) arr[0];
@@ -933,7 +933,12 @@ public class EclipseHandlerUtil {
 			WildcardBinding wildcard = (WildcardBinding) binding;
 			if (wildcard.boundKind == Wildcard.EXTENDS) {
 				if (!allowCompound) {
-					return makeType(wildcard.bound, pos, false);
+					TypeBinding bound = wildcard.bound;
+					boolean isObject = bound.id == TypeIds.T_JavaLangObject;
+					TypeBinding[] otherBounds = wildcard.otherBounds;
+					if (isObject && otherBounds != null && otherBounds.length > 0) {
+						return makeType(otherBounds[0], pos, false);
+					} else return makeType(bound, pos, false);
 				} else {
 					Wildcard out = new Wildcard(Wildcard.EXTENDS);
 					setGeneratedBy(out, pos);
@@ -960,7 +965,8 @@ public class EclipseHandlerUtil {
 		// Finally, add however many nullTypeArgument[] arrays as that are missing, inverse the list, toArray it, and use that as PTR's typeArgument argument.
 		
 		List<TypeReference[]> params = new ArrayList<TypeReference[]>();
-		/* Calculate generics */ {
+		/* Calculate generics */
+		if (!(binding instanceof RawTypeBinding)) {
 			TypeBinding b = binding;
 			while (true) {
 				boolean isFinalStop = b.isLocalType() || !b.isMemberType() || b.enclosingType() == null;
diff --git a/src/core/lombok/javac/JavacResolution.java b/src/core/lombok/javac/JavacResolution.java
index abbf6726..7f940d2a 100644
--- a/src/core/lombok/javac/JavacResolution.java
+++ b/src/core/lombok/javac/JavacResolution.java
@@ -336,7 +336,7 @@ public class JavacResolution {
 			if (type instanceof ClassType) {
 				List<Type> ifaces = ((ClassType) type).interfaces_field;
 				Type supertype = ((ClassType) type).supertype_field;
-				if (ifaces != null && ifaces.length() == 1) {
+				if (isObject(supertype) && ifaces != null && ifaces.length() > 0) {
 					return typeToJCTree(ifaces.get(0), ast, allowCompound, allowVoid);
 				}
 				if (supertype != null) return typeToJCTree(supertype, ast, allowCompound, allowVoid);
@@ -402,6 +402,10 @@ public class JavacResolution {
 		return genericsToJCTreeNodes(generics, ast, replacement);
 	}
 	
+	private static boolean isObject(Type supertype) {
+		return supertype.tsym.toString().equals("java.lang.Object");
+	}
+	
 	private static JCExpression genericsToJCTreeNodes(List<Type> generics, JavacAST ast, JCExpression rawTypeNode) throws TypeNotConvertibleException {
 		if (generics != null && !generics.isEmpty()) {
 			ListBuffer<JCExpression> args = new ListBuffer<JCExpression>();
diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java
index b32c99cd..c0c2cea6 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java
@@ -21,8 +21,11 @@
  */
 package lombok.eclipse.agent;
 
+import org.eclipse.jdt.core.compiler.CategorizedProblem;
+import org.eclipse.jdt.internal.compiler.CompilationResult;
 import org.eclipse.jdt.internal.compiler.ast.ASTNode;
 import org.eclipse.jdt.internal.compiler.ast.Annotation;
+import org.eclipse.jdt.internal.compiler.ast.ConditionalExpression;
 import org.eclipse.jdt.internal.compiler.ast.Expression;
 import org.eclipse.jdt.internal.compiler.ast.ForeachStatement;
 import org.eclipse.jdt.internal.compiler.ast.ImportReference;
@@ -44,11 +47,13 @@ import org.eclipse.jdt.internal.compiler.lookup.TypeConstants;
 import org.eclipse.jdt.internal.compiler.lookup.TypeIds;
 
 import lombok.permit.Permit;
+import org.eclipse.jdt.internal.compiler.problem.AbortCompilation;
 
 import java.lang.reflect.Field;
 
 import static lombok.eclipse.Eclipse.poss;
 import static lombok.eclipse.handlers.EclipseHandlerUtil.makeType;
+import static org.eclipse.jdt.core.compiler.CategorizedProblem.CAT_TYPE;
 
 public class PatchVal {
 	
@@ -263,15 +268,11 @@ public class PatchVal {
 				resolved = null;
 			}
 			if (resolved != null) {
-				if (resolved.getClass().getSimpleName().startsWith("IntersectionTypeBinding")) {
-					// We intentionally deconstruct these into simply 'Object', because picking an arbitrary type amongst the intersection feels worse.
-				} else {
-					try {
-						replacement = makeType(resolved, local.type, false);
-						if (!decomponent) init.resolvedType = replacement.resolveType(scope);
-					} catch (Exception e) {
-						// Some type thing failed.
-					}
+				try {
+					replacement = makeType(resolved, local.type, false);
+					if (!decomponent) init.resolvedType = replacement.resolveType(scope);
+				} catch (Exception e) {
+					// Some type thing failed.
 				}
 			}
 		}
@@ -362,6 +363,32 @@ public class PatchVal {
 		} catch (ArrayIndexOutOfBoundsException e) {
 			// Known cause of issues; for example: val e = mth("X"), where mth takes 2 arguments.
 			return null;
+		} catch (AbortCompilation e) {
+			if (collection instanceof ConditionalExpression) {
+				ConditionalExpression cexp = (ConditionalExpression) collection;
+				Expression ifTrue = cexp.valueIfTrue;
+				Expression ifFalse = cexp.valueIfFalse;
+				TypeBinding ifTrueResolvedType = ifTrue.resolvedType;
+				CategorizedProblem problem = e.problem;
+				if (ifTrueResolvedType != null && ifFalse.resolvedType == null && problem.getCategoryID() == CAT_TYPE) {
+					CompilationResult compilationResult = e.compilationResult;
+					CategorizedProblem[] problems = compilationResult.problems;
+					int problemCount = compilationResult.problemCount;
+					for (int i = 0; i < problemCount; ++i) {
+						if (problems[i] == problem) {
+							problems[i] = null;
+							if (i + 1 < problemCount) {
+								System.arraycopy(problems, i + 1, problems, i, problemCount - i + 1);
+							}
+							break;
+						}
+					}
+					compilationResult.removeProblem(problem);
+					
+					return ifTrueResolvedType;
+				}
+			}
+			throw e;
 		}
 	}
 }