EricMarti updated this revision to Diff 136645.
EricMarti added a comment.
Herald added a subscriber: klimek.
Updated the comment in Format.h and ran the python script. Looks like a few
more changes got pulled into the rst file.
https://reviews.llvm.org/D43731
Files:
docs/ClangFormatStyleOptions.rst
include/clang/Format/Format.h
Index: include/clang/Format/Format.h
===
--- include/clang/Format/Format.h
+++ include/clang/Format/Format.h
@@ -1506,7 +1506,7 @@
/// \brief If ``true``, a space is inserted after C style casts.
/// \code
///true: false:
- ///(int)i;vs. (int) i;
+ ///(int) i; vs. (int)i;
/// \endcode
bool SpaceAfterCStyleCast;
Index: docs/ClangFormatStyleOptions.rst
===
--- docs/ClangFormatStyleOptions.rst
+++ docs/ClangFormatStyleOptions.rst
@@ -629,7 +629,9 @@
int bar();
}
- * ``bool AfterObjCDeclaration`` Wrap ObjC definitions (``@autoreleasepool``,
interfaces, ..).
+ * ``bool AfterObjCDeclaration`` Wrap ObjC definitions (interfaces,
implementations...).
+@autoreleasepool and @synchronized blocks are wrapped
+according to `AfterControlStatement` flag.
* ``bool AfterStruct`` Wrap struct definitions.
@@ -1508,6 +1510,52 @@
+**ObjCBinPackProtocolList** (``BinPackStyle``)
+ Controls bin-packing Objective-C protocol conformance list
+ items into as few lines as possible when they go over ``ColumnLimit``.
+
+ If ``Auto`` (the default), delegates to the value in
+ ``BinPackParameters``. If that is ``true``, bin-packs Objective-C
+ protocol conformance list items into as few lines as possible
+ whenever they go over ``ColumnLimit``.
+
+ If ``Always``, always bin-packs Objective-C protocol conformance
+ list items into as few lines as possible whenever they go over
+ ``ColumnLimit``.
+
+ If ``Never``, lays out Objective-C protocol conformance list items
+ onto individual lines whenever they go over ``ColumnLimit``.
+
+
+ .. code-block:: c++
+
+ Always (or Auto, if BinPackParameters=true):
+ @interface c () <
+ c, c,
+ c, c> {
+ }
+
+ Never (or Auto, if BinPackParameters=false):
+ @interface d () <
+ d,
+ d,
+ d,
+ d> {
+ }
+
+ Possible values:
+
+ * ``BPS_Auto`` (in configuration: ``Auto``)
+Automatically determine parameter bin-packing behavior.
+
+ * ``BPS_Always`` (in configuration: ``Always``)
+Always bin-pack parameters.
+
+ * ``BPS_Never`` (in configuration: ``Never``)
+Never bin-pack parameters.
+
+
+
**ObjCBlockIndentWidth** (``unsigned``)
The number of characters to use for indentation of ObjC blocks.
@@ -1662,7 +1710,7 @@
.. code-block:: c++
true: false:
- (int)i;vs. (int) i;
+ (int) i; vs. (int)i;
**SpaceAfterTemplateKeyword** (``bool``)
If ``true``, a space will be inserted after the 'template' keyword.
Index: include/clang/Format/Format.h
===
--- include/clang/Format/Format.h
+++ include/clang/Format/Format.h
@@ -1506,7 +1506,7 @@
/// \brief If ``true``, a space is inserted after C style casts.
/// \code
///true: false:
- ///(int)i;vs. (int) i;
+ ///(int) i; vs. (int)i;
/// \endcode
bool SpaceAfterCStyleCast;
Index: docs/ClangFormatStyleOptions.rst
===
--- docs/ClangFormatStyleOptions.rst
+++ docs/ClangFormatStyleOptions.rst
@@ -629,7 +629,9 @@
int bar();
}
- * ``bool AfterObjCDeclaration`` Wrap ObjC definitions (``@autoreleasepool``, interfaces, ..).
+ * ``bool AfterObjCDeclaration`` Wrap ObjC definitions (interfaces, implementations...).
+@autoreleasepool and @synchronized blocks are wrapped
+according to `AfterControlStatement` flag.
* ``bool AfterStruct`` Wrap struct definitions.
@@ -1508,6 +1510,52 @@
+**ObjCBinPackProtocolList** (``BinPackStyle``)
+ Controls bin-packing Objective-C protocol conformance list
+ items into as few lines as possible when they go over ``ColumnLimit``.
+
+ If ``Auto`` (the default), delegates to the value in
+ ``BinPackParameters``. If that is ``true``, bin-packs Objective-C
+ protocol conformance list items into as few lines as possible
+ whenever they go over ``ColumnLimit``.
+
+ If ``Always``, always bin-packs Objective-C protocol conformance
+ list items into as few lines as possible whenever they go over
+ ``ColumnLimit``.
+
+ If ``Never`
