diff options
Diffstat (limited to 'lib/Format/Format.cpp')
| -rw-r--r-- | lib/Format/Format.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 120b54d831..1205c424b1 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -940,7 +940,10 @@ private: return false; if (Left.is(tok::exclaim) || Left.is(tok::tilde)) return false; - if (Left.is(tok::at) && Right.is(tok::identifier)) + if (Left.is(tok::at) && + (Right.is(tok::identifier) || Right.is(tok::string_literal) || + Right.is(tok::char_constant) || Right.is(tok::numeric_constant) || + Right.is(tok::l_paren) || Right.is(tok::l_brace))) return false; if (Left.is(tok::less) || Right.is(tok::greater) || Right.is(tok::less)) return false; |