From: Sylvestre Ledru Date: Mon, 22 Oct 2018 19:07:29 +0000 (+0000) Subject: Hopefully fix the documentation generation issue X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41e165b659ec7d8262153a6e0ed9130431c886de;p=clang Hopefully fix the documentation generation issue git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@344939 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/docs/ClangFormatStyleOptions.rst b/docs/ClangFormatStyleOptions.rst index 3a43c98911..d50c883dbd 100644 --- a/docs/ClangFormatStyleOptions.rst +++ b/docs/ClangFormatStyleOptions.rst @@ -1406,12 +1406,14 @@ the configuration (without a prefix: ``Auto``). 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: + In the .clang-format configuration file, this can be configured like + in the following yaml example. This will result in imports being + formatted as in the Java example below. .. code-block:: yaml JavaImportGroups: ['com.example', 'com', 'org'] - Which will result in imports being formatted as so: + .. code-block:: java diff --git a/include/clang/Format/Format.h b/include/clang/Format/Format.h index cb5886f335..b777496eb1 100644 --- a/include/clang/Format/Format.h +++ b/include/clang/Format/Format.h @@ -1139,11 +1139,13 @@ struct FormatStyle { /// 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: + /// In the .clang-format configuration file, this can be configured like + /// in the following yaml example. This will result in imports being + /// formatted as in the Java example below. /// \code{.yaml} /// JavaImportGroups: ['com.example', 'com', 'org'] /// \endcode - /// Which will result in imports being formatted as so: + /// /// \code{.java} /// import static com.example.function1; ///