Replace sourcegraph/go-lsp with internal/protocol

radeksimko · radeksimko · commit ce61c4892af0 · 2020-11-20T09:19:34.000Z
diff --git a/commands/completion_command.go b/commands/completion_command.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/hashicorp/terraform-ls/internal/filesystem"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 	"github.com/hashicorp/terraform-ls/internal/terraform/rootmodule"
 	"github.com/hashicorp/terraform-ls/logging"
 	"github.com/mitchellh/cli"
-	lsp "github.com/sourcegraph/go-lsp"
 )
 
 type CompletionCommand struct {
diff --git a/go.mod b/go.mod
@@ -22,10 +22,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
-	github.com/sourcegraph/go-lsp v0.0.0-20200117082640-b19bb38222e2
 	github.com/spf13/afero v1.3.2
 	github.com/stretchr/testify v1.4.0
 	github.com/vektra/mockery/v2 v2.3.0
 )
-
-replace github.com/sourcegraph/go-lsp => github.com/radeksimko/go-lsp v0.1.0
diff --git a/go.sum b/go.sum
@@ -301,8 +301,6 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/radeksimko/go-lsp v0.1.0 h1:evTibJ/0G2QtamSdA6mi+Xov7t5RpoGmMcTK60bWp+E=
-github.com/radeksimko/go-lsp v0.1.0/go.mod h1:tpps84QRlOVVLYk5QpKYX8Tr289D1v/UTWDLqeguiqM=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
diff --git a/internal/context/context.go b/internal/context/context.go
@@ -5,10 +5,10 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform-ls/internal/filesystem"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 	"github.com/hashicorp/terraform-ls/internal/terraform/rootmodule"
 	"github.com/hashicorp/terraform-ls/internal/watcher"
 	"github.com/hashicorp/terraform-ls/langserver/diagnostics"
