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

internal/lsp: remove the redundant Server.Run() call.

Browse Source 
`go s.Run(ctx)` repeats `h(s)`.

Change-Id: I03ae6df64ad34194b8f46aabd0cf67e5a9e8c777
GitHub-Last-Rev: 3669875d72a196a8c84fb1709a7cf9f84fdbb688
GitHub-Pull-Request: golang/tools#105
Reviewed-on: https://go-review.googlesource.com/c/tools/+/179297
Reviewed-by: Ian Cottrell <iancottrell@google.com>
This commit is contained in:
Henry Wong 2019-05-30 10:13:54 +00:00 committed by Ian Cottrell
parent 04b924abaa
commit bf5f34bf87
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/lsp/cmd/serve.go
View File

@ -81,7 +81,7 @@ func (s *Serve) Run(ctx context.Context, args ...string) error {
// For debugging purposes only. // For debugging purposes only.
run := func(srv *lsp.Server) { run := func(srv *lsp.Server) {
srv.Conn.Logger = logger(s.Trace, out) srv.Conn.Logger = logger(s.Trace, out)
go srv.Conn.Run(ctx) go srv.Run(ctx)
} }
if s.Address != "" { if s.Address != "" {
return lsp.RunServerOnAddress(ctx, s.app.cache, s.Address, run) return lsp.RunServerOnAddress(ctx, s.app.cache, s.Address, run)
@ -92,7 +92,7 @@ func (s *Serve) Run(ctx context.Context, args ...string) error {
stream := jsonrpc2.NewHeaderStream(os.Stdin, os.Stdout) stream := jsonrpc2.NewHeaderStream(os.Stdin, os.Stdout)
srv := lsp.NewServer(s.app.cache, stream) srv := lsp.NewServer(s.app.cache, stream)
srv.Conn.Logger = logger(s.Trace, out) srv.Conn.Logger = logger(s.Trace, out)
return srv.Conn.Run(ctx) return srv.Run(ctx)
} }
func (s *Serve) forward() error { func (s *Serve) forward() error {

5
internal/lsp/server.go
View File

@ -53,10 +53,7 @@ func RunServerOnAddress(ctx context.Context, cache source.Cache, addr string, h
if err != nil { if err != nil {
return err return err
} }
stream := jsonrpc2.NewHeaderStream(conn, conn) h(NewServer(cache, jsonrpc2.NewHeaderStream(conn, conn)))
s := NewServer(cache, stream)
h(s)
go s.Run(ctx)
} }
} }