fix: provider discovery

Author: cmilesio

internal/wire/parse.go

@@ -574,6 +574,11 @@ func (oc *objectCache) semanticProviderSet(obj *types.Var) (*ProviderSet, bool,
 	if !ok {
 		return nil, false, nil
 	}
+	for _, item := range setArt.Items {
+		if item.Kind == "bind" {
+			return nil, false, nil
+		}
+	}
 	pset := &ProviderSet{
 		Pos:     obj.Pos(),
 		PkgPath: obj.Pkg().Path(),
@@ -1856,5 +1861,11 @@ func bindShouldUsePointer(info *types.Info, call *ast.CallExpr) bool {
 	fun := call.Fun.(*ast.SelectorExpr)                 // wire.Bind
 	pkgName := fun.X.(*ast.Ident)                       // wire
 	wireName := info.ObjectOf(pkgName).(*types.PkgName) // wire package
-	return wireName.Imported().Scope().Lookup("bindToUsePointer") != nil
+	if imported := wireName.Imported(); imported != nil {
+		if isWireImport(imported.Path()) {
+			return true
+		}
+		return imported.Scope().Lookup("bindToUsePointer") != nil
+	}
+	return false
 }

internal/wire/parse_coverage_test.go

@@ -367,7 +367,7 @@ func TestObjectCacheSemanticProviderSetFallback(t *testing.T) {
 	}
 }
 
-func TestObjectCacheSemanticProviderSetFallbackTypeOnlyForms(t *testing.T) {
+func TestObjectCacheSemanticProviderSetSkipsBindArtifacts(t *testing.T) {
 	t.Parallel()
 
 	fset := token.NewFileSet()
@@ -429,22 +429,15 @@ func TestObjectCacheSemanticProviderSetFallbackTypeOnlyForms(t *testing.T) {
 		},
 		hasher: typeutil.MakeHasher(),
 	}
-	item, errs := oc.get(setVar)
+	pset, ok, errs := oc.semanticProviderSet(setVar)
 	if len(errs) > 0 {
-		t.Fatalf("oc.get(Set) errs = %v", errs)
-	}
-	pset, ok := item.(*ProviderSet)
-	if !ok || pset == nil {
-		t.Fatalf("oc.get(Set) type = %T, want *ProviderSet", item)
-	}
-	if len(pset.Bindings) != 1 {
-		t.Fatalf("bindings len = %d, want 1", len(pset.Bindings))
+		t.Fatalf("semanticProviderSet(Set) errs = %v", errs)
 	}
-	if len(pset.Providers) != 1 || !pset.Providers[0].IsStruct {
-		t.Fatalf("providers = %+v, want one struct provider", pset.Providers)
+	if ok {
+		t.Fatalf("semanticProviderSet(Set) ok = true, want false")
 	}
-	if len(pset.Fields) != 1 || pset.Fields[0].Name != "Message" {
-		t.Fatalf("fields = %+v, want Message field", pset.Fields)
+	if pset != nil {
+		t.Fatalf("semanticProviderSet(Set) = %#v, want nil", pset)
 	}
 }