Merged PR 454676: Do not emit index event for TypeDeclaration

Do not emit index event for TypeDeclaration
microsoft · Apr 9, 2019 · b421025 · b421025
1 parent fb80cd7
commit b421025
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 19 deletions.
diff --git a/....java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/DefinitionVisitor.java b/....java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/DefinitionVisitor.java
@@ -12,7 +12,6 @@
 import org.eclipse.jdt.core.dom.SimpleType;
 import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.jdt.ls.core.internal.JDTUtils;
 import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager;
 import org.eclipse.lsp4j.Location;
@@ -34,7 +33,7 @@ public DefinitionVisitor() {
 	@Override
 	public boolean visit(SimpleName node) {
 		emitDefinition(node.getStartPosition(), node.getLength());
-		return super.visit(node);
+		return false;
 	}
 
 	@Override
@@ -44,12 +43,6 @@ public boolean visit(SingleVariableDeclaration node) {
 		return false;
 	}
 
-	@Override
-	public boolean visit(TypeDeclaration node) {
-		emitDefinition(node.getStartPosition(), node.getLength());
-		return true;
-	}
-
 	@Override
 	public boolean visit(SimpleType node) {
 		emitDefinition(node.getStartPosition(), node.getLength());

diff --git a/...osoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/HoverVisitor.java b/...osoft.java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/HoverVisitor.java
@@ -38,13 +38,13 @@ public HoverVisitor() {
 	@Override
 	public boolean visit(SimpleType type) {
 		emitHover(type.getStartPosition(), type.getLength());
-		return super.visit(type);
+		return false;
 	}
 
 	@Override
 	public boolean visit(SimpleName node) {
 		emitHover(node.getStartPosition(), node.getLength());
-		return super.visit(node);
+		return false;
 	}
 
 	private void emitHover(int startPosition, int length) {

diff --git a/....java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/ReferencesVisitor.java b/....java.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/ReferencesVisitor.java
@@ -35,13 +35,13 @@ public ReferencesVisitor() {
 	@Override
 	public boolean visit(SimpleType type) {
 		emitReferences(type.getStartPosition(), type.getLength());
-		return super.visit(type);
+		return false;
 	}
 
 	@Override
 	public boolean visit(SimpleName node) {
 		emitReferences(node.getStartPosition(), node.getLength());
-		return super.visit(node);
+		return false;
 	}
 
 	public void emitReferences(int startPosition, int length) {

diff --git a/...a.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/TypeDefinitionVisitor.java b/...a.lsif.core/src/com/microsoft/java/lsif/core/internal/visitors/TypeDefinitionVisitor.java
@@ -13,7 +13,6 @@
 import org.eclipse.jdt.core.dom.SimpleType;
 import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.jdt.ls.core.internal.JDTUtils;
 import org.eclipse.jdt.ls.core.internal.handlers.NavigateToTypeDefinitionHandler;
 import org.eclipse.lsp4j.Location;
@@ -47,12 +46,6 @@ public boolean visit(SingleVariableDeclaration node) {
 		return false;
 	}
 
-	@Override
-	public boolean visit(TypeDeclaration node) {
-		emitTypeDefinition(node.getStartPosition(), node.getLength());
-		return true;
-	}
-
 	@Override
 	public boolean visit(SimpleType node) {
 		emitTypeDefinition(node.getStartPosition(), node.getLength());