Author: Krystian Kuzniarek Date: 2022-09-05T09:38:22+02:00 New Revision: 961fd77687d27089acf0a09ea29a87fb8ccd7522
URL: https://github.com/llvm/llvm-project/commit/961fd77687d27089acf0a09ea29a87fb8ccd7522 DIFF: https://github.com/llvm/llvm-project/commit/961fd77687d27089acf0a09ea29a87fb8ccd7522.diff LOG: [clang-format][docs] Fix incorrect 'clang-format 4' option markers Introduced by 23a5090c6, some style option markers indicated 'clang-format 4', though their respective options were available in earlier releases. Differential Revision: https://reviews.llvm.org/D129934 Added: Modified: clang/docs/ClangFormatStyleOptions.rst clang/include/clang/Format/Format.h Removed: ################################################################################ diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index d3e1d71fd04b7..8bc24c81c9ec2 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -3670,7 +3670,7 @@ the configuration (without a prefix: ``Auto``). -**ReflowComments** (``Boolean``) :versionbadge:`clang-format 4` +**ReflowComments** (``Boolean``) :versionbadge:`clang-format 3.8` If ``true``, clang-format will attempt to re-flow comments. .. code-block:: c++ @@ -3910,7 +3910,7 @@ the configuration (without a prefix: ``Auto``). int bar; int bar; } // namespace b } // namespace b -**SortIncludes** (``SortIncludesOptions``) :versionbadge:`clang-format 4` +**SortIncludes** (``SortIncludesOptions``) :versionbadge:`clang-format 3.8` Controls if and how clang-format will sort ``#includes``. If ``Never``, includes are never sorted. If ``CaseInsensitive``, includes are sorted in an ASCIIbetical or case diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index 77ff9a8634295..e057632cc1b02 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -2980,7 +2980,7 @@ struct FormatStyle { /// /* second veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongComment with plenty of /// * information */ /// \endcode - /// \version 4 + /// \version 3.8 bool ReflowComments; // clang-format on @@ -3236,7 +3236,7 @@ struct FormatStyle { /// insensitive fashion. /// If ``CaseSensitive``, includes are sorted in an alphabetical or case /// sensitive fashion. - /// \version 4 + /// \version 3.8 SortIncludesOptions SortIncludes; /// Position for Java Static imports. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
