summaryrefslogtreecommitdiffstats
path: root/lib/Format
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2019-04-04 14:19:45 +0000
committerNico Weber <nicolasweber@gmx.de>2019-04-04 14:19:45 +0000
commit070a4ca7a3a984e8254934d2d3d921c298dffb27 (patch)
tree6f86675ddedcc6e4f6c8ff2061300da61cf8853f /lib/Format
parent35026dff4f76858540c9b5e2441a8aa290ecba1c (diff)
Updating Chromium's Java import order
Adding in androidx as another import group. Differential Revision: https://reviews.llvm.org/D60203 Patch from Sam Maier <smaier@chromium.org>! git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@357700 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format')
-rw-r--r--lib/Format/Format.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 8d86be5b3a..e2326423a7 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -898,9 +898,16 @@ FormatStyle getChromiumStyle(FormatStyle::LanguageKind Language) {
// See styleguide for import groups:
// https://chromium.googlesource.com/chromium/src/+/master/styleguide/java/java.md#Import-Order
ChromiumStyle.JavaImportGroups = {
- "android", "com", "dalvik",
- "junit", "org", "com.google.android.apps.chrome",
- "org.chromium", "java", "javax",
+ "android",
+ "androidx",
+ "com",
+ "dalvik",
+ "junit",
+ "org",
+ "com.google.android.apps.chrome",
+ "org.chromium",
+ "java",
+ "javax",
};
ChromiumStyle.SortIncludes = true;
} else if (Language == FormatStyle::LK_JavaScript) {