From 42107d6a8ef41ed13565b041f00a3d9e6b6c1989 Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Sun, 25 Jul 2010 02:17:54 +0200
Subject: Issue 133:	@ToString on an inner class should print Outer.Inner
 instead of Inner

---
 src/core/lombok/eclipse/handlers/HandleToString.java | 20 +++++++++++++++++---
 src/core/lombok/javac/handlers/HandleToString.java   | 12 +++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'src/core')

diff --git a/src/core/lombok/eclipse/handlers/HandleToString.java b/src/core/lombok/eclipse/handlers/HandleToString.java
index 37c73bc8..93821412 100644
--- a/src/core/lombok/eclipse/handlers/HandleToString.java
+++ b/src/core/lombok/eclipse/handlers/HandleToString.java
@@ -177,9 +177,7 @@ public class HandleToString implements EclipseAnnotationHandler<ToString> {
 	
 	private MethodDeclaration createToString(EclipseNode type, Collection<EclipseNode> fields,
 			boolean includeFieldNames, boolean callSuper, ASTNode source, boolean useFieldsDirectly) {
-		TypeDeclaration typeDeclaration = (TypeDeclaration)type.get();
-		char[] rawTypeName = typeDeclaration.name;
-		String typeName = rawTypeName == null ? "" : new String(rawTypeName);
+		String typeName = getTypeName(type);
 		char[] suffix = ")".toCharArray();
 		String infixS = ", ";
 		char[] infix = infixS.toCharArray();
@@ -285,6 +283,22 @@ public class HandleToString implements EclipseAnnotationHandler<ToString> {
 		return method;
 	}
 	
+	private String getTypeName(EclipseNode type) {
+		String typeName = getSingleTypeName(type);
+		EclipseNode upType = type.up();
+		while (upType.getKind() == Kind.TYPE) {
+			typeName = getSingleTypeName(upType) + "." + typeName; 
+			upType = upType.up();
+		}
+		return typeName;
+	}
+	
+	private String getSingleTypeName(EclipseNode type) {
+		TypeDeclaration typeDeclaration = (TypeDeclaration)type.get();
+		char[] rawTypeName = typeDeclaration.name;
+		return rawTypeName == null ? "" : new String(rawTypeName);
+	}
+	
 	private static final Set<String> BUILT_IN_TYPES = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
 			"byte", "short", "int", "long", "char", "boolean", "double", "float")));
 	
diff --git a/src/core/lombok/javac/handlers/HandleToString.java b/src/core/lombok/javac/handlers/HandleToString.java
index 7b1b3b81..4dce4b9f 100644
--- a/src/core/lombok/javac/handlers/HandleToString.java
+++ b/src/core/lombok/javac/handlers/HandleToString.java
@@ -174,7 +174,7 @@ public class HandleToString implements JavacAnnotationHandler<ToString> {
 		
 		boolean first = true;
 		
-		String typeName = ((JCClassDecl) typeNode.get()).name.toString();
+		String typeName = getTypeName(typeNode);
 		String infix = ", ";
 		String suffix = ")";
 		String prefix;
@@ -237,4 +237,14 @@ public class HandleToString implements JavacAnnotationHandler<ToString> {
 		return maker.MethodDef(mods, typeNode.toName("toString"), returnType,
 				List.<JCTypeParameter>nil(), List.<JCVariableDecl>nil(), List.<JCExpression>nil(), body, null);
 	}
+	
+	private String getTypeName(JavacNode typeNode) {
+		String typeName = ((JCClassDecl) typeNode.get()).name.toString();
+		JavacNode upType = typeNode.up();
+		while (upType.getKind() == Kind.TYPE) {
+			typeName = ((JCClassDecl) upType.get()).name.toString() + "." + typeName; 
+			upType = upType.up();
+		}
+		return typeName;
+	}
 }
-- 
cgit