Merge branch 'master' into eclipse-javadoc

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	test/core/src/lombok/RunTestsViaEcj.java

2 files changed, 78 insertions, 5 deletions

diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java
index 8e73e122..448f77ab 100644
--- a/test/core/src/lombok/AbstractRunTests.java
+++ b/test/core/src/lombok/AbstractRunTests.java
@@ -285,7 +285,7 @@ public abstract class AbstractRunTests {
 			endIdx--;
 		}
 		
-		return in.substring(0, endIdx);
+		return in.substring(0, endIdx + 1);
 	}
 	
 	private static String[] removeBlanks(String[] in) {
diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java
index 3a6e1702..5c29533c 100644
--- a/test/core/src/lombok/RunTestsViaEcj.java
+++ b/test/core/src/lombok/RunTestsViaEcj.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 The Project Lombok Authors.
+ * Copyright (C) 2010-2020 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,20 +23,29 @@ package lombok;
 
 import java.io.File;
 import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 
 import lombok.eclipse.Eclipse;
 import lombok.javac.CapturingDiagnosticListener.CompilerMessage;
 
+import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.compiler.CategorizedProblem;
 import org.eclipse.jdt.core.compiler.CharOperation;
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.internal.compiler.CompilationResult;
 import org.eclipse.jdt.internal.compiler.Compiler;
 import org.eclipse.jdt.internal.compiler.ICompilerRequestor;
@@ -46,7 +55,6 @@ import org.eclipse.jdt.internal.compiler.batch.FileSystem;
 import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
-import org.eclipse.jdt.internal.core.CompilationUnit;
 
 public class RunTestsViaEcj extends AbstractRunTests {
 	protected CompilerOptions ecjCompilerOptions() {
@@ -104,7 +112,8 @@ public class RunTestsViaEcj extends AbstractRunTests {
 		};
 		
 		String source = readFile(file);
-		final CompilationUnit sourceUnit = new TestCompilationUnit(file.getName(), source);
+		char[] sourceArray = source.toCharArray();
+		final ICompilationUnit sourceUnit = new TestCompilationUnit(file.getName(), source);
 		
 		Compiler ecjCompiler = new Compiler(createFileSystem(file, minVersion), ecjErrorHandlingPolicy(), ecjCompilerOptions(), bitbucketRequestor, new DefaultProblemFactory(Locale.ENGLISH)) {
 			@Override protected synchronized void addCompilationUnit(ICompilationUnit inUnit, CompilationUnitDeclaration parsedUnit) {
@@ -127,11 +136,75 @@ public class RunTestsViaEcj extends AbstractRunTests {
 		if (cud == null) result.append("---- No CompilationUnit provided by ecj ----");
 		else result.append(cud.toString());
 		
+		if (eclipseAvailable()) {
+			EclipseDomConversion.toDomAst(cud, sourceArray);
+		}
+		
+		return true;
+	}
+	
+	private boolean eclipseAvailable() {
+		try {
+			Class.forName("org.eclipse.jdt.core.dom.CompilationUnit");
+		} catch (Throwable t) {
+			return false;
+		}
+		
 		return true;
 	}
 	
 	private static final String bootRuntimePath = System.getProperty("delombok.bootclasspath");
 	
+	private static class EclipseDomConversion {
+		static CompilationUnit toDomAst(CompilationUnitDeclaration cud, final char[] source) {
+			Map<String, String> options = new HashMap<String, String>();
+			options.put(JavaCore.COMPILER_SOURCE, "11");
+			options.put("org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures", "enabled");
+			try {
+				org.eclipse.jdt.internal.core.CompilationUnit ccu = new org.eclipse.jdt.internal.core.CompilationUnit(null, null, null) {
+					@Override public char[] getContents() {
+						return source;
+					}
+				};
+				return AST.convertCompilationUnit(4, cud, options, false, ccu, 0, null);
+			} catch (SecurityException e) {
+				try {
+					debugClasspathConflicts("org/eclipse/jdt/internal/compiler");
+				} catch (Exception e2) {
+					throw Lombok.sneakyThrow(e2);
+				}
+				throw e;
+			}
+		}
+	}
+	
+	@SuppressWarnings({"all"})
+	private static void debugClasspathConflicts(String prefixToLookFor) throws Exception {
+		String[] paths = System.getProperty("java.class.path").split(":");
+		for (String p : paths) {
+			Path cp = Paths.get(p);
+			if (Files.isDirectory(cp)) {
+				if (Files.isDirectory(cp.resolve(prefixToLookFor))) System.out.println("** DIR-BASED: " + cp);
+			} else if (Files.isRegularFile(cp)) {
+				JarFile jf = new JarFile(cp.toFile());
+				try {
+					Enumeration<JarEntry> jes = jf.entries();
+					while (jes.hasMoreElements()) {
+						JarEntry je = jes.nextElement();
+						if (je.getName().startsWith(prefixToLookFor)) {
+							System.out.println("** JAR-BASED: " + cp);
+							break;
+						}
+					}
+				} finally {
+					jf.close();
+				}
+			} else {
+				System.out.println("** MISSING: " + cp);
+			}
+		}
+	}
+	
 	private FileSystem createFileSystem(File file, int minVersion) {
 		List<String> classpath = new ArrayList<String>();
 		for (Iterator<String> i = classpath.iterator(); i.hasNext();) {
@@ -152,7 +225,7 @@ public class RunTestsViaEcj extends AbstractRunTests {
 		return new FileSystem(classpath.toArray(new String[0]), new String[] {file.getAbsolutePath()}, "UTF-8");
 	}
 	
-	private static final class TestCompilationUnit extends CompilationUnit {
+	private static final class TestCompilationUnit extends org.eclipse.jdt.internal.core.CompilationUnit {
 		private final char[] source;
 		private final char[] mainTypeName;