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

@Delegate in eclipse now uses more of the standard infrastructure to inject methods.

Browse Source
This commit is contained in:
Reinier Zwitserloot committed 2010-12-01 20:00:43 +01:00
1 parent b0072a17eb
commit e308909def
2 files changed
+62 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/lombok/eclipse/TransformEclipseAST.java
+24 -23
View File
@@ -84,6 +84,29 @@ public class TransformEclipseAST {
transform(parser, ast);
}
public static EclipseAST getAST(CompilationUnitDeclaration ast) {
EclipseAST existing = null;
if (astCacheField != null) {
try {
existing = (EclipseAST)astCacheField.get(ast);
} catch (Exception e) {
// existing remains null
}
}
if (existing == null) {
existing = new EclipseAST(ast);
if (astCacheField != null) try {
astCacheField.set(ast, existing);
} catch (Exception ignore) {
}
} else {
existing.reparse();
}
return existing;
}
/**
* This method is called immediately after Eclipse finishes building a CompilationUnitDeclaration, which is
* the top-level AST node when Eclipse parses a source file. The signature is 'magic' - you should not
@@ -101,11 +124,7 @@ public class TransformEclipseAST {
if (Symbols.hasSymbol("lombok.disable")) return;
try {
EclipseAST existing = getCache(ast);
if (existing == null) {
existing = new EclipseAST(ast);
setCache(ast, existing);
} else existing.reparse();
EclipseAST existing = getAST(ast);
new TransformEclipseAST(existing).go();
} catch (Throwable t) {
try {
@@ -129,24 +148,6 @@ public class TransformEclipseAST {
}
}
private static EclipseAST getCache(CompilationUnitDeclaration ast) {
if (astCacheField == null) return null;
try {
return (EclipseAST)astCacheField.get(ast);
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
private static void setCache(CompilationUnitDeclaration ast, EclipseAST cache) {
if (astCacheField != null) try {
astCacheField.set(ast, cache);
} catch (Exception ignore) {
ignore.printStackTrace();
}
}
public TransformEclipseAST(EclipseAST ast) {
this.ast = ast;
}
src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java
+38 -25
View File
@@ -33,6 +33,9 @@ import java.util.List;
import java.util.Set;
import lombok.eclipse.Eclipse;
import lombok.eclipse.EclipseAST;
import lombok.eclipse.EclipseNode;
import lombok.eclipse.TransformEclipseAST;
import lombok.eclipse.handlers.EclipseHandlerUtil;
import lombok.patcher.Hook;
import lombok.patcher.MethodTarget;
@@ -47,7 +50,7 @@ import org.eclipse.jdt.internal.compiler.ast.Annotation;
import org.eclipse.jdt.internal.compiler.ast.Argument;
import org.eclipse.jdt.internal.compiler.ast.ArrayInitializer;
import org.eclipse.jdt.internal.compiler.ast.ClassLiteralAccess;
import org.eclipse.jdt.internal.compiler.ast.Clinit;
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.FieldReference;
@@ -87,6 +90,9 @@ public class PatchDelegate {
TypeDeclaration decl = scope.referenceContext;
if (decl == null) return false;
CompilationUnitDeclaration cud = null;
EclipseAST astNode = null;
if (decl.fields != null) for (FieldDeclaration field : decl.fields) {
if (field.annotations == null) continue;
for (Annotation ann : field.annotations) {
@@ -95,6 +101,11 @@ public class PatchDelegate {
if (!charArrayEquals("lombok", tb.qualifiedPackageName())) continue;
if (!charArrayEquals("Delegate", tb.qualifiedSourceName())) continue;
if (cud == null) {
cud = scope.compilationUnitScope().referenceContext;
astNode = TransformEclipseAST.getAST(cud);
}
List<ClassLiteralAccess> rawTypes = new ArrayList<ClassLiteralAccess>();
for (MemberValuePair pair : ann.memberValuePairs()) {
if (pair.name == null || charArrayEquals("value", pair.name)) {
@@ -121,7 +132,7 @@ public class PatchDelegate {
removeExistingMethods(methodsToDelegate, decl, scope);
generateDelegateMethods(decl, methodsToDelegate, field.name, ann);
generateDelegateMethods(astNode.get(decl), methodsToDelegate, field.name, ann);
}
}
@@ -154,29 +165,31 @@ public class PatchDelegate {
}
}
private static void generateDelegateMethods(TypeDeclaration type, List<MethodBinding> methods, char[] delegate, ASTNode source) {
private static void generateDelegateMethods(EclipseNode typeNode, List<MethodBinding> methods, char[] delegate, ASTNode source) {
CompilationUnitDeclaration top = (CompilationUnitDeclaration) typeNode.top().get();
for (MethodBinding binding : methods) {
MethodDeclaration method = generateDelegateMethod(delegate, binding, type.compilationResult, source);
if (type.methods == null) {
type.methods = new AbstractMethodDeclaration[1];
type.methods[0] = method;
} else {
int insertionPoint;
for (insertionPoint = 0; insertionPoint < type.methods.length; insertionPoint++) {
AbstractMethodDeclaration current = type.methods[insertionPoint];
if (current instanceof Clinit) continue;
if (Eclipse.isGenerated(current)) continue;
break;
}
AbstractMethodDeclaration[] newArray = new AbstractMethodDeclaration[type.methods.length + 1];
System.arraycopy(type.methods, 0, newArray, 0, insertionPoint);
if (insertionPoint <= type.methods.length) {
System.arraycopy(type.methods, insertionPoint, newArray, insertionPoint + 1, type.methods.length - insertionPoint);
}
newArray[insertionPoint] = method;
type.methods = newArray;
}
MethodDeclaration method = generateDelegateMethod(delegate, binding, top.compilationResult, source);
EclipseHandlerUtil.injectMethod(typeNode, method);
// if (type.methods == null) {
// type.methods = new AbstractMethodDeclaration[1];
// type.methods[0] = method;
// } else {
// int insertionPoint;
// for (insertionPoint = 0; insertionPoint < type.methods.length; insertionPoint++) {
// AbstractMethodDeclaration current = type.methods[insertionPoint];
// if (current instanceof Clinit) continue;
// if (Eclipse.isGenerated(current)) continue;
// break;
// }
// AbstractMethodDeclaration[] newArray = new AbstractMethodDeclaration[type.methods.length + 1];
// System.arraycopy(type.methods, 0, newArray, 0, insertionPoint);
// if (insertionPoint <= type.methods.length) {
// System.arraycopy(type.methods, insertionPoint, newArray, insertionPoint + 1, type.methods.length - insertionPoint);
// }
//
// newArray[insertionPoint] = method;
// type.methods = newArray;
// }
}
}
@@ -188,7 +201,7 @@ public class PatchDelegate {
method.sourceStart = pS; method.sourceEnd = pE;
method.modifiers = ClassFileConstants.AccPublic;
method.returnType = Eclipse.makeType(binding.returnType, source, false);
method.annotations = EclipseHandlerUtil.createSuppressWarningsAll(source, null);
method.annotations = null;
if (binding.parameters != null && binding.parameters.length > 0) {
method.arguments = new Argument[binding.parameters.length];
for (int i = 0; i < method.arguments.length; i++) {