mirror of
https://github.com/tiennm99/lombok.git
synced 2026-10-13 16:15:16 +00:00
Merge
This commit is contained in:
Roel Spilker committed
commit
3796efe82e
3 files changed
+71
-36
No files matched your search
@@ -1,6 +1,9 @@
|
||||
Lombok Changelog
|
||||
----------------
|
||||
|
||||
### v0.10.7 (edge)
|
||||
* BUGFIX: 0.10.6 causes ClassNotFoundErrors when using ecj (and thus, play framework, gwt, etc). [Issue #320](http://code.google.com/p/projectlombok/issues/detail?id=320)
|
||||
|
||||
### v0.10.6 (December 19th, 2011)
|
||||
* PERFORMANCE: Performance issues (memory leaks) when using lombok in netbeans, introduced in 0.10, have been fixed. [Issue #242](http://code.google.com/p/projectlombok/issues/detail?id=242)
|
||||
* BUGFIX: Eclipse quickfix "Add unimplemented methods" would sometimes insert the new method stubs in strange places, especially if `@Data` was present. [Issue #51](http://code.google.com/p/projectlombok/issues/detail?id=51)
|
||||
|
||||
@@ -78,8 +78,6 @@ public class EclipsePatcher extends Agent {
|
||||
EquinoxClassLoader.registerScripts(sm);
|
||||
}
|
||||
|
||||
patchAvoidReparsingGeneratedCode(sm);
|
||||
|
||||
if (!ecjOnly) {
|
||||
patchCatchReparse(sm);
|
||||
patchIdentifierEndReparse(sm);
|
||||
@@ -99,6 +97,7 @@ public class EclipsePatcher extends Agent {
|
||||
patchPostCompileHookEcj(sm);
|
||||
}
|
||||
|
||||
patchAvoidReparsingGeneratedCode(sm);
|
||||
patchLombokizeAST(sm);
|
||||
patchEcjTransformers(sm, ecjOnly);
|
||||
|
||||
@@ -106,6 +105,27 @@ public class EclipsePatcher extends Agent {
|
||||
}
|
||||
|
||||
private static void patchExtractInterface(ScriptManager sm) {
|
||||
/* Fix sourceEnding for generated nodes to avoid null pointer */
|
||||
sm.addScript(ScriptBuilder.wrapMethodCall()
|
||||
.target(new MethodTarget("org.eclipse.jdt.internal.compiler.SourceElementNotifier", "notifySourceElementRequestor", "void", "org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration", "org.eclipse.jdt.internal.compiler.ast.TypeDeclaration", "org.eclipse.jdt.internal.compiler.ast.ImportReference"))
|
||||
.methodToWrap(new Hook("org.eclipse.jdt.internal.compiler.util.HashtableOfObjectToInt", "get", "int", "java.lang.Object"))
|
||||
.wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "getSourceEndFixed", "int", "int", "org.eclipse.jdt.internal.compiler.ast.ASTNode"))
|
||||
.requestExtra(StackRequest.PARAM1)
|
||||
.transplant().build());
|
||||
|
||||
/* Make sure the generated source element is found instead of the annotation */
|
||||
sm.addScript(ScriptBuilder.wrapMethodCall()
|
||||
.target(new MethodTarget("org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceProcessor", "createMethodDeclaration", "void",
|
||||
"org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite",
|
||||
"org.eclipse.jdt.core.dom.rewrite.ASTRewrite",
|
||||
"org.eclipse.jdt.core.dom.AbstractTypeDeclaration",
|
||||
"org.eclipse.jdt.core.dom.MethodDeclaration"
|
||||
))
|
||||
.methodToWrap(new Hook("org.eclipse.jface.text.IDocument", "get", "java.lang.String", "int", "int"))
|
||||
.wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "getRealMethodDeclarationSource", "java.lang.String", "java.lang.String", "org.eclipse.jdt.core.dom.MethodDeclaration"))
|
||||
.requestExtra(StackRequest.PARAM4)
|
||||
.build());
|
||||
|
||||
/* get real generated node in stead of a random one generated by the annotation */
|
||||
sm.addScript(ScriptBuilder.replaceMethodCall()
|
||||
.target(new MethodTarget("org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceProcessor", "createMemberDeclarations"))
|
||||
@@ -114,13 +134,19 @@ public class EclipsePatcher extends Agent {
|
||||
.replacementMethod(new Hook("lombok.eclipse.agent.PatchFixes", "getRealMethodDeclarationNode", "org.eclipse.jdt.core.dom.MethodDeclaration", "org.eclipse.jdt.core.IMethod", "org.eclipse.jdt.core.dom.CompilationUnit"))
|
||||
.build());
|
||||
|
||||
/* Do not add @Override's for generated methods */
|
||||
/* Do not add @Override's for generated methods */
|
||||
sm.addScript(ScriptBuilder.exitEarly()
|
||||
.target(new MethodTarget("org.eclipse.jdt.core.dom.rewrite.ListRewrite", "insertFirst"))
|
||||
.decisionMethod(new Hook("lombok.eclipse.agent.PatchFixes", "isListRewriteOnGeneratedNode", "boolean", "org.eclipse.jdt.core.dom.rewrite.ListRewrite"))
|
||||
.request(StackRequest.THIS)
|
||||
.build());
|
||||
|
||||
/* Do not add comments for generated methods */
|
||||
sm.addScript(ScriptBuilder.exitEarly()
|
||||
.target(new MethodTarget("org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceProcessor", "createMethodComment"))
|
||||
.decisionMethod(new Hook("lombok.eclipse.agent.PatchFixes", "isGenerated", "boolean", "org.eclipse.jdt.core.dom.ASTNode"))
|
||||
.request(StackRequest.PARAM2)
|
||||
.build());
|
||||
}
|
||||
|
||||
private static void patchSyntaxAndOccurrencesHighlighting(ScriptManager sm) {
|
||||
@@ -172,7 +198,7 @@ public class EclipsePatcher extends Agent {
|
||||
}
|
||||
|
||||
private static void patchSortMembersOperation(ScriptManager sm) {
|
||||
/* Fixes "sort members" action with @Data @Log
|
||||
/* Fixes "sort members" action with @Data @Log
|
||||
* I would have liked to patch sortMembers, but kept getting a VerifyError: Illegal type in constant pool
|
||||
* So now I just patch all calling methods
|
||||
*/
|
||||
@@ -240,6 +266,7 @@ public class EclipsePatcher extends Agent {
|
||||
.target(new MethodTarget("org.eclipse.jdt.internal.compiler.tool.EclipseCompilerImpl", "outputClassFiles"))
|
||||
.methodToWrap(new Hook("javax.tools.JavaFileObject", "openOutputStream", "java.io.OutputStream"))
|
||||
.wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "runPostCompiler", "java.io.OutputStream", "java.io.OutputStream"))
|
||||
.transplant()
|
||||
.build());
|
||||
|
||||
sm.addScript(ScriptBuilder.wrapMethodCall()
|
||||
@@ -247,29 +274,11 @@ public class EclipsePatcher extends Agent {
|
||||
.methodToWrap(new Hook("java.io.BufferedOutputStream", "<init>", "void", "java.io.OutputStream", "int"))
|
||||
.wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "runPostCompiler", "java.io.BufferedOutputStream", "java.io.BufferedOutputStream", "java.lang.String", "java.lang.String"))
|
||||
.requestExtra(StackRequest.PARAM2, StackRequest.PARAM3)
|
||||
.transplant()
|
||||
.build());
|
||||
}
|
||||
|
||||
private static void patchHideGeneratedNodes(ScriptManager sm) {
|
||||
sm.addScript(ScriptBuilder.wrapMethodCall()
|
||||
.target(new MethodTarget("org.eclipse.jdt.internal.compiler.SourceElementNotifier", "notifySourceElementRequestor", "void", "org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration", "org.eclipse.jdt.internal.compiler.ast.TypeDeclaration", "org.eclipse.jdt.internal.compiler.ast.ImportReference"))
|
||||
.methodToWrap(new Hook("org.eclipse.jdt.internal.compiler.util.HashtableOfObjectToInt", "get", "int", "java.lang.Object"))
|
||||
.wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "getSourceEndFixed", "int", "int", "org.eclipse.jdt.internal.compiler.ast.ASTNode"))
|
||||
.requestExtra(StackRequest.PARAM1)
|
||||
.transplant().build());
|
||||
|
||||
sm.addScript(ScriptBuilder.wrapMethodCall()
|
||||
.target(new MethodTarget("org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceProcessor", "createMethodDeclaration", "void",
|
||||
"org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite",
|
||||
"org.eclipse.jdt.core.dom.rewrite.ASTRewrite",
|
||||
"org.eclipse.jdt.core.dom.AbstractTypeDeclaration",
|
||||
"org.eclipse.jdt.core.dom.MethodDeclaration"
|
||||
))
|
||||
.methodToWrap(new Hook("org.eclipse.jface.text.IDocument", "get", "java.lang.String", "int", "int"))
|
||||
.wrapMethod(new Hook("lombok.eclipse.agent.PatchFixes", "getRealMethodDeclarationSource", "java.lang.String", "java.lang.String", "org.eclipse.jdt.core.dom.MethodDeclaration"))
|
||||
.requestExtra(StackRequest.PARAM4)
|
||||
.build());
|
||||
|
||||
sm.addScript(ScriptBuilder.wrapReturnValue()
|
||||
.target(new MethodTarget("org.eclipse.jdt.internal.corext.dom.LinkedNodeFinder", "findByNode"))
|
||||
.target(new MethodTarget("org.eclipse.jdt.internal.corext.dom.LinkedNodeFinder", "findByBinding"))
|
||||
@@ -417,6 +426,7 @@ public class EclipsePatcher extends Agent {
|
||||
"org.eclipse.jdt.internal.compiler.ast.MethodDeclaration",
|
||||
"org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration"))
|
||||
.decisionMethod(new Hook("lombok.eclipse.agent.PatchFixes", "checkBit24", "boolean", "java.lang.Object"))
|
||||
.transplant()
|
||||
.request(StackRequest.PARAM1).build());
|
||||
|
||||
sm.addScript(ScriptBuilder.exitEarly()
|
||||
@@ -424,6 +434,7 @@ public class EclipsePatcher extends Agent {
|
||||
"org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration",
|
||||
"org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration", "boolean"))
|
||||
.decisionMethod(new Hook("lombok.eclipse.agent.PatchFixes", "checkBit24", "boolean", "java.lang.Object"))
|
||||
.transplant()
|
||||
.request(StackRequest.PARAM1).build());
|
||||
|
||||
sm.addScript(ScriptBuilder.exitEarly()
|
||||
@@ -432,6 +443,7 @@ public class EclipsePatcher extends Agent {
|
||||
"org.eclipse.jdt.internal.compiler.ast.TypeDeclaration",
|
||||
"org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration"))
|
||||
.decisionMethod(new Hook("lombok.eclipse.agent.PatchFixes", "checkBit24", "boolean", "java.lang.Object"))
|
||||
.transplant()
|
||||
.request(StackRequest.PARAM1).build());
|
||||
}
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ import java.io.OutputStream;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Stack;
|
||||
|
||||
import lombok.core.DiagnosticsReceiver;
|
||||
import lombok.core.PostCompiler;
|
||||
@@ -36,8 +37,8 @@ import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.jdt.core.IAnnotatable;
|
||||
import org.eclipse.jdt.core.IAnnotation;
|
||||
import org.eclipse.jdt.core.IMethod;
|
||||
import org.eclipse.jdt.core.IType;
|
||||
import org.eclipse.jdt.core.JavaModelException;
|
||||
import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
|
||||
import org.eclipse.jdt.core.dom.MethodDeclaration;
|
||||
import org.eclipse.jdt.core.dom.SimpleName;
|
||||
import org.eclipse.jdt.internal.compiler.ast.Annotation;
|
||||
@@ -96,21 +97,29 @@ public class PatchFixes {
|
||||
}
|
||||
|
||||
|
||||
// lombok.eclipse.agent.PatchFixes.getRealMethodDeclarationNode(Lorg/eclipse/jdt/core/IMethod;Lorg/eclipse/jdt/core/dom/CompilationUnit;)Lorg/eclipse/jdt/core/dom/MethodDeclaration;
|
||||
public static org.eclipse.jdt.core.dom.MethodDeclaration getRealMethodDeclarationNode(org.eclipse.jdt.core.IMethod sourceMethod, org.eclipse.jdt.core.dom.CompilationUnit cuUnit) throws JavaModelException {
|
||||
MethodDeclaration methodDeclarationNode = ASTNodeSearchUtil.getMethodDeclarationNode(sourceMethod, cuUnit);
|
||||
if (isGenerated(methodDeclarationNode)) {
|
||||
String typeName = sourceMethod.getTypeRoot().getElementName();
|
||||
String methodName = sourceMethod.getElementName();
|
||||
for (Object type : cuUnit.types()) {
|
||||
org.eclipse.jdt.core.dom.AbstractTypeDeclaration typeDeclaration = (AbstractTypeDeclaration)type;
|
||||
if ((typeDeclaration.getName()+".java").equals(typeName)) {
|
||||
for (Object declaration : typeDeclaration.bodyDeclarations()) {
|
||||
if (declaration instanceof org.eclipse.jdt.core.dom.MethodDeclaration) {
|
||||
org.eclipse.jdt.core.dom.MethodDeclaration methodDeclaration = (org.eclipse.jdt.core.dom.MethodDeclaration) declaration;
|
||||
if (methodDeclaration.getName().toString().equals(methodName)) {
|
||||
return methodDeclaration;
|
||||
}
|
||||
IType declaringType = sourceMethod.getDeclaringType();
|
||||
Stack<IType> typeStack = new Stack<IType>();
|
||||
while (declaringType != null) {
|
||||
typeStack.push(declaringType);
|
||||
declaringType = declaringType.getDeclaringType();
|
||||
}
|
||||
|
||||
IType rootType = typeStack.pop();
|
||||
org.eclipse.jdt.core.dom.AbstractTypeDeclaration typeDeclaration = findTypeDeclaration(rootType, cuUnit.types());
|
||||
while (!typeStack.isEmpty() && typeDeclaration != null) {
|
||||
typeDeclaration = findTypeDeclaration(typeStack.pop(), typeDeclaration.bodyDeclarations());
|
||||
}
|
||||
|
||||
if (typeStack.isEmpty() && typeDeclaration != null) {
|
||||
String methodName = sourceMethod.getElementName();
|
||||
for (Object declaration : typeDeclaration.bodyDeclarations()) {
|
||||
if (declaration instanceof org.eclipse.jdt.core.dom.MethodDeclaration) {
|
||||
org.eclipse.jdt.core.dom.MethodDeclaration methodDeclaration = (org.eclipse.jdt.core.dom.MethodDeclaration) declaration;
|
||||
if (methodDeclaration.getName().toString().equals(methodName)) {
|
||||
return methodDeclaration;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -119,6 +128,17 @@ public class PatchFixes {
|
||||
return methodDeclarationNode;
|
||||
}
|
||||
|
||||
private static org.eclipse.jdt.core.dom.AbstractTypeDeclaration findTypeDeclaration(IType searchType, List<?> nodes) {
|
||||
for (Object object : nodes) {
|
||||
if (object instanceof org.eclipse.jdt.core.dom.AbstractTypeDeclaration) {
|
||||
org.eclipse.jdt.core.dom.AbstractTypeDeclaration typeDeclaration = (org.eclipse.jdt.core.dom.AbstractTypeDeclaration) object;
|
||||
if (typeDeclaration.getName().toString().equals(searchType.getElementName()))
|
||||
return typeDeclaration;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static int getSourceEndFixed(int sourceEnd, org.eclipse.jdt.internal.compiler.ast.ASTNode node) throws Exception {
|
||||
if (sourceEnd == -1) {
|
||||
org.eclipse.jdt.internal.compiler.ast.ASTNode object = (org.eclipse.jdt.internal.compiler.ast.ASTNode)node.getClass().getField("$generatedBy").get(node);
|
||||
|
||||
Reference in new issue
Block a user