Support resolving with Go modules

André Eriksson · André Eriksson · commit 5b52022d889d · 2019-02-21T09:21:54.000+01:00
diff --git a/pkg/util/caller/resolver.go b/pkg/util/caller/resolver.go
@@ -72,7 +72,8 @@ var defaultRE = func() *regexp.Regexp {
 		// creates packages inside of a "src" directory within their GOPATH.
 		return regexp.MustCompile(".*" + qSep + "src" + pkgStrip)
 	}
-	if !strings.HasSuffix(root, sep+"src") && !strings.HasSuffix(root, sep+"vendor") {
+	if !strings.HasSuffix(root, sep+"src") && !strings.HasSuffix(root, sep+"vendor") &&
+		!strings.HasSuffix(root, sep+"pkg/mod") {
 		panic("unable to find base path for default call resolver, got " + root)
 	}
 	return regexp.MustCompile(regexp.QuoteMeta(root) + pkgStrip)

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ var defaultRE = func() *regexp.Regexp {`
`72`	`72`	`// creates packages inside of a "src" directory within their GOPATH.`
`73`	`73`	`return regexp.MustCompile(".*" + qSep + "src" + pkgStrip)`
`74`	`74`	`}`
`75`		`- if !strings.HasSuffix(root, sep+"src") && !strings.HasSuffix(root, sep+"vendor") {`
	`75`	`+ if !strings.HasSuffix(root, sep+"src") && !strings.HasSuffix(root, sep+"vendor") &&`
	`76`	`+ !strings.HasSuffix(root, sep+"pkg/mod") {`
`76`	`77`	`panic("unable to find base path for default call resolver, got " + root)`
`77`	`78`	`}`
`78`	`79`	`return regexp.MustCompile(regexp.QuoteMeta(root) + pkgStrip)`