address comments

Author: yushan8

gazelle/python/generate.go

@@ -32,7 +32,6 @@ import (
 	"github.com/emirpasic/gods/sets/treeset"
 	godsutils "github.com/emirpasic/gods/utils"
 
-
 	"github.com/bazel-contrib/rules_python/gazelle/pythonconfig"
 )
 
@@ -112,7 +111,10 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 	hasConftestFile := false
 
 	testFileGlobs := cfg.TestFilePattern()
-
+	filteredFiles := make(map[string]struct{})
+	for _, f := range args.RegularFiles {
+		filteredFiles[f] = struct{}{}
+	}
 	for _, f := range args.RegularFiles {
 		if cfg.IgnoresFile(filepath.Base(f)) {
 			continue
@@ -474,7 +476,7 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 		result.Imports = append(result.Imports, pyTest.PrivateAttr(config.GazelleImportsKey))
 	}
 	if !cfg.CoarseGrainedGeneration() {
-		emptyRules := py.getRulesWithInvalidSrcs(args)
+		emptyRules := py.getRulesWithInvalidSrcs(cfg, args)
 		result.Empty = append(result.Empty, emptyRules...)
 	}
 	if !collisionErrors.Empty() {
@@ -488,13 +490,17 @@ func (py *Python) GenerateRules(args language.GenerateArgs) language.GenerateRes
 	return result
 }
 
-// getRulesWithInvalidSrcs checks existing Python rules in the BUILD file and return the rules with invalid srcs.
-func (py *Python) getRulesWithInvalidSrcs(args language.GenerateArgs) (invalidRules []*rule.Rule) {
+// getRulesWithInvalidSrcs checks existing Python rules in the BUILD file and return the rules with invalid source files.
+// Invalid source files are files that do not exist or not a target.
+func (py *Python) getRulesWithInvalidSrcs(cfg *pythonconfig.Config, args language.GenerateArgs) (invalidRules []*rule.Rule) {
 	if args.File == nil {
 		return
 	}
 	filesMap := make(map[string]struct{})
 	for _, file := range args.RegularFiles {
+		if cfg.IgnoresFile(filepath.Base(file)) {
+			continue
+		}
 		filesMap[file] = struct{}{}
 	}
 	for _, file := range args.GenFiles {
@@ -508,18 +514,18 @@ func (py *Python) getRulesWithInvalidSrcs(args language.GenerateArgs) (invalidRu
 		if existingRule.Kind() != pyBinaryKind {
 			continue
 		}
-		allInvalidSrcs := true
+		hasValidSrcs := true
 		for _, src := range existingRule.AttrStrings("srcs") {
-			if _, ok := filesMap[src]; ok {
-				allInvalidSrcs = false
-				break
-			}
 			if isTarget(src) {
-				allInvalidSrcs = false
-				break
+				continue
+			}
+			if _, ok := filesMap[src]; ok {
+				continue
 			}
+			hasValidSrcs = false
+			break
 		}
-		if allInvalidSrcs {
+		if !hasValidSrcs {
 			invalidRules = append(invalidRules, newTargetBuilder(existingRule.Kind(), existingRule.Name(), args.Config.RepoRoot, args.Rel, nil).build())
 		}
 	}

gazelle/python/testdata/remove_invalid_binary/BUILD.in

@@ -1,5 +1,9 @@
 load("@rules_python//python:defs.bzl", "py_binary")
 
+py_library(
+    name = "keep_library",
+    deps = ["//keep_binary:foo"],
+)
 py_binary(
     name = "remove_invalid_binary",
     srcs = ["__main__.py"],

gazelle/python/testdata/remove_invalid_binary/WORKSPACE

@@ -1 +0,0 @@
-workspace(name = "remove_invalid_binary")

gazelle/python/testdata/remove_invalid_binary/keep_binary/BUILD.in

@@ -1,5 +1,7 @@
+load("@rules_python//python:defs.bzl", "py_binary")
+
 py_binary(
-    name = "keep_target_binary",
-    srcs = ["//test/binary:__main__.py"],
+    name = "foo",
+    srcs = ["foo.py"],
     visibility = ["//:__subpackages__"],
 )

gazelle/python/testdata/remove_invalid_binary/keep_binary/BUILD.out

@@ -1,5 +1,7 @@
+load("@rules_python//python:defs.bzl", "py_binary")
+
 py_binary(
-    name = "keep_target_binary",
-    srcs = ["//test/binary:__main__.py"],
+    name = "foo",
+    srcs = ["foo.py"],
     visibility = ["//:__subpackages__"],
 )

gazelle/python/testdata/remove_invalid_binary/keep_binary/foo.py

@@ -0,0 +1,2 @@
+if __name__ == "__main__":
+    print("foo")

gazelle/python/testdata/remove_invalid_binary/test.yaml

@@ -1,15 +0,0 @@
-# Copyright 2023 The Bazel Authors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----