diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -2457,7 +2457,7 @@ Priority: 2 SortPriority: 2 CaseSensitive: true - - Regex: '^(<|"(gtest|gmock|isl|json)/)' + - Regex: '^((<|")(gtest|gmock|isl|json)/)' Priority: 3 - Regex: '<[[:alnum:].]+>' Priority: 4 @@ -3236,7 +3236,7 @@ **QualifierAlignment** (``QualifierAlignmentStyle``) :versionbadge:`clang-format 14` Different ways to arrange specifiers and qualifiers (e.g. const/volatile). - .. warning:: + .. warning:: Setting ``QualifierAlignment`` to something other than `Leave`, COULD lead to incorrect code formatting due to incorrect decisions made due to diff --git a/clang/include/clang/Tooling/Inclusions/IncludeStyle.h b/clang/include/clang/Tooling/Inclusions/IncludeStyle.h --- a/clang/include/clang/Tooling/Inclusions/IncludeStyle.h +++ b/clang/include/clang/Tooling/Inclusions/IncludeStyle.h @@ -106,7 +106,7 @@ /// Priority: 2 /// SortPriority: 2 /// CaseSensitive: true - /// - Regex: '^(<|"(gtest|gmock|isl|json)/)' + /// - Regex: '^((<|")(gtest|gmock|isl|json)/)' /// Priority: 3 /// - Regex: '<[[:alnum:].]+>' /// Priority: 4