qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 14:04:45 -07:00
Code Releases Activity

internal/lsp: avoid panic caused by assuming file ends with newline

Browse Source 
importPrefix in format.go computes the end of the package statement
including a trailing newline. This causes a panic if the user has
not typed the newline. The code now checks for that case.

Fixes golang/go#40208

Change-Id: I4c5118a5de78027e6c5e6ed91dfddca81e38f7e9
Reviewed-on: https://go-review.googlesource.com/c/tools/+/242638
Reviewed-by: Heschi Kreinick <heschi@google.com>
This commit is contained in:
Peter Weinbergr 2020-07-14 14:15:32 -04:00 committed by Peter Weinberger
parent 6acd2ab80e
commit 9048b464a0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/lsp/source/format.go
View File

@ -214,6 +214,9 @@ func importPrefix(src []byte) string {
} }
if importEnd == 0 { if importEnd == 0 {
importEnd = pkgEnd importEnd = pkgEnd
if importEnd > len(src) {
importEnd-- // pkgEnd is off by 1 because Pos is 1-based
}
} }
for _, c := range f.Comments { for _, c := range f.Comments {
if int(c.End()) > importEnd { if int(c.End()) > importEnd {

3
internal/lsp/source/format_test.go
View File

@ -10,6 +10,7 @@ type data struct {
func TestImportPrefix(t *testing.T) { func TestImportPrefix(t *testing.T) {
var tdata = []data{ var tdata = []data{
{"package foo", "package foo"},
{"package foo\n", "package foo\n"}, {"package foo\n", "package foo\n"},
{"package foo\n\nfunc f(){}\n", "package foo\n"}, {"package foo\n\nfunc f(){}\n", "package foo\n"},
{"package foo\n\nimport \"fmt\"\n", "package foo\n\nimport \"fmt\""}, {"package foo\n\nimport \"fmt\"\n", "package foo\n\nimport \"fmt\""},
@ -24,7 +25,7 @@ func TestImportPrefix(t *testing.T) {
for i, x := range tdata { for i, x := range tdata {
got := importPrefix([]byte(x.input)) got := importPrefix([]byte(x.input))
if got != x.want { if got != x.want {
t.Errorf("%d: got\n%q, wanted\n%q", i, got, x.want) t.Errorf("%d: got\n%q, wanted\n%q for %q", i, got, x.want, x.input)
} }
} }
} }