From 961fd77687d27089acf0a09ea29a87fb8ccd7522 Mon Sep 17 00:00:00 2001 From: Krystian Kuzniarek Date: Sun, 4 Sep 2022 22:06:42 +0200 Subject: [PATCH] [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 --- clang/docs/ClangFormatStyleOptions.rst | 4 ++-- clang/include/clang/Format/Format.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index d3e1d71..8bc24c8 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 77ff9a8..e057632 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. -- 2.7.4