diff options
| author | Daniel Jasper <djasper@google.com> | 2017-02-20 14:51:16 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2017-02-20 14:51:16 +0000 |
| commit | 98e0b12d13946257c321c90d92c995cb47faffd5 (patch) | |
| tree | bcd9369fdfc528b6a41747645b97fe7cbf9fff74 /clang/unittests/Format/FormatTestJS.cpp | |
| parent | 1c33c9f0b0d804edf76c359c94417aaefedbc9e9 (diff) | |
| download | bcm5719-llvm-98e0b12d13946257c321c90d92c995cb47faffd5.tar.gz bcm5719-llvm-98e0b12d13946257c321c90d92c995cb47faffd5.zip | |
clang-format: [JS] Improve line-wrapping behavior of template strings.
Specifically, similar to other blocks, clang-format now wraps both
after "${" and before the corresponding "}", if the contained
expression spans multiple lines.
llvm-svn: 295663
Diffstat (limited to 'clang/unittests/Format/FormatTestJS.cpp')
| -rw-r--r-- | clang/unittests/Format/FormatTestJS.cpp | 56 |
1 files changed, 20 insertions, 36 deletions
diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp index ffd443cc3d7..fe87bf248ff 100644 --- a/clang/unittests/Format/FormatTestJS.cpp +++ b/clang/unittests/Format/FormatTestJS.cpp @@ -1421,62 +1421,46 @@ TEST_F(FormatTestJS, TemplateStrings) { " aaaaaaaaaaaaa:${ aaaaaaa. aaaaa} aaaaaaaa`;"); verifyFormat("var x = someFunction(`${})`) //\n" " .oooooooooooooooooon();"); - verifyFormat("var x = someFunction(`${aaaa}${aaaaa( //\n" - " aaaaa)})`);"); + verifyFormat("var x = someFunction(`${aaaa}${\n" + " aaaaa( //\n" + " aaaaa)\n" + " })`);"); } TEST_F(FormatTestJS, TemplateStringMultiLineExpression) { - verifyFormat("var f = `aaaaaaaaaaaaaaaaaa: ${aaaaa + //\n" - " bbbb}`;", - "var f = `aaaaaaaaaaaaaaaaaa: ${aaaaa + //\n" - " bbbb}`;"); - verifyFormat("var f = `aaaaaaaaaaaaaaaaaa: ${ //\n" - " aaaaa + //\n" - " bbbb}`;", - "var f = `aaaaaaaaaaaaaaaaaa: ${ //\n" + verifyFormat("var f = `aaaaaaaaaaaaaaaaaa: ${\n" " aaaaa + //\n" + " bbbb\n" + " }`;", + "var f = `aaaaaaaaaaaaaaaaaa: ${aaaaa + //\n" " bbbb}`;"); verifyFormat("var f = `\n" - " aaaaaaaaaaaaaaaaaa: ${aaaaa + //\n" - " bbbb}`;", + " aaaaaaaaaaaaaaaaaa: ${\n" + " aaaaa + //\n" + " bbbb\n" + " }`;", "var f = `\n" " aaaaaaaaaaaaaaaaaa: ${ aaaaa + //\n" " bbbb }`;"); verifyFormat("var f = `\n" - " aaaaaaaaaaaaaaaaaa: ${ //\n" - " aaaaa + //\n" - " bbbb}`;", - "var f = `\n" - " aaaaaaaaaaaaaaaaaa: ${ //\n" - " aaaaa + //\n" - " bbbb}` ;"); - verifyFormat("var f = `\n" - " aaaaaaaaaaaaaaaaaa: ${someFunction(\n" - " aaaaa + //\n" - " bbbb)}`;", - "var f = `\n" - " aaaaaaaaaaaaaaaaaa: ${ someFunction (\n" - " aaaaa + //\n" - " bbbb)}`;"); - verifyFormat("var f = `\n" - " aaaaaaaaaaaaaaaaaa: ${ //\n" + " aaaaaaaaaaaaaaaaaa: ${\n" " someFunction(\n" " aaaaa + //\n" - " bbbb)}`;", + " bbbb)\n" + " }`;", "var f = `\n" - " aaaaaaaaaaaaaaaaaa: ${ //\n" - " someFunction (\n" + " aaaaaaaaaaaaaaaaaa: ${someFunction (\n" " aaaaa + //\n" " bbbb)}`;"); + + // It might be preferable to wrap before "someFunction". verifyFormat("var f = `\n" - " aaaaaaaaaaaaaaaaaa: ${ //\n" - " someFunction({\n" + " aaaaaaaaaaaaaaaaaa: ${someFunction({\n" " aaaa: aaaaa,\n" " bbbb: bbbbb,\n" " })}`;", "var f = `\n" - " aaaaaaaaaaaaaaaaaa: ${ //\n" - " someFunction ({\n" + " aaaaaaaaaaaaaaaaaa: ${someFunction ({\n" " aaaa: aaaaa,\n" " bbbb: bbbbb,\n" " })}`;"); |
