Update format file based on feedback, rerun it

Author: dmachaj

.clang-format

@@ -1,6 +1,6 @@
 ---
 Language: Cpp
-# BasedOnStyle: LLVM
+BasedOnStyle: Microsoft
 
 AccessModifierOffset: -4
 AlignAfterOpenBracket: AlwaysBreak
@@ -10,39 +10,22 @@ AlignOperands: true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLambdasOnASingleLine: Empty
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
+AllowShortLambdasOnASingleLine: Inline
 AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: MultiLine
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
   AfterCaseLabel: true
-  AfterClass: true
-  AfterControlStatement: true
-  AfterEnum: true
-  AfterFunction: true
-  AfterNamespace: true
-  AfterStruct: true
   AfterUnion: true
-  AfterExternBlock: true
-  BeforeCatch: true
-  BeforeElse: true
   BeforeLambdaBody: true
   SplitEmptyFunction: false
   SplitEmptyRecord: false
   SplitEmptyNamespace: false
 BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: AfterColon
 BreakStringLiterals: false
-ColumnLimit: 170
 CommentPragmas: '^ IWYU pragma:'
 CompactNamespaces: true
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
@@ -58,7 +41,6 @@ IndentCaseLabels: false
 IncludeCategories:
   - Regex: '^"(stdafx.h|pch.h|precomp.h)"$'
     Priority: -1
-IndentWidth: 4
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: true
 MacroBlockBegin: '^BEGIN_COM_MAP$|^BEGIN_CONNECTION_POINT_MAP$|^BEGIN_HELPER_NODEMAP$|^BEGIN_MODULE$|^BEGIN_MSG_MAP$|^BEGIN_OBJECT_MAP$|^BEGIN_TEST_CLASS$|^BEGIN_TEST_METHOD$|^BEGIN_TEST_METHOD_PROPERTIES$'
@@ -74,7 +56,6 @@ PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 2000
 PenaltyExcessCharacter: 2
-PenaltyReturnTypeOnItsOwnLine: 1000
 PointerAlignment: Left
 SortIncludes: false
 SpaceAfterCStyleCast: false
@@ -88,8 +69,6 @@ SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard: Latest
-TabWidth: 4
-UseTab: Never
 
 AttributeMacros: [
   CALLBACK,
@@ -173,11 +152,6 @@ StatementMacros: [
   CoCreatableClassWithFactory,
   CoCreatableClassWithFactoryEx,
 
-  # Additional definitions for the WIL repo
-  _Translates_NTSTATUS_to_HRESULT_,
-  _Translates_Win32_to_HRESULT_,
-  _Translates_last_error_to_HRESULT_,
-
   TEST_CASE,
   SECTION,
 ]
@@ -187,50 +161,3 @@ TypenameMacros: [
   STDMETHOD,
   STDAPI_,
 ]
-
-# Additional definitions for the WIL repo
-WhitespaceSensitiveMacros: [
-  __WI_CLANG_DISABLE_WARNING,
-]
-
-# TODO: Only supported by clang-format version 17+
-# Macros:
-# - WI_NOEXCEPT=noexcept
-# - __R_FN_PARAMS_FULL=int x
-# - RESULT_NORETURN=[[noreturn]]
----
-Language: CSharp
-AlignAfterOpenBracket: AlwaysBreak
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-BraceWrapping:
-  AfterCaseLabel: true
-  AfterClass: true
-  AfterControlStatement: true
-  AfterEnum: true
-  AfterFunction: true
-  AfterNamespace: true
-  AfterStruct: true
-  BeforeCatch: true
-  BeforeElse: true
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBraces: Custom
-ColumnLimit: 130
-DerivePointerAlignment: false
-IndentWidth: 4
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 2000
-PenaltyExcessCharacter: 2
-PenaltyReturnTypeOnItsOwnLine: 1000
-PointerAlignment: Left
-TabWidth: 4
-UseTab: Never
-...
-

cppwinrt/cmd_reader.h

@@ -81,13 +81,17 @@ namespace cppwinrt
     };
 
     inline void add_files_from_xml(
-        std::set<std::string>& files, std::string const& sdk_version, std::filesystem::path const& xml_path, std::filesystem::path const& sdk_path, xml_requirement xml_path_requirement)
+        std::set<std::string>& files,
+        std::string const& sdk_version,
+        std::filesystem::path const& xml_path,
+        std::filesystem::path const& sdk_path,
+        xml_requirement xml_path_requirement)
     {
         com_ptr<IStream> stream;
 
         auto streamResult = SHCreateStreamOnFileW(xml_path.c_str(), STGM_READ, &stream.ptr);
-        if (xml_path_requirement == xml_requirement::optional &&
-            (streamResult == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || streamResult == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)))
+        if (xml_path_requirement == xml_requirement::optional && (streamResult == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) ||
+                                                                  streamResult == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)))
         {
             return;
         }
@@ -144,8 +148,8 @@ namespace cppwinrt
                      HKEY_LOCAL_MACHINE,
                      L"SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots",
                      0,
-                     // https://task.ms/29349404 - The SDK sometimes stores the 64 bit location into KitsRoot10 which is wrong,
-                     // this breaks 64-bit cppwinrt.exe, so work around this by forcing to use the WoW64 hive.
+                     // https://task.ms/29349404 - The SDK sometimes stores the 64 bit location into KitsRoot10 which is
+                     // wrong, this breaks 64-bit cppwinrt.exe, so work around this by forcing to use the WoW64 hive.
                      KEY_READ | KEY_WOW64_32KEY,
                      &key))
         {
@@ -299,7 +303,8 @@ namespace cppwinrt
 
     struct reader
     {
-        template <typename C, typename V, size_t numOptions> reader(C const argc, V const argv, const option (&options)[numOptions])
+        template <typename C, typename V, size_t numOptions>
+        reader(C const argc, V const argv, const option (&options)[numOptions])
         {
 #ifdef _DEBUG
             {
@@ -422,9 +427,11 @@ namespace cppwinrt
 #if defined(_WIN32) || defined(_WIN64)
                     std::array<char, 260> local{};
 #ifdef _WIN64
-                    ExpandEnvironmentStringsA("%windir%\\System32\\WinMetadata", local.data(), static_cast<uint32_t>(local.size()));
+                    ExpandEnvironmentStringsA(
+                        "%windir%\\System32\\WinMetadata", local.data(), static_cast<uint32_t>(local.size()));
 #else
-                    ExpandEnvironmentStringsA("%windir%\\SysNative\\WinMetadata", local.data(), static_cast<uint32_t>(local.size()));
+                    ExpandEnvironmentStringsA(
+                        "%windir%\\SysNative\\WinMetadata", local.data(), static_cast<uint32_t>(local.size()));
 #endif
                     add_directory(local.data());
 #else  /* defined(_WIN32) || defined(_WIN64) */
@@ -493,12 +500,7 @@ namespace cppwinrt
 
         auto files(std::string_view const& name) const
         {
-            return files(
-                name,
-                [](auto&&)
-                {
-                    return true;
-                });
+            return files(name, [](auto&&) { return true; });
         }
 
     private:
@@ -555,18 +557,16 @@ namespace cppwinrt
             }
         }
 
-        template <typename O, typename L> void extract_response_file(std::string_view const& arg, O const& options, L& last)
+        template <typename O, typename L>
+        void extract_response_file(std::string_view const& arg, O const& options, L& last)
         {
             std::filesystem::path response_path{ std::string{ arg } };
             std::string extension = response_path.extension().generic_string();
             std::transform(
                 extension.begin(),
                 extension.end(),
                 extension.begin(),
-                [](auto c)
-                {
-                    return static_cast<unsigned char>(::tolower(c));
-                });
+                [](auto c) { return static_cast<unsigned char>(::tolower(c)); });
 
             // Check if misuse of @ prefix, so if directory or metadata file instead of response file.
             if (is_directory(response_path) || extension == ".winmd")
@@ -589,7 +589,8 @@ namespace cppwinrt
             }
         }
 
-        template <typename Character> static void parse_command_line(Character* cmdstart, std::vector<std::string>& argv, size_t* argument_count)
+        template <typename Character>
+        static void parse_command_line(Character* cmdstart, std::vector<std::string>& argv, size_t* argument_count)
         {
 
             std::string arg;