This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG9106a07f1fcb: [clang-format][docs] Fix incorrect
'clang-format 12' option markers (authored by kuzkry, committed by
HazardyKnusperkeks).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D120631/new/
https://reviews.llvm.org/D120631
Files:
clang/docs/ClangFormatStyleOptions.rst
clang/include/clang/Format/Format.h
Index: clang/include/clang/Format/Format.h
===================================================================
--- clang/include/clang/Format/Format.h
+++ clang/include/clang/Format/Format.h
@@ -503,7 +503,7 @@
/// 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 @@
/// B
/// } myEnum;
/// \endcode
- /// \version 12
+ /// \version 11
bool AllowShortEnumsOnASingleLine;
/// Different styles for merging short blocks containing at most one
@@ -991,7 +991,7 @@
/// // ^ inserted
/// ]
/// \endcode
- /// \version 12
+ /// \version 11
TrailingCommaStyle InsertTrailingCommas;
/// If ``false``, a function declaration's or function definition's
@@ -2359,7 +2359,7 @@
/// \endcode
///
/// For example: BOOST_PP_STRINGIZE
- /// \version 12
+ /// \version 11
std::vector<std::string> WhitespaceSensitiveMacros;
tooling::IncludeStyle IncludeStyle;
@@ -2522,7 +2522,7 @@
};
/// 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 @@
/// }]
/// }
/// \endcode
- /// \version 12
+ /// \version 11
bool ObjCBreakBeforeNestedBlockParam;
/// Add a space in front of an Objective-C protocol list, i.e. use
Index: clang/docs/ClangFormatStyleOptions.rst
===================================================================
--- clang/docs/ClangFormatStyleOptions.rst
+++ clang/docs/ClangFormatStyleOptions.rst
@@ -606,7 +606,7 @@
-**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 @@
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 @@
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 @@
--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 @@
[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 @@
-**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.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
