Author: sylvestre
Date: Mon Oct 22 11:48:58 2018
New Revision: 344934
URL: http://llvm.org/viewvc/llvm-project?rev=344934&view=rev
Log:
Generate ClangFormatStyleOptions.rst from Format.h (using
docs/tools/dump_format_style.py)
Modified:
cfe/trunk/docs/ClangFormatStyleOptions.rst
Modified: cfe/trunk/docs/ClangFormatStyleOptions.rst
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/ClangFormatStyleOptions.rst?rev=344934&r1=344933&r2=344934&view=diff
==============================================================================
--- cfe/trunk/docs/ClangFormatStyleOptions.rst (original)
+++ cfe/trunk/docs/ClangFormatStyleOptions.rst Mon Oct 22 11:48:58 2018
@@ -1134,21 +1134,17 @@ the configuration (without a prefix: ``A
.. code-block:: c++
true:
- FitsOnOneLine::Constructor()
- : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}
-
- DoesntFit::Constructor()
- : aaaaaaaaaaaaa(aaaaaaaaaaaaaa),
- aaaaaaaaaaaaa(aaaaaaaaaaaaaa),
- aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}
+ SomeClass::Constructor()
+ : aaaaaaaa(aaaaaaaa), aaaaaaaa(aaaaaaaa),
aaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaa) {
+ return 0;
+ }
false:
- FitsOnOneLine::Constructor()
- : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}
-
- DoesntFit::Constructor()
- : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaa(aaaaaaaaaaaaaa),
- aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}
+ SomeClass::Constructor()
+ : aaaaaaaa(aaaaaaaa), aaaaaaaa(aaaaaaaa),
+ aaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaa) {
+ return 0;
+ }
**ConstructorInitializerIndentWidth** (``unsigned``)
The number of characters to use for indentation of constructor
@@ -1402,6 +1398,37 @@ the configuration (without a prefix: ``A
LoooooooooooooooooooooooooooooooooooooooongReturnType
LoooooooooooooooooooooooooooooooongFunctionDeclaration();
+**JavaImportGroups** (``std::vector<std::string>``)
+ A vector of prefixes ordered by the desired groups for Java imports.
+
+ Each group is seperated by a newline. Static imports will also follow the
+ same grouping convention above all non-static imports. One group's prefix
+ can be a subset of another - the longest prefix is always matched. Within
+ a group, the imports are ordered lexicographically.
+
+ In the .clang-format configuration file, this can be configured like:
+
+ .. code-block:: yaml
+
+ JavaImportGroups: ['com.example', 'com', 'org']
+ Which will result in imports being formatted as so:
+
+ .. code-block:: java
+
+ import static com.example.function1;
+
+ import static com.test.function2;
+
+ import static org.example.function3;
+
+ import com.example.ClassA;
+ import com.example.Test;
+ import com.example.a.ClassB;
+
+ import com.test.ClassC;
+
+ import org.example.ClassD;
+
**JavaScriptQuotes** (``JavaScriptQuoteStyle``)
The JavaScriptQuoteStyle to use for JavaScript strings.
@@ -1980,7 +2007,8 @@ the configuration (without a prefix: ``A
**StatementMacros** (``std::vector<std::string>``)
- A vector of macros that should be interpreted as complete statements.
+ A vector of macros that should be interpreted as complete
+ statements.
Typical macros are expressions, and require a semi-colon to be
added; sometimes this is not the case, and this allows to make
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
