mirror of
https://github.com/tiennm99/lombok.git
synced 2026-10-14 02:16:18 +00:00
Fixes for eclipse mars.
This commit is contained in:
Reinier Zwitserloot committed
1 parent
251fd03cd7
commit
75647ee2df
5 files changed
+108
-11
No files matched your search
@@ -382,6 +382,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
|
||||
<antcall target="-augmentClasspath"><param name="pluginName" value="org.eclipse.osgi" /></antcall>
|
||||
<antcall target="-augmentClasspath"><param name="pluginName" value="org.eclipse.jdt.core" /></antcall>
|
||||
<antcall target="-augmentClasspath"><param name="pluginName" value="org.eclipse.jdt.ui" /></antcall>
|
||||
<antcall target="-augmentClasspath"><param name="pluginName" value="org.eclipse.jface.text" /></antcall>
|
||||
<antcall target="-augmentClasspath"><param name="pluginName" value="org.eclipse.core.resources" /></antcall>
|
||||
<antcall target="-augmentClasspath"><param name="pluginName" value="org.eclipse.core.jobs" /></antcall>
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ Lombok Changelog
|
||||
* BUGFIX: Parameterized static methods with `@Builder` would produce compiler errors in javac. [Issue #793](https://code.google.com/p/projectlombok/issues/detail?id=793).
|
||||
* PERFORMANCE: the config system caused significant slowdowns in eclipse if the filesystem is very slow (network file system) or has a slow authentication system.
|
||||
* FEATURE: the `hashCode()` method generated by lombok via `@EqualsAndHashCode`, `@Data`, and `@Value` is now smarter about nulls; they are treated as if they hash to a magic prime instead of 0, which reduces hash collisions.
|
||||
* BUGFIX: Various quickfixes in Eclipse Mars were broken. [Issue #835](https://code.google.com/p/projectlombok/issues/detail?id=835) [Issue #831](https://code.google.com/p/projectlombok/issues/detail?id=831).
|
||||
|
||||
### v1.16.4 (April 14th, 2015)
|
||||
* BUGFIX: Lombok now works with Eclipse Mars.
|
||||
|
||||
@@ -369,11 +369,35 @@ public class EclipsePatcher implements AgentLauncher.AgentLaunchable {
|
||||
}
|
||||
|
||||
private static void patchRetrieveRightBraceOrSemiColonPosition(ScriptManager sm) {
|
||||
sm.addScript(ScriptBuilder.wrapReturnValue()
|
||||
.target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "retrieveRightBraceOrSemiColonPosition"))
|
||||
.target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "retrieveRightBrace"))
|
||||
.wrapMethod(new Hook("lombok.launch.PatchFixesHider$PatchFixes", "fixRetrieveRightBraceOrSemiColonPosition", "int", "int", "int"))
|
||||
.transplant().request(StackRequest.RETURN_VALUE, StackRequest.PARAM2).build());
|
||||
sm.addScript(ScriptBuilder.wrapMethodCall()
|
||||
.target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "convert", "org.eclipse.jdt.core.dom.ASTNode", "boolean", "org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration"))
|
||||
.methodToWrap(new Hook("org.eclipse.jdt.core.dom.ASTConverter", "retrieveRightBraceOrSemiColonPosition", "int", "int", "int"))
|
||||
.wrapMethod(new Hook("lombok.launch.PatchFixesHider$PatchFixes", "fixRetrieveRightBraceOrSemiColonPosition", "int", "int", "org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration"))
|
||||
.requestExtra(StackRequest.PARAM2)
|
||||
.transplant()
|
||||
.build());
|
||||
|
||||
sm.addScript(ScriptBuilder.wrapMethodCall()
|
||||
.target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "convert", "org.eclipse.jdt.core.dom.ASTNode", "boolean", "org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration"))
|
||||
.methodToWrap(new Hook("org.eclipse.jdt.core.dom.ASTConverter", "retrieveRightBrace", "int", "int", "int"))
|
||||
.wrapMethod(new Hook("lombok.launch.PatchFixesHider$PatchFixes", "fixRetrieveRightBraceOrSemiColonPosition", "int", "int", "org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration"))
|
||||
.requestExtra(StackRequest.PARAM2)
|
||||
.transplant()
|
||||
.build());
|
||||
|
||||
sm.addScript(ScriptBuilder.wrapMethodCall()
|
||||
.target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "convert", "org.eclipse.jdt.core.dom.ASTNode", "org.eclipse.jdt.internal.compiler.ast.FieldDeclaration"))
|
||||
.methodToWrap(new Hook("org.eclipse.jdt.core.dom.ASTConverter", "retrieveRightBrace", "int", "int", "int"))
|
||||
.wrapMethod(new Hook("lombok.launch.PatchFixesHider$PatchFixes", "fixRetrieveRightBraceOrSemiColonPosition", "int", "int", "org.eclipse.jdt.internal.compiler.ast.FieldDeclaration"))
|
||||
.requestExtra(StackRequest.PARAM1)
|
||||
.transplant()
|
||||
.build());
|
||||
|
||||
// sm.addScript(ScriptBuilder.wrapReturnValue()
|
||||
// .target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "retrieveRightBraceOrSemiColonPosition"))
|
||||
// .target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "retrieveRightBrace"))
|
||||
// .wrapMethod(new Hook("lombok.launch.PatchFixesHider$PatchFixes", "fixRetrieveRightBraceOrSemiColonPosition", "int", "int", "int"))
|
||||
// .transplant().request(StackRequest.RETURN_VALUE, StackRequest.PARAM2).build());
|
||||
}
|
||||
|
||||
private static void patchSetGeneratedFlag(ScriptManager sm) {
|
||||
@@ -671,6 +695,7 @@ public class EclipsePatcher implements AgentLauncher.AgentLaunchable {
|
||||
final String PATCH_EXTENSIONMETHOD_COMPLETIONPROPOSAL_PORTAL = "lombok.eclipse.agent.PatchExtensionMethodCompletionProposalPortal";
|
||||
final String MESSAGE_SEND_SIG = "org.eclipse.jdt.internal.compiler.ast.MessageSend";
|
||||
final String TYPE_BINDING_SIG = "org.eclipse.jdt.internal.compiler.lookup.TypeBinding";
|
||||
final String SCOPE_SIG = "org.eclipse.jdt.internal.compiler.lookup.Scope";
|
||||
final String BLOCK_SCOPE_SIG = "org.eclipse.jdt.internal.compiler.lookup.BlockScope";
|
||||
final String TYPE_BINDINGS_SIG = "org.eclipse.jdt.internal.compiler.lookup.TypeBinding[]";
|
||||
final String PROBLEM_REPORTER_SIG = "org.eclipse.jdt.internal.compiler.problem.ProblemReporter";
|
||||
@@ -698,6 +723,13 @@ public class EclipsePatcher implements AgentLauncher.AgentLaunchable {
|
||||
.replacementMethod(new Hook(PATCH_EXTENSIONMETHOD, "invalidMethod", "void", PROBLEM_REPORTER_SIG, MESSAGE_SEND_SIG, METHOD_BINDING_SIG))
|
||||
.build());
|
||||
|
||||
// Since eclipse mars; they added a param.
|
||||
sm.addScript(replaceMethodCall()
|
||||
.target(new MethodTarget(MESSAGE_SEND_SIG, "resolveType", TYPE_BINDING_SIG, BLOCK_SCOPE_SIG))
|
||||
.methodToReplace(new Hook(PROBLEM_REPORTER_SIG, "invalidMethod", "void", MESSAGE_SEND_SIG, METHOD_BINDING_SIG, SCOPE_SIG))
|
||||
.replacementMethod(new Hook(PATCH_EXTENSIONMETHOD, "invalidMethod", "void", PROBLEM_REPORTER_SIG, MESSAGE_SEND_SIG, METHOD_BINDING_SIG, SCOPE_SIG))
|
||||
.build());
|
||||
|
||||
if (!ecj) {
|
||||
sm.addScript(wrapReturnValue()
|
||||
.target(new MethodTarget(COMPLETION_PROPOSAL_COLLECTOR_SIG, "getJavaCompletionProposals", I_JAVA_COMPLETION_PROPOSAL_SIG))
|
||||
|
||||
@@ -24,6 +24,8 @@ package lombok.eclipse.agent;
|
||||
import static lombok.eclipse.handlers.EclipseHandlerUtil.createAnnotation;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
@@ -56,6 +58,7 @@ import org.eclipse.jdt.internal.compiler.lookup.CompilationUnitScope;
|
||||
import org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
|
||||
import org.eclipse.jdt.internal.compiler.lookup.ProblemMethodBinding;
|
||||
import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
|
||||
import org.eclipse.jdt.internal.compiler.lookup.Scope;
|
||||
import org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
|
||||
import org.eclipse.jdt.internal.compiler.lookup.TypeIds;
|
||||
import org.eclipse.jdt.internal.compiler.problem.ProblemReporter;
|
||||
@@ -89,16 +92,47 @@ public class PatchExtensionMethod {
|
||||
private final ProblemReporter problemReporter;
|
||||
private final WeakReference<MessageSend> messageSendRef;
|
||||
private final MethodBinding method;
|
||||
private final Scope scope;
|
||||
|
||||
PostponedInvalidMethodError(ProblemReporter problemReporter, MessageSend messageSend, MethodBinding method) {
|
||||
private static final Method shortMethod = getMethod("invalidMethod", MessageSend.class, MethodBinding.class);
|
||||
private static final Method longMethod = getMethod("invalidMethod", MessageSend.class, MethodBinding.class, Scope.class);
|
||||
|
||||
private static Method getMethod(String name, Class<?>... types) {
|
||||
try {
|
||||
Method m = ProblemReporter.class.getMethod(name, types);
|
||||
m.setAccessible(true);
|
||||
return m;
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
PostponedInvalidMethodError(ProblemReporter problemReporter, MessageSend messageSend, MethodBinding method, Scope scope) {
|
||||
this.problemReporter = problemReporter;
|
||||
this.messageSendRef = new WeakReference<MessageSend>(messageSend);
|
||||
this.method = method;
|
||||
this.scope = scope;
|
||||
}
|
||||
|
||||
static void invoke(ProblemReporter problemReporter, MessageSend messageSend, MethodBinding method, Scope scope) {
|
||||
if (messageSend != null) {
|
||||
try {
|
||||
if (shortMethod != null) shortMethod.invoke(problemReporter, messageSend, method);
|
||||
else if (longMethod != null) longMethod.invoke(problemReporter, messageSend, method, scope);
|
||||
} catch (IllegalAccessException e) {
|
||||
throw new RuntimeException(e);
|
||||
} catch (InvocationTargetException e) {
|
||||
Throwable t = e.getCause();
|
||||
if (t instanceof Error) throw (Error) t;
|
||||
if (t instanceof RuntimeException) throw (RuntimeException) t;
|
||||
throw new RuntimeException(t);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void fire() {
|
||||
MessageSend messageSend = messageSendRef.get();
|
||||
if (messageSend != null) problemReporter.invalidMethod(messageSend, method);
|
||||
invoke(problemReporter, messageSend, method, scope);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,7 +219,11 @@ public class PatchExtensionMethod {
|
||||
}
|
||||
|
||||
public static void invalidMethod(ProblemReporter problemReporter, MessageSend messageSend, MethodBinding method) {
|
||||
MessageSend_postponedErrors.set(messageSend, new PostponedInvalidMethodError(problemReporter, messageSend, method));
|
||||
MessageSend_postponedErrors.set(messageSend, new PostponedInvalidMethodError(problemReporter, messageSend, method, null));
|
||||
}
|
||||
|
||||
public static void invalidMethod(ProblemReporter problemReporter, MessageSend messageSend, MethodBinding method, Scope scope) {
|
||||
MessageSend_postponedErrors.set(messageSend, new PostponedInvalidMethodError(problemReporter, messageSend, method, scope));
|
||||
}
|
||||
|
||||
public static TypeBinding resolveType(TypeBinding resolvedType, MessageSend methodCall, BlockScope scope) {
|
||||
@@ -233,7 +271,7 @@ public class PatchExtensionMethod {
|
||||
if (fixedBinding instanceof ProblemMethodBinding) {
|
||||
methodCall.arguments = originalArgs;
|
||||
if (fixedBinding.declaringClass != null) {
|
||||
scope.problemReporter().invalidMethod(methodCall, fixedBinding);
|
||||
PostponedInvalidMethodError.invoke(scope.problemReporter(), methodCall, fixedBinding, scope);
|
||||
}
|
||||
} else {
|
||||
for (int i = 0, iend = arguments.size(); i < iend; i++) {
|
||||
|
||||
@@ -41,14 +41,17 @@ import org.eclipse.jdt.core.IType;
|
||||
import org.eclipse.jdt.core.JavaModelException;
|
||||
import org.eclipse.jdt.core.dom.MethodDeclaration;
|
||||
import org.eclipse.jdt.core.dom.SimpleName;
|
||||
import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
|
||||
import org.eclipse.jdt.internal.compiler.ast.Annotation;
|
||||
import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
|
||||
import org.eclipse.jdt.internal.compiler.ast.Expression;
|
||||
import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration;
|
||||
import org.eclipse.jdt.internal.compiler.ast.ForeachStatement;
|
||||
import org.eclipse.jdt.internal.compiler.ast.LocalDeclaration;
|
||||
import org.eclipse.jdt.internal.compiler.ast.MessageSend;
|
||||
import org.eclipse.jdt.internal.compiler.lookup.BlockScope;
|
||||
import org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
|
||||
import org.eclipse.jdt.internal.compiler.lookup.Scope;
|
||||
import org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
|
||||
import org.eclipse.jdt.internal.compiler.parser.Parser;
|
||||
import org.eclipse.jdt.internal.compiler.problem.ProblemReporter;
|
||||
@@ -258,13 +261,14 @@ final class PatchFixesHider {
|
||||
public static final class ExtensionMethod {
|
||||
private static final Method RESOLVE_TYPE;
|
||||
private static final Method ERROR_NO_METHOD_FOR;
|
||||
private static final Method INVALID_METHOD;
|
||||
private static final Method INVALID_METHOD, INVALID_METHOD2;
|
||||
|
||||
static {
|
||||
Class<?> shadowed = Util.shadowLoadClass("lombok.eclipse.agent.PatchExtensionMethod");
|
||||
RESOLVE_TYPE = Util.findMethod(shadowed, "resolveType", TypeBinding.class, MessageSend.class, BlockScope.class);
|
||||
ERROR_NO_METHOD_FOR = Util.findMethod(shadowed, "errorNoMethodFor", ProblemReporter.class, MessageSend.class, TypeBinding.class, TypeBinding[].class);
|
||||
INVALID_METHOD = Util.findMethod(shadowed, "invalidMethod", ProblemReporter.class, MessageSend.class, MethodBinding.class);
|
||||
INVALID_METHOD2 = Util.findMethod(shadowed, "invalidMethod", ProblemReporter.class, MessageSend.class, MethodBinding.class, Scope.class);
|
||||
}
|
||||
|
||||
public static TypeBinding resolveType(TypeBinding resolvedType, MessageSend methodCall, BlockScope scope) {
|
||||
@@ -278,6 +282,10 @@ final class PatchFixesHider {
|
||||
public static void invalidMethod(ProblemReporter problemReporter, MessageSend messageSend, MethodBinding method) {
|
||||
Util.invokeMethod(INVALID_METHOD, problemReporter, messageSend, method);
|
||||
}
|
||||
|
||||
public static void invalidMethod(ProblemReporter problemReporter, MessageSend messageSend, MethodBinding method, Scope scope) {
|
||||
Util.invokeMethod(INVALID_METHOD2, problemReporter, messageSend, method, scope);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -469,7 +477,24 @@ final class PatchFixesHider {
|
||||
}
|
||||
|
||||
public static int fixRetrieveRightBraceOrSemiColonPosition(int original, int end) {
|
||||
return original == -1 ? end : original; // Need to fix: see issue 325.
|
||||
// if (original == -1) {
|
||||
// Thread.dumpStack();
|
||||
// }
|
||||
return original == -1 ? end : original;
|
||||
}
|
||||
|
||||
public static int fixRetrieveRightBraceOrSemiColonPosition(int retVal, AbstractMethodDeclaration amd) {
|
||||
if (retVal != -1 || amd == null) return retVal;
|
||||
boolean isGenerated = EclipseAugments.ASTNode_generatedBy.get(amd) != null;
|
||||
if (isGenerated) return amd.declarationSourceEnd;
|
||||
return -1;
|
||||
}
|
||||
|
||||
public static int fixRetrieveRightBraceOrSemiColonPosition(int retVal, FieldDeclaration fd) {
|
||||
if (retVal != -1 || fd == null) return retVal;
|
||||
boolean isGenerated = EclipseAugments.ASTNode_generatedBy.get(fd) != null;
|
||||
if (isGenerated) return fd.declarationSourceEnd;
|
||||
return -1;
|
||||
}
|
||||
|
||||
public static final int ALREADY_PROCESSED_FLAG = 0x800000; //Bit 24
|
||||
|
||||
Reference in new issue
Block a user