Include return type when generating method names

2 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/org/zwobble/couscous/ast/MethodSignature.java b/src/main/java/org/zwobble/couscous/ast/MethodSignature.java
index d7bc725..908e673 100644
--- a/src/main/java/org/zwobble/couscous/ast/MethodSignature.java
+++ b/src/main/java/org/zwobble/couscous/ast/MethodSignature.java
@@ -21,6 +21,10 @@ public class MethodSignature {
         return arguments;
     }
 
+    public TypeName getReturnType() {
+        return returnType;
+    }
+
     @Override
     public String toString() {
         return "MethodSignature(" +
diff --git a/src/main/java/org/zwobble/couscous/backends/Names.java b/src/main/java/org/zwobble/couscous/backends/Names.java
index fc8072f..d467296 100644
--- a/src/main/java/org/zwobble/couscous/backends/Names.java
+++ b/src/main/java/org/zwobble/couscous/backends/Names.java
@@ -3,6 +3,7 @@ package org.zwobble.couscous.backends;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Iterables;
 import org.zwobble.couscous.ast.MethodSignature;
+import org.zwobble.couscous.ast.TypeName;
 
 import static com.google.common.collect.Iterables.transform;
 import static org.zwobble.couscous.util.ExtraLists.list;
@@ -11,6 +12,11 @@ public class Names {
     public static String toUniqueName(MethodSignature signature) {
         return Joiner.on("__").join(Iterables.concat(
             list(signature.getName()),
-            transform(signature.getArguments(), argument -> argument.getQualifiedName().replace('.', '_'))));
+            transform(signature.getArguments(), Names::typeToString),
+            list(typeToString(signature.getReturnType()))));
+    }
+
+    private static String typeToString(TypeName argument) {
+        return argument.getQualifiedName().replace('.', '_');
     }
 }