Address comments

Author: yushan8

gazelle/python/generate.go

@@ -523,7 +523,8 @@ func (py *Python) getRulesWithInvalidSrcs(args language.GenerateArgs, validFiles
 		return strings.HasPrefix(src, "@") || strings.HasPrefix(src, "//") || strings.HasPrefix(src, ":")
 	}
 	for _, existingRule := range args.File.Rules {
-		if existingRule.Kind() != pyBinaryKind {
+		actualPyBinaryKind := GetActualKindName(pyBinaryKind, args)
+		if existingRule.Kind() != actualPyBinaryKind {
 			continue
 		}
 		var hasValidSrcs bool
@@ -538,7 +539,7 @@ func (py *Python) getRulesWithInvalidSrcs(args language.GenerateArgs, validFiles
 			}
 		}
 		if !hasValidSrcs {
-			invalidRules = append(invalidRules, newTargetBuilder(existingRule.Kind(), existingRule.Name(), args.Config.RepoRoot, args.Rel, nil, false).build())
+			invalidRules = append(invalidRules, newTargetBuilder(pyBinaryKind, existingRule.Name(), "", "", nil, false).build())
 		}
 	}
 	return invalidRules

gazelle/python/kinds.go

@@ -46,6 +46,7 @@ var pyKinds = map[string]rule.KindInfo{
 		SubstituteAttrs: map[string]bool{},
 		MergeableAttrs: map[string]bool{
 			"srcs": true,
+			"imports": true,
 		},
 		ResolveAttrs: map[string]bool{
 			"deps":     true,

gazelle/python/testdata/remove_invalid_binary/BUILD.in

@@ -7,5 +7,7 @@ py_library(
 py_binary(
     name = "remove_invalid_binary",
     srcs = ["__main__.py"],
+    imports = ["."],
+    data = ["testdata/test.txt"],
     visibility = ["//:__subpackages__"],
 )

gazelle/python/testdata/respect_kind_mapping/BUILD.in

@@ -1,6 +1,7 @@
 load("@rules_python//python:defs.bzl", "py_library")
 
 # gazelle:map_kind py_test my_test :mytest.bzl
+# gazelle:map_kind py_binary my_bin :mytest.bzl
 
 py_library(
     name = "respect_kind_mapping",
@@ -13,3 +14,8 @@ my_test(
     main = "__test__.py",
     deps = [":respect_kind_mapping"],
 )
+
+my_bin(
+    name = "my_bin_gets_removed",
+    srcs = ["__main__.py"],
+)

gazelle/python/testdata/respect_kind_mapping/BUILD.out

@@ -2,6 +2,7 @@ load("@rules_python//python:defs.bzl", "py_library")
 load(":mytest.bzl", "my_test")
 
 # gazelle:map_kind py_test my_test :mytest.bzl
+# gazelle:map_kind py_binary my_bin :mytest.bzl
 
 py_library(
     name = "respect_kind_mapping",