cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-05 15:43:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

internal/span: handle character values beyond end of line in FromUTF16Column

Browse Source 
On the assumption these implementations are designed to
support/implement the LSP spec, FromUTF16Column should handle the case
where a character value is beyond the end of the line.

https://github.com/Microsoft/language-server-protocol/blob/gh-pages/specification.md#position:

> * If the character value is greater than the line length it defaults back to the
> * line length.

Fixes golang/go#31883

Change-Id: I370845b7f2f046d8e84048a26bae5b23e9c27d06
Reviewed-on: https://go-review.googlesource.com/c/tools/+/185058
Run-TryBot: Paul Jolly <paul@myitcv.org.uk>
Reviewed-by: Ian Cottrell <iancottrell@google.com>
This commit is contained in:
Paul Jolly 2019-07-04 09:55:57 +01:00 committed by Paul Jolly
parent 2214986f16
commit 72ffa07ba3
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/span/utf16.go
View File

@ -69,7 +69,11 @@ func FromUTF16Column(p Point, chr int, content []byte) (Point, error) {
} }
r, w := utf8.DecodeRune(remains) r, w := utf8.DecodeRune(remains)
if r == '\n' { if r == '\n' {
return Point{}, fmt.Errorf("FromUTF16Column: chr goes beyond the line") // Per the LSP spec:
//
// > If the character value is greater than the line length it
// > defaults back to the line length.
break
} }
remains = remains[w:] remains = remains[w:]
if r >= 0x10000 { if r >= 0x10000 {

15
internal/span/utf16_test.go
View File

@ -185,12 +185,15 @@ var fromUTF16Tests = []struct {
post: "", post: "",
}, },
{ {
scenario: "cursor beyond last character on line", scenario: "cursor beyond last character on line",
input: funnyString, input: funnyString,
line: 1, line: 1,
offset: 0, offset: 0,
utf16col: 6, utf16col: 6,
err: "FromUTF16Column: chr goes beyond the line", resCol: 7,
resOffset: 6,
pre: "𐐀23",
post: "",
}, },
{ {
scenario: "cursor before funny character; second line", scenario: "cursor before funny character; second line",