Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Update gocode #305

Merged
merged 12 commits into from
Sep 17, 2018
Merged

Update gocode #305

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cad92cb
update gocode
Aug 11, 2018
bbd3c49
use lang server binary cache config
Sep 2, 2018
8305a24
add recover for gocode panic
Sep 2, 2018
57c86bd
update completion tests and add todos
Sep 2, 2018
e54ccd0
drop go 1.8 support
anjmao Sep 3, 2018
9c95515
include gocode builtin autocompletion
anjmao Sep 10, 2018
68907e0
merge with upstream
anjmao Sep 10, 2018
3d6ca62
add go 1.11.x travis build
anjmao Sep 12, 2018
622d511
remove @ from import path to work on go 1.11
anjmao Sep 12, 2018
e8fb6d4
fix: change incorrect gb relative path formatting
Sep 16, 2018
8104bff
fix: do not hardcode GOOS and GOARCH in langserver_test.go
Sep 16, 2018
7b8431e
use binary cache for completion tests
Sep 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: go

go:
- 1.8.x
- 1.9.x
- 1.10.x
anjmao marked this conversation as resolved.
Show resolved Hide resolved
- 1.11.x

go_import_path: github.com/sourcegraph/go-langserver

Expand Down
21 changes: 16 additions & 5 deletions langserver/completion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"strings"

"github.com/sourcegraph/go-langserver/langserver/internal/gocode"
"github.com/sourcegraph/go-langserver/langserver/internal/gocode/gbimporter"
"github.com/sourcegraph/go-langserver/langserver/util"
"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/jsonrpc2"
Expand Down Expand Up @@ -46,11 +47,21 @@ func (h *LangHandler) handleTextDocumentCompletion(ctx context.Context, conn jso
return nil, fmt.Errorf("invalid position: %s:%d:%d (%s)", filename, params.Position.Line, params.Position.Character, why)
}

ca, rangelen := gocode.AutoComplete(contents, filename, offset)
citems := make([]lsp.CompletionItem, len(ca))
for i, it := range ca {
ac, err := gocode.AutoComplete(&gocode.AutoCompleteRequest{
Filename: filename,
Data: contents,
Cursor: offset,
Builtin: true,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@keegancsmith I was missing this flag, after adding Builtin: true I was able to fix failing tests except whos with package autocomplete. There is one bug in gocode , if I place dot inside package path I get all builtins. In real world this is not a big deal and this can also be fixed with package autocomplete.

image

Source: !h.config.UseBinaryPkgCache,
Context: gbimporter.PackContext(h.BuildContext(ctx)),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@keegancsmith Thanks for review.

As I'm not using gocode daemon (not starting any net listener) I'm setting build context here. In current master https://github.com/sourcegraph/go-langserver/blob/master/langserver/internal/gocode/export.go#L17 is used only in unit tests.
There are failing integration tests since this gocode fork returns different suggestions for some cases.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to update those tests instead of just commenting them out?

Ok great about setting the buildcontext where you set it, that actually makes a lot of sense.

})
if err != nil {
return nil, fmt.Errorf("could not autocomplete %s: %v", filename, err)
}
citems := make([]lsp.CompletionItem, len(ac.Candidates))
for i, it := range ac.Candidates {
var kind lsp.CompletionItemKind
switch it.Class.String() {
switch it.Class {
case "const":
kind = CIKConstantSupported
case "func":
Expand All @@ -75,7 +86,7 @@ func (h *LangHandler) handleTextDocumentCompletion(ctx context.Context, conn jso
InsertText: newText,
TextEdit: &lsp.TextEdit{
Range: lsp.Range{
Start: lsp.Position{Line: params.Position.Line, Character: params.Position.Character - rangelen},
Start: lsp.Position{Line: params.Position.Line, Character: params.Position.Character - ac.Len},
End: lsp.Position{Line: params.Position.Line, Character: params.Position.Character},
},
NewText: newText,
Expand Down
4 changes: 0 additions & 4 deletions langserver/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
opentracing "github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/ext"

"github.com/sourcegraph/go-langserver/langserver/internal/gocode"
"github.com/sourcegraph/go-langserver/pkg/lsp"
"github.com/sourcegraph/go-langserver/pkg/lspext"
"github.com/sourcegraph/jsonrpc2"
Expand Down Expand Up @@ -222,9 +221,6 @@ func (h *LangHandler) Handle(ctx context.Context, conn jsonrpc2.JSONRPC2, req *j
if err := h.reset(&params); err != nil {
return nil, err
}
if h.config.GocodeCompletionEnabled {
gocode.InitDaemon(h.BuildContext(ctx))
}

// PERF: Kick off a workspace/symbol in the background to warm up the server
if yes, _ := strconv.ParseBool(envWarmupOnInitialize); yes {
Expand Down
Loading