diff options
| author | Daniel Jasper <djasper@google.com> | 2016-12-12 12:42:29 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2016-12-12 12:42:29 +0000 |
| commit | 03a04fe95ffbf54ce54957e378c36a520f0b19d3 (patch) | |
| tree | c31f3b7d87665e954448af4a4c26d53748977200 /clang/lib/Format/ContinuationIndenter.cpp | |
| parent | d2396b642514cdfa94de6bafd07f30645910ee73 (diff) | |
| download | bcm5719-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/lib/Format/ContinuationIndenter.cpp')
| -rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 404e3a3b4ad..aa6f37bd199 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -560,6 +560,7 @@ unsigned ContinuationIndenter::addTokenOnNewLine(LineState &State, // and we need to avoid bin packing there. bool NestedBlockSpecialCase = Style.Language != FormatStyle::LK_Cpp && + Style.Language != FormatStyle::LK_ObjC && Current.is(tok::r_brace) && State.Stack.size() > 1 && State.Stack[State.Stack.size() - 2].NestedBlockInlined; if (!NestedBlockSpecialCase) |
