Merge branch 'master' of git@github.com:rzwitserloot/lombok

1 files changed, 23 insertions, 1 deletions

diff --git a/src/core/lombok/javac/JavacResolution.java b/src/core/lombok/javac/JavacResolution.java
index 653e6d6d..730cca31 100644
--- a/src/core/lombok/javac/JavacResolution.java
+++ b/src/core/lombok/javac/JavacResolution.java
@@ -242,7 +242,7 @@ public class JavacResolution {
 		}
 	}
 	
-	public Map<JCTree, JCTree> resolve(JavacNode node) {
+	public Map<JCTree, JCTree> resolveMethodMember(JavacNode node) {
 		ArrayDeque<JCTree> stack = new ArrayDeque<JCTree>();
 		
 		{
@@ -268,6 +268,28 @@ public class JavacResolution {
 		}
 	}
 	
+	public void resolveClassMember(JavacNode node) {
+		ArrayDeque<JCTree> stack = new ArrayDeque<JCTree>();
+		
+		{
+			JavacNode n = node;
+			while (n != null) {
+				stack.push(n.get());
+				n = n.up();
+			}
+		}
+		
+		logDisabler.disableLoggers();
+		try {
+			EnvFinder finder = new EnvFinder(node.getContext());
+			while (!stack.isEmpty()) stack.pop().accept(finder);
+			
+			attrib(node.get(), finder.get());
+		} finally {
+			logDisabler.enableLoggers();
+		}
+	}
+	
 	private void attrib(JCTree tree, Env<AttrContext> env) {
 		if (tree instanceof JCBlock) attr.attribStat(tree, env);
 		else if (tree instanceof JCMethodDecl) attr.attribStat(((JCMethodDecl)tree).body, env);