Incremental update bazel-gazelle (#286)

* Incremental update bazel-gazelle to end of 2021
* Upgrade past bazel-gazelle #1158
* Bump to 6adf61901eee7e6de7d8ab3af0fc15d06982ad34

Author: pcj

deps/BUILD.bazel

@@ -109,30 +109,23 @@ proto_dependency(
     visibility = ["//visibility:public"],
 )
 
-# Branch: master
-# Commit: 425d85daecb9aeffa1ae24b83df7b97b534dcf05
-# Date: 2021-10-29 00:25:25 +0000 UTC
-# URL: https://github.com/bazelbuild/bazel-gazelle/commit/425d85daecb9aeffa1ae24b83df7b97b534dcf05
-#
-# Stardoc generates repository.md (#1123)
-#
-# * Stardoc generates repository.md
+# Commit: 6adf61901eee7e6de7d8ab3af0fc15d06982ad34
+# Date: 2022-03-16 21:48:10 +0000 UTC
+# URL: https://github.com/bazelbuild/bazel-gazelle/commit/6adf61901eee7e6de7d8ab3af0fc15d06982ad34
 #
-# This is a mirror of the content in repository.rst, allowing us to manually inspect the delta between them.
-# As soon as we are satisfied that the generated content is correct, we'll delete repository.rst and update any links to it.
-#
-# Technique: copied doc strings out of existing rst file into the starlark files. Transcribed rst syntax to markdown.
-#
-# * Replace repository.rst content with link to markdown version
-# Size: 1416940 (1.4 MB)
+# ci: Add gazelle check (#1203)
+# Size: 1432187 (1.4 MB)
 proto_dependency(
     name = "bazel_gazelle",
     patch_args = ["-p1"],
-    patches = ["@build_stack_rules_proto//third_party:bazel-gazelle-PR1274.patch"],
+    patches = [
+        "@build_stack_rules_proto//third_party:bazel-gazelle-PR1274.patch",
+        "@build_stack_rules_proto//third_party:bazel-gazelle-revert-1152.patch",
+    ],
     repository_rule = "http_archive",
-    sha256 = "cb05501bd37e2cbfdea8e23b28e5a7fe4ff4f12cef30eeb1924a0b8c3c0cea61",
-    strip_prefix = "bazel-gazelle-425d85daecb9aeffa1ae24b83df7b97b534dcf05",
-    urls = ["https://github.com/bazelbuild/bazel-gazelle/archive/425d85daecb9aeffa1ae24b83df7b97b534dcf05.tar.gz"],
+    sha256 = "9a67de0258804915cda489cf0925d9b5894ee77c021a83cee9a2f405b2a95048",
+    strip_prefix = "bazel-gazelle-6adf61901eee7e6de7d8ab3af0fc15d06982ad34",
+    urls = ["https://github.com/bazelbuild/bazel-gazelle/archive/6adf61901eee7e6de7d8ab3af0fc15d06982ad34.tar.gz"],
     deps = [":io_bazel_rules_go"],
 )
 

deps/core_deps.bzl

@@ -30,13 +30,14 @@ def bazel_gazelle():
     _maybe(
         http_archive,
         name = "bazel_gazelle",
-        sha256 = "cb05501bd37e2cbfdea8e23b28e5a7fe4ff4f12cef30eeb1924a0b8c3c0cea61",
-        strip_prefix = "bazel-gazelle-425d85daecb9aeffa1ae24b83df7b97b534dcf05",
+        sha256 = "9a67de0258804915cda489cf0925d9b5894ee77c021a83cee9a2f405b2a95048",
+        strip_prefix = "bazel-gazelle-6adf61901eee7e6de7d8ab3af0fc15d06982ad34",
         urls = [
-            "https://github.com/bazelbuild/bazel-gazelle/archive/425d85daecb9aeffa1ae24b83df7b97b534dcf05.tar.gz",
+            "https://github.com/bazelbuild/bazel-gazelle/archive/6adf61901eee7e6de7d8ab3af0fc15d06982ad34.tar.gz",
         ],
         patches = [
             "@build_stack_rules_proto//third_party:bazel-gazelle-PR1274.patch",
+            "@build_stack_rules_proto//third_party:bazel-gazelle-revert-1152.patch",
         ],
         patch_args = [
             "-p1",

third_party/BUILD.bazel

@@ -3,9 +3,13 @@ filegroup(
     srcs = [
         "BUILD.bazel",
         "bazel-gazelle-PR1274.patch",
+        "bazel-gazelle-revert-1152.patch",
         "zlib.BUILD",
     ],
     visibility = ["//:__pkg__"],
 )
 
-exports_files(["bazel-gazelle-PR1274.patch"])
+exports_files([
+    "bazel-gazelle-PR1274.patch",
+    "bazel-gazelle-revert-1152.patch",
+])

third_party/bazel-gazelle-revert-1152.patch

@@ -0,0 +1,17 @@
+diff --git a/language/proto/generate.go b/language/proto/generate.go
+index afa0cbe..48bddc9 100644
+--- a/language/proto/generate.go
++++ b/language/proto/generate.go
+@@ -235,12 +235,6 @@ func generateProto(pc *ProtoConfig, rel string, pkg *Package, shouldSetVisibilit
+ 	r.SetPrivateAttr(PackageKey, *pkg)
+ 	imports := make([]string, 0, len(pkg.Imports))
+ 	for i := range pkg.Imports {
+-		// If FileMode isn't enabled and the proto import is a self import
+-		// (an import between the same package), skip it
+-		if pc.Mode != FileMode && getPrefix(pc, path.Dir(i)) == getPrefix(pc, rel) {
+-			delete(pkg.Imports, i)
+-			continue
+-		}
+ 		imports = append(imports, i)
+ 	}
+ 	sort.Strings(imports)