From 5952be3b6a444ecf67037394f0968e0196a0ac49 Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Mon, 22 Apr 2024 21:34:13 +0200 Subject: [PATCH] Add support for `*.MODULE.bazel` files (#1266) After https://github.com/bazelbuild/bazel/pull/22075, these are the files that can be `include()`ed into `MODULE.bazel` files and should be formatted and edited just like them. --- build/lex.go | 4 ++-- buildozer/buildozer_test.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/build/lex.go b/build/lex.go index 6126d5715..7486605c7 100644 --- a/build/lex.go +++ b/build/lex.go @@ -42,7 +42,7 @@ const ( TypeWorkspace // TypeBzl represents .bzl files TypeBzl - //TypeModule represents MODULE.bazel files + //TypeModule represents MODULE.bazel and *.MODULE.bazel files TypeModule ) @@ -130,7 +130,7 @@ func getFileType(filename string) FileType { if strings.HasSuffix(basename, ".oss") { basename = basename[:len(basename)-4] } - if basename == "module.bazel" { + if basename == "module.bazel" || strings.HasSuffix(basename, ".module.bazel") { return TypeModule } ext := filepath.Ext(basename) diff --git a/buildozer/buildozer_test.sh b/buildozer/buildozer_test.sh index 666d4b940..1aba85c92 100755 --- a/buildozer/buildozer_test.sh +++ b/buildozer/buildozer_test.sh @@ -2038,6 +2038,36 @@ EOF diff -u MODULE.bazel.expected MODULE.bazel || fail "Output didn't match" } +function test_module_bazel_segment() { + cat > go.MODULE.bazel < go.MODULE.bazel.expected < MODULE.bazel <