-	"github.com/sourcegraph/go-lsp"
 )
 
 type contextKey struct {
diff --git a/internal/lsp/completion.go b/internal/lsp/completion.go
@@ -3,7 +3,7 @@ package lsp
 import (
 	"github.com/hashicorp/hcl-lang/lang"
 	"github.com/hashicorp/terraform-ls/internal/mdplain"
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 type CompletionList struct {
diff --git a/internal/lsp/diagnostics.go b/internal/lsp/diagnostics.go
@@ -2,7 +2,7 @@ package lsp
 
 import (
 	"github.com/hashicorp/hcl/v2"
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func HCLSeverityToLSP(severity hcl.DiagnosticSeverity) lsp.DiagnosticSeverity {
diff --git a/internal/lsp/file.go b/internal/lsp/file.go
@@ -1,8 +1,8 @@
 package lsp
 
 import (
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 	"github.com/hashicorp/terraform-ls/internal/source"
-	lsp "github.com/sourcegraph/go-lsp"
 )
 
 type File interface {
diff --git a/internal/lsp/file_change.go b/internal/lsp/file_change.go
@@ -2,7 +2,7 @@ package lsp
 
 import (
 	"github.com/hashicorp/terraform-ls/internal/filesystem"
-	"github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 type contentChange struct {
diff --git a/internal/lsp/file_handler.go b/internal/lsp/file_handler.go
@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 	"github.com/hashicorp/terraform-ls/internal/uri"
-	"github.com/sourcegraph/go-lsp"
 )
 
 func FileHandlerFromDocumentURI(docUri lsp.DocumentURI) *fileHandler {
diff --git a/internal/lsp/file_handler_test.go b/internal/lsp/file_handler_test.go
@@ -3,7 +3,7 @@ package lsp
 import (
 	"testing"
 
-	"github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 var (
diff --git a/internal/lsp/file_handler_unix_test.go b/internal/lsp/file_handler_unix_test.go
@@ -5,7 +5,7 @@ package lsp
 import (
 	"testing"
 
-	"github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func TestFileHandler_valid_unix(t *testing.T) {
diff --git a/internal/lsp/file_handler_windows_test.go b/internal/lsp/file_handler_windows_test.go
@@ -3,7 +3,7 @@ package lsp
 import (
 	"testing"
 
-	"github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 var (
diff --git a/internal/lsp/hover.go b/internal/lsp/hover.go
@@ -3,7 +3,7 @@ package lsp
 import (
 	"github.com/hashicorp/hcl-lang/lang"
 	"github.com/hashicorp/terraform-ls/internal/mdplain"
-	"github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func HoverData(data *lang.HoverData, cc lsp.TextDocumentClientCapabilities) lsp.Hover {
diff --git a/internal/lsp/position.go b/internal/lsp/position.go
@@ -3,7 +3,7 @@ package lsp
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/terraform-ls/internal/filesystem"
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 type filePosition struct {
diff --git a/internal/lsp/range.go b/internal/lsp/range.go
@@ -3,7 +3,7 @@ package lsp
 import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/terraform-ls/internal/filesystem"
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func fsRangeToLSP(fsRng *filesystem.Range) lsp.Range {
diff --git a/internal/lsp/symbols.go b/internal/lsp/symbols.go
@@ -2,7 +2,7 @@ package lsp
 
 import (
 	"github.com/hashicorp/hcl-lang/decoder"
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func ConvertSymbols(uri lsp.DocumentURI, sbs []decoder.Symbol) []lsp.SymbolInformation {
diff --git a/langserver/diagnostics/diagnostics.go b/langserver/diagnostics/diagnostics.go
@@ -9,8 +9,8 @@ import (
 	"github.com/creachadair/jrpc2"
 	"github.com/hashicorp/hcl/v2"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 	"github.com/hashicorp/terraform-ls/internal/uri"
-	"github.com/sourcegraph/go-lsp"
 )
 
 type diagContext struct {
diff --git a/langserver/handlers/cancel_request.go b/langserver/handlers/cancel_request.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/creachadair/jrpc2"
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func CancelRequest(ctx context.Context, params lsp.CancelParams) error {
diff --git a/langserver/handlers/complete.go b/langserver/handlers/complete.go
@@ -5,7 +5,7 @@ import (
 
 	lsctx "github.com/hashicorp/terraform-ls/internal/context"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func (h *logHandler) TextDocumentComplete(ctx context.Context, params lsp.CompletionParams) (ilsp.CompletionList, error) {
diff --git a/langserver/handlers/did_change.go b/langserver/handlers/did_change.go
@@ -7,7 +7,7 @@ import (
 
 	lsctx "github.com/hashicorp/terraform-ls/internal/context"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func TextDocumentDidChange(ctx context.Context, params DidChangeTextDocumentParams) error {
diff --git a/langserver/handlers/did_close.go b/langserver/handlers/did_close.go
@@ -5,7 +5,7 @@ import (
 
 	lsctx "github.com/hashicorp/terraform-ls/internal/context"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func TextDocumentDidClose(ctx context.Context, params lsp.DidCloseTextDocumentParams) error {
diff --git a/langserver/handlers/did_open.go b/langserver/handlers/did_open.go
@@ -9,9 +9,9 @@ import (
 	"github.com/creachadair/jrpc2"
 	lsctx "github.com/hashicorp/terraform-ls/internal/context"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 	"github.com/hashicorp/terraform-ls/internal/terraform/rootmodule"
 	"github.com/hashicorp/terraform-ls/internal/watcher"
-	lsp "github.com/sourcegraph/go-lsp"
 )
 
 func (lh *logHandler) TextDocumentDidOpen(ctx context.Context, params lsp.DidOpenTextDocumentParams) error {
diff --git a/langserver/handlers/execute_command.go b/langserver/handlers/execute_command.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/creachadair/jrpc2/code"
 	lsctx "github.com/hashicorp/terraform-ls/internal/context"
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 type executeCommandHandler func(context.Context, commandArgs) (interface{}, error)
diff --git a/langserver/handlers/execute_command_rootmodules.go b/langserver/handlers/execute_command_rootmodules.go
@@ -8,8 +8,8 @@ import (
 	"github.com/creachadair/jrpc2/code"
 	lsctx "github.com/hashicorp/terraform-ls/internal/context"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 	"github.com/hashicorp/terraform-ls/internal/uri"
-	lsp "github.com/sourcegraph/go-lsp"
 )
 
 const rootmodulesCommandResponseVersion = 0
diff --git a/langserver/handlers/formatting.go b/langserver/handlers/formatting.go
@@ -7,9 +7,9 @@ import (
 	lsctx "github.com/hashicorp/terraform-ls/internal/context"
 	"github.com/hashicorp/terraform-ls/internal/hcl"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 	"github.com/hashicorp/terraform-ls/internal/terraform/exec"
 	"github.com/hashicorp/terraform-ls/internal/terraform/rootmodule"
-	lsp "github.com/sourcegraph/go-lsp"
 )
 
 func (h *logHandler) TextDocumentFormatting(ctx context.Context, params lsp.DocumentFormattingParams) ([]lsp.TextEdit, error) {
diff --git a/langserver/handlers/hover.go b/langserver/handlers/hover.go
@@ -5,7 +5,7 @@ import (
 
 	lsctx "github.com/hashicorp/terraform-ls/internal/context"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func (h *logHandler) TextDocumentHover(ctx context.Context, params lsp.TextDocumentPositionParams) (lsp.Hover, error) {
diff --git a/langserver/handlers/initialize.go b/langserver/handlers/initialize.go
@@ -9,9 +9,9 @@ import (
 	"github.com/creachadair/jrpc2"
 	lsctx "github.com/hashicorp/terraform-ls/internal/context"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 	"github.com/hashicorp/terraform-ls/internal/settings"
 	"github.com/mitchellh/go-homedir"
-	lsp "github.com/sourcegraph/go-lsp"
 )
 
 func (lh *logHandler) Initialize(ctx context.Context, params lsp.InitializeParams) (lsp.InitializeResult, error) {
diff --git a/langserver/handlers/initialized.go b/langserver/handlers/initialized.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"context"
 
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func Initialized(ctx context.Context, params lsp.None) error {
diff --git a/langserver/handlers/service.go b/langserver/handlers/service.go
@@ -13,11 +13,11 @@ import (
 	rpch "github.com/creachadair/jrpc2/handler"
 	lsctx "github.com/hashicorp/terraform-ls/internal/context"
 	"github.com/hashicorp/terraform-ls/internal/filesystem"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 	"github.com/hashicorp/terraform-ls/internal/terraform/rootmodule"
 	"github.com/hashicorp/terraform-ls/internal/watcher"
 	"github.com/hashicorp/terraform-ls/langserver/diagnostics"
 	"github.com/hashicorp/terraform-ls/langserver/session"
-	"github.com/sourcegraph/go-lsp"
 )
 
 type service struct {
diff --git a/langserver/handlers/shutdown.go b/langserver/handlers/shutdown.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"context"
 
-	lsp "github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func Shutdown(ctx context.Context, vs lsp.None) error {
diff --git a/langserver/handlers/symbols.go b/langserver/handlers/symbols.go
@@ -6,7 +6,7 @@ import (
 
 	lsctx "github.com/hashicorp/terraform-ls/internal/context"
 	ilsp "github.com/hashicorp/terraform-ls/internal/lsp"
-	"github.com/sourcegraph/go-lsp"
+	lsp "github.com/hashicorp/terraform-ls/internal/protocol"
 )
 
 func (h *logHandler) TextDocumentSymbol(ctx context.Context, params lsp.DocumentSymbolParams) ([]lsp.SymbolInformation, error) {

-Original file line number
+Diff line change
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
 -	github.com/sourcegraph/go-lsp v0.0.0-20200117082640-b19bb38222e2
 	github.com/spf13/afero v1.3.2
 	github.com/stretchr/testify v1.4.0
 	github.com/vektra/mockery/v2 v2.3.0
+)
+-
 -replace github.com/sourcegraph/go-lsp => github.com/radeksimko/go-lsp v0.1.0
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package lsp`
`3`	`3`	`import (`
`4`	`4`	`"github.com/hashicorp/hcl-lang/lang"`
`5`	`5`	`"github.com/hashicorp/terraform-ls/internal/mdplain"`
`6`		`- lsp "github.com/sourcegraph/go-lsp"`
	`6`	`+ lsp "github.com/hashicorp/terraform-ls/internal/protocol"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type CompletionList struct {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package lsp`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/hashicorp/hcl/v2"`
`5`		`- lsp "github.com/sourcegraph/go-lsp"`
	`5`	`+ lsp "github.com/hashicorp/terraform-ls/internal/protocol"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func HCLSeverityToLSP(severity hcl.DiagnosticSeverity) lsp.DiagnosticSeverity {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package lsp`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ lsp "github.com/hashicorp/terraform-ls/internal/protocol"`
`4`	`5`	`"github.com/hashicorp/terraform-ls/internal/source"`
`5`		`- lsp "github.com/sourcegraph/go-lsp"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`type File interface {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`"path/filepath"`
`6`	`6`	`"strings"`
`7`	`7`
	`8`	`+ lsp "github.com/hashicorp/terraform-ls/internal/protocol"`
`8`	`9`	`"github.com/hashicorp/terraform-ls/internal/uri"`
`9`		`- "github.com/sourcegraph/go-lsp"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func FileHandlerFromDocumentURI(docUri lsp.DocumentURI) *fileHandler {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package lsp`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/sourcegraph/go-lsp"`
	`6`	`+ lsp "github.com/hashicorp/terraform-ls/internal/protocol"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`var (`