Skip to content

Commit

Permalink
Revert "all: Remove dependency on go-langserver (#170)"
Browse files Browse the repository at this point in the history 
This reverts commit 51e0454.

This change makes our go-builderserver have many build failures. Rather revert
for now.
  • Loading branch information
@keegancsmith
keegancsmith committed Oct 1, 2018
1 parent 0126d37 commit 71b1991
Show file tree
Hide file tree
Showing 47 changed files with 113 additions and 214 deletions.
4 changes: 2 additions & 2 deletions cmd/frontend/backend/defs_refs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
opentracing "github.com/opentracing/opentracing-go"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/sourcegraph/pkg/lspext"
"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/go-langserver/pkg/lspext"

"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
Expand Down
4 changes: 2 additions & 2 deletions cmd/frontend/backend/dependencies.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
opentracing "github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/ext"
"github.com/pkg/errors"
"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/go-langserver/pkg/lspext"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/sourcegraph/pkg/lspext"
"github.com/sourcegraph/sourcegraph/xlang"
xlang_lspext "github.com/sourcegraph/sourcegraph/xlang/lspext"
"github.com/sourcegraph/sourcegraph/xlang/proxy"
Expand Down
2 changes: 1 addition & 1 deletion cmd/frontend/backend/dependencies_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/go-langserver/pkg/lsp"

"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
Expand Down
4 changes: 2 additions & 2 deletions cmd/frontend/backend/lang_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package backend
import (
"context"

"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/go-langserver/pkg/lspext"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/sourcegraph/pkg/lspext"
)

// LangServer contains backend methods for communicating with language and build servers over LSP (via xlang).
Expand Down
2 changes: 1 addition & 1 deletion cmd/frontend/backend/packages.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
opentracing "github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/ext"
"github.com/pkg/errors"
"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/sourcegraph/xlang"
"github.com/sourcegraph/sourcegraph/xlang/lspext"
"github.com/sourcegraph/sourcegraph/xlang/proxy"
Expand Down
2 changes: 1 addition & 1 deletion cmd/frontend/backend/packages_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/go-langserver/pkg/lsp"

"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
Expand Down
4 changes: 2 additions & 2 deletions cmd/frontend/backend/symbols.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package backend
import (
"context"

"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/go-langserver/pkg/lspext"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/sourcegraph/pkg/lspext"
symbolsclient "github.com/sourcegraph/sourcegraph/pkg/symbols"
"github.com/sourcegraph/sourcegraph/pkg/symbols/protocol"
"github.com/sourcegraph/sourcegraph/xlang"
Expand Down
2 changes: 1 addition & 1 deletion cmd/frontend/backend/xlang.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/pkg/errors"
"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/go-langserver/pkg/lsp"

"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
"github.com/sourcegraph/sourcegraph/pkg/api"
Expand Down
2 changes: 1 addition & 1 deletion cmd/frontend/graphqlbackend/location.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strconv"

"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/go-langserver/pkg/lsp"
)

