tiennm99/lombok
1
0 Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-10-14 02:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for lombok not compiling if JDK8’s javac is used as default compiler.

Browse Source
This commit is contained in:
Reinier Zwitserloot committed 2014-12-04 02:10:35 +01:00
1 parent f5819f11f4
commit 932dc55b1a
4 files changed
+8 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.xml
+4 -8
View File
@@ -155,16 +155,14 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
</ivy:compile>
<ivy:compile destdir="build/lombok-utils" source="1.5" target="1.5" includeantruntime="false">
<compilerarg value="-Xbootclasspath/p:lib/openJDK6Environment/rt-openjdk6.jar" />
<compilerarg value="-Xbootclasspath/p:build/stubs" />
<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" />
<src path="src/utils" />
<exclude name="lombok/javac/**" />
<classpath refid="build.path" />
</ivy:compile>
<ivy:compile destdir="build/lombok-utils" source="1.6" target="1.6" includeantruntime="false">
<compilerarg value="-Xbootclasspath/p:lib/openJDK6Environment/rt-openjdk6.jar" />
<compilerarg value="-Xbootclasspath/p:build/stubs" />
<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" />
<src path="src/utils" />
<include name="lombok/javac/**" />
<classpath location="build/lombok-utils" />
@@ -176,8 +174,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
</copy>
<ivy:compile destdir="build/lombok" source="1.5" target="1.5" includeantruntime="false">
<compilerarg value="-Xbootclasspath/p:lib/openJDK6Environment/rt-openjdk6.jar" />
<compilerarg value="-Xbootclasspath/p:build/stubs" />
<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" />
<src path="src/launch" />
<src path="src/core" />
<src path="src/installer" />
@@ -188,8 +185,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
</ivy:compile>
<ivy:compile destdir="build/lombok" source="1.6" target="1.6" includeantruntime="false">
<compilerarg value="-Xbootclasspath/p:lib/openJDK6Environment/rt-openjdk6.jar" />
<compilerarg value="-Xbootclasspath/p:build/stubs" />
<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" />
<src path="src/core" />
<src path="src/delombok" />
<include name="lombok/javac/**" />
src/core/lombok/eclipse/handlers/HandlePrintAST.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class HandlePrintAST extends EclipseAnnotationHandler<PrintAST> {
try {
stream.close();
} catch (Exception e) {
Lombok.sneakyThrow(e);
throw Lombok.sneakyThrow(e);
}
}
}
src/core/lombok/javac/handlers/HandlePrintAST.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class HandlePrintAST extends JavacAnnotationHandler<PrintAST> {
try {
stream.close();
} catch (Exception e) {
Lombok.sneakyThrow(e);
throw Lombok.sneakyThrow(e);
}
}
}
src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java
+2 -1
View File
@@ -224,7 +224,8 @@ public class PatchExtensionMethod {
if (methodCall.arguments != null) arguments.addAll(Arrays.asList(methodCall.arguments));
List<TypeBinding> argumentTypes = new ArrayList<TypeBinding>();
for (Expression argument : arguments) {
argumentTypes.add(argument.resolvedType);
if (argument.resolvedType != null) argumentTypes.add(argument.resolvedType);
// TODO: Instead of just skipping nulls entirely, there is probably a 'unresolved type' placeholder. THAT is what we ought to be adding here!
}
MethodBinding fixedBinding = scope.getMethod(extensionMethod.declaringClass, methodCall.selector, argumentTypes.toArray(new TypeBinding[0]), methodCall);
if (fixedBinding instanceof ProblemMethodBinding) {