summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/docs/ClangFormatStyleOptions.rst6
-rw-r--r--clang/include/clang/Format/Format.h6
2 files changed, 8 insertions, 4 deletions
diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst
index 3a43c989114..d50c883dbd9 100644
--- a/clang/docs/ClangFormatStyleOptions.rst
+++ b/clang/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/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h
index cb5886f335f..b777496eb19 100644
--- a/clang/include/clang/Format/Format.h
+++ b/clang/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;
///
OpenPOWER on IntegriCloud