type locationResolver struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/frontend/graphqlbackend/repository_packages.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
graphql "github.com/graph-gophers/graphql-go"
"github.com/graph-gophers/graphql-go/relay"
"github.com/pkg/errors"
"github.com/sourcegraph/go-langserver/pkg/lspext"
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search/query"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/lspext"
"github.com/sourcegraph/sourcegraph/xlang"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/frontend/graphqlbackend/search_references.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (

otlog "github.com/opentracing/opentracing-go/log"
"github.com/pkg/errors"
"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/go-langserver/pkg/lspext"
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search"
Expand All @@ -18,8 +20,6 @@ import (
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/pkg/gitserver"
"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/sourcegraph/pkg/lspext"
"github.com/sourcegraph/sourcegraph/pkg/trace"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
"github.com/sourcegraph/sourcegraph/xlang"
Expand Down
2 changes: 1 addition & 1 deletion cmd/frontend/graphqlbackend/search_suggestions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (

"github.com/neelance/parallel"
"github.com/pkg/errors"
"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search/query"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/pkg/lsp"
log15 "gopkg.in/inconshreveable/log15.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/frontend/graphqlbackend/search_symbols.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import (
"github.com/opentracing/opentracing-go/ext"
otlog "github.com/opentracing/opentracing-go/log"
"github.com/pkg/errors"
"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/goroutine"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search"
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search/query"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/sourcegraph/pkg/symbols/protocol"
"github.com/sourcegraph/sourcegraph/pkg/trace"
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
Expand Down
2 changes: 1 addition & 1 deletion cmd/frontend/graphqlbackend/symbols.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"strings"
"time"

"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/sourcegraph/pkg/symbols/protocol"
"github.com/sourcegraph/sourcegraph/xlang/uri"
log15 "gopkg.in/inconshreveable/log15.v2"
Expand Down
2 changes: 1 addition & 1 deletion cmd/frontend/internal/app/go_symbol_url.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"path"
"strings"

"github.com/sourcegraph/go-langserver/pkg/lspext"
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
"github.com/sourcegraph/sourcegraph/pkg/api"
"github.com/sourcegraph/sourcegraph/pkg/errcode"
"github.com/sourcegraph/sourcegraph/pkg/gosrc"
"github.com/sourcegraph/sourcegraph/pkg/httputil"
"github.com/sourcegraph/sourcegraph/pkg/lspext"
"github.com/sourcegraph/sourcegraph/xlang/uri"
)

Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ require (
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
github.com/sourcegraph/ctxvfs v0.0.0-20180418081416-2b65f1b1ea81
github.com/sourcegraph/go-jsonschema v0.0.0-20180805125535-0e659b54484d
github.com/sourcegraph/go-langserver v0.0.0-20180817131207-7df19dc017ef
github.com/sourcegraph/godockerize v0.0.0-20180919081208-f4fb18a2ab18
github.com/sourcegraph/gosyntect v0.0.0-20180604231642-c01be3625b10
github.com/sourcegraph/httpcache v0.0.0-20160524185540-16db777d8ebe
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,8 @@ github.com/sourcegraph/ctxvfs v0.0.0-20180418081416-2b65f1b1ea81 h1:v4/JVxZSPWif
github.com/sourcegraph/ctxvfs v0.0.0-20180418081416-2b65f1b1ea81/go.mod h1:xIvvI5FiHLxhv8prbzVpaMHaaGPFPFQSuTcxC91ryOo=
github.com/sourcegraph/go-jsonschema v0.0.0-20180805125535-0e659b54484d h1:BAP431YeA7rgSoySjmVzBfFjXsLtnD93zZip5JIOWdk=
github.com/sourcegraph/go-jsonschema v0.0.0-20180805125535-0e659b54484d/go.mod h1:6DfNy4BLIggAeittTJ8o9z/6d1ly+YujBTSnv03i7Bk=
github.com/sourcegraph/go-langserver v0.0.0-20180817131207-7df19dc017ef h1:3fS/iN2AQkK7B/6689FC7a30DhGJ2zRg4gtcAd7tlk0=
github.com/sourcegraph/go-langserver v0.0.0-20180817131207-7df19dc017ef/go.mod h1:bBMjfpzEHd6ijPRoQ7f+knFfw+e8R+W158/MsqAy77c=
github.com/sourcegraph/godockerize v0.0.0-20180919081208-f4fb18a2ab18 h1:Owk1nJ1CZIhtKyiVrG65ajT834xuNhtpJWmhnNF2x3A=
github.com/sourcegraph/godockerize v0.0.0-20180919081208-f4fb18a2ab18/go.mod h1:EnJwbnfidbH57UXewOZLIrwQVpu/spwbS/BMN0sPfCA=
github.com/sourcegraph/goreman v0.1.2-0.20180928223752-6e9a2beb830d/go.mod h1:8HCyYaC38XwX0AOu0+fuY02Y5Z7CkITW0oVJavbna4Q=
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"time"

"github.com/sourcegraph/sourcegraph/pkg/lspext"
"github.com/sourcegraph/go-langserver/pkg/lspext"
xlang_lspext "github.com/sourcegraph/sourcegraph/xlang/lspext"
)

Expand Down
12 changes: 0 additions & 12 deletions pkg/lsp/README.md
View file

This file was deleted.

137 changes: 0 additions & 137 deletions pkg/lsp/service_test.go
View file

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/lspclient/lspclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"time"

"github.com/gorilla/websocket"
"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/jsonrpc2"
websocketjsonrpc2 "github.com/sourcegraph/jsonrpc2/websocket"
"github.com/sourcegraph/sourcegraph/pkg/lsp"
"github.com/sourcegraph/sourcegraph/xlang/lspext"
)

Expand Down
7 changes: 0 additions & 7 deletions pkg/lspext/README.md
View file

This file was deleted.

19 changes: 19 additions & 0 deletions vendor/github.com/sourcegraph/go-langserver/LICENSE
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 71b1991

Please sign in to comment.