data: changed name of Java generic type to use name of declaration
* changed the name resolution of generic type instantiations to use the name of the type's declaration instead of using the provided type arguments here. * fixed tests
This commit is contained in:
@@ -37,6 +37,7 @@ public class ASTDumper extends JavaAstVisitor{
|
||||
line += " [" + ((ClassOrInterfaceType)n).getName() + "]";
|
||||
}
|
||||
|
||||
|
||||
System.out.println(line);
|
||||
}
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@ public class JavaDeclName
|
||||
return string;
|
||||
}
|
||||
|
||||
private String getTypeParameterString()
|
||||
public String getTypeParameterString()
|
||||
{
|
||||
String string = "";
|
||||
if (m_typeParameterNames != null && !m_typeParameterNames.isEmpty())
|
||||
|
||||
@@ -82,6 +82,8 @@ public class JavaSymbolSolverTypeNameResolver extends JavaNameResolver
|
||||
m_ignoredContexts
|
||||
);
|
||||
|
||||
return new JavaTypeName(declName.getName() + declName.getTypeParameterString(), new ArrayList<JavaTypeName>(), declName.getParent());
|
||||
/*
|
||||
if (declName != null)
|
||||
{
|
||||
List<JavaTypeName> typeArgumentNames = new ArrayList<>();
|
||||
@@ -92,6 +94,7 @@ public class JavaSymbolSolverTypeNameResolver extends JavaNameResolver
|
||||
}
|
||||
return new JavaTypeName(declName.getName(), typeArgumentNames, declName.getParent());
|
||||
}
|
||||
*/
|
||||
}
|
||||
else if (typeUsage instanceof TypeParameterUsage)
|
||||
{
|
||||
|
||||
@@ -769,7 +769,7 @@ public:
|
||||
);
|
||||
|
||||
TS_ASSERT_EQUALS(client->typeUses.size(), 1);
|
||||
TS_ASSERT_EQUALS(client->typeUses[0], "A<T>.t -> A<java.lang.Void> <3:2 3:2>");
|
||||
TS_ASSERT_EQUALS(client->typeUses[0], "A<T>.t -> A<T> <3:2 3:2>");
|
||||
}
|
||||
|
||||
void test_java_parser_finds_bound_type_of_type_parameter()
|
||||
|
||||
Reference in New Issue
Block a user