Skip to content

Commit 71b1991

Browse files
keegancsmithkeegancsmith
committed
Revert "all: Remove dependency on go-langserver (#170)"
This reverts commit 51e0454. This change makes our go-builderserver have many build failures. Rather revert for now.
1 parent 0126d37 commit 71b1991

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+113
-214
lines changed

‎cmd/frontend/backend/defs_refs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
opentracing "github.com/opentracing/opentracing-go"
99
"github.com/pkg/errors"
1010
"github.com/prometheus/client_golang/prometheus"
11-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
12-
"github.com/sourcegraph/sourcegraph/pkg/lspext"
11+
"github.com/sourcegraph/go-langserver/pkg/lsp"
12+
"github.com/sourcegraph/go-langserver/pkg/lspext"
1313

1414
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
1515
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"

‎cmd/frontend/backend/dependencies.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
opentracing "github.com/opentracing/opentracing-go"
99
"github.com/opentracing/opentracing-go/ext"
1010
"github.com/pkg/errors"
11+
"github.com/sourcegraph/go-langserver/pkg/lsp"
12+
"github.com/sourcegraph/go-langserver/pkg/lspext"
1113
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
1214
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
1315
"github.com/sourcegraph/sourcegraph/pkg/api"
14-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
15-
"github.com/sourcegraph/sourcegraph/pkg/lspext"
1616
"github.com/sourcegraph/sourcegraph/xlang"
1717
xlang_lspext "github.com/sourcegraph/sourcegraph/xlang/lspext"
1818
"github.com/sourcegraph/sourcegraph/xlang/proxy"

‎cmd/frontend/backend/dependencies_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"reflect"
66
"testing"
77

8-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
8+
"github.com/sourcegraph/go-langserver/pkg/lsp"
99

1010
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
1111
"github.com/sourcegraph/sourcegraph/pkg/api"

‎cmd/frontend/backend/lang_server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package backend
33
import (
44
"context"
55

6+
"github.com/sourcegraph/go-langserver/pkg/lsp"
7+
"github.com/sourcegraph/go-langserver/pkg/lspext"
68
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
79
"github.com/sourcegraph/sourcegraph/pkg/api"
8-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
9-
"github.com/sourcegraph/sourcegraph/pkg/lspext"
1010
)
1111

1212
// LangServer contains backend methods for communicating with language and build servers over LSP (via xlang).

‎cmd/frontend/backend/packages.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
opentracing "github.com/opentracing/opentracing-go"
99
"github.com/opentracing/opentracing-go/ext"
1010
"github.com/pkg/errors"
11+
"github.com/sourcegraph/go-langserver/pkg/lsp"
1112
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
1213
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
1314
"github.com/sourcegraph/sourcegraph/pkg/api"
14-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
1515
"github.com/sourcegraph/sourcegraph/xlang"
1616
"github.com/sourcegraph/sourcegraph/xlang/lspext"
1717
"github.com/sourcegraph/sourcegraph/xlang/proxy"

‎cmd/frontend/backend/packages_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"reflect"
66
"testing"
77

8-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
8+
"github.com/sourcegraph/go-langserver/pkg/lsp"
99

1010
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
1111
"github.com/sourcegraph/sourcegraph/pkg/api"

‎cmd/frontend/backend/symbols.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package backend
33
import (
44
"context"
55

6+
"github.com/sourcegraph/go-langserver/pkg/lsp"
7+
"github.com/sourcegraph/go-langserver/pkg/lspext"
68
"github.com/sourcegraph/sourcegraph/pkg/api"
7-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
8-
"github.com/sourcegraph/sourcegraph/pkg/lspext"
99
symbolsclient "github.com/sourcegraph/sourcegraph/pkg/symbols"
1010
"github.com/sourcegraph/sourcegraph/pkg/symbols/protocol"
1111
"github.com/sourcegraph/sourcegraph/xlang"

‎cmd/frontend/backend/xlang.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88

99
"github.com/pkg/errors"
10-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
10+
"github.com/sourcegraph/go-langserver/pkg/lsp"
1111

1212
"github.com/sourcegraph/sourcegraph/cmd/frontend/types"
1313
"github.com/sourcegraph/sourcegraph/pkg/api"

‎cmd/frontend/graphqlbackend/location.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"strconv"
66

7-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
7+
"github.com/sourcegraph/go-langserver/pkg/lsp"
88
)
99

