summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorMartin Probst <martin@probst.io>2017-03-16 10:21:35 +0000
committerMartin Probst <martin@probst.io>2017-03-16 10:21:35 +0000
commitc9c51c4e41ee51b149eb8ae5e21d88a1cfe100fb (patch)
tree8e979f9bfed6d9f2b1f4ce14d5e3cd539e273936 /clang/lib/Format
parent6ef42cc6bb6cb9e9dece92f6188e1b3a47a23642 (diff)
downloadbcm5719-llvm-c9c51c4e41ee51b149eb8ae5e21d88a1cfe100fb.tar.gz
bcm5719-llvm-c9c51c4e41ee51b149eb8ae5e21d88a1cfe100fb.zip
[clang-format] disable adding extra space after MSVC '__super' keyword
clang-format treats MSVC `__super` keyword like all other keywords adding a single space after. This change disables this behavior for `__super`. Patch originally by jutocz (thanks!). Differential Revision: https://reviews.llvm.org/D30932 llvm-svn: 297936
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 228425bc473..043d83df502 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -2382,7 +2382,7 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
return (Left.is(TT_TemplateOpener) &&
Style.Standard == FormatStyle::LS_Cpp03) ||
!(Left.isOneOf(tok::l_paren, tok::r_paren, tok::l_square,
- TT_TemplateCloser, TT_TemplateOpener));
+ tok::kw___super, TT_TemplateCloser, TT_TemplateOpener));
if ((Left.is(TT_TemplateOpener)) != (Right.is(TT_TemplateCloser)))
return Style.SpacesInAngles;
if ((Right.is(TT_BinaryOperator) && !Left.is(tok::l_paren)) ||
OpenPOWER on IntegriCloud