internal/span: span to protocol needs position as well as offset

ianthehat · ianthehat · commit c5ac96b4c419 · 2019-04-02T16:07:49.000Z
Change-Id: I4f39abb5932a951b2e5fa0932f478b00138e626a Reviewed-on: https://go-review.googlesource.com/c/tools/+/170186 Reviewed-by: Rebecca Stambler <rstambler@golang.org> Run-TryBot: Rebecca Stambler <rstambler@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
diff --git a/internal/lsp/protocol/span.go b/internal/lsp/protocol/span.go
@@ -43,7 +43,7 @@ func (m *ColumnMapper) Range(s span.Span) (Range, error) {
 	if m.URI != s.URI() {
 		return Range{}, fmt.Errorf("column mapper is for file %q instead of %q", m.URI, s.URI())
 	}
-	s, err := s.WithOffset(m.Converter)
+	s, err := s.WithAll(m.Converter)
 	if err != nil {
 		return Range{}, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func (m *ColumnMapper) Range(s span.Span) (Range, error) {`
`43`	`43`	`if m.URI != s.URI() {`
`44`	`44`	`return Range{}, fmt.Errorf("column mapper is for file %q instead of %q", m.URI, s.URI())`
`45`	`45`	`}`
`46`		`- s, err := s.WithOffset(m.Converter)`
	`46`	`+ s, err := s.WithAll(m.Converter)`
`47`	`47`	`if err != nil {`
`48`	`48`	`return Range{}, err`
`49`	`49`	`}`