Merge pull request #15 from d4l3k/fix15

pry: go-pry now properly works on go1.5

pry/importer.go

@@ -0,0 +1,30 @@
+// +build !go1.5
+
+package pry
+
+import (
+	"go/types"
+
+	gcimporter "golang.org/x/tools/go/gcimporter15"
+)
+
+var gcImporter = importer{
+	impFn:    gcimporter.Import,
+	packages: make(map[string]*types.Package),
+}
+
+// importer implements go/types.Importer.
+// It also implements go/types.ImporterFrom, which was new in Go 1.6,
+// so vendoring will work.
+type importer struct {
+	impFn    func(packages map[string]*types.Package, path, srcDir string) (*types.Package, error)
+	packages map[string]*types.Package
+}
+
+func (i importer) Import(path string) (*types.Package, error) {
+	return i.impFn(i.packages, path, "")
+}
+
+func (i importer) ImportFrom(path, srcDir string, mode types.ImportMode) (*types.Package, error) {
+	return i.impFn(i.packages, path, srcDir)
+}

pry/importer15.go

@@ -0,0 +1,7 @@
+// +build go1.5
+
+package pry
+
+import gcimporter "go/importer"
+
+var gcImporter = gcimporter.Default()

pry/interpreter.go

@@ -16,7 +16,6 @@ import (
 
 	"go/types"
 	// Used by types for import determination
-	"golang.org/x/tools/go/gcimporter15"
 )
 
 // Scope is a string-interface key-value pair that represents variables/functions in scope.
@@ -593,10 +592,7 @@ func (scope *Scope) ConfigureTypes(path string, line int) error {
 	scope.fset = token.NewFileSet() // positions are relative to fset
 	scope.config = &types.Config{
 		FakeImportC: true,
-		Importer: importer{
-			impFn:    gcImporter,
-			packages: make(map[string]*types.Package),
-		},
+		Importer:    gcImporter,
 	}
 
 	// Parse the file containing this very example
@@ -746,19 +742,3 @@ func ValuesToInterfaces(vals []reflect.Value) []interface{} {
 	}
 	return inters
 }
-
-// These lines were taken from github.com/golang/lint, see that project for
-// more information.
-var gcImporter = gcimporter.Import
-
-// importer implements go/types.Importer.
-// It also implements go/types.ImporterFrom, which was new in Go 1.6,
-// so vendoring will work.
-type importer struct {
-	impFn    func(packages map[string]*types.Package, path, srcDir string) (*types.Package, error)
-	packages map[string]*types.Package
-}
-
-func (i importer) Import(path string) (*types.Package, error) {
-	return i.impFn(i.packages, path, "")
-}