From 440603ee24e1d76625c2088d1b90e02540591e06 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Fri, 1 May 2026 16:06:03 -0700
Subject: [PATCH] Fix gazelle not updating deps

---
 gazelle/bzl/gazelle.go                    |  1 +
 gazelle/bzl/testdata/merge_deps/BUILD.in  | 20 ++++++++++++++++++++
 gazelle/bzl/testdata/merge_deps/BUILD.out | 23 +++++++++++++++++++++++
 gazelle/bzl/testdata/merge_deps/WORKSPACE |  0
 gazelle/bzl/testdata/merge_deps/bar.bzl   |  4 ++++
 gazelle/bzl/testdata/merge_deps/baz.bzl   |  4 ++++
 gazelle/bzl/testdata/merge_deps/foo.bzl   |  7 +++++++
 7 files changed, 59 insertions(+)
 create mode 100644 gazelle/bzl/testdata/merge_deps/BUILD.in
 create mode 100644 gazelle/bzl/testdata/merge_deps/BUILD.out
 create mode 100644 gazelle/bzl/testdata/merge_deps/WORKSPACE
 create mode 100644 gazelle/bzl/testdata/merge_deps/bar.bzl
 create mode 100644 gazelle/bzl/testdata/merge_deps/baz.bzl
 create mode 100644 gazelle/bzl/testdata/merge_deps/foo.bzl

diff --git a/gazelle/bzl/gazelle.go b/gazelle/bzl/gazelle.go
index fe15fb8c..f59d9449 100644
--- a/gazelle/bzl/gazelle.go
+++ b/gazelle/bzl/gazelle.go
@@ -203,6 +203,7 @@ var kinds = map[string]rule.KindInfo{
 	"bzl_library": {
 		NonEmptyAttrs:  map[string]bool{"srcs": true, "deps": true},
 		MergeableAttrs: map[string]bool{"srcs": true},
+		ResolveAttrs:   map[string]bool{"deps": true},
 	},
 }
 
diff --git a/gazelle/bzl/testdata/merge_deps/BUILD.in b/gazelle/bzl/testdata/merge_deps/BUILD.in
new file mode 100644
index 00000000..3045714d
--- /dev/null
+++ b/gazelle/bzl/testdata/merge_deps/BUILD.in
@@ -0,0 +1,20 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+bzl_library(
+    name = "bar",
+    srcs = ["bar.bzl"],
+    visibility = ["//visibility:public"],
+)
+
+bzl_library(
+    name = "baz",
+    srcs = ["baz.bzl"],
+    visibility = ["//visibility:public"],
+)
+
+bzl_library(
+    name = "foo",
+    srcs = ["foo.bzl"],
+    visibility = ["//visibility:public"],
+    deps = [":bar"],
+)
diff --git a/gazelle/bzl/testdata/merge_deps/BUILD.out b/gazelle/bzl/testdata/merge_deps/BUILD.out
new file mode 100644
index 00000000..56b3f3dd
--- /dev/null
+++ b/gazelle/bzl/testdata/merge_deps/BUILD.out
@@ -0,0 +1,23 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+bzl_library(
+    name = "bar",
+    srcs = ["bar.bzl"],
+    visibility = ["//visibility:public"],
+)
+
+bzl_library(
+    name = "baz",
+    srcs = ["baz.bzl"],
+    visibility = ["//visibility:public"],
+)
+
+bzl_library(
+    name = "foo",
+    srcs = ["foo.bzl"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":bar",
+        ":baz",
+    ],
+)
diff --git a/gazelle/bzl/testdata/merge_deps/WORKSPACE b/gazelle/bzl/testdata/merge_deps/WORKSPACE
new file mode 100644
index 00000000..e69de29b
diff --git a/gazelle/bzl/testdata/merge_deps/bar.bzl b/gazelle/bzl/testdata/merge_deps/bar.bzl
new file mode 100644
index 00000000..9ada54fe
--- /dev/null
+++ b/gazelle/bzl/testdata/merge_deps/bar.bzl
@@ -0,0 +1,4 @@
+"""Doc string"""
+
+def bar():
+    pass
diff --git a/gazelle/bzl/testdata/merge_deps/baz.bzl b/gazelle/bzl/testdata/merge_deps/baz.bzl
new file mode 100644
index 00000000..309dbc1a
--- /dev/null
+++ b/gazelle/bzl/testdata/merge_deps/baz.bzl
@@ -0,0 +1,4 @@
+"""Doc string"""
+
+def baz():
+    pass
diff --git a/gazelle/bzl/testdata/merge_deps/foo.bzl b/gazelle/bzl/testdata/merge_deps/foo.bzl
new file mode 100644
index 00000000..d24e429b
--- /dev/null
+++ b/gazelle/bzl/testdata/merge_deps/foo.bzl
@@ -0,0 +1,7 @@
+"""Have deps on both"""
+
+load("//:bar.bzl", "bar")
+load("//:baz.bzl", "baz")
+
+bar()
+baz()