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/utils/lombok/javac | |
| 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/utils/lombok/javac')
| -rw-r--r-- | src/utils/lombok/javac/JavacTreeMaker.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/utils/lombok/javac/JavacTreeMaker.java b/src/utils/lombok/javac/JavacTreeMaker.java index 83d9c53f..84293f11 100644 --- a/src/utils/lombok/javac/JavacTreeMaker.java +++ b/src/utils/lombok/javac/JavacTreeMaker.java @@ -441,7 +441,11 @@ public class JavacTreeMaker { //javac versions: 6-8 private static final MethodId<JCVariableDecl> VarDef = MethodId("VarDef"); public JCVariableDecl VarDef(JCModifiers mods, Name name, JCExpression vartype, JCExpression init) { - return invoke(VarDef, mods, name, vartype, init); + JCVariableDecl varDef = invoke(VarDef, mods, name, vartype, init); + // We use 'position of the type is -1' as indicator in delombok that the original node was written using JDK10's 'var' feature, because javac desugars 'var' to the real type and doesn't leave any markers other than the + // node position to indicate that it did so. Unfortunately, that means vardecls we generate look like 'var' to delombok. Adjust the position to avoid this. + if (varDef.vartype != null && varDef.vartype.pos == -1) varDef.vartype.pos = 0; + return varDef; } //javac versions: 8 |