forked from OSchip/llvm-project
[clang-format][docs] Fix incorrect 'clang-format 7' option markers
Introduced by 23a5090c6
, some style option markers indicated
'clang-format 7', though their respective options were available in
different releases.
This commit is contained in:
parent
1436420082
commit
b2465748f2
|
@ -1256,7 +1256,7 @@ the configuration (without a prefix: ``Auto``).
|
|||
"bbbb" "cccc";
|
||||
"cccc";
|
||||
|
||||
**AlwaysBreakTemplateDeclarations** (``BreakTemplateDeclarationsStyle``) :versionbadge:`clang-format 7`
|
||||
**AlwaysBreakTemplateDeclarations** (``BreakTemplateDeclarationsStyle``) :versionbadge:`clang-format 3.4`
|
||||
The template declaration breaking style to use.
|
||||
|
||||
Possible values:
|
||||
|
@ -2623,7 +2623,7 @@ the configuration (without a prefix: ``Auto``).
|
|||
For example: `KJ_IF_MAYBE
|
||||
<https://github.com/capnproto/capnproto/blob/master/kjdoc/tour.md#maybes>`_
|
||||
|
||||
**IncludeBlocks** (``IncludeBlocksStyle``) :versionbadge:`clang-format 7`
|
||||
**IncludeBlocks** (``IncludeBlocksStyle``) :versionbadge:`clang-format 6`
|
||||
Dependent on the value, multiple ``#include`` blocks can be sorted
|
||||
as one and divided based on category.
|
||||
|
||||
|
@ -2663,7 +2663,7 @@ the configuration (without a prefix: ``Auto``).
|
|||
|
||||
|
||||
|
||||
**IncludeCategories** (``List of IncludeCategories``) :versionbadge:`clang-format 7`
|
||||
**IncludeCategories** (``List of IncludeCategories``) :versionbadge:`clang-format 3.8`
|
||||
Regular expressions denoting the different ``#include`` categories
|
||||
used for ordering ``#includes``.
|
||||
|
||||
|
@ -2711,7 +2711,7 @@ the configuration (without a prefix: ``Auto``).
|
|||
Priority: 1
|
||||
SortPriority: 0
|
||||
|
||||
**IncludeIsMainRegex** (``String``) :versionbadge:`clang-format 7`
|
||||
**IncludeIsMainRegex** (``String``) :versionbadge:`clang-format 3.9`
|
||||
Specify a regular expression of suffixes that are allowed in the
|
||||
file-to-main-include mapping.
|
||||
|
||||
|
@ -2724,7 +2724,7 @@ the configuration (without a prefix: ``Auto``).
|
|||
For example, if configured to "(_test)?$", then a header a.h would be seen
|
||||
as the "main" include in both a.cc and a_test.cc.
|
||||
|
||||
**IncludeIsMainSourceRegex** (``String``) :versionbadge:`clang-format 7`
|
||||
**IncludeIsMainSourceRegex** (``String``) :versionbadge:`clang-format 10`
|
||||
Specify a regular expression for files being formatted
|
||||
that are allowed to be considered "main" in the
|
||||
file-to-main-include mapping.
|
||||
|
|
|
@ -786,7 +786,7 @@ struct FormatStyle {
|
|||
};
|
||||
|
||||
/// The template declaration breaking style to use.
|
||||
/// \version 7
|
||||
/// \version 3.4
|
||||
BreakTemplateDeclarationsStyle AlwaysBreakTemplateDeclarations;
|
||||
|
||||
/// A vector of strings that should be interpreted as attributes/qualifiers
|
||||
|
|
|
@ -50,7 +50,7 @@ struct IncludeStyle {
|
|||
|
||||
/// Dependent on the value, multiple ``#include`` blocks can be sorted
|
||||
/// as one and divided based on category.
|
||||
/// \version 7
|
||||
/// \version 6
|
||||
IncludeBlocksStyle IncludeBlocks;
|
||||
|
||||
/// See documentation of ``IncludeCategories``.
|
||||
|
@ -114,7 +114,7 @@ struct IncludeStyle {
|
|||
/// Priority: 1
|
||||
/// SortPriority: 0
|
||||
/// \endcode
|
||||
/// \version 7
|
||||
/// \version 3.8
|
||||
std::vector<IncludeCategory> IncludeCategories;
|
||||
|
||||
/// Specify a regular expression of suffixes that are allowed in the
|
||||
|
@ -128,7 +128,7 @@ struct IncludeStyle {
|
|||
///
|
||||
/// For example, if configured to "(_test)?$", then a header a.h would be seen
|
||||
/// as the "main" include in both a.cc and a_test.cc.
|
||||
/// \version 7
|
||||
/// \version 3.9
|
||||
std::string IncludeIsMainRegex;
|
||||
|
||||
/// Specify a regular expression for files being formatted
|
||||
|
@ -149,7 +149,7 @@ struct IncludeStyle {
|
|||
/// also being respected in later phase). Without this option set,
|
||||
/// ``ClassImpl.hpp`` would not have the main include file put on top
|
||||
/// before any other include.
|
||||
/// \version 7
|
||||
/// \version 10
|
||||
std::string IncludeIsMainSourceRegex;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue