diff options
| author | Daniel Jasper <djasper@google.com> | 2013-02-23 07:46:38 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-02-23 07:46:38 +0000 |
| commit | 3a204418482c9ae70ad482e781132c54306c3aa6 (patch) | |
| tree | 3e3ae9f1d077aaed04020e436e6ebd4dfe30a67e /unittests/Format/FormatTest.cpp | |
| parent | a8f7a97a22d1ed92fd3309f071c0121c22e52aa3 (diff) | |
Allow splitting between string literals and identifiers.
Also don't break in long include directives as that is not desired.
We can now format:
#include "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
#define LL_FORMAT "ll"
printf("aaaaa: %d, bbbbbbbbb: %" LL_FORMAT "d, cccccccc: %" LL_FORMAT
"d, ddddddddd: %" LL_FORMAT "d\n");
Before, this led to weird results.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175959 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Format/FormatTest.cpp')
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 00657e046b..3cf151e43f 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -1460,6 +1460,11 @@ TEST_F(FormatTest, AlignsStringLiterals) { verifyFormat("a = a + \"a\"\n" " \"a\"\n" " \"a\";"); + + verifyFormat( + "#define LL_FORMAT \"ll\"\n" + "printf(\"aaaaa: %d, bbbbbb: %\" LL_FORMAT \"d, cccccccc: %\" LL_FORMAT\n" + " \"d, ddddddddd: %\" LL_FORMAT \"d\");"); } TEST_F(FormatTest, AlignsPipes) { @@ -1933,7 +1938,9 @@ TEST_F(FormatTest, HandlesIncludeDirectives) { "#include \"string.h\"\n" "#include \"string.h\"\n" "#include <a-a>\n" - "#include < path with space >\n"); + "#include < path with space >\n" + "#include \"some very long include paaaaaaaaaaaaaaaaaaaaaaath\"", + getLLVMStyleWithColumns(35)); verifyFormat("#import <string>"); verifyFormat("#import <a/b/c.h>"); |