Fix gazelle overwriting matching rules

gazelle/buf/buf_lock.go

@@ -15,7 +15,7 @@
 package buf
 
 // bufLock is subset of the `buf.lock` representation copied from bufbuild/buf
-// 
+//
 // Must be kept in sync with: bufbuild/buf/private/bufpkg/buflock.ExternalConfigV1
 type bufLock struct {
 	Version string `yaml:"version,omitempty" json:"version,omitempty"`

gazelle/buf/buf_test.go

@@ -62,6 +62,11 @@ func TestPush(t *testing.T) {
 	testRunGazelle(t, "push")
 }
 
+func TestMerge(t *testing.T) {
+	t.Parallel()
+	testRunGazelle(t, "merge")
+}
+
 func TestImportResolve(t *testing.T) {
 	t.Parallel()
 	testRunGazelle(t, "imports", "update-repos", "--from_file=buf.work.yaml", "-to_macro=buf_deps.bzl%buf_deps", "-prune")

gazelle/buf/buf_work.go

@@ -15,7 +15,7 @@
 package buf
 
 // bufWork is a subset of the `buf.work.yaml` representation copied from bufbuild/buf
-// 
+//
 // Must be kept in sync with: bufbuild/buf/private/buf/bufwork.ExternalConfigV1
 type bufWork struct {
 	Version     string   `yaml:"version,omitempty" json:"version,omitempty"`

gazelle/buf/generate.go

@@ -133,7 +133,7 @@ func shouldRemoveSingleTargetBufRule(
 		// Not generated by us
 		return false
 	}
-	if len(targets) == 1 && protoRuleMap[targets[0]] != nil {
+	if len(targets) == 1 && protoRuleMap[strings.TrimPrefix(targets[0], ":")] != nil {
 		// Target is accurate so skip
 		return false
 	}

gazelle/buf/testdata/merge/BUILD.in

@@ -0,0 +1,2 @@
+# gazelle:buf_breaking_against //:against_file
+# gazelle:buf_breaking_mode package

gazelle/buf/testdata/merge/BUILD.out

@@ -0,0 +1,2 @@
+# gazelle:buf_breaking_against //:against_file
+# gazelle:buf_breaking_mode package

gazelle/buf/testdata/merge/buf.yaml

@@ -0,0 +1,7 @@
+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT

gazelle/buf/testdata/merge/foo/v1/BUILD.in

@@ -0,0 +1,24 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_buf//buf:defs.bzl", "buf_breaking_test", "buf_lint_test")
+
+proto_library(
+    name = "foo_proto",
+    srcs = ["foo.proto"],
+    visibility = ["//visibility:public"],
+)
+
+buf_lint_test(
+    name = "foo_proto_lint",
+    size = "small",
+    config = "//:buf.yaml",
+    targets = [":foo_proto"],
+)
+
+buf_breaking_test(
+    name = "foo_proto_breaking",
+    size = "small",
+    against = "//:against_file",
+    config = "//:buf.yaml",
+    limit_to_input_files = True,
+    targets = [":foo_proto"],
+)

gazelle/buf/testdata/merge/foo/v1/BUILD.out

@@ -0,0 +1,24 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_buf//buf:defs.bzl", "buf_breaking_test", "buf_lint_test")
+
+proto_library(
+    name = "foo_proto",
+    srcs = ["foo.proto"],
+    visibility = ["//visibility:public"],
+)
+
+buf_lint_test(
+    name = "foo_proto_lint",
+    size = "small",
+    config = "//:buf.yaml",
+    targets = [":foo_proto"],
+)
+
+buf_breaking_test(
+    name = "foo_proto_breaking",
+    size = "small",
+    against = "//:against_file",
+    config = "//:buf.yaml",
+    limit_to_input_files = True,
+    targets = [":foo_proto"],
+)