summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/Format.cpp
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2017-01-31 18:42:05 +0000
committerNico Weber <nicolasweber@gmx.de>2017-01-31 18:42:05 +0000
commit9e2bc306baad5ab6646db4dfff9d3a70e3b3424d (patch)
treeaeab8437f1c3ab3870dbf43f32282076d6f1ea04 /clang/lib/Format/Format.cpp
parent01fa962226d0a3ea022cd339b5104f4669cf031f (diff)
downloadbcm5719-llvm-9e2bc306baad5ab6646db4dfff9d3a70e3b3424d.tar.gz
bcm5719-llvm-9e2bc306baad5ab6646db4dfff9d3a70e3b3424d.zip
Keep Chromium ObjC column limit at 80 for consistency with C++
https://reviews.llvm.org/D29337 Patch from Dan Beam <dbeam@chromium.org>! llvm-svn: 293675
Diffstat (limited to 'clang/lib/Format/Format.cpp')
-rw-r--r--clang/lib/Format/Format.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 91456112f98..77d351eeb2b 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -653,6 +653,8 @@ FormatStyle getChromiumStyle(FormatStyle::LanguageKind Language) {
ChromiumStyle.AllowShortLoopsOnASingleLine = false;
ChromiumStyle.BinPackParameters = false;
ChromiumStyle.DerivePointerAlignment = false;
+ if (Language == FormatStyle::LK_ObjC)
+ ChromiumStyle.ColumnLimit = 80;
}
ChromiumStyle.SortIncludes = false;
return ChromiumStyle;
OpenPOWER on IntegriCloud