From 94c5763a7c8445e53114d02cae1060df14079935 Mon Sep 17 00:00:00 2001 From: Rebecca Stambler Date: Thu, 27 Jun 2019 16:29:03 -0400 Subject: [PATCH] internal/lsp: handle err in formatRange Change-Id: I4aa2715c7adf541da814cb60dd5205dd6e575b61 Reviewed-on: https://go-review.googlesource.com/c/tools/+/184044 Run-TryBot: Rebecca Stambler TryBot-Result: Gobot Gobot Reviewed-by: Suzy Mueller --- internal/lsp/format.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/lsp/format.go b/internal/lsp/format.go index f5319892..cf29a5db 100644 --- a/internal/lsp/format.go +++ b/internal/lsp/format.go @@ -17,12 +17,10 @@ func (s *Server) formatting(ctx context.Context, params *protocol.DocumentFormat uri := span.NewURI(params.TextDocument.URI) view := s.session.ViewOf(uri) spn := span.New(uri, span.Point{}, span.Point{}) - return formatRange(ctx, view, spn) -} - -// formatRange formats a document with a given range. -func formatRange(ctx context.Context, view source.View, s span.Span) ([]protocol.TextEdit, error) { - f, m, rng, err := spanToRange(ctx, view, s) + f, m, rng, err := spanToRange(ctx, view, spn) + if err != nil { + return nil, err + } edits, err := source.Format(ctx, f, rng) if err != nil { return nil, err