diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index a552c9795acb9..21342e1b89ea8 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -1217,7 +1217,7 @@ the configuration (without a prefix: ``Auto``). .. _AllowShortCompoundRequirementOnASingleLine: -**AllowShortCompoundRequirementOnASingleLine** (``Boolean``) :versionbadge:`clang-format 16` :ref:`¶ ` +**AllowShortCompoundRequirementOnASingleLine** (``Boolean``) :versionbadge:`clang-format 18` :ref:`¶ ` Allow short compound requirement on a single line. .. code-block:: c++ diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index c0514e5b70783..903ad19d0b845 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -775,6 +775,7 @@ AST Matchers clang-format ------------ - Add ``AllowBreakBeforeNoexceptSpecifier`` option. +- Add ``AllowShortCompoundRequirementOnASingleLine`` option. libclang -------- diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index f2ee25bc96d6f..3e9d1915badd8 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -701,7 +701,7 @@ struct FormatStyle { /// } -> std::same_as; /// }; /// \endcode - /// \version 16 + /// \version 18 bool AllowShortCompoundRequirementOnASingleLine; /// Allow short enums on a single line.