diff options
| -rw-r--r-- | build.xml | 9 | ||||
| -rw-r--r-- | src/delombok/lombok/delombok/Delombok.java | 1 | ||||
| -rw-r--r-- | test/core/src/lombok/AbstractRunTests.java | 2 | ||||
| -rw-r--r-- | test/transform/resource/before/VarComplex.java | 1 | ||||
| -rw-r--r-- | test/transform/resource/before/VarInFor.java | 1 | ||||
| -rw-r--r-- | test/transform/resource/before/VarInForOld.java | 1 | ||||
| -rw-r--r-- | test/transform/resource/before/VarInForOldMulti.java | 1 | ||||
| -rw-r--r-- | test/transform/resource/before/VarModifier.java | 1 | ||||
| -rw-r--r-- | test/transform/resource/before/VarNullInit.java | 1 | ||||
| -rw-r--r-- | test/transform/resource/before/VarWarning.java | 1 | ||||
| -rw-r--r-- | website/templates/setup/gwt.html | 18 |
11 files changed, 33 insertions, 4 deletions
@@ -543,6 +543,7 @@ ${sourceWarning}</echo> <classpath refid="test.path" /> <classpath refid="build.path" /> <classpath path="build/lombok" /> + <classpath path="build/tests" /> <src path="test/core/src" /> <src path="test/transform/src" /> <src path="test/bytecode/src" /> @@ -679,7 +680,9 @@ You can also create your own by writing a 'testenvironment.properties' file. The </fail> </target> - <target name="test" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj, -test-check, -test8, -test9" /> + <target name="test" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj, -test-check, -test8, -test9" description="Runs all tests." /> + + <target name="testfast" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, -test-check, -test8, -test9" /> <target name="-test-check"> <condition property="test9.run"> @@ -696,7 +699,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The </condition> </target> - <target name="-test9" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj" if="test9.run"> + <target name="-test9" if="test9.run"> <echo>Running test suite in JDK9+ mode</echo> <junit haltonfailure="no" fork="true"> <jvmarg value="-javaagent:dist/lombok.jar" /> @@ -731,7 +734,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The </junit> </target> - <target name="-test8" depends="-loadTestEnvironmentProperties, -failIfNoTestEnvironmentProperties, -test-compile, dist, test-ecj" if="test8.run" description="Runs the tests."> + <target name="-test8" if="test8.run"> <echo>Running test suite in JDK6-8 mode</echo> <junit haltonfailure="no" fork="true"> <jvmarg value="-javaagent:dist/lombok.jar" /> diff --git a/src/delombok/lombok/delombok/Delombok.java b/src/delombok/lombok/delombok/Delombok.java index f5372fbb..be0ce81c 100644 --- a/src/delombok/lombok/delombok/Delombok.java +++ b/src/delombok/lombok/delombok/Delombok.java @@ -527,6 +527,7 @@ public class Delombok { } String[] argv = argsList.toArray(new String[0]); args.init("javac", argv); + options.put("diags.legacy", "TRUE"); } CommentCatcher catcher = CommentCatcher.create(context); diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java index f93fbe27..fc05aea2 100644 --- a/test/core/src/lombok/AbstractRunTests.java +++ b/test/core/src/lombok/AbstractRunTests.java @@ -197,7 +197,7 @@ public abstract class AbstractRunTests { } } - @SuppressWarnings("null") /* eclipse bug; it falsely thinks stuffAc will always be null or some such hogwash. */ + @SuppressWarnings("null") /* eclipse bug workaround; it falsely thinks stuffAc will always be null. */ private static void compareMessages(String name, LombokImmutableList<CompilerMessageMatcher> expected, LinkedHashSet<CompilerMessage> actual) { Iterator<CompilerMessageMatcher> expectedIterator = expected.iterator(); Iterator<CompilerMessage> actualIterator = actual.iterator(); diff --git a/test/transform/resource/before/VarComplex.java b/test/transform/resource/before/VarComplex.java index c93e177a..0f2afb2a 100644 --- a/test/transform/resource/before/VarComplex.java +++ b/test/transform/resource/before/VarComplex.java @@ -1,3 +1,4 @@ +//version :9 import lombok.var; public class VarComplex { diff --git a/test/transform/resource/before/VarInFor.java b/test/transform/resource/before/VarInFor.java index 7f7bb7a7..0c54921e 100644 --- a/test/transform/resource/before/VarInFor.java +++ b/test/transform/resource/before/VarInFor.java @@ -1,3 +1,4 @@ +//version :9 import lombok.var; public class VarInFor { diff --git a/test/transform/resource/before/VarInForOld.java b/test/transform/resource/before/VarInForOld.java index 99e83b57..a6e1333d 100644 --- a/test/transform/resource/before/VarInForOld.java +++ b/test/transform/resource/before/VarInForOld.java @@ -1,3 +1,4 @@ +//version :9 import lombok.var; public class VarInForOld { diff --git a/test/transform/resource/before/VarInForOldMulti.java b/test/transform/resource/before/VarInForOldMulti.java index e2ea9682..417076d0 100644 --- a/test/transform/resource/before/VarInForOldMulti.java +++ b/test/transform/resource/before/VarInForOldMulti.java @@ -1,3 +1,4 @@ +//version :9 //skip compare contents import lombok.var; diff --git a/test/transform/resource/before/VarModifier.java b/test/transform/resource/before/VarModifier.java index 5c68caa7..22d8f2ad 100644 --- a/test/transform/resource/before/VarModifier.java +++ b/test/transform/resource/before/VarModifier.java @@ -1,3 +1,4 @@ +//version :9 import lombok.experimental.var; public class VarModifier { diff --git a/test/transform/resource/before/VarNullInit.java b/test/transform/resource/before/VarNullInit.java index f9bb53a3..08eb4dda 100644 --- a/test/transform/resource/before/VarNullInit.java +++ b/test/transform/resource/before/VarNullInit.java @@ -1,3 +1,4 @@ +//version :9 import lombok.var; public class VarNullInit { diff --git a/test/transform/resource/before/VarWarning.java b/test/transform/resource/before/VarWarning.java index 90464d30..47b7ad3c 100644 --- a/test/transform/resource/before/VarWarning.java +++ b/test/transform/resource/before/VarWarning.java @@ -1,3 +1,4 @@ +//version :9 //CONF: lombok.var.flagUsage = WARNING import lombok.var; diff --git a/website/templates/setup/gwt.html b/website/templates/setup/gwt.html index 142362ac..ac6659a5 100644 --- a/website/templates/setup/gwt.html +++ b/website/templates/setup/gwt.html @@ -13,4 +13,22 @@ java <strong>-javaagent:lombok.jar=ECJ</strong> <em>(rest of arguments)</em> Thanks to Stephen Haberman for figuring this out. </p> </@s.introduction> + + <@s.section title="GWT plugin in Eclipse"> + <p> + To use the GWT plugin in eclipse together with Lombok:<br /> + Install lombok into eclipse as normal (start <code>lombok.jar</code> as an application).<br /> + Download the JDT variant that GWT uses. This is the most recent org.eclipse.jdt.core_VERSION-CUSTOM-GWT jar found on the <a href="https://github.com/gwtproject/tools/tree/master/lib/eclipse">lib/eclipse section GWT's github page</a>. As of October 2018, that would be <a href="https://github.com/gwtproject/tools/raw/master/lib/eclipse/org.eclipse.jdt.core_3.13.50-CUSTOM-GWT-20171215.jar">org.eclipse.jdt.core_3.13.50-CUSTOM-GWT-20171215.jar</a>.<br /> + Configure the 'GWT/Compile' option in the eclipse GWT plugin; in the advanced section, add the following VM arguments:<br /> +<pre>-javaagent:/path/to/lombok.jar=ECJ +-Xbootclasspath/p:/path/to/lombok.jar:/path/to/org.eclipse.jdt.core_fromPreviousStep.jar</pre> +Where the colon should be replaced with a semicolon on windows.<br /> + GWT Dev Mode needs a similar configuration: In the VM arguments section ('Arguments' tab), add: +<pre>-javaagent:/path/to/lombok.jar=ECJ</pre> + and in the 'Classpath' tab, add both lombok.jar and the org.eclipse.jdt.core file you downloaded. + </p> + <p> + The above instructions are contributed by Stas via the forum. Let us know if they work, or if you run into issues. Thanks and have fun! + </p> + </@s.section> </@s.scaffold> |