diff options
| author | Bulgakov Alexander <mfourgeneralsherman@gmail.com> | 2019-05-03 22:07:43 +0300 |
|---|---|---|
| committer | Bulgakov Alexander <mfourgeneralsherman@gmail.com> | 2019-05-03 22:07:43 +0300 |
| commit | 2611e6bf9830e4971dcae3abedfede59f3cc86a5 (patch) | |
| tree | 58e279150b6577b26e3a7a9c24aed4e1b347fda1 /src/eclipseAgent/lombok | |
| parent | 715c731fc24bf2915d2eaefefd964615e62c12ed (diff) | |
| download | lombok-2611e6bf9830e4971dcae3abedfede59f3cc86a5.tar.gz lombok-2611e6bf9830e4971dcae3abedfede59f3cc86a5.tar.bz2 lombok-2611e6bf9830e4971dcae3abedfede59f3cc86a5.zip | |
Revert "[val] in ecj we were constructing a different type than for javac, when using ‘val’ on an intersection type."
This reverts commit 1730a991
Diffstat (limited to 'src/eclipseAgent/lombok')
| -rw-r--r-- | src/eclipseAgent/lombok/eclipse/agent/PatchVal.java | 14 |
1 files 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. } } } |