ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: changed Java type_argument edges to originate in the generic type or method

Browse Source 
* added tests for java type argument recording
* implemented recording type arguments for java ExpressionMethodReferences
* changed type_argument edge to originate in generic type
* added type_usage edge for type_arguments that originates in context (e.g. calling method)
This commit is contained in:
mlangkabel
2018-08-20 16:27:53 +02:00
parent 14a8d024b9
commit 36a9d552da
104 changed files with 2136 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java_indexer/src/main/java/com/sourcetrail/ContextAwareAstVisitor.java
+26 -45
View File
@@ -11,6 +11,7 @@ import org.eclipse.jdt.core.dom.ConstructorInvocation;
import org.eclipse.jdt.core.dom.CreationReference;
import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
import org.eclipse.jdt.core.dom.EnumDeclaration;
import org.eclipse.jdt.core.dom.ExpressionMethodReference;
import org.eclipse.jdt.core.dom.FieldDeclaration;
import org.eclipse.jdt.core.dom.ImportDeclaration;
import org.eclipse.jdt.core.dom.Javadoc;
@@ -133,11 +134,7 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChild(node.getType());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChildren(node.typeArguments());
}
return false;
@@ -181,11 +178,7 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChild(node.getExpression());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChildren(node.typeArguments());
acceptChild(node.getName());
acceptChildren(node.arguments());
}
@@ -201,11 +194,7 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChildren(node.typeArguments());
acceptChild(node.getName());
acceptChildren(node.arguments());
}
@@ -220,11 +209,7 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChildren(node.typeArguments());
acceptChildren(node.arguments());
}
@@ -239,11 +224,7 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChild(node.getExpression());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChildren(node.typeArguments());
acceptChildren(node.arguments());
}
@@ -258,11 +239,23 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChildren(node.typeArguments());
}
return false;
}
@Override
public boolean visit(ExpressionMethodReference node)
{
// We don't want to visit qualifiers right now.
boolean visitChildren = super.visit(node);
if (visitChildren)
{
acceptChild(node.getExpression());
acceptChildren(node.typeArguments());
acceptChild(node.getName());
}
return false;
@@ -276,11 +269,7 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChildren(node.typeArguments());
acceptChild(node.getName());
}
@@ -295,11 +284,7 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChildren(node.typeArguments());
acceptChild(node.getName());
}
@@ -314,11 +299,7 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChild(node.getExpression());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChildren(node.typeArguments());
if (node.getAnonymousClassDeclaration() != null)
{