From d46ff4aeb9c5ab34b74d1a7965a1f1ed044729e3 Mon Sep 17 00:00:00 2001
From: Alex <alexkrapivin@gmx.com>
Date: Tue, 7 Apr 2026 19:15:51 +0200
Subject: [PATCH] Fix buildifier setup

---
 .github/workflows/lint.yaml     |  2 +-
 BUILD                           | 23 +++--------------------
 MODULE.bazel                    |  3 +--
 test/unit/generated_files/BUILD |  1 +
 test/unit/legacy/BUILD          |  1 +
 test/unit/virtual_include/BUILD |  1 +
 6 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 33885a8d..611a5a9d 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -29,6 +29,6 @@ jobs:
 
     - name: Analyzing the code with Buildifier
       run: |
-        bazel test //:format_test --test_output=errors
+        bazel test //:buildifier --test_output=all
 
     # TODO: Add more linters here
diff --git a/BUILD b/BUILD
index 2e308d79..91ac8ed2 100644
--- a/BUILD
+++ b/BUILD
@@ -1,31 +1,14 @@
-load("@aspect_rules_lint//format:defs.bzl", "format_test")
 load("@buildifier_prebuilt//:rules.bzl", "buildifier_test")
 
 buildifier_test(
-    name = "buildifier_native",
-    diff_command = "diff -u",
+    name = "buildifier",
     exclude_patterns = [
         "./.git/*",
     ],
     lint_mode = "warn",
+    lint_warnings = ["all"],
     mode = "diff",
     no_sandbox = True,
-    workspace = "//:WORKSPACE",
-)
-
-format_test(
-    name = "format_test",
-    # Temporary workaround for not being able to use -diff_command
-    env = ["BUILDIFIER_DIFF='diff -u'"],
-    no_sandbox = True,
-    # TODO: extend with pylint
-    starlark = "@buildifier_prebuilt//:buildifier",
-    starlark_check_args = [
-        "-lint=warn",
-        "-warnings=all",
-        "-mode=diff",
-        # -u will always get passed to buildifier not diff_command
-        #"-diff_command=\"diff -u\"",
-    ],
+    verbose = True,
     workspace = "//:WORKSPACE",
 )
diff --git a/MODULE.bazel b/MODULE.bazel
index eb740bd0..50e2f42b 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -21,10 +21,9 @@ bazel_dep(name = "rules_cc", version = "0.2.3")
 
 bazel_dep(
     name = "buildifier_prebuilt",
-    version = "6.4.0",
+    version = "7.3.1",
     dev_dependency = True,
 )
-bazel_dep(name = "aspect_rules_lint", version = "1.11.0", dev_dependency = True)
 
 codechecker_extension = use_extension(
     "//src:tools.bzl",
diff --git a/test/unit/generated_files/BUILD b/test/unit/generated_files/BUILD
index b072d754..449af206 100644
--- a/test/unit/generated_files/BUILD
+++ b/test/unit/generated_files/BUILD
@@ -40,6 +40,7 @@ cc_binary(
         "genrule_header_consumer.cc",
         ":genrule_header.h",
     ],
+    copts = ["-Wno-unused-variable"],
 )
 
 codechecker_test(
diff --git a/test/unit/legacy/BUILD b/test/unit/legacy/BUILD
index ac0c9ef2..cdea4b99 100644
--- a/test/unit/legacy/BUILD
+++ b/test/unit/legacy/BUILD
@@ -46,6 +46,7 @@ cc_library(
 cc_library(
     name = "test_lib",
     srcs = ["src/lib.cc"],
+    copts = ["-Wno-unused-variable"],
 )
 
 # Test defect in CTU mode
diff --git a/test/unit/virtual_include/BUILD b/test/unit/virtual_include/BUILD
index 7aef09f4..f8f2ccca 100644
--- a/test/unit/virtual_include/BUILD
+++ b/test/unit/virtual_include/BUILD
@@ -34,6 +34,7 @@ cc_library(
 cc_library(
     name = "virtual_include",
     srcs = ["source.cc"],
+    copts = ["-Wno-return-type"],
     deps = ["test_inc"],
 )