Disable "sort-includes" in clang-format for ZAP generation.

Also update cluster-objects-src.zapt to use the correct #include statement order which was previously altered by clang-format. Update the ZAP-generated files.
selissia · Feb 12, 2024 · 9cadf45 · 9cadf45
1 parent 3b3d37b
commit 9cadf45
Show file tree

Hide file tree

Showing 23 changed files with 52 additions and 52 deletions.
diff --git a/scripts/tools/zap/generate.py b/scripts/tools/zap/generate.py
@@ -314,7 +314,7 @@ def runClangPrettifier(templates_file, output_dir):
             #       compatible only with pigweed provided clang-format (which is
             #       tracking non-released clang).
             clang_format = getClangFormatBinary()
-            args = [clang_format, '-i']
+            args = [clang_format, '--sort-includes=false', '-i']
             args.extend(clangOutputs)
             subprocess.check_call(args)
             print('Formatted using %s (%s)' % (clang_format, subprocess.check_output([clang_format, '--version'])))

diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp
@@ -17,16 +17,16 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-#include <cinttypes>
 #include <cstdint>
+#include <cinttypes>
 
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app-common/zap-generated/ids/Commands.h>
+#include <app/util/util.h>
 #include <app/CommandHandler.h>
 #include <app/InteractionModelEngine.h>
-#include <app/util/util.h>
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/TypeTraits.h>
 

diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
@@ -20,8 +20,8 @@
 // Prevent multiple inclusion
 #pragma once
 
-#include <app/util/endpoint-config-defines.h>
 #include <lib/core/CHIPConfig.h>
+#include <app/util/endpoint-config-defines.h>
 
 // Default values for the attributes longer than a pointer,
 // in a form of a binary blob

diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp
@@ -17,16 +17,16 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-#include <cinttypes>
 #include <cstdint>
+#include <cinttypes>
 
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app-common/zap-generated/ids/Commands.h>
+#include <app/util/util.h>
 #include <app/CommandHandler.h>
 #include <app/InteractionModelEngine.h>
-#include <app/util/util.h>
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/TypeTraits.h>
 

diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
@@ -20,8 +20,8 @@
 // Prevent multiple inclusion
 #pragma once
 
-#include <app/util/endpoint-config-defines.h>
 #include <lib/core/CHIPConfig.h>
+#include <app/util/endpoint-config-defines.h>
 
 // Default values for the attributes longer than a pointer,
 // in a form of a binary blob

diff --git a/src/app/zap-templates/templates/app/cluster-objects-src.zapt b/src/app/zap-templates/templates/app/cluster-objects-src.zapt
@@ -1,7 +1,7 @@
 {{> header}}
 
-#include <app/data-model/WrappedStructEncoder.h>
 #include <app-common/zap-generated/cluster-objects.h>
+#include <app/data-model/WrappedStructEncoder.h>
 
 #include <variant>
 

diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h