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

@Helper is now legal in just about every place method local classes are legal. Also now no longer messes up syntax highlighting in eclipse.

Browse Source 
Still need to investigate how to improve autocomplete presence of helper methods.
This commit is contained in:
Reinier Zwitserloot committed 2016-03-07 15:21:01 +01:00
1 parent 07b8af4cc5
commit 3378cbe655
7 files changed
+94 -56
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/lombok/eclipse/handlers/HandleHelper.java
+22 -7
View File
@@ -33,12 +33,14 @@ import org.eclipse.jdt.internal.compiler.ast.ASTNode;
import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
import org.eclipse.jdt.internal.compiler.ast.AllocationExpression;
import org.eclipse.jdt.internal.compiler.ast.Annotation;
import org.eclipse.jdt.internal.compiler.ast.Block;
import org.eclipse.jdt.internal.compiler.ast.LocalDeclaration;
import org.eclipse.jdt.internal.compiler.ast.MessageSend;
import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;
import org.eclipse.jdt.internal.compiler.ast.SingleNameReference;
import org.eclipse.jdt.internal.compiler.ast.SingleTypeReference;
import org.eclipse.jdt.internal.compiler.ast.Statement;
import org.eclipse.jdt.internal.compiler.ast.SwitchStatement;
import org.eclipse.jdt.internal.compiler.ast.ThisReference;
import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
@@ -48,7 +50,6 @@ import org.mangosdk.spi.ProviderFor;
import lombok.ConfigurationKeys;
import lombok.core.AST.Kind;
import lombok.core.AnnotationValues;
import lombok.eclipse.Eclipse;
import lombok.eclipse.EclipseAnnotationHandler;
import lombok.eclipse.EclipseNode;
import lombok.experimental.Helper;
@@ -58,19 +59,33 @@ import lombok.experimental.Helper;
*/
@ProviderFor(EclipseAnnotationHandler.class)
public class HandleHelper extends EclipseAnnotationHandler<Helper> {
private Statement[] getStatementsFromAstNode(ASTNode node) {
if (node instanceof Block) return ((Block) node).statements;
if (node instanceof AbstractMethodDeclaration) return ((AbstractMethodDeclaration) node).statements;
if (node instanceof SwitchStatement) return ((SwitchStatement) node).statements;
return null;
}
private void setStatementsOfAstNode(ASTNode node, Statement[] statements) {
if (node instanceof Block) ((Block) node).statements = statements;
else if (node instanceof AbstractMethodDeclaration) ((AbstractMethodDeclaration) node).statements = statements;
else if (node instanceof SwitchStatement) ((SwitchStatement) node).statements = statements;
else throw new IllegalArgumentException("Can't set statements on node type: " + node.getClass());
}
@Override public void handle(AnnotationValues<Helper> annotation, Annotation ast, EclipseNode annotationNode) {
handleExperimentalFlagUsage(annotationNode, ConfigurationKeys.HELPER_FLAG_USAGE, "@Helper");
EclipseNode annotatedType = annotationNode.up();
EclipseNode containingMethod = annotatedType == null ? null : annotatedType.up();
if (annotatedType == null || containingMethod == null || annotatedType.getKind() != Kind.TYPE || containingMethod.getKind() != Kind.METHOD) {
EclipseNode containingBlock = annotatedType == null ? null : annotatedType.directUp();
Statement[] origStatements = getStatementsFromAstNode(containingBlock == null ? null : containingBlock.get());
if (annotatedType == null || annotatedType.getKind() != Kind.TYPE || origStatements == null) {
annotationNode.addError("@Helper is legal only on method-local classes.");
return;
}
TypeDeclaration annotatedType_ = (TypeDeclaration) annotatedType.get();
AbstractMethodDeclaration amd = (AbstractMethodDeclaration) containingMethod.get();
Statement[] origStatements = amd.statements;
int indexOfType = -1;
for (int i = 0; i < origStatements.length; i++) {
if (origStatements[i] == annotatedType_) {
@@ -105,7 +120,7 @@ public class HandleHelper extends EclipseAnnotationHandler<Helper> {
if (name == null || name.length == 0 || name[0] == '<') return true;
String n = new String(name);
if (Arrays.binarySearch(knownMethodNames_, n) < 0) return true;
messageSend.receiver = new SingleNameReference(helperName, Eclipse.pos(messageSend));
messageSend.receiver = new SingleNameReference(helperName, messageSend.nameSourcePosition);
helperUsed[0] = true;
return true;
}
@@ -132,6 +147,6 @@ public class HandleHelper extends EclipseAnnotationHandler<Helper> {
SetGeneratedByVisitor sgbvVisitor = new SetGeneratedByVisitor(annotationNode.get());
decl.traverse(sgbvVisitor, null);
newStatements[indexOfType + 1] = decl;
amd.statements = newStatements;
setStatementsOfAstNode(containingBlock.get(), newStatements);
}
}
src/core/lombok/javac/handlers/HandleHelper.java
+19 -6
View File
@@ -35,11 +35,13 @@ import com.sun.source.tree.MethodInvocationTree;
import com.sun.source.tree.TreeVisitor;
import com.sun.source.util.TreeScanner;
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.JCAnnotation;
import com.sun.tools.javac.tree.JCTree.JCBlock;
import com.sun.tools.javac.tree.JCTree.JCCase;
import com.sun.tools.javac.tree.JCTree.JCClassDecl;
import com.sun.tools.javac.tree.JCTree.JCExpression;
import com.sun.tools.javac.tree.JCTree.JCIdent;
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
import com.sun.tools.javac.tree.JCTree.JCMethodInvocation;
import com.sun.tools.javac.tree.JCTree.JCStatement;
import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
@@ -57,21 +59,32 @@ import lombok.javac.JavacTreeMaker;
@ProviderFor(JavacAnnotationHandler.class)
public class HandleHelper extends JavacAnnotationHandler<Helper> {
private List<JCStatement> getStatementsFromJcNode(JCTree tree) {
if (tree instanceof JCBlock) return ((JCBlock) tree).stats;
if (tree instanceof JCCase) return ((JCCase) tree).stats;
return null;
}
private void setStatementsOfJcNode(JCTree tree, List<JCStatement> statements) {
if (tree instanceof JCBlock) ((JCBlock) tree).stats = statements;
else if (tree instanceof JCCase) ((JCCase) tree).stats = statements;
else throw new IllegalArgumentException("Can't set statements on node type: " + tree.getClass());
}
@Override public void handle(AnnotationValues<Helper> annotation, JCAnnotation ast, JavacNode annotationNode) {
handleExperimentalFlagUsage(annotationNode, ConfigurationKeys.HELPER_FLAG_USAGE, "@Helper");
deleteAnnotationIfNeccessary(annotationNode, Helper.class);
JavacNode annotatedType = annotationNode.up();
JavacNode containingMethod = annotatedType == null ? null : annotatedType.up();
JavacNode containingBlock = annotatedType == null ? null : annotatedType.directUp();
List<JCStatement> origStatements = getStatementsFromJcNode(containingBlock == null ? null : containingBlock.get());
if (annotatedType == null || containingMethod == null || annotatedType.getKind() != Kind.TYPE || containingMethod.getKind() != Kind.METHOD) {
if (annotatedType == null || annotatedType.getKind() != Kind.TYPE || origStatements == null) {
annotationNode.addError("@Helper is legal only on method-local classes.");
return;
}
JCClassDecl annotatedType_ = (JCClassDecl) annotatedType.get();
JCMethodDecl amd = (JCMethodDecl) containingMethod.get();
List<JCStatement> origStatements = amd.body.stats;
Iterator<JCStatement> it = origStatements.iterator();
while (it.hasNext()) {
if (it.next() == annotatedType_) {
@@ -133,6 +146,6 @@ public class HandleHelper extends JavacAnnotationHandler<Helper> {
JCVariableDecl decl = maker.VarDef(maker.Modifiers(Flags.FINAL), helperName, varType, init);
newStatements.append(decl);
}
amd.body.stats = newStatements.toList();
setStatementsOfJcNode(containingBlock.get(), newStatements.toList());
}
}
test/transform/resource/after-delombok/Helper.java
+13 -10
View File
@@ -1,15 +1,18 @@
class HelperTest {
void test() {
class H1 {
void foo() {
System.out.println("Hello");
{
final int z = 5;
if (Boolean.TRUE) {
class H1 {
void foo(int x) {
System.out.println("Hello, " + (x + z));
}
}
}
final H1 $H1 = new H1();
$H1.foo();
class H2 {
void bar() {
$H1.foo();
final H1 $H1 = new H1();
$H1.foo(10);
class H2 {
void bar() {
$H1.foo(12);
}
}
}
}
test/transform/resource/after-ecj/Helper.java
+24 -20
View File
@@ -1,26 +1,30 @@
import lombok.experimental.Helper;
class HelperTest {
{
final int z = 5;
if (Boolean.TRUE)
{
@Helper class H1 {
H1() {
super();
}
void foo(int x) {
System.out.println(("Hello, " + (x + z)));
}
}
final H1 $H1 = new H1();
$H1.foo(10);
@Helper class H2 {
H2() {
super();
}
void bar() {
$H1.foo(12);
}
}
}
}
HelperTest() {
super();
}
void test() {
@Helper class H1 {
H1() {
super();
}
void foo() {
System.out.println("Hello");
}
}
final H1 $H1 = new H1();
$H1.foo();
@Helper class H2 {
H2() {
super();
}
void bar() {
$H1.foo();
}
}
}
}
test/transform/resource/before/Helper.java
+14 -11
View File
@@ -1,18 +1,21 @@
import lombok.experimental.Helper;
class HelperTest {
void test() {
@Helper class H1 {
void foo() {
System.out.println("Hello");
{
final int z = 5;
if (Boolean.TRUE) {
@Helper class H1 {
void foo(int x) {
System.out.println("Hello, " + (x + z));
}
}
}
foo();
@Helper class H2 {
void bar() {
foo();
foo(10);
@Helper class H2 {
void bar() {
foo(12);
}
}
}
}
test/transform/resource/messages-delombok/Helper.java.messages
+1 -1
View File
@@ -1 +1 @@
13 No methods of this helper class are ever used.
15 No methods of this helper class are ever used.
test/transform/resource/messages-ecj/Helper.java.messages
+1 -1
View File
@@ -1 +1 @@
13 No methods of this helper class are ever used.
15 No methods of this helper class are ever used.