internal/lsp/source: return obj decl first in find-references

Restore previous behavior where the object's declaration is returned
as the first reference in find-reference calls.

Fixes #36598.

Change-Id: Ibdeaf9971aa5cb1f3244f6a888fe77bdf386e563
Reviewed-on: https://go-review.googlesource.com/c/tools/+/215057
Run-TryBot: Muir Manders <[email protected]>
Reviewed-by: Rebecca Stambler <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>

Author: muirdm

internal/lsp/source/references.go

@@ -41,6 +41,24 @@ func References(ctx context.Context, s Snapshot, f FileHandle, pp protocol.Posit
 		fset       = s.View().Session().Cache().FileSet()
 	)
 
+	// Make sure declaration is the first item in the response.
+	if includeDeclaration {
+		rng, err := objToMappedRange(s.View(), qualifiedObjs[0].pkg, qualifiedObjs[0].obj)
+		if err != nil {
+			return nil, err
+		}
+
+		ident, _ := qualifiedObjs[0].node.(*ast.Ident)
+		references = append(references, &ReferenceInfo{
+			mappedRange:   rng,
+			Name:          qualifiedObjs[0].obj.Name(),
+			ident:         ident,
+			obj:           qualifiedObjs[0].obj,
+			pkg:           qualifiedObjs[0].pkg,
+			isDeclaration: true,
+		})
+	}
+
 	for _, qo := range qualifiedObjs {
 		var searchPkgs []Package
 
@@ -90,22 +108,5 @@ func References(ctx context.Context, s Snapshot, f FileHandle, pp protocol.Posit
 		}
 	}
 
-	if includeDeclaration {
-		rng, err := objToMappedRange(s.View(), qualifiedObjs[0].pkg, qualifiedObjs[0].obj)
-		if err != nil {
-			return nil, err
-		}
-
-		ident, _ := qualifiedObjs[0].node.(*ast.Ident)
-		references = append(references, &ReferenceInfo{
-			mappedRange:   rng,
-			Name:          qualifiedObjs[0].obj.Name(),
-			ident:         ident,
-			obj:           qualifiedObjs[0].obj,
-			pkg:           qualifiedObjs[0].pkg,
-			isDeclaration: true,
-		})
-	}
-
 	return references, nil
 }