diff options
| author | Bulgakov Alexander <mfourgeneralsherman@gmail.com> | 2019-05-03 21:50:15 +0300 |
|---|---|---|
| committer | Bulgakov Alexander <mfourgeneralsherman@gmail.com> | 2019-05-03 21:50:15 +0300 |
| commit | 715c731fc24bf2915d2eaefefd964615e62c12ed (patch) | |
| tree | abca888cf3284c6e4bb911a041e15c50d8ca92f9 /src/eclipseAgent | |
| parent | f0343886a331f3cb2175545a062f3736610f9179 (diff) | |
| parent | 2335f251665d43b4c8cebe00b980f07ef33bdb17 (diff) | |
| download | lombok-715c731fc24bf2915d2eaefefd964615e62c12ed.tar.gz lombok-715c731fc24bf2915d2eaefefd964615e62c12ed.tar.bz2 lombok-715c731fc24bf2915d2eaefefd964615e62c12ed.zip | |
Merge remote-tracking branch 'lombok/master' into feature/typeInferenceImprovements
Diffstat (limited to 'src/eclipseAgent')
| -rw-r--r-- | src/eclipseAgent/lombok/eclipse/agent/PatchVal.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java index 12f4ad3d..b32c99cd 100644 --- a/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java +++ b/src/eclipseAgent/lombok/eclipse/agent/PatchVal.java @@ -263,11 +263,15 @@ public class PatchVal { resolved = null; } if (resolved != null) { - try { - replacement = makeType(resolved, local.type, false); - if (!decomponent) init.resolvedType = replacement.resolveType(scope); - } catch (Exception e) { - // Some type thing failed. + 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. + } } } } |