Fixed delombok making a mess of comments (issue 284) for javac 6. delombok in java7 is now completely broken but we'll fix that next.

1 files changed, 43 insertions, 0 deletions

diff --git a/src/utils/lombok/javac/java6/CommentCollectingParserFactory.java b/src/utils/lombok/javac/java6/CommentCollectingParserFactory.java
new file mode 100644
index 00000000..ef8b22c4
--- /dev/null
+++ b/src/utils/lombok/javac/java6/CommentCollectingParserFactory.java
@@ -0,0 +1,43 @@
+package lombok.javac.java6;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+import lombok.javac.Comment;
+
+import com.sun.tools.javac.main.JavaCompiler;
+import com.sun.tools.javac.parser.Lexer;
+import com.sun.tools.javac.parser.Parser;
+import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.List;
+
+public class CommentCollectingParserFactory extends Parser.Factory {
+	
+	private final Map<JCCompilationUnit, List<Comment>> commentsMap;
+
+	static Context.Key<Parser.Factory> key() {
+		return parserFactoryKey;
+	}
+	
+	protected CommentCollectingParserFactory(Context context, Map<JCCompilationUnit, List<Comment>> commentsMap) {
+		super(context);
+		this.commentsMap = commentsMap;
+	}
+	
+	@Override public Parser newParser(Lexer S, boolean keepDocComments, boolean genEndPos) {
+		return new CommentCollectingParser(this, S, keepDocComments, commentsMap);
+	}
+	
+	public static void setInCompiler(JavaCompiler compiler, Context context, Map<JCCompilationUnit, List<Comment>> commentsMap) {
+		context.put(CommentCollectingParserFactory.key(), (Parser.Factory)null);
+		Field field;
+		try {
+			field = JavaCompiler.class.getDeclaredField("parserFactory");
+			field.setAccessible(true);
+			field.set(compiler, new CommentCollectingParserFactory(context, commentsMap));
+		} catch (Exception e) {
+			throw new IllegalStateException("Could not set comment sensitive parser in the compiler", e);
+		} 
+	}
+}
\ No newline at end of file