1010
type locationResolver struct {

‎cmd/frontend/graphqlbackend/repository_packages.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212
graphql "github.com/graph-gophers/graphql-go"
1313
"github.com/graph-gophers/graphql-go/relay"
1414
"github.com/pkg/errors"
15+
"github.com/sourcegraph/go-langserver/pkg/lspext"
1516
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
1617
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
1718
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
1819
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search/query"
1920
"github.com/sourcegraph/sourcegraph/pkg/api"
20-
"github.com/sourcegraph/sourcegraph/pkg/lspext"
2121
"github.com/sourcegraph/sourcegraph/xlang"
2222
)
2323

‎cmd/frontend/graphqlbackend/search_references.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010

1111
otlog "github.com/opentracing/opentracing-go/log"
1212
"github.com/pkg/errors"
13+
"github.com/sourcegraph/go-langserver/pkg/lsp"
14+
"github.com/sourcegraph/go-langserver/pkg/lspext"
1315
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
1416
"github.com/sourcegraph/sourcegraph/cmd/frontend/db"
1517
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search"
@@ -18,8 +20,6 @@ import (
1820
"github.com/sourcegraph/sourcegraph/pkg/api"
1921
"github.com/sourcegraph/sourcegraph/pkg/errcode"
2022
"github.com/sourcegraph/sourcegraph/pkg/gitserver"
21-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
22-
"github.com/sourcegraph/sourcegraph/pkg/lspext"
2323
"github.com/sourcegraph/sourcegraph/pkg/trace"
2424
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"
2525
"github.com/sourcegraph/sourcegraph/xlang"

‎cmd/frontend/graphqlbackend/search_suggestions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111

1212
"github.com/neelance/parallel"
1313
"github.com/pkg/errors"
14+
"github.com/sourcegraph/go-langserver/pkg/lsp"
1415
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search"
1516
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search/query"
1617
"github.com/sourcegraph/sourcegraph/pkg/api"
1718
"github.com/sourcegraph/sourcegraph/pkg/errcode"
18-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
1919
log15 "gopkg.in/inconshreveable/log15.v2"
2020
)
2121

‎cmd/frontend/graphqlbackend/search_symbols.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import (
1313
"github.com/opentracing/opentracing-go/ext"
1414
otlog "github.com/opentracing/opentracing-go/log"
1515
"github.com/pkg/errors"
16+
"github.com/sourcegraph/go-langserver/pkg/lsp"
1617
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
1718
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/goroutine"
1819
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search"
1920
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/pkg/search/query"
2021
"github.com/sourcegraph/sourcegraph/pkg/api"
2122
"github.com/sourcegraph/sourcegraph/pkg/errcode"
22-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
2323
"github.com/sourcegraph/sourcegraph/pkg/symbols/protocol"
2424
"github.com/sourcegraph/sourcegraph/pkg/trace"
2525
"github.com/sourcegraph/sourcegraph/pkg/vcs/git"

‎cmd/frontend/graphqlbackend/symbols.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"strings"
77
"time"
88

9+
"github.com/sourcegraph/go-langserver/pkg/lsp"
910
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
1011
"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
1112
"github.com/sourcegraph/sourcegraph/pkg/api"
12-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
1313
"github.com/sourcegraph/sourcegraph/pkg/symbols/protocol"
1414
"github.com/sourcegraph/sourcegraph/xlang/uri"
1515
log15 "gopkg.in/inconshreveable/log15.v2"

‎cmd/frontend/internal/app/go_symbol_url.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"path"
99
"strings"
1010

11+
"github.com/sourcegraph/go-langserver/pkg/lspext"
1112
"github.com/sourcegraph/sourcegraph/cmd/frontend/backend"
1213
"github.com/sourcegraph/sourcegraph/pkg/api"
1314
"github.com/sourcegraph/sourcegraph/pkg/errcode"
1415
"github.com/sourcegraph/sourcegraph/pkg/gosrc"
1516
"github.com/sourcegraph/sourcegraph/pkg/httputil"
16-
"github.com/sourcegraph/sourcegraph/pkg/lspext"
1717
"github.com/sourcegraph/sourcegraph/xlang/uri"
1818
)
1919

