summaryrefslogtreecommitdiffstats
path: root/clang/tools/clang-format/ClangFormat.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2016-12-12 12:42:29 +0000
committerDaniel Jasper <djasper@google.com>2016-12-12 12:42:29 +0000
commit03a04fe95ffbf54ce54957e378c36a520f0b19d3 (patch)
treec31f3b7d87665e954448af4a4c26d53748977200 /clang/tools/clang-format/ClangFormat.cpp
parentd2396b642514cdfa94de6bafd07f30645910ee73 (diff)
downloadbcm5719-llvm-03a04fe95ffbf54ce54957e378c36a520f0b19d3.tar.gz
bcm5719-llvm-03a04fe95ffbf54ce54957e378c36a520f0b19d3.zip
clang-format: Separate out a language kind for ObjC.
While C(++) and ObjC are generally formatted the same way and can be mixed, people might want to choose different styles based on the language. This patch recognizes .m and .mm files as ObjC and also implements a very crude detection of whether or not a .h file contains ObjC code. This can be improved over time. Also move most of the ObjC tests into their own test file to keep file size maintainable. llvm-svn: 289428
Diffstat (limited to 'clang/tools/clang-format/ClangFormat.cpp')
-rw-r--r--clang/tools/clang-format/ClangFormat.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/tools/clang-format/ClangFormat.cpp b/clang/tools/clang-format/ClangFormat.cpp
index c09723928b7..6c50daf5383 100644
--- a/clang/tools/clang-format/ClangFormat.cpp
+++ b/clang/tools/clang-format/ClangFormat.cpp
@@ -249,7 +249,8 @@ static bool format(StringRef FileName) {
if (fillRanges(Code.get(), Ranges))
return true;
StringRef AssumedFileName = (FileName == "-") ? AssumeFileName : FileName;
- FormatStyle FormatStyle = getStyle(Style, AssumedFileName, FallbackStyle);
+ FormatStyle FormatStyle =
+ getStyle(Style, AssumedFileName, FallbackStyle, Code->getBuffer());
if (SortIncludes.getNumOccurrences() != 0)
FormatStyle.SortIncludes = SortIncludes;
unsigned CursorPosition = Cursor;
OpenPOWER on IntegriCloud