From b5bda7c0b0994cdcc78a874c10fa5d2a42e47745 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 6 Oct 2015 12:11:51 +0000 Subject: [PATCH] clang-format: Add empty line before code-blocks in Docs. llvm-svn: 249394 --- clang/docs/ClangFormatStyleOptions.rst | 6 ++++++ clang/docs/tools/dump_format_style.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index fd14d90ff537..7d31a5869cef 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -155,6 +155,7 @@ the configuration (without a prefix: ``Auto``). This applies to round brackets (parentheses), angle brackets and square brackets. This will result in formattings like + .. code-block:: c++ someLongFunction(argument1, argument2); @@ -164,6 +165,7 @@ the configuration (without a prefix: ``Auto``). This will align the assignment operators of consecutive lines. This will result in formattings like + .. code-block:: c++ int aaaa = 12; int b = 23; @@ -174,6 +176,7 @@ the configuration (without a prefix: ``Auto``). This will align the declaration names of consecutive lines. This will result in formattings like + .. code-block:: c++ int aaaa = 12; float b = 23; @@ -389,11 +392,13 @@ the configuration (without a prefix: ``Auto``). instead of as function calls. These are expected to be macros of the form: + .. code-block:: c++ FOREACH(, ...) In the .clang-format configuration file, this can be configured like: + .. code-block:: c++ ForEachMacros: ['RANGES_FOR', 'FOREACH'] @@ -415,6 +420,7 @@ the configuration (without a prefix: ``Auto``). (http://llvm.org/docs/CodingStandards.html#include-style). To configure this in the .clang-format file, use: + .. code-block:: c++ IncludeCategories: - Regex: '^"(llvm|llvm-c|clang|clang-c)/' diff --git a/clang/docs/tools/dump_format_style.py b/clang/docs/tools/dump_format_style.py index 8d1323e8a1ae..3c04171044e2 100755 --- a/clang/docs/tools/dump_format_style.py +++ b/clang/docs/tools/dump_format_style.py @@ -87,7 +87,7 @@ class EnumValue: def clean_comment_line(line): if line == '/// \\code': - return '.. code-block:: c++\n' + return '\n.. code-block:: c++\n' if line == '/// \\endcode': return '' return line[4:] + '\n'