[PATCH] D43731: [clang-format] Fix documentation for SpaceAfterCStyleCast option

2018-03-06 Thread Krasimir Georgiev via Phabricator via cfe-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rL326781: [clang-format] Fix documentation for 
SpaceAfterCStyleCast option (authored by krasimir, committed by ).
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D43731?vs=136645=137166#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D43731

Files:
  cfe/trunk/docs/ClangFormatStyleOptions.rst
  cfe/trunk/include/clang/Format/Format.h


Index: cfe/trunk/docs/ClangFormatStyleOptions.rst
===
--- cfe/trunk/docs/ClangFormatStyleOptions.rst
+++ cfe/trunk/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: cfe/trunk/include/clang/Format/Format.h
===
--- cfe/trunk/include/clang/Format/Format.h
+++ cfe/trunk/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: cfe/trunk/docs/ClangFormatStyleOptions.rst
===
--- cfe/trunk/docs/ClangFormatStyleOptions.rst
+++ cfe/trunk/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,

[PATCH] D43731: [clang-format] Fix documentation for SpaceAfterCStyleCast option

2018-03-06 Thread Krasimir Georgiev via Phabricator via cfe-commits 
krasimir added a comment.

I'll commit this for you.


https://reviews.llvm.org/D43731



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D43731: [clang-format] Fix documentation for SpaceAfterCStyleCast option

2018-03-05 Thread Eric Marti via Phabricator via cfe-commits 
EricMarti added a comment.

I cannot commit this patch myself, as I do not have commit access.


https://reviews.llvm.org/D43731



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D43731: [clang-format] Fix documentation for SpaceAfterCStyleCast option

2018-03-05 Thread Krasimir Georgiev via Phabricator via cfe-commits 
krasimir accepted this revision.
krasimir added a comment.
This revision is now accepted and ready to land.

Thank you!


https://reviews.llvm.org/D43731



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D43731: [clang-format] Fix documentation for SpaceAfterCStyleCast option

2018-03-01 Thread Eric Marti via Phabricator via cfe-commits 
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

[PATCH] D43731: [clang-format] Fix documentation for SpaceAfterCStyleCast option

2018-03-01 Thread Krasimir Georgiev via Phabricator via cfe-commits 
krasimir requested changes to this revision.
krasimir added a comment.
This revision now requires changes to proceed.

This rst file is generated from include/clang/Format/Format.h using 
docs/tools/dump_format_style.py. Update it there and run the tool to regenerate 
the .rst file.


Repository:
  rC Clang

https://reviews.llvm.org/D43731



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits