Use _py_proto suffix, to align with java, go naming schemes

shaldengeki · shaldengeki · commit 3e0fdcc0a334 · 2025-07-12T02:08:59.000-04:00
diff --git a/gazelle/README.md b/gazelle/README.md
@@ -513,7 +513,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_proto",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )
diff --git a/gazelle/python/generate.go b/gazelle/python/generate.go
@@ -580,7 +580,7 @@ func generateProtoLibraries(args language.GenerateArgs, pythonProjectRoot string
 	emptySiblings := treeset.Set{}
 	// Generate a py_proto_library for each proto_library.
 	for _, protoRuleName := range protoRuleNames {
-		pyProtoLibraryName := protoRuleName + "_py_pb2"
+		pyProtoLibraryName := strings.TrimSuffix(protoRuleName, "_proto") + "_py_proto"
 		pyProtoLibrary := newTargetBuilder(pyProtoLibraryKind, pyProtoLibraryName, pythonProjectRoot, args.Rel, &emptySiblings).
 			addVisibility(visibility).
 			addResolvedDependency(":" + protoRuleName).
diff --git a/gazelle/python/testdata/directive_python_generate_proto/test5_enabled_with_proto/BUILD.out b/gazelle/python/testdata/directive_python_generate_proto/test5_enabled_with_proto/BUILD.out
@@ -10,7 +10,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_proto",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )
diff --git a/gazelle/python/testdata/directive_python_generate_proto/test7_removes_when_unnecessary/BUILD.in b/gazelle/python/testdata/directive_python_generate_proto/test7_removes_when_unnecessary/BUILD.in
@@ -10,7 +10,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_proto",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )
diff --git a/gazelle/python/testdata/directive_python_generate_proto/test8_disabled_ignores_py_proto_library/BUILD.in b/gazelle/python/testdata/directive_python_generate_proto/test8_disabled_ignores_py_proto_library/BUILD.in
@@ -10,7 +10,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_proto",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )
diff --git a/gazelle/python/testdata/directive_python_generate_proto/test8_disabled_ignores_py_proto_library/BUILD.out b/gazelle/python/testdata/directive_python_generate_proto/test8_disabled_ignores_py_proto_library/BUILD.out
@@ -10,7 +10,7 @@ proto_library(
 )
 
 py_proto_library(
-    name = "foo_proto_py_pb2",
+    name = "foo_py_proto",
     visibility = ["//:__subpackages__"],
     deps = [":foo_proto"],
 )

Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ proto_library(`
`513`	`513`	`)`
`514`	`514`
`515`	`515`	`py_proto_library(`
`516`		`- name = "foo_proto_py_pb2",`
	`516`	`+ name = "foo_py_proto",`
`517`	`517`	`visibility = ["//:__subpackages__"],`
`518`	`518`	`deps = [":foo_proto"],`
`519`	`519`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ proto_library(`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`py_proto_library(`
`13`		`- name = "foo_proto_py_pb2",`
	`13`	`+ name = "foo_py_proto",`
`14`	`14`	`visibility = ["//:__subpackages__"],`
`15`	`15`	`deps = [":foo_proto"],`
`16`	`16`	`)`