ignore declaration when references return only two results, #83752

microsoft · Nov 6, 2019 · 7b9217c · 7b9217c
1 parent 22adcb9
commit 7b9217c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/vs/editor/contrib/gotoSymbol/goToSymbol.ts b/src/vs/editor/contrib/gotoSymbol/goToSymbol.ts
@@ -59,8 +59,16 @@ export function getTypeDefinitionsAtPosition(model: ITextModel, position: Positi
 }
 
 export function getReferencesAtPosition(model: ITextModel, position: Position, token: CancellationToken): Promise<LocationLink[]> {
-	return getLocationLinks(model, position, ReferenceProviderRegistry, (provider, model, position) => {
-		return provider.provideReferences(model, position, { includeDeclaration: true }, token);
+	return getLocationLinks(model, position, ReferenceProviderRegistry, async (provider, model, position) => {
+		const result = await provider.provideReferences(model, position, { includeDeclaration: true }, token);
+		if (!result || result.length !== 2) {
+			return result;
+		}
+		const resultWithoutDeclaration = await provider.provideReferences(model, position, { includeDeclaration: false }, token);
+		if (resultWithoutDeclaration && resultWithoutDeclaration.length === 1) {
+			return resultWithoutDeclaration;
+		}
+		return result;
 	});
 }