From 7fc92a55388d7eac4db3c225ffd875c986d92781 Mon Sep 17 00:00:00 2001 From: Christoph Hegemann Date: Fri, 2 Aug 2024 16:51:57 +0200 Subject: [PATCH] codeintel: make usage-range non-optional (#64236) Closes https://linear.app/sourcegraph/issue/GRAPH-727/make-range-for-usagerange-non-optional ## Test plan Tests continue to pass --- cmd/frontend/graphqlbackend/codeintel.codenav.graphql | 2 +- .../codenav/transport/graphql/root_resolver_usages.go | 4 ++-- internal/codeintel/resolvers/codenav.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/frontend/graphqlbackend/codeintel.codenav.graphql b/cmd/frontend/graphqlbackend/codeintel.codenav.graphql index c0ac87d8c95..a882e9a0d16 100644 --- a/cmd/frontend/graphqlbackend/codeintel.codenav.graphql +++ b/cmd/frontend/graphqlbackend/codeintel.codenav.graphql @@ -746,7 +746,7 @@ type Usage { # Invariant: `range.path` == `blob.path`. The path is made available # as part of this type for convenience. # """ - usageRange: UsageRange + usageRange: UsageRange! # TODO: Add a blob: GitBlob field here for more flexibility? diff --git a/internal/codeintel/codenav/transport/graphql/root_resolver_usages.go b/internal/codeintel/codenav/transport/graphql/root_resolver_usages.go index 8175a9392d6..22aac47f088 100644 --- a/internal/codeintel/codenav/transport/graphql/root_resolver_usages.go +++ b/internal/codeintel/codenav/transport/graphql/root_resolver_usages.go @@ -179,8 +179,8 @@ func (u *usageResolver) DataSource() *string { panic("implement me") } -func (u *usageResolver) UsageRange(ctx context.Context) (resolverstubs.UsageRangeResolver, error) { - return u.usageRange, nil +func (u *usageResolver) UsageRange(ctx context.Context) resolverstubs.UsageRangeResolver { + return u.usageRange } func (u *usageResolver) SurroundingContent(ctx context.Context) string { diff --git a/internal/codeintel/resolvers/codenav.go b/internal/codeintel/resolvers/codenav.go index acf5d6f6263..103f2be036f 100644 --- a/internal/codeintel/resolvers/codenav.go +++ b/internal/codeintel/resolvers/codenav.go @@ -533,7 +533,7 @@ type UsageResolver interface { Symbol(context.Context) (SymbolInformationResolver, error) Provenance(context.Context) (codenav.CodeGraphDataProvenance, error) DataSource() *string - UsageRange(context.Context) (UsageRangeResolver, error) + UsageRange(context.Context) UsageRangeResolver SurroundingContent(_ context.Context) string UsageKind() SymbolUsageKind }