From 2611e6bf9830e4971dcae3abedfede59f3cc86a5 Mon Sep 17 00:00:00 2001 From: Bulgakov Alexander Date: Fri, 3 May 2019 22:07:43 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"[val]=20in=20ecj=20we=20were=20constr?= =?UTF-8?q?ucting=20a=20different=20type=20than=20for=20javac,=20when=20us?= =?UTF-8?q?ing=20=E2=80=98val=E2=80=99=20on=20an=20intersection=20type."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1730a991 --- .../lombok/eclipse/agent/PatchVal.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java index b32c99cd..12f4ad3d 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java @@ -263,15 +263,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. } } }