Revert changes to target.go and simplify resolve.go

Author: amartani

gazelle/python/resolve.go

@@ -301,38 +301,40 @@ func (py *Resolver) Resolve(
 		}
 	}
 
+	addResolvedDeps(r, deps)
+
 	if cfg.GeneratePyiDeps() {
-		addResolvedDepsAndSetAttr(r, deps, resolvedDepsKey, "deps")
-		addResolvedDepsAndSetAttr(r, pyiDeps, resolvedPyiDepsKey, "pyi_deps")
+		if !deps.Empty() {
+			r.SetAttr("deps", convertDependencySetToExpr(deps))
+		}
+		if !pyiDeps.Empty() {
+			r.SetAttr("pyi_deps", convertDependencySetToExpr(pyiDeps))
+		}
 	} else {
 		// When generate_pyi_deps is false, merge both deps and pyiDeps into deps
 		combinedDeps := treeset.NewWith(godsutils.StringComparator)
 		combinedDeps.Add(deps.Values()...)
 		combinedDeps.Add(pyiDeps.Values()...)
 
-		addResolvedDepsAndSetAttr(r, combinedDeps, resolvedDepsKey, "deps")
+		if !combinedDeps.Empty() {
+			r.SetAttr("deps", convertDependencySetToExpr(combinedDeps))
+		}
 	}
 }
 
-// addResolvedDepsAndSetAttr adds the pre-resolved dependencies from the rule's private attributes
-// to the provided deps set and sets the attribute on the rule.
-func addResolvedDepsAndSetAttr(
+// addResolvedDeps adds the pre-resolved dependencies from the rule's private attributes
+// to the provided deps set.
+func addResolvedDeps(
 	r *rule.Rule,
 	deps *treeset.Set,
-	resolvedDepsAttrName string,
-	depsAttrName string,
 ) {
-	resolvedDeps := r.PrivateAttr(resolvedDepsAttrName).(*treeset.Set)
+	resolvedDeps := r.PrivateAttr(resolvedDepsKey).(*treeset.Set)
 	if !resolvedDeps.Empty() {
 		it := resolvedDeps.Iterator()
 		for it.Next() {
 			deps.Add(it.Value())
 		}
 	}
-
-	if !deps.Empty() {
-		r.SetAttr(depsAttrName, convertDependencySetToExpr(deps))
-	}
 }
 
 // targetListFromResults returns a string with the human-readable list of

gazelle/python/target.go

@@ -15,12 +15,11 @@
 package python
 
 import (
-	"path/filepath"
-
 	"github.com/bazelbuild/bazel-gazelle/config"
 	"github.com/bazelbuild/bazel-gazelle/rule"
 	"github.com/emirpasic/gods/sets/treeset"
 	godsutils "github.com/emirpasic/gods/utils"
+	"path/filepath"
 )
 
 // targetBuilder builds targets to be generated by Gazelle.
@@ -32,9 +31,7 @@ type targetBuilder struct {
 	srcs              *treeset.Set
 	siblingSrcs       *treeset.Set
 	deps              *treeset.Set
-	pyiDeps           *treeset.Set
 	resolvedDeps      *treeset.Set
-	resolvedPyiDeps   *treeset.Set
 	visibility        *treeset.Set
 	main              *string
 	imports           []string
@@ -51,9 +48,7 @@ func newTargetBuilder(kind, name, pythonProjectRoot, bzlPackage string, siblingS
 		srcs:              treeset.NewWith(godsutils.StringComparator),
 		siblingSrcs:       siblingSrcs,
 		deps:              treeset.NewWith(moduleComparator),
-		pyiDeps:           treeset.NewWith(moduleComparator),
 		resolvedDeps:      treeset.NewWith(godsutils.StringComparator),
-		resolvedPyiDeps:   treeset.NewWith(godsutils.StringComparator),
 		visibility:        treeset.NewWith(godsutils.StringComparator),
 	}
 }
@@ -84,13 +79,7 @@ func (t *targetBuilder) addModuleDependency(dep Module) *targetBuilder {
 		// dependency resolution easier
 		dep.Name = importSpecFromSrc(t.pythonProjectRoot, t.bzlPackage, fileName).Imp
 	}
-
-	// Add to appropriate dependency set based on whether it's type-checking only
-	if dep.TypeCheckingOnly {
-		t.pyiDeps.Add(dep)
-	} else {
-		t.deps.Add(dep)
-	}
+	t.deps.Add(dep)
 	return t
 }
 
@@ -173,23 +162,12 @@ func (t *targetBuilder) build() *rule.Rule {
 	if t.imports != nil {
 		r.SetAttr("imports", t.imports)
 	}
-	if combinedDeps := t.combinedDeps(); !combinedDeps.Empty() {
-		r.SetPrivateAttr(config.GazelleImportsKey, combinedDeps)
+	if !t.deps.Empty() {
+		r.SetPrivateAttr(config.GazelleImportsKey, t.deps)
 	}
 	if t.testonly {
 		r.SetAttr("testonly", true)
 	}
 	r.SetPrivateAttr(resolvedDepsKey, t.resolvedDeps)
-	r.SetPrivateAttr(resolvedPyiDepsKey, t.resolvedPyiDeps)
 	return r
 }
-
-// Combine both regular and type-checking imports into a single set
-// for passing to the resolver. The resolver will distinguish them
-// based on the TypeCheckingOnly field.
-func (t *targetBuilder) combinedDeps() *treeset.Set {
-	combinedDeps := treeset.NewWith(moduleComparator)
-	combinedDeps.Add(t.pyiDeps.Values()...)
-	combinedDeps.Add(t.deps.Values()...)
-	return combinedDeps
-}