Use Identifier instead of ScalarType in TypeParameter

1 files changed, 17 insertions, 5 deletions

diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
index 3b7a472..4b3c5ea 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
@@ -2,6 +2,7 @@ package org.zwobble.couscous.frontends.java;
 
 import com.google.common.collect.ImmutableSet;
 import org.eclipse.jdt.core.dom.*;
+import org.zwobble.couscous.ast.identifiers.Identifier;
 import org.zwobble.couscous.types.*;
 import org.zwobble.couscous.types.ParameterizedType;
 import org.zwobble.couscous.types.Type;
@@ -42,11 +43,8 @@ public class JavaTypes {
         }
         ITypeBinding outerClass = typeBinding.getDeclaringClass();
         if (typeBinding.isTypeVariable()) {
-            if (outerClass == null) {
-                // TODO: handle type variables for methods properly
-                outerClass = typeBinding.getDeclaringMethod().getDeclaringClass();
-            }
-            return new TypeParameter(erasure(typeOf(outerClass)), typeBinding.getName());
+            Identifier declaringScope = getDeclaringScope(typeBinding);
+            return new TypeParameter(declaringScope, typeBinding.getName());
         }
         ScalarType rawType = outerClass == null
             ? ScalarType.of(typeBinding.getErasure().getQualifiedName())
@@ -62,6 +60,20 @@ public class JavaTypes {
         }
     }
 
+    private static Identifier getDeclaringScope(ITypeBinding typeParameter) {
+        if (typeParameter.getDeclaringClass() == null) {
+            IMethodBinding method = typeParameter.getDeclaringMethod();
+            // TODO: disambiguate overloads
+            return identifierForType(method.getDeclaringClass()).extend(method.getName());
+        } else {
+            return identifierForType(typeParameter.getDeclaringClass());
+        }
+    }
+
+    private static Identifier identifierForType(ITypeBinding type) {
+        return Identifier.TOP.extend(erasure(typeOf(type)).getQualifiedName());
+    }
+
     static Set<Type> superTypes(TypeDeclaration declaration) {
         return superTypes(declaration.resolveBinding());
     }