‎go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ require (
9090
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
9191
github.com/sourcegraph/ctxvfs v0.0.0-20180418081416-2b65f1b1ea81
9292
github.com/sourcegraph/go-jsonschema v0.0.0-20180805125535-0e659b54484d
93+
github.com/sourcegraph/go-langserver v0.0.0-20180817131207-7df19dc017ef
9394
github.com/sourcegraph/godockerize v0.0.0-20180919081208-f4fb18a2ab18
9495
github.com/sourcegraph/gosyntect v0.0.0-20180604231642-c01be3625b10
9596
github.com/sourcegraph/httpcache v0.0.0-20160524185540-16db777d8ebe

‎go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ github.com/sourcegraph/ctxvfs v0.0.0-20180418081416-2b65f1b1ea81 h1:v4/JVxZSPWif
277277
github.com/sourcegraph/ctxvfs v0.0.0-20180418081416-2b65f1b1ea81/go.mod h1:xIvvI5FiHLxhv8prbzVpaMHaaGPFPFQSuTcxC91ryOo=
278278
github.com/sourcegraph/go-jsonschema v0.0.0-20180805125535-0e659b54484d h1:BAP431YeA7rgSoySjmVzBfFjXsLtnD93zZip5JIOWdk=
279279
github.com/sourcegraph/go-jsonschema v0.0.0-20180805125535-0e659b54484d/go.mod h1:6DfNy4BLIggAeittTJ8o9z/6d1ly+YujBTSnv03i7Bk=
280+
github.com/sourcegraph/go-langserver v0.0.0-20180817131207-7df19dc017ef h1:3fS/iN2AQkK7B/6689FC7a30DhGJ2zRg4gtcAd7tlk0=
281+
github.com/sourcegraph/go-langserver v0.0.0-20180817131207-7df19dc017ef/go.mod h1:bBMjfpzEHd6ijPRoQ7f+knFfw+e8R+W158/MsqAy77c=
280282
github.com/sourcegraph/godockerize v0.0.0-20180919081208-f4fb18a2ab18 h1:Owk1nJ1CZIhtKyiVrG65ajT834xuNhtpJWmhnNF2x3A=
281283
github.com/sourcegraph/godockerize v0.0.0-20180919081208-f4fb18a2ab18/go.mod h1:EnJwbnfidbH57UXewOZLIrwQVpu/spwbS/BMN0sPfCA=
282284
github.com/sourcegraph/goreman v0.1.2-0.20180928223752-6e9a2beb830d/go.mod h1:8HCyYaC38XwX0AOu0+fuY02Y5Z7CkITW0oVJavbna4Q=

‎pkg/api/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"time"
77

8-
"github.com/sourcegraph/sourcegraph/pkg/lspext"
8+
"github.com/sourcegraph/go-langserver/pkg/lspext"
99
xlang_lspext "github.com/sourcegraph/sourcegraph/xlang/lspext"
1010
)
1111

‎pkg/lsp/README.md

-12
This file was deleted.

‎pkg/lsp/service_test.go

-137
This file was deleted.

‎pkg/lspclient/lspclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"time"
1414

1515
"github.com/gorilla/websocket"
16+
"github.com/sourcegraph/go-langserver/pkg/lsp"
1617
"github.com/sourcegraph/jsonrpc2"
1718
websocketjsonrpc2 "github.com/sourcegraph/jsonrpc2/websocket"
18-
"github.com/sourcegraph/sourcegraph/pkg/lsp"
1919
"github.com/sourcegraph/sourcegraph/xlang/lspext"
2020
)
2121

‎pkg/lspext/README.md

-7
This file was deleted.

‎vendor/github.com/sourcegraph/go-langserver/LICENSE

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)