[vcpkg formatting] Fix format regex (#12369)

* [vcpkg formatting] correct the header regexes

* format

18 files changed, 55 insertions, 35 deletions

diff --git a/toolsrc/src/vcpkg-test/arguments.cpp b/toolsrc/src/vcpkg-test/arguments.cpp
index a40edc945..3ce4c5a9b 100644
--- a/toolsrc/src/vcpkg-test/arguments.cpp
+++ b/toolsrc/src/vcpkg-test/arguments.cpp
@@ -1,9 +1,9 @@
 #include <catch2/catch.hpp>
 
-#include <vector>
-
 #include <vcpkg/vcpkgcmdarguments.h>
 
+#include <vector>
+
 using vcpkg::CommandSetting;
 using vcpkg::CommandStructure;
 using vcpkg::CommandSwitch;
diff --git a/toolsrc/src/vcpkg-test/binarycaching.cpp b/toolsrc/src/vcpkg-test/binarycaching.cpp
index 49386b529..a8204f9c2 100644
--- a/toolsrc/src/vcpkg-test/binarycaching.cpp
+++ b/toolsrc/src/vcpkg-test/binarycaching.cpp
@@ -1,8 +1,7 @@
 #include <catch2/catch.hpp>
 
-#include <string>
-
 #include <vcpkg/base/files.h>
+
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/binarycaching.private.h>
 #include <vcpkg/dependencies.h>
@@ -10,6 +9,8 @@
 #include <vcpkg/sourceparagraph.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 
+#include <string>
+
 using namespace vcpkg;
 
 TEST_CASE ("reformat_version semver-ish", "[reformat_version]")
diff --git a/toolsrc/src/vcpkg-test/commands.build.cpp b/toolsrc/src/vcpkg-test/commands.build.cpp
index 573d217e4..88749e7fe 100644
--- a/toolsrc/src/vcpkg-test/commands.build.cpp
+++ b/toolsrc/src/vcpkg-test/commands.build.cpp
@@ -1,14 +1,16 @@
 #include <catch2/catch.hpp>
 
-#include <iterator>
-#include <string>
-
-#include <vcpkg-test/util.h>
 #include <vcpkg/base/files.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <iterator>
+#include <string>
+
+#include <vcpkg-test/util.h>
+
 using namespace vcpkg;
 
 TEST_CASE ("build smoke test", "[commands-build]")
diff --git a/toolsrc/src/vcpkg-test/commands.create.cpp b/toolsrc/src/vcpkg-test/commands.create.cpp
index 345527cca..4d8b2fd50 100644
--- a/toolsrc/src/vcpkg-test/commands.create.cpp
+++ b/toolsrc/src/vcpkg-test/commands.create.cpp
@@ -1,13 +1,14 @@
 #include <catch2/catch.hpp>
 
-#include <iterator>
-#include <string>
-
 #include <vcpkg/base/files.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <iterator>
+#include <string>
+
 TEST_CASE ("create smoke test", "[commands-create]")
 {
     using namespace vcpkg;
diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp
index ad4fff9e4..6bd9dfc42 100644
--- a/toolsrc/src/vcpkg-test/dependencies.cpp
+++ b/toolsrc/src/vcpkg-test/dependencies.cpp
@@ -1,11 +1,12 @@
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/mockcmakevarprovider.h>
-#include <vcpkg-test/util.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/paragraphparser.h>
 #include <vcpkg/sourceparagraph.h>
 
+#include <vcpkg-test/mockcmakevarprovider.h>
+#include <vcpkg-test/util.h>
+
 using namespace vcpkg;
 using namespace vcpkg::Parse;
 
diff --git a/toolsrc/src/vcpkg-test/files.cpp b/toolsrc/src/vcpkg-test/files.cpp
index 0a8362a51..bc617d326 100644
--- a/toolsrc/src/vcpkg-test/files.cpp
+++ b/toolsrc/src/vcpkg-test/files.cpp
@@ -1,12 +1,13 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/strings.h>
+
 #include <iostream>
 #include <random>
 #include <vector>
 
 #include <vcpkg-test/util.h>
-#include <vcpkg/base/files.h>
-#include <vcpkg/base/strings.h>
 
 using vcpkg::Test::AllowSymlinks;
 using vcpkg::Test::base_temporary_directory;
diff --git a/toolsrc/src/vcpkg-test/hash.cpp b/toolsrc/src/vcpkg-test/hash.cpp
index 88c7bd7b0..9f3ccc25e 100644
--- a/toolsrc/src/vcpkg-test/hash.cpp
+++ b/toolsrc/src/vcpkg-test/hash.cpp
@@ -1,12 +1,12 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/hash.h>
+
 #include <algorithm>
 #include <iostream>
 #include <iterator>
 #include <map>
 
-#include <vcpkg/base/hash.h>
-
 namespace Hash = vcpkg::Hash;
 using vcpkg::StringView;
 
diff --git a/toolsrc/src/vcpkg-test/json.cpp b/toolsrc/src/vcpkg-test/json.cpp
index 19aaaa6fe..90a3537ab 100644
--- a/toolsrc/src/vcpkg-test/json.cpp
+++ b/toolsrc/src/vcpkg-test/json.cpp
@@ -1,10 +1,11 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/json.h>
+#include <vcpkg/base/unicode.h>
+
 #include <iostream>
 
 #include "math.h"
-#include <vcpkg/base/json.h>
-#include <vcpkg/base/unicode.h>
 
 // TODO: remove this once we switch to C++20 completely
 // This is the worst, but we also can't really deal with it any other way.
diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp
index bfe15cd2a..108b2d0c5 100644
--- a/toolsrc/src/vcpkg-test/manifests.cpp
+++ b/toolsrc/src/vcpkg-test/manifests.cpp
@@ -1,11 +1,13 @@
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/util.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/sourceparagraph.h>
 
+#include <vcpkg-test/util.h>
+
 using namespace vcpkg;
 using namespace vcpkg::Paragraphs;
 using namespace vcpkg::Test;
diff --git a/toolsrc/src/vcpkg-test/optional.cpp b/toolsrc/src/vcpkg-test/optional.cpp
index f7b2770b8..929410eb3 100644
--- a/toolsrc/src/vcpkg-test/optional.cpp
+++ b/toolsrc/src/vcpkg-test/optional.cpp
@@ -1,9 +1,9 @@
 #include <catch2/catch.hpp>
 
-#include <vector>
-
 #include <vcpkg/base/optional.h>
 
+#include <vector>
+
 namespace
 {
     struct identity_projection
diff --git a/toolsrc/src/vcpkg-test/paragraph.cpp b/toolsrc/src/vcpkg-test/paragraph.cpp
index e4b2cf0e2..2638a3900 100644
--- a/toolsrc/src/vcpkg-test/paragraph.cpp
+++ b/toolsrc/src/vcpkg-test/paragraph.cpp
@@ -1,9 +1,11 @@
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/util.h>
 #include <vcpkg/base/strings.h>
+
 #include <vcpkg/paragraphs.h>
 
+#include <vcpkg-test/util.h>
+
 namespace Strings = vcpkg::Strings;
 using vcpkg::Parse::Paragraph;
 
diff --git a/toolsrc/src/vcpkg-test/plan.cpp b/toolsrc/src/vcpkg-test/plan.cpp
index a6c9a54ec..09c377ecc 100644
--- a/toolsrc/src/vcpkg-test/plan.cpp
+++ b/toolsrc/src/vcpkg-test/plan.cpp
@@ -1,16 +1,18 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/graphs.h>
+
+#include <vcpkg/dependencies.h>
+#include <vcpkg/portfileprovider.h>
+#include <vcpkg/sourceparagraph.h>
+#include <vcpkg/triplet.h>
+
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
 #include <vcpkg-test/mockcmakevarprovider.h>
 #include <vcpkg-test/util.h>
-#include <vcpkg/base/graphs.h>
-#include <vcpkg/dependencies.h>
-#include <vcpkg/portfileprovider.h>
-#include <vcpkg/sourceparagraph.h>
-#include <vcpkg/triplet.h>
 
 using namespace vcpkg;
 
diff --git a/toolsrc/src/vcpkg-test/specifier.cpp b/toolsrc/src/vcpkg-test/specifier.cpp
index 2a1398416..f350ff601 100644
--- a/toolsrc/src/vcpkg-test/specifier.cpp
+++ b/toolsrc/src/vcpkg-test/specifier.cpp
@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/packagespec.h>
 
 using namespace vcpkg;
diff --git a/toolsrc/src/vcpkg-test/statusparagraphs.cpp b/toolsrc/src/vcpkg-test/statusparagraphs.cpp
index f2d8ba37c..382eab1a7 100644
--- a/toolsrc/src/vcpkg-test/statusparagraphs.cpp
+++ b/toolsrc/src/vcpkg-test/statusparagraphs.cpp
@@ -1,10 +1,12 @@
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/util.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/statusparagraphs.h>
 
+#include <vcpkg-test/util.h>
+
 using namespace vcpkg;
 using namespace vcpkg::Paragraphs;
 using namespace vcpkg::Test;
diff --git a/toolsrc/src/vcpkg-test/strings.cpp b/toolsrc/src/vcpkg-test/strings.cpp
index da3198976..95a6de2af 100644
--- a/toolsrc/src/vcpkg-test/strings.cpp
+++ b/toolsrc/src/vcpkg-test/strings.cpp
@@ -1,13 +1,13 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/strings.h>
+
 #include <stdint.h>
 
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <vcpkg/base/strings.h>
-
 TEST_CASE ("b32 encoding", "[strings]")
 {
     using u64 = uint64_t;
diff --git a/toolsrc/src/vcpkg-test/system.cpp b/toolsrc/src/vcpkg-test/system.cpp
index 596b569a7..015406358 100644
--- a/toolsrc/src/vcpkg-test/system.cpp
+++ b/toolsrc/src/vcpkg-test/system.cpp
@@ -2,8 +2,6 @@
 
 #include <catch2/catch.hpp>
 
-#include <string>
-
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/stringview.h>
@@ -11,6 +9,8 @@
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/zstringview.h>
 
+#include <string>
+
 using vcpkg::nullopt;
 using vcpkg::Optional;
 using vcpkg::StringView;
diff --git a/toolsrc/src/vcpkg-test/update.cpp b/toolsrc/src/vcpkg-test/update.cpp
index 0ae893855..68339547a 100644
--- a/toolsrc/src/vcpkg-test/update.cpp
+++ b/toolsrc/src/vcpkg-test/update.cpp
@@ -1,9 +1,11 @@
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/util.h>
 #include <vcpkg/base/sortedvector.h>
+
 #include <vcpkg/update.h>
 
+#include <vcpkg-test/util.h>
+
 using namespace vcpkg;
 using namespace vcpkg::Update;
 using namespace vcpkg::Test;
diff --git a/toolsrc/src/vcpkg-test/util.cpp b/toolsrc/src/vcpkg-test/util.cpp
index c857db5b2..74ade3aeb 100644
--- a/toolsrc/src/vcpkg-test/util.cpp
+++ b/toolsrc/src/vcpkg-test/util.cpp
@@ -2,12 +2,14 @@
 
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/util.h>
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/statusparagraph.h>
 
+#include <vcpkg-test/util.h>
+
 // used to get the implementation specific compiler flags (i.e., __cpp_lib_filesystem)
 #include <ciso646>
 #include <iostream>