From d1f656545b674ade3c8f42d8cdaaf4f714a73a6a Mon Sep 17 00:00:00 2001 From: Edward Muller Date: Mon, 24 Jun 2019 21:48:30 +0000 Subject: [PATCH] internal/lsp/source: don't panic compiling regex This package is basically a library (even though it's internal) and it's generally considered a bad practice for libraries to panic, so don't. Change-Id: I37d9d73ae48ececc6b31436f1076e1f85213f129 Change-Id: I37d9d73ae48ececc6b31436f1076e1f85213f129 GitHub-Last-Rev: 453b538e53e48889171d31829af3304409f9a8bc GitHub-Pull-Request: golang/tools#124 Reviewed-on: https://go-review.googlesource.com/c/tools/+/183680 Reviewed-by: Suzy Mueller --- internal/lsp/source/rename.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/lsp/source/rename.go b/internal/lsp/source/rename.go index 9b045064..b373275e 100644 --- a/internal/lsp/source/rename.go +++ b/internal/lsp/source/rename.go @@ -85,7 +85,10 @@ func (i *IdentifierInfo) Rename(ctx context.Context, newName string) (map[span.U func (r *renamer) update(ctx context.Context) (map[span.URI][]TextEdit, error) { result := make(map[span.URI][]TextEdit) - docRegexp := regexp.MustCompile(`\b` + r.from + `\b`) + docRegexp, err := regexp.Compile(`\b` + r.from + `\b`) + if err != nil { + return nil, err + } for _, ref := range r.refs { refSpan, err := ref.Range.Span() if err != nil {