Some work on actually making lombok work on JDK8's javac.

3 files changed, 18 insertions, 5 deletions

diff --git a/src/core/lombok/javac/JavacAST.java b/src/core/lombok/javac/JavacAST.java
index 1f3b04a4..e49d8ac8 100644
--- a/src/core/lombok/javac/JavacAST.java
+++ b/src/core/lombok/javac/JavacAST.java
@@ -375,7 +375,7 @@ public class JavacAST extends AST<JavacAST, JavacNode, JCTree> {
 			if (pos == null) pos = astObject.pos();
 		}
 		if (pos != null && attemptToRemoveErrorsInRange) {
-			removeFromDeferredDiagnostics(pos.getStartPosition(), pos.getEndPosition(top.endPositions));
+			removeFromDeferredDiagnostics(pos.getStartPosition(), node.getEndPosition(pos));
 		}
 		try {
 			switch (kind) {
diff --git a/src/core/lombok/javac/JavacNode.java b/src/core/lombok/javac/JavacNode.java
index 30a470a9..6eef36eb 100644
--- a/src/core/lombok/javac/JavacNode.java
+++ b/src/core/lombok/javac/JavacNode.java
@@ -51,6 +51,15 @@ public class JavacNode extends lombok.core.LombokNode<JavacAST, JavacNode, JCTre
 		super(ast, node, children, kind);
 	}
 	
+	public int getEndPosition(DiagnosticPosition pos) {
+		JCCompilationUnit cu = (JCCompilationUnit) top().get();
+		return Javac.getEndPosition(pos, cu);
+	}
+	
+	public int getEndPosition() {
+		return getEndPosition(node);
+	}
+	
 	/**
 	 * Visits this node and all child nodes depth-first, calling the provided visitor's visit methods.
 	 */
diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
index d0673c57..c245d506 100644
--- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java
+++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
@@ -44,6 +44,7 @@ import lombok.core.AnnotationValues.AnnotationValue;
 import lombok.core.TransformationsUtil;
 import lombok.core.TypeResolver;
 import lombok.experimental.Accessors;
+import lombok.javac.Javac;
 import lombok.javac.JavacNode;
 import lombok.javac.JavacTreeMaker;
 
@@ -1275,17 +1276,20 @@ public class JavacHandlerUtil {
 	 * 
 	 * in 'SETTER' mode, stripping works similarly to 'GETTER' mode, except {@code param} are copied and stripped from the original and {@code @return} are skipped.
 	 */
+	@SuppressWarnings("unchecked")
 	public static void copyJavadoc(JavacNode from, JCTree to, CopyJavadoc copyMode) {
 		if (copyMode == null) copyMode = CopyJavadoc.VERBATIM;
 		try {
 			JCCompilationUnit cu = ((JCCompilationUnit) from.top().get());
-			if (cu.docComments != null) {
-				String javadoc = cu.docComments.get(from.get());
+			Object dc = Javac.getDocComments(cu);
+			if (dc instanceof Map) {
+				Map<JCTree, String> docComments = (Map<JCTree, String>) dc;
+				String javadoc = docComments.get(from.get());
 				
 				if (javadoc != null) {
 					String[] filtered = copyMode.split(javadoc);
-					cu.docComments.put(to, filtered[0]);
-					cu.docComments.put(from.get(), filtered[1]);
+					docComments.put(to, filtered[0]);
+					docComments.put(from.get(), filtered[1]);
 				}
 			}
 		} catch (Exception ignore) {}