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

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

Browse Source
This commit is contained in:
mlangkabel
2018-08-28 16:20:51 +02:00
parent ff92ac7929
commit 8e6d5e6010
104 changed files with 901 additions and 2144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java_indexer/src/main/java/com/sourcetrail/ContextAwareAstVisitor.java
+45 -26
View File
@@ -11,7 +11,6 @@ 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;
@@ -134,7 +133,11 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChild(node.getType());
acceptChildren(node.typeArguments());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
}
return false;
@@ -178,7 +181,11 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChild(node.getExpression());
acceptChildren(node.typeArguments());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChild(node.getName());
acceptChildren(node.arguments());
}
@@ -194,7 +201,11 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChildren(node.typeArguments());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChild(node.getName());
acceptChildren(node.arguments());
}
@@ -209,7 +220,11 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChildren(node.typeArguments());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChildren(node.arguments());
}
@@ -224,7 +239,11 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChild(node.getExpression());
acceptChildren(node.typeArguments());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChildren(node.arguments());
}
@@ -239,23 +258,11 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
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());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
}
return false;
@@ -269,7 +276,11 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChildren(node.typeArguments());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChild(node.getName());
}
@@ -284,7 +295,11 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChildren(node.typeArguments());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
acceptChild(node.getName());
}
@@ -299,7 +314,11 @@ public class ContextAwareAstVisitor extends AstVisitor
if (visitChildren)
{
acceptChild(node.getExpression());
acceptChildren(node.typeArguments());
{
m_typeRefKind.push(ReferenceKind.TYPE_ARGUMENT);
acceptChildren(node.typeArguments());
m_typeRefKind.pop();
}
if (node.getAnonymousClassDeclaration() != null)
{