From ff694a2184c2d6c20485efd5755dcb56f284306c Mon Sep 17 00:00:00 2001 From: Rebecca Stambler Date: Mon, 10 Jun 2019 14:02:28 -0400 Subject: [PATCH] internal/lsp: stop requiring a .go extension for all Go files This change should fix the TryBot failures exposed by https://golang.org/cl/181317. Updates golang/go#31561 Change-Id: Ie77c9e3bfd6825dcd2608523e72f804f81d3f48c Reviewed-on: https://go-review.googlesource.com/c/tools/+/181546 Run-TryBot: Rebecca Stambler TryBot-Result: Gobot Gobot Reviewed-by: Ian Cottrell --- internal/lsp/cache/view.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/internal/lsp/cache/view.go b/internal/lsp/cache/view.go index b5b59685..7d81fb05 100644 --- a/internal/lsp/cache/view.go +++ b/internal/lsp/cache/view.go @@ -6,7 +6,6 @@ package cache import ( "context" - "fmt" "go/ast" "go/parser" "go/types" @@ -314,16 +313,6 @@ func (v *view) getFile(uri span.URI) (viewFile, error) { filename := uri.Filename() var f viewFile switch ext := filepath.Ext(filename); ext { - case ".go": - f = &goFile{ - fileBase: fileBase{ - view: v, - fname: filename, - }, - } - v.session.filesWatchMap.Watch(uri, func() { - f.(*goFile).invalidateContent() - }) case ".mod": f = &modFile{ fileBase: fileBase{ @@ -339,7 +328,16 @@ func (v *view) getFile(uri span.URI) (viewFile, error) { }, } default: - return nil, fmt.Errorf("unsupported file extension: %s", ext) + // Assume that all other files are Go files, regardless of extension. + f = &goFile{ + fileBase: fileBase{ + view: v, + fname: filename, + }, + } + v.session.filesWatchMap.Watch(uri, func() { + f.(*goFile).invalidateContent() + }) } v.mapFile(uri, f) return f, nil