summaryrefslogtreecommitdiffstats
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
commitffff492128eec117eeaba7b29967b6bbb7f2b989 (patch)
treed14da5cd5b9cc39e74e9dcf2fa88f23323d4b32e
parentd411677deae092cb1199ae511972f1a85ec34ba8 (diff)
downloadbcm5719-llvm-ffff492128eec117eeaba7b29967b6bbb7f2b989.tar.gz
bcm5719-llvm-ffff492128eec117eeaba7b29967b6bbb7f2b989.zip
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>! llvm-svn: 357700
-rw-r--r--clang/lib/Format/Format.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 8d86be5b3ae..e2326423a7a 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/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) {
OpenPOWER on IntegriCloud