aboutsummaryrefslogtreecommitdiff
path: root/lib/Format/Format.cpp
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2013-01-08 19:40:21 +0000
committerNico Weber <nicolasweber@gmx.de>2013-01-08 19:40:21 +0000
commitcb4d690820295d93c1cea6c13fb4409b8c1db2cf (patch)
tree5d1e8b68d0a2cd2ff576fd914a5758a56e23cdf5 /lib/Format/Format.cpp
parentf7fd7994a0c520d94e4dfd38848076e68da10a17 (diff)
Formatter: Format @ literals better. Array and dictionary literals need more work.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@171887 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/Format.cpp')
-rw-r--r--lib/Format/Format.cpp5
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;