Author: Joshua Huels Date: 2021-12-17T18:46:12-08:00 New Revision: 212e6c99776f393e0af368ca2086eb8bae2ee1ed
URL: https://github.com/llvm/llvm-project/commit/212e6c99776f393e0af368ca2086eb8bae2ee1ed DIFF: https://github.com/llvm/llvm-project/commit/212e6c99776f393e0af368ca2086eb8bae2ee1ed.diff LOG: [doc] Fix regex in ClangFormatStyleOptions for IncludeCategories This fixes the regex in ClangFormatStyleOptions for IncludeCategories to match anything starting with < or starting with | AND followed by (gtest|gmock|isl|json) then /. Differential Revision: https://reviews.llvm.org/D115910 Added: Modified: clang/docs/ClangFormatStyleOptions.rst clang/include/clang/Tooling/Inclusions/IncludeStyle.h Removed: ################################################################################ diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index 0c43429fda03c..111ebd90d95b5 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -2457,7 +2457,7 @@ the configuration (without a prefix: ``Auto``). 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 @@ the configuration (without a prefix: ``Auto``). **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 index d54f8a402e2d1..d5638642d0172 100644 --- a/clang/include/clang/Tooling/Inclusions/IncludeStyle.h +++ b/clang/include/clang/Tooling/Inclusions/IncludeStyle.h @@ -106,7 +106,7 @@ struct IncludeStyle { /// Priority: 2 /// SortPriority: 2 /// CaseSensitive: true - /// - Regex: '^(<|"(gtest|gmock|isl|json)/)' + /// - Regex: '^((<|")(gtest|gmock|isl|json)/)' /// Priority: 3 /// - Regex: '<[[:alnum:].]+>' /// Priority: 4 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
