summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorManuel Klimek <klimek@google.com>2016-01-19 14:05:32 +0000
committerManuel Klimek <klimek@google.com>2016-01-19 14:05:32 +0000
commit27f278186db7834feec5302ff114ba422d74d360 (patch)
treeaaa8d7feb6414167eb1f90c87a4ec69ab099b778 /clang/lib/Format
parent15f89c420bc090b1a307bde1fea799aae7dbb646 (diff)
downloadbcm5719-llvm-27f278186db7834feec5302ff114ba422d74d360.tar.gz
bcm5719-llvm-27f278186db7834feec5302ff114ba422d74d360.zip
Fix formatting of fully qualified names in array subscripts.
Before: a[ ::b::c]; After: a[::b::c]; llvm-svn: 258123
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 6d6df0cf401..9435ea9704a 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -2114,7 +2114,8 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
if (Right.is(tok::coloncolon) && Left.isNot(tok::l_brace))
return (Left.is(TT_TemplateOpener) &&
Style.Standard == FormatStyle::LS_Cpp03) ||
- !(Left.isOneOf(tok::identifier, tok::l_paren, tok::r_paren) ||
+ !(Left.isOneOf(tok::identifier, tok::l_paren, tok::r_paren,
+ tok::l_square) ||
Left.isOneOf(TT_TemplateCloser, TT_TemplateOpener));
if ((Left.is(TT_TemplateOpener)) != (Right.is(TT_TemplateCloser)))
return Style.SpacesInAngles;
OpenPOWER on IntegriCloud