diff options
| -rw-r--r-- | src/lombok/javac/HandlerLibrary.java | 5 | ||||
| -rw-r--r-- | src/lombok/javac/Javac.java | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/lombok/javac/HandlerLibrary.java b/src/lombok/javac/HandlerLibrary.java index 7253cbaa..ff21bd3f 100644 --- a/src/lombok/javac/HandlerLibrary.java +++ b/src/lombok/javac/HandlerLibrary.java @@ -146,6 +146,7 @@ public class HandlerLibrary { /** Generates an error in the Messager that was used to initialize this HandlerLibrary. */ public void javacError(String message, Throwable t) { messager.printMessage(Diagnostic.Kind.ERROR, message + (t == null ? "" : (": " + t))); + if ( t != null ) t.printStackTrace(); } /** @@ -180,7 +181,9 @@ public class HandlerLibrary { } catch ( AnnotationValueDecodeFail fail ) { fail.owner.setError(fail.getMessage(), fail.idx); } catch ( Throwable t ) { - javacError(String.format("Lombok annotation handler %s failed", container.handler.getClass()), t); + String sourceName = "(unknown).java"; + if ( unit != null && unit.sourcefile != null ) sourceName = unit.sourcefile.getName(); + javacError(String.format("Lombok annotation handler %s failed on " + sourceName, container.handler.getClass()), t); } } diff --git a/src/lombok/javac/Javac.java b/src/lombok/javac/Javac.java index 2a3727b6..0987d31a 100644 --- a/src/lombok/javac/Javac.java +++ b/src/lombok/javac/Javac.java @@ -94,10 +94,19 @@ public class Javac { final List<DiagnosticPosition> positions = new ArrayList<DiagnosticPosition>(); for ( JCExpression arg : arguments ) { - JCAssign assign = (JCAssign) arg; - String mName = assign.lhs.toString(); + String mName; + JCExpression rhs; + + if ( arg instanceof JCAssign ) { + JCAssign assign = (JCAssign) arg; + mName = assign.lhs.toString(); + rhs = assign.rhs; + } else { + rhs = arg; + mName = "value"; + } + if ( !mName.equals(name) ) continue; - JCExpression rhs = assign.rhs; if ( rhs instanceof JCNewArray ) { List<JCExpression> elems = ((JCNewArray)rhs).elems; for ( JCExpression inner : elems ) { |