Author: Krystian Kuzniarek Date: 2022-03-12T22:49:57+01:00 New Revision: 9106a07f1fcb4bd425a3ef2f9f3e2b68bc1ad916
URL: https://github.com/llvm/llvm-project/commit/9106a07f1fcb4bd425a3ef2f9f3e2b68bc1ad916 DIFF: https://github.com/llvm/llvm-project/commit/9106a07f1fcb4bd425a3ef2f9f3e2b68bc1ad916.diff LOG: [clang-format][docs] Fix incorrect 'clang-format 12' option markers Introduced by 23a5090c6, some style option markers indicated 'clang-format 12', though their respective options were available in earlier releases. Differential Revision: https://reviews.llvm.org/D120631 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 1f2e94940b53c..9b5d9ee7ef298 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -606,7 +606,7 @@ the configuration (without a prefix: ``Auto``). -**AlignOperands** (``OperandAlignmentStyle``) :versionbadge:`clang-format 12` +**AlignOperands** (``OperandAlignmentStyle``) :versionbadge:`clang-format 3.5` If ``true``, horizontally align operands of binary and ternary expressions. @@ -749,7 +749,7 @@ the configuration (without a prefix: ``Auto``). return; } -**AllowShortEnumsOnASingleLine** (``Boolean``) :versionbadge:`clang-format 12` +**AllowShortEnumsOnASingleLine** (``Boolean``) :versionbadge:`clang-format 11` Allow short enums on a single line. .. code-block:: c++ @@ -2606,7 +2606,7 @@ the configuration (without a prefix: ``Auto``). plop(); plop(); } } -**IndentExternBlock** (``IndentExternBlockStyle``) :versionbadge:`clang-format 12` +**IndentExternBlock** (``IndentExternBlockStyle``) :versionbadge:`clang-format 11` IndentExternBlockStyle is the type of indenting of extern blocks. Possible values: @@ -2792,7 +2792,7 @@ the configuration (without a prefix: ``Auto``). --i; --i; while (i); } while (i); -**InsertTrailingCommas** (``TrailingCommaStyle``) :versionbadge:`clang-format 12` +**InsertTrailingCommas** (``TrailingCommaStyle``) :versionbadge:`clang-format 11` If set to ``TCS_Wrapped`` will insert trailing commas in container literals (arrays and objects) that wrap across multiple lines. It is currently only available for JavaScript @@ -3150,7 +3150,7 @@ the configuration (without a prefix: ``Auto``). [self onOperationDone]; }]; -**ObjCBreakBeforeNestedBlockParam** (``Boolean``) :versionbadge:`clang-format 12` +**ObjCBreakBeforeNestedBlockParam** (``Boolean``) :versionbadge:`clang-format 11` Break parameters list into lines when there is nested block parameters in a function call. @@ -4358,7 +4358,7 @@ the configuration (without a prefix: ``Auto``). -**WhitespaceSensitiveMacros** (``List of Strings``) :versionbadge:`clang-format 12` +**WhitespaceSensitiveMacros** (``List of Strings``) :versionbadge:`clang-format 11` A vector of macros which are whitespace-sensitive and should not be touched. diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index 49b932c8d16e1..70af9b19085ee 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -503,7 +503,7 @@ struct FormatStyle { /// If ``true``, horizontally align operands of binary and ternary /// expressions. - /// \version 12 + /// \version 3.5 OperandAlignmentStyle AlignOperands; /// If ``true``, aligns trailing comments. @@ -566,7 +566,7 @@ struct FormatStyle { /// B /// } myEnum; /// \endcode - /// \version 12 + /// \version 11 bool AllowShortEnumsOnASingleLine; /// Different styles for merging short blocks containing at most one @@ -991,7 +991,7 @@ struct FormatStyle { /// // ^ inserted /// ] /// \endcode - /// \version 12 + /// \version 11 TrailingCommaStyle InsertTrailingCommas; /// If ``false``, a function declaration's or function definition's @@ -2359,7 +2359,7 @@ struct FormatStyle { /// \endcode /// /// For example: BOOST_PP_STRINGIZE - /// \version 12 + /// \version 11 std::vector<std::string> WhitespaceSensitiveMacros; tooling::IncludeStyle IncludeStyle; @@ -2522,7 +2522,7 @@ struct FormatStyle { }; /// IndentExternBlockStyle is the type of indenting of extern blocks. - /// \version 12 + /// \version 11 IndentExternBlockStyle IndentExternBlock; /// Indent the requires clause in a template. This only applies when @@ -2922,7 +2922,7 @@ struct FormatStyle { /// }] /// } /// \endcode - /// \version 12 + /// \version 11 bool ObjCBreakBeforeNestedBlockParam; /// Add a space in front of an Objective-C protocol list, i.e. use _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
