diff options
| -rw-r--r-- | clang/docs/ClangFormatStyleOptions.rst | 11 | ||||
| -rw-r--r-- | clang/include/clang/Format/Format.h | 13 |
2 files changed, 22 insertions, 2 deletions
diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index 3cd47d3c0ac..cadb6d4f491 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -1321,6 +1321,17 @@ the configuration (without a prefix: ``Auto``). **BreakStringLiterals** (``bool``) Allow breaking string literals when formatting. + .. code-block:: c++ + + true: + const char* x = "veryVeryVeryVeryVeryVe" + "ryVeryVeryVeryVeryVery" + "VeryLongString"; + + false: + const char* x = + "veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongString"; + **ColumnLimit** (``unsigned``) The column limit. diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index 7e71b7e8b16..1095821eb66 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -782,7 +782,7 @@ struct FormatStyle { /// The brace breaking style to use. BraceBreakingStyle BreakBeforeBraces; - // Different ways to wrap braces after control statements. + /// Different ways to wrap braces after control statements. enum BraceWrappingAfterControlStatementStyle { /// Never wrap braces after a control statement. /// \code @@ -1077,6 +1077,16 @@ struct FormatStyle { bool BreakAfterJavaFieldAnnotations; /// Allow breaking string literals when formatting. + /// \code + /// true: + /// const char* x = "veryVeryVeryVeryVeryVe" + /// "ryVeryVeryVeryVeryVery" + /// "VeryLongString"; + /// + /// false: + /// const char* x = + /// "veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongString"; + /// \endcode bool BreakStringLiterals; /// The column limit. @@ -1985,7 +1995,6 @@ struct FormatStyle { /// Latest: Parse and format using the latest supported language version. /// 'Cpp11' is an alias for LS_Latest for historical reasons. LS_Latest, - /// Auto: Automatic detection based on the input. /// Parse using the latest language version. Format based on detected input. LS_Auto, |
