chore: upgrade gazelle to 0.46.rc2, aspect-gazelle to be0c9d661455

bazel/include/go.MODULE.bazel

@@ -13,59 +13,60 @@ use_repo(go_sdk, "go_sdk")
 bazel_dep(name = "gazelle", version = "0.45.0", repo_name = "bazel_gazelle")
 archive_override(
     module_name = "gazelle",
-    integrity = "sha256-3NCjXwfTFu/htS5BEzcn/uKXSdjKEZhrYdC+zykbcUE=",
+    integrity = "sha256-7OFD5iTGfqKOaFkiuMIwl2ph2gXVUSpaCxWHnY/lwOw=",
     patch_strip = 1,
     patches = [
-        "//patches:bazelbuild_bazel-gazelle_aspect-cli.patch",
+        "//patches:gazelle-branded.patch",
         "//patches:gazelle-gitignore.patch",
+        "//patches:gazelle-watchman.patch",
     ],
-    strip_prefix = "bazel-gazelle-0e862c3d81827441407c1e7c421831af511acfdb",
-    urls = ["https://github.com/bazel-contrib/bazel-gazelle/archive/0e862c3d81827441407c1e7c421831af511acfdb.tar.gz"],
+    strip_prefix = "bazel-gazelle-47b5773efc64569526e4cafe53cf74d8993dfda9",
+    urls = ["https://github.com/bazel-contrib/bazel-gazelle/archive/47b5773efc64569526e4cafe53cf74d8993dfda9.tar.gz"],
 )
 
 bazel_dep(name = "aspect_gazelle", version = "0.0.0")
 archive_override(
     module_name = "aspect_gazelle",
-    integrity = "sha256-aG0e/HzI65635JXQ3RQuEqV9cmdNl4bBXAD0VyfL/DU=",
-    strip_prefix = "aspect-gazelle-1859933dc67ead69d44b824830ab38d782113f56",
-    urls = ["https://github.com/aspect-build/aspect-gazelle/archive/1859933dc67ead69d44b824830ab38d782113f56.tar.gz"],
+    integrity = "sha256-4t2jOJ0VnxdGMlbUe98HJnaSr3Zk7iQq/c/pJiTCsi8=",
+    strip_prefix = "aspect-gazelle-4a3c2d2f2d0333258c4adc9aa1d45e920a60697c",
+    urls = ["https://github.com/aspect-build/aspect-gazelle/archive/4a3c2d2f2d0333258c4adc9aa1d45e920a60697c.tar.gz"],
 )
 
 bazel_dep(name = "aspect_gazelle_js", version = "0.0.0")
 archive_override(
     module_name = "aspect_gazelle_js",
-    integrity = "sha256-aG0e/HzI65635JXQ3RQuEqV9cmdNl4bBXAD0VyfL/DU=",
-    strip_prefix = "aspect-gazelle-1859933dc67ead69d44b824830ab38d782113f56/language/js",
-    urls = ["https://github.com/aspect-build/aspect-gazelle/archive/1859933dc67ead69d44b824830ab38d782113f56.tar.gz"],
+    integrity = "sha256-4t2jOJ0VnxdGMlbUe98HJnaSr3Zk7iQq/c/pJiTCsi8=",
+    strip_prefix = "aspect-gazelle-4a3c2d2f2d0333258c4adc9aa1d45e920a60697c/language/js",
+    urls = ["https://github.com/aspect-build/aspect-gazelle/archive/4a3c2d2f2d0333258c4adc9aa1d45e920a60697c.tar.gz"],
 )
 
 bazel_dep(name = "aspect_gazelle_orion", version = "0.0.0")
 archive_override(
     module_name = "aspect_gazelle_orion",
-    integrity = "sha256-aG0e/HzI65635JXQ3RQuEqV9cmdNl4bBXAD0VyfL/DU=",
-    strip_prefix = "aspect-gazelle-1859933dc67ead69d44b824830ab38d782113f56/language/orion",
-    urls = ["https://github.com/aspect-build/aspect-gazelle/archive/1859933dc67ead69d44b824830ab38d782113f56.tar.gz"],
+    integrity = "sha256-4t2jOJ0VnxdGMlbUe98HJnaSr3Zk7iQq/c/pJiTCsi8=",
+    strip_prefix = "aspect-gazelle-4a3c2d2f2d0333258c4adc9aa1d45e920a60697c/language/orion",
+    urls = ["https://github.com/aspect-build/aspect-gazelle/archive/4a3c2d2f2d0333258c4adc9aa1d45e920a60697c.tar.gz"],
 )
 
 bazel_dep(name = "aspect_gazelle_runner", version = "0.0.0")
 archive_override(
     module_name = "aspect_gazelle_runner",
-    integrity = "sha256-aG0e/HzI65635JXQ3RQuEqV9cmdNl4bBXAD0VyfL/DU=",
+    integrity = "sha256-4t2jOJ0VnxdGMlbUe98HJnaSr3Zk7iQq/c/pJiTCsi8=",
     patch_strip = 2,
     patches = [
         "//patches:aspect-gazelle-runner.patch",
     ],
-    strip_prefix = "aspect-gazelle-1859933dc67ead69d44b824830ab38d782113f56/runner",
-    urls = ["https://github.com/aspect-build/aspect-gazelle/archive/1859933dc67ead69d44b824830ab38d782113f56.tar.gz"],
+    strip_prefix = "aspect-gazelle-4a3c2d2f2d0333258c4adc9aa1d45e920a60697c/runner",
+    urls = ["https://github.com/aspect-build/aspect-gazelle/archive/4a3c2d2f2d0333258c4adc9aa1d45e920a60697c.tar.gz"],
 )
 
 # Not direclty used but must be declared+overriden until aspect_gazelle_runner points to one published to BCR.
 bazel_dep(name = "aspect_gazelle_kotlin", version = "0.0.0")
 archive_override(
     module_name = "aspect_gazelle_kotlin",
-    integrity = "sha256-aG0e/HzI65635JXQ3RQuEqV9cmdNl4bBXAD0VyfL/DU=",
-    strip_prefix = "aspect-gazelle-1859933dc67ead69d44b824830ab38d782113f56/language/kotlin",
-    urls = ["https://github.com/aspect-build/aspect-gazelle/archive/1859933dc67ead69d44b824830ab38d782113f56.tar.gz"],
+    integrity = "sha256-4t2jOJ0VnxdGMlbUe98HJnaSr3Zk7iQq/c/pJiTCsi8=",
+    strip_prefix = "aspect-gazelle-4a3c2d2f2d0333258c4adc9aa1d45e920a60697c/language/kotlin",
+    urls = ["https://github.com/aspect-build/aspect-gazelle/archive/4a3c2d2f2d0333258c4adc9aa1d45e920a60697c.tar.gz"],
 )
 
 # Go modules

go.mod

@@ -5,10 +5,10 @@ go 1.24.5
 require (
 	github.com/Masterminds/semver/v3 v3.4.0 // indirect
 	github.com/alphadose/haxmap v1.4.1
-	github.com/aspect-build/aspect-gazelle/common v0.0.0-20251023224130-1859933dc67e
-	github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251023224130-1859933dc67e
-	github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251023224130-1859933dc67e
-	github.com/bazelbuild/bazel-gazelle v0.45.1-0.20250924144014-2de7b829fef1
+	github.com/aspect-build/aspect-gazelle/common v0.0.0-20251029222723-4a3c2d2f2d03
+	github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251029222723-4a3c2d2f2d03
+	github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251029222723-4a3c2d2f2d03
+	github.com/bazelbuild/bazel-gazelle v0.46.0-rc2
 	github.com/bazelbuild/bazelisk v1.26.0 // NOTE: keep vendored code in sync
 	github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52
 	github.com/bluekeyes/go-gitdiff v0.7.3
@@ -20,23 +20,18 @@ require (
 	github.com/golang/protobuf v1.5.4
 	github.com/hashicorp/go-hclog v1.6.3
 	github.com/hashicorp/go-plugin v1.6.1
-	github.com/itchyny/gojq v0.12.18-0.20251005142832-e46d0344f209 // indirect
 	github.com/manifoldco/promptui v0.9.0
 	github.com/mattn/go-isatty v0.0.20
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/msolo/jsonr v0.0.0-20231023064044-62fbfc3a0313 // indirect
 	github.com/onsi/gomega v1.38.2
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/reviewdog/errorformat v0.0.0-20240608101709-1d3280ed6bd4
 	github.com/rs/zerolog v1.34.0
-	github.com/smacker/go-tree-sitter v0.0.0-20240827094217-dd81d9e9be82 // indirect
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/pflag v1.0.10
 	github.com/spf13/viper v1.20.1
 	github.com/tejzpr/ordered-concurrently/v3 v3.0.1
 	github.com/twmb/murmur3 v1.1.8
-	go.starlark.net v0.0.0-20250906160240-bf296ed553ea // indirect
 	golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 // indirect
 	golang.org/x/mod v0.29.0
 	golang.org/x/sync v0.17.0
@@ -64,13 +59,6 @@ require (
 	gotest.tools/v3 v3.5.1
 )
 
-require (
-	github.com/aspect-build/aspect-gazelle/language/kotlin v0.0.0-20251023224130-1859933dc67e // indirect
-	github.com/bazel-contrib/rules_jvm v0.30.0 // indirect
-	github.com/google/btree v1.1.3 // indirect
-	github.com/sagikazarmark/locafero v0.7.0 // indirect
-)
-
 require (
 	dario.cat/mergo v1.0.2 // indirect
 	github.com/EngFlow/gazelle_cc v0.1.0 // indirect
@@ -79,7 +67,6 @@ require (
 	github.com/a8m/envsubst v1.4.3 // indirect
 	github.com/alecthomas/chroma/v2 v2.15.0 // indirect
 	github.com/alecthomas/participle/v2 v2.1.4 // indirect
-	github.com/aspect-build/aspect-gazelle/language/js v0.0.0-20251023224130-1859933dc67e // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
@@ -128,6 +115,7 @@ require (
 	github.com/haya14busa/go-sarif v0.0.0-20210102043135-e2c5fed2fa3d // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/itchyny/gojq v0.12.18-0.20251005142832-e46d0344f209 // indirect
 	github.com/itchyny/timefmt-go v0.1.7 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jinzhu/copier v0.4.0 // indirect
@@ -150,12 +138,15 @@ require (
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pjbgf/sha1cd v0.4.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/psanford/memfs v0.0.0-20241019191636-4ef911798f9b // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect; indirect	github.com/sagikazarmark/locafero v0.9.0 // indirect
+	github.com/sagikazarmark/locafero v0.7.0 // indirect
 	github.com/sahilm/fuzzy v0.1.1 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/skeema/knownhosts v1.3.1 // indirect
+	github.com/smacker/go-tree-sitter v0.0.0-20240827094217-dd81d9e9be82 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.12.0 // indirect
 	github.com/spf13/cast v1.7.1 // indirect
@@ -169,6 +160,7 @@ require (
 	github.com/yuin/gopher-lua v1.1.1 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	go.starlark.net v0.0.0-20250906160240-bf296ed553ea // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect

go.sum

@@ -27,16 +27,12 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/aspect-build/aspect-gazelle/common v0.0.0-20251023224130-1859933dc67e h1:1zA9KwD6DNsmiOKxK8npF8rrX4xvKiIC29XJa+kl5dQ=
-github.com/aspect-build/aspect-gazelle/common v0.0.0-20251023224130-1859933dc67e/go.mod h1:FtyqQH3X6R33MNd3uuhTTNHEjmZnUuDs9kIU13y/HkA=
-github.com/aspect-build/aspect-gazelle/language/js v0.0.0-20251023224130-1859933dc67e h1:5a2blHzKw39zG00in9rBr+lZMfj7jzVc0YYpqdbAKEw=
-github.com/aspect-build/aspect-gazelle/language/js v0.0.0-20251023224130-1859933dc67e/go.mod h1:DizauW23YdN/LjVGk9yw08pTiqZUX9B7EVhS/Dq5P08=
-github.com/aspect-build/aspect-gazelle/language/kotlin v0.0.0-20251023224130-1859933dc67e h1:04Q8BzN3V4jn+kU4rHmHFy4xhuspGqhkqbY9LuJ+nXo=
-github.com/aspect-build/aspect-gazelle/language/kotlin v0.0.0-20251023224130-1859933dc67e/go.mod h1:bZKc3URSRU5DOrM8YcAvky165ZHFf9i9Kr55uJA5+H8=
-github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251023224130-1859933dc67e h1:us4QYAdDdiio2PypTRNSA3SXKHm9LxA33sGneN5OfDs=
-github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251023224130-1859933dc67e/go.mod h1:GIff4fwG3AqM13oIKG7vlUzNH7jHOvW2V2WN+mK44SE=
-github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251023224130-1859933dc67e h1:0vd3rBzc3QqnX1YokmZNFPl1JHPNxaBssbAhHTxg2u0=
-github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251023224130-1859933dc67e/go.mod h1:JvktCLm56Wx/IyRlIePNsgHhRP9v5Ar4FrMw0cefytY=
+github.com/aspect-build/aspect-gazelle/common v0.0.0-20251029222723-4a3c2d2f2d03 h1:6W6sDdQJF7zyy9SNjDALdwHKJ89GjZLdvYOddhUMixw=
+github.com/aspect-build/aspect-gazelle/common v0.0.0-20251029222723-4a3c2d2f2d03/go.mod h1:G6awMFN6QlDY5yV9tUjTqGSlAKzd1SC/bBtPiiG/y48=
+github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251029222723-4a3c2d2f2d03 h1:RD9fc6lnejarPTgT9IagEQXEFkjYQWz5s5IbDlCJMvI=
+github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251029222723-4a3c2d2f2d03/go.mod h1:Jrp2AN2kf4sVyChii70kClZwzMWy9/n28wAENBlrT9M=
+github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251029222723-4a3c2d2f2d03 h1:xFe/4SoFlBMXDQJsjzfh57+FaAoqWqv2scmgHCYR1b4=
+github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251029222723-4a3c2d2f2d03/go.mod h1:1tAv6P6NfvRO+no+cqgXaOAXGAqi/JLASdRMmqV4a8Y=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
@@ -45,12 +41,10 @@ github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWp
 github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
-github.com/bazel-contrib/rules_jvm v0.30.0 h1:GSKDLgH7hi5dpOwmdhE3SJEQzVtsv31i2IvSUWIkP5Q=
-github.com/bazel-contrib/rules_jvm v0.30.0/go.mod h1:HxRDtmRlh/ErR+2QlVwYs4BcIrB248HeheKi5uyKeN4=
 github.com/bazel-contrib/rules_python/gazelle v0.0.0-20251012075144-43a5acf8cedf h1:HGT/ELJizYCYtTtyL4m9HAD0wYzuLBzDP3YYfk5N8Ow=
 github.com/bazel-contrib/rules_python/gazelle v0.0.0-20251012075144-43a5acf8cedf/go.mod h1:84dcq5fZ/hiQGnpjzH57+Xm7T6uwpPty1KPB7qzHDO0=
-github.com/bazelbuild/bazel-gazelle v0.45.1-0.20250924144014-2de7b829fef1 h1:tsMoNz7rX4r65wf8eMyehnIyJPWf2BzS+VaDAfcZmdc=
-github.com/bazelbuild/bazel-gazelle v0.45.1-0.20250924144014-2de7b829fef1/go.mod h1:XdBdWhrTc5x50CKzKXOcwrZWdLuX58IX1KcSaWPtEGo=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2 h1:opKbd+Bj7ZKtlYJF1JqE9W4OVDvFEZogj2ncVtrLpOU=
+github.com/bazelbuild/bazel-gazelle v0.46.0-rc2/go.mod h1:8Ozf20jhv+in87nCUHdmUPPcVGTfKg/gotZ/hce3T+w=
 github.com/bazelbuild/bazelisk v1.26.0 h1:LvPtflqF7p+gjfdp491hqVWtu4+S/7yW9Yz2Xj4KzQk=
 github.com/bazelbuild/bazelisk v1.26.0/go.mod h1:te9bGfPtIk03+J52OwFXVJ2Laf9O0v7xphPTWWt9Flk=
 github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52 h1:njQAmjTv/YHRm/0Lfv9DXHFZ4MdT2IA/RKHTnqZkgDw=
@@ -178,8 +172,6 @@ github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/
 github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
-github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -270,8 +262,6 @@ github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4
 github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/msolo/jsonr v0.0.0-20231023064044-62fbfc3a0313 h1:A8w3/wSixa6RqN8bLYQ9mayk+d8xxq6jQCmlKs/jCRo=
-github.com/msolo/jsonr v0.0.0-20231023064044-62fbfc3a0313/go.mod h1:6qRblG2m4u2fk3x59GT4awRlwvZbnZ3P1RmFZrDjVwk=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=

patches/BUILD.bazel

@@ -3,8 +3,10 @@ load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
 exports_files(glob(["**/*.patch"]))
 
 write_source_files(
-    name = "orion_patches",
+    name = "gazelle_patches",
     files = {
+        "gazelle-branded.patch": "@aspect_gazelle_runner//patches:bazelbuild_bazel-gazelle_aspect-cli.patch",
         "gazelle-gitignore.patch": "@aspect_gazelle_runner//pkg/git:gazelle-gitignore.patch",
+        "gazelle-watchman.patch": "@aspect_gazelle_runner//patches:bazelbuild_bazel-gazelle_aspect-watchman.patch",
     },
 )

patches/gazelle-watchman.patch

@@ -0,0 +1,17 @@
+diff --git a/walk/walk.go b/walk/walk.go
+index 0e59bcf..b8d774c 100644
+--- a/walk/walk.go
++++ b/walk/walk.go
+@@ -373,6 +373,12 @@ func newWalker(c *config.Config, cexts []config.Configurer, dirs []string, mode
+ 		relsToVisitSeen: make(map[string]struct{}),
+ 	}
+
++	// PATCH(caching): additional aspect-gazelle caching of walker
++	if c.Exts["aspect:walkCache:load"] != nil {
++		walkCacheLoad := c.Exts["aspect:walkCache:load"].(func(m interface{}))
++		walkCacheLoad(&w.cache.entryMap)
++	}
++
+ 	// Asynchronously populate the walker cache in the background.
+ 	go w.populateCache()
+