maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Align a multiline string literal with the first part. 

Before:
  #define A(X)          \
    "aaaaa" #X "bbbbbb" \
               "ccccc"

After:
  #define A(X)          \
    "aaaaa" #X "bbbbbb" \
    "ccccc"

llvm-svn: 181732
This commit is contained in:
Daniel Jasper 2013-05-13 20:50:15 +00:00
parent f8cf9d4851
commit 47a04442f9
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Format/Format.cpp
View File

@ -738,10 +738,10 @@ private:
State.Stack.back().VariablePos = VariablePos;
}
if (Current.is(tok::string_literal)) {
if (Current.is(tok::string_literal) && State.StartOfStringLiteral == 0) {
State.StartOfStringLiteral = State.Column;
} else if (Current.isNot(tok::comment)) {
State.StartOfStringLiteral = 0;
} else if (!Current.isOneOf(tok::comment, tok::identifier, tok::hash,
tok::string_literal)) {
}
State.Column += Current.FormatTok.TokenLength;

8
clang/unittests/Format/FormatTest.cpp
View File

@ -2231,6 +2231,14 @@ TEST_F(FormatTest, AlignsStringLiterals) {
"#define LL_FORMAT \"ll\"\n"
"printf(\"aaaaa: %d, bbbbbb: %\" LL_FORMAT \"d, cccccccc: %\" LL_FORMAT\n"
" \"d, ddddddddd: %\" LL_FORMAT \"d\");");
verifyFormat("#define A(X) \\\n"
" \"aaaaa\" #X \"bbbbbb\" \\\n"
" \"ccccc\"",
getLLVMStyleWithColumns(23));
verifyFormat("#define A \"def\"\n"
"f(\"abc\" A \"ghi\"\n"
" \"jkl\");");
}
TEST_F(FormatTest, AlignsPipes) {