gocode: fix a bug with gbroot

stamblerre · Nov 27, 2018 · 322154f · 322154f
1 parent b3141dc
commit 322154f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/internal/suggest/suggest.go b/internal/suggest/suggest.go
@@ -55,6 +55,7 @@ func (c *Config) Suggest(filename string, data []byte, cursor int) ([]Candidate,
 
 	fset, pos, pkg, imports := c.analyzePackage(filename, data, cursor)
 	if pkg == nil {
+		c.Logf("no package found for %s", filename)
 		return nil, 0
 	}
 	scope := pkg.Scope().Innermost(pos)

diff --git a/internal/suggest/suggest_test.go b/internal/suggest/suggest_test.go
@@ -112,6 +112,7 @@ func testRegress(t *testing.T, testDir string) {
 		Logf:    func(string, ...interface{}) {},
 		Context: &suggest.PackedContext{},
 	}
+	cfg.Logf = func(string, ...interface{}) {}
 	if testing.Verbose() {
 		cfg.Logf = t.Logf
 	}

diff --git a/server.go b/server.go
@@ -3,6 +3,11 @@ package main
 import (
 	"bytes"
 	"fmt"
+<<<<<<< HEAD
+=======
+	"go/build"
+	"go/importer"
+>>>>>>> gocode: fix a bug with gbroot
 	"log"
 	"net"
 	"net/rpc"