diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -1988,7 +1988,7 @@ -**BreakBeforeConceptDeclarations** (``BreakBeforeConceptDeclarationsStyle``) :versionbadge:`clang-format 13` +**BreakBeforeConceptDeclarations** (``BreakBeforeConceptDeclarationsStyle``) :versionbadge:`clang-format 12` The concept declaration style to use. Possible values: @@ -2278,7 +2278,7 @@ -**EmptyLineBeforeAccessModifier** (``EmptyLineBeforeAccessModifierStyle``) :versionbadge:`clang-format 13` +**EmptyLineBeforeAccessModifier** (``EmptyLineBeforeAccessModifierStyle``) :versionbadge:`clang-format 12` Defines in which cases to put empty line before access modifiers. Possible values: @@ -2706,10 +2706,12 @@ -**IndentRequiresClause** (``Boolean``) :versionbadge:`clang-format 13` +**IndentRequiresClause** (``Boolean``) :versionbadge:`clang-format 15` Indent the requires clause in a template. This only applies when ``RequiresClausePosition`` is ``OwnLine``, or ``WithFollowing``. + In clang-format 13 and 14 it was named ``IndentRequires``. + .. code-block:: c++ true: diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -1791,7 +1791,7 @@ }; /// The concept declaration style to use. - /// \version 13 + /// \version 12 BreakBeforeConceptDeclarationsStyle BreakBeforeConceptDeclarations; /// If ``true``, ternary operators will be placed after line breaks. @@ -2185,7 +2185,7 @@ }; /// Defines in which cases to put empty line before access modifiers. - /// \version 13 + /// \version 12 EmptyLineBeforeAccessModifierStyle EmptyLineBeforeAccessModifier; /// If ``true``, clang-format detects whether function calls and @@ -2523,6 +2523,8 @@ /// Indent the requires clause in a template. This only applies when /// ``RequiresClausePosition`` is ``OwnLine``, or ``WithFollowing``. + /// + /// In clang-format 13 and 14 it was named ``IndentRequires``. /// \code /// true: /// template @@ -2538,7 +2540,7 @@ /// //.... /// } /// \endcode - /// \version 13 + /// \version 15 bool IndentRequiresClause; /// The number of columns to use for indentation.