r344939 - Hopefully fix the documentation generation issue

Sylvestre Ledru via cfe-commits cfe-commits at lists.llvm.org
Mon Oct 22 12:07:29 PDT 2018


Author: sylvestre
Date: Mon Oct 22 12:07:29 2018
New Revision: 344939

URL: http://llvm.org/viewvc/llvm-project?rev=344939&view=rev
Log:
Hopefully fix the documentation generation issue

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

Modified: cfe/trunk/docs/ClangFormatStyleOptions.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/ClangFormatStyleOptions.rst?rev=344939&r1=344938&r2=344939&view=diff
==============================================================================
--- cfe/trunk/docs/ClangFormatStyleOptions.rst (original)
+++ cfe/trunk/docs/ClangFormatStyleOptions.rst Mon Oct 22 12:07:29 2018
@@ -1406,12 +1406,14 @@ the configuration (without a prefix: ``A
   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
 

Modified: cfe/trunk/include/clang/Format/Format.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Format/Format.h?rev=344939&r1=344938&r2=344939&view=diff
==============================================================================
--- cfe/trunk/include/clang/Format/Format.h (original)
+++ cfe/trunk/include/clang/Format/Format.h Mon Oct 22 12:07:29 2018
@@ -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;
   ///




More information about the cfe-commits mailing list