[vcpkg formatting] Fix format regex (microsoft#12369)

* [vcpkg formatting] correct the header regexes

* format

.clang-format

@@ -39,9 +39,9 @@ IncludeCategories:
     Priority: -1
   - Regex: '^<catch2/catch\.hpp>$'
     Priority: 1
-  - Regex: '^<vcpkg/base/*\.h>$'
+  - Regex: '^<vcpkg/base/.*\.h>$'
     Priority: 2
-  - Regex: '^<vcpkg/*\.h>$'
+  - Regex: '^<vcpkg/.*\.h>$'
     Priority: 3
   - Regex: '^<[a-z0-9_]*\.h>$'
     Priority: 4

include/vcpkg-test/util.h

@@ -2,12 +2,13 @@
 
 #include <catch2/catch.hpp>
 
-#include <memory>
-
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/pragmas.h>
+
 #include <vcpkg/statusparagraph.h>
 
+#include <memory>
+
 #define CHECK_EC(ec)                                                                                                   \
     do                                                                                                                 \
     {                                                                                                                  \

include/vcpkg/archives.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/files.h>
+
 #include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg::Archives

include/vcpkg/base/chrono.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <chrono>
-#include <string>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/optional.h>
 
+#include <chrono>
+#include <string>
+
 namespace vcpkg::Chrono
 {
     class ElapsedTime

include/vcpkg/base/cofffilereader.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <vector>
-
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/machinetype.h>
 
+#include <vector>
+
 namespace vcpkg::CoffFileReader
 {
     struct DllInfo

include/vcpkg/base/enums.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/lineinfo.h>
 
+#include <string>
+
 namespace vcpkg::Enums
 {
     std::string nullvalue_to_string(const CStringView enum_name);

include/vcpkg/base/expected.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <system_error>
-
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/stringliteral.h>
 
+#include <system_error>
+
 namespace vcpkg
 {
     template<class Err>

include/vcpkg/base/graphs.h

@@ -1,12 +1,12 @@
 #pragma once
 
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/system.print.h>
+
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <vcpkg/base/checks.h>
-#include <vcpkg/base/system.print.h>
-
 namespace vcpkg::Graphs
 {
     enum class ExplorationStatus

include/vcpkg/base/hash.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/files.h>
 
+#include <string>
+
 namespace vcpkg::Hash
 {
     enum class Algorithm

include/vcpkg/base/json.h

@@ -1,5 +1,10 @@
 #pragma once
 
+#include <vcpkg/base/expected.h>
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/parse.h>
+#include <vcpkg/base/stringview.h>
+
 #include <stddef.h>
 #include <stdint.h>
 
@@ -8,11 +13,6 @@
 #include <utility>
 #include <vector>
 
-#include <vcpkg/base/expected.h>
-#include <vcpkg/base/files.h>
-#include <vcpkg/base/parse.h>
-#include <vcpkg/base/stringview.h>
-
 namespace vcpkg::Json
 {
     struct JsonStyle

include/vcpkg/base/optional.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <type_traits>
-#include <utility>
-
 #include <vcpkg/base/lineinfo.h>
 #include <vcpkg/base/pragmas.h>
 
+#include <type_traits>
+#include <utility>
+
 namespace vcpkg
 {
     struct NullOpt

include/vcpkg/base/parse.h

@@ -1,14 +1,15 @@
 #pragma once
 
-#include <memory>
-#include <string>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/stringview.h>
 #include <vcpkg/base/unicode.h>
+
 #include <vcpkg/textrowcol.h>
 
+#include <memory>
+#include <string>
+
 namespace vcpkg::Parse
 {
     struct IParseError

include/vcpkg/base/stringliteral.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/zstringview.h>
 
+#include <string>
+
 namespace vcpkg
 {
     struct StringLiteral : ZStringView

include/vcpkg/base/strings.h

@@ -1,18 +1,18 @@
 #pragma once
 
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-
-#include <vector>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/pragmas.h>
 #include <vcpkg/base/stringliteral.h>
 #include <vcpkg/base/stringview.h>
 #include <vcpkg/base/view.h>
 
+#include <errno.h>
+#include <inttypes.h>
+#include <limits.h>
+
+#include <vector>
+
 namespace vcpkg::Strings::details
 {
     template<class T>

include/vcpkg/base/stringview.h

@@ -1,11 +1,11 @@
 #pragma once
 
+#include <vcpkg/base/optional.h>
+
 #include <limits>
 #include <string>
 #include <vector>
 
-#include <vcpkg/base/optional.h>
-
 namespace vcpkg
 {
     struct StringView

include/vcpkg/base/system.debug.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <atomic>
-
 #include <vcpkg/base/chrono.h>
 #include <vcpkg/base/system.print.h>
 
+#include <atomic>
+
 namespace vcpkg::Debug
 {
     extern std::atomic<bool> g_debugging;

include/vcpkg/base/system.process.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/zstringview.h>
+
 #include <functional>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <vcpkg/base/files.h>
-#include <vcpkg/base/zstringview.h>
-
 namespace vcpkg::System
 {
     struct CMakeVariable

include/vcpkg/base/zstringview.h

@@ -1,12 +1,12 @@
 #pragma once
 
+#include <vcpkg/base/stringview.h>
+
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
 #include <string>
 
-#include <vcpkg/base/stringview.h>
-
 namespace vcpkg
 {
     // A counted view of a null-terminated string

include/vcpkg/binarycaching.h

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/expected.h>
 #include <vcpkg/base/files.h>
+
 #include <vcpkg/packagespec.h>
 #include <vcpkg/vcpkgpaths.h>
 

include/vcpkg/binarycaching.private.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/dependencies.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <string>
+
 namespace vcpkg
 {
     std::string reformat_version(const std::string& version, const std::string& abi_tag);

include/vcpkg/build.h

@@ -1,21 +1,22 @@
 #pragma once
 
-#include <array>
-#include <map>
-#include <set>
-#include <vector>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/system.process.h>
+
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/triplet.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <array>
+#include <map>
+#include <set>
+#include <vector>
+
 namespace vcpkg
 {
     struct IBinaryProvider;

include/vcpkg/buildenvironment.h

@@ -1,9 +1,10 @@
-#include <string>
-#include <vector>
-
 #include <vcpkg/base/system.process.h>
+
 #include <vcpkg/vcpkgpaths.h>
 
+#include <string>
+#include <vector>
+
 namespace vcpkg
 {
     std::string make_cmake_cmd(const VcpkgPaths& paths,

include/vcpkg/cmakevars.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/optional.h>
+
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/vcpkgpaths.h>
 

include/vcpkg/commands.h

@@ -1,15 +1,15 @@
 #pragma once
 
-#include <array>
-#include <map>
-#include <vector>
-
 #include <vcpkg/build.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <array>
+#include <map>
+#include <vector>
+
 namespace vcpkg::Commands
 {
     using CommandTypeA = void (*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths, Triplet default_triplet);

include/vcpkg/dependencies.h

@@ -1,18 +1,19 @@
 #pragma once
 
-#include <functional>
-#include <map>
-#include <vector>
-
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/build.h>
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <functional>
+#include <map>
+#include <vector>
+
 namespace vcpkg::Graphs
 {
     struct Randomizer;

include/vcpkg/export.chocolatey.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <vector>
-
 #include <vcpkg/dependencies.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <vector>
+
 namespace vcpkg::Export::Chocolatey
 {
     struct Options