Age | Commit message (Collapse) | Author |
|
|
|
* Conflict due to adding topic() feature to logger in master, and 'field name' feature in config branch.
* master has since updated to shiny new eclipse dep versions and the 'ant eclipseForDebugging' feature, but this branch added deps. Addressed that.
* Renamed 'loggerCategory' to 'loggerTopic'. I know, that wasn't exactly right to do in a merge, but, there you have it.
* Test infrastructure changed in configuration branch, and tests had been added in master branch.
Conflicts:
build.xml
buildScripts/ivy.xml
src/core/lombok/eclipse/handlers/HandleLog.java
src/core/lombok/extern/apachecommons/CommonsLog.java
src/core/lombok/extern/java/Log.java
src/core/lombok/extern/log4j/Log4j.java
src/core/lombok/extern/log4j/Log4j2.java
src/core/lombok/javac/handlers/HandleLog.java
test/transform/resource/after-ecj/ValInTryWithResources.java
|
|
as well
|
|
|
|
about wonky timing on replacing Options with LombokOptions, causing javac to complain about not recognizing i.e. a Getter annotation when using it more than once in a file.
|
|
|
|
of the issue #608.
|
|
actually cause the old options to be wrapped continuously, thus wrapping LombokOptions into itself infinitely. Now it just wraps if needed, other wise returns what's already been done.
|
|
application of 'final'.
|
|
|
|
|
|
indent empty lines.
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/delombok/lombok/delombok/DelombokApp.java
|
|
|
|
below; fixed.
|
|
some copyright headers.
|
|
values, so we now work around that javac bug).
|
|
try and keep up with the complete rewrites of the doc comment parser from java6 to java7 to java8. Still doesn't actually work in jdk8, but only because of a last-mile issue. (we communicate the doc comment via compilationUnit.docComments but that changed types in jdk8, we just need to make a wrapper to make that work).
|
|
lombok.jar that works on all javas.
|
|
this also solves the AssertionError in the Bits class on javac8-ea.
|
|
loading classes.
|
|
|
|
it has major refactorings to make JDK6-8 support
possibly with much prettier code.
|
|
still a looooong way to go.
|
|
Conflicts:
src/core/lombok/javac/handlers/JavacHandlerUtil.java
src/utils/lombok/javac/CommentCatcher.java
src/utils/lombok/javac/Javac.java
|
|
javadoc for getters/setters, and fixed pretty printer to no longer inject an extra newline at the top of javadoc.
|
|
javadoc from field to setter/getter in javac.
|
|
This caused a bunch of weirdness because eclipse changes a bunch of warnings and quickfixes based on this (such as complaining about lack of @SafeVarargs, a 1.7-only feature).
|
|
|
|
|
|
|
|
Instead they are retrieved
dynamically, with a pinch of caching during runtime. We already had some
fixes to make sure that compile time constanst were not inlined, but we
need to take into account that a lot of the Integer-based enums have
been replaced with actual enums.
Also, certain TreeMaker methods needed to be invoked dynamically with
reflection.
This needs to be reviewed, and if it turns out that these changes are too
dramatic, we should fork out a larger part of our code for specific JVM
versions.
|
|
|
|
After this was finalized I realize that we might consider moving entirely
to String based options, instead of inferring the options from the
provided enum. This setup does have the benefit of throwing exceptions when
options are not present.
|
|
|
|
seems to just remove these from the AST entirely.
|
|
|
|
in our tests, the tests are in the unfortunate scenario where we always compile against a given javac (lib/build/javac6.jar), and always run the tests against a given javac, but that javac tries to use the bootclasspath of the host JRE, and if that is JRE7, you get all sorts of errors.
I fixed it by still compiling against a given javac (we can only ship one lombok.jar after all), but having the test task run with a given bootclasspath and a given javac.jar.
There are 2 tasks that download both rt.jar and javac.jar for either OpenJDK6 or OpenJDK7, and it writes a properties file with those locations. The test task will use this property file, and explain what you need to do if it is not there.
Incidentally, this brought to light issue 422: Delombok in java7 produces VerifyErrors.
|
|
because attrib adds them even in places where that's wrong).
Also split up the SynchronizedName test into separate cases for each expected failure mode.
|
|
which is particularly important for tests.
This does mean delombok really does need your entire source/classpath to work right but there's unfortunately no real avoiding this anyway,
given that we're doing more and more with resolution.
|
|
|
|
Issue #350
|
|
|
|
|
|
on a per Compilation Unit basis. The old way involved making reflective calls and detecting whether you need the 1.6 or the 1.7 variant to do this. These shenanigans are now hidden behind a nice API (lombok.javac.CommentCatcher).
|