This is an archive of the discontinued LLVM Phabricator instance.

Differential D34938

clang-format: [JS] space between pseudo keywords and template literals.
ClosedPublic

Authored by mprobst on Jul 3 2017, 3:27 AM.

Details

Reviewers
djasper
Commits
rGbd1eb12d3179: clang-format: [JS] space between pseudo keywords and template literals.
rC307023: clang-format: [JS] space between pseudo keywords and template literals.
rL307023: clang-format: [JS] space between pseudo keywords and template literals.
Summary

Before:

yield`foo`;

After:

yield `foo`;

Diff Detail

Event Timeline

mprobst created this revision.Jul 3 2017, 3:27 AM
Herald added a subscriber: klimek. · View Herald TranscriptJul 3 2017, 3:27 AM
djasper accepted this revision.Jul 3 2017, 7:24 AM
This revision is now accepted and ready to land.Jul 3 2017, 7:24 AM
Harbormaster completed remote builds in B7909: Diff 105046.Jul 3 2017, 7:34 AM
Closed by commit rL307023: clang-format: [JS] space between pseudo keywords and template literals. (authored by mprobst). · Explain WhyJul 3 2017, 7:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Format/
6 lines
unittests/
Format/
1 line

Diff 105046

lib/Format/TokenAnnotator.cpp

Show First 20 Lines • Show All 2,294 Lines • ▼ Show 20 Lines if (Left.is(Keywords.kw_async) && Right.is(tok::l_paren) &&
// An async arrow function, for example: `x = async () => foo();`, // An async arrow function, for example: `x = async () => foo();`,
// as opposed to calling a function called async: `x = async();` // as opposed to calling a function called async: `x = async();`
if (Next && Next->is(TT_JsFatArrow)) if (Next && Next->is(TT_JsFatArrow))
return true; return true;
} }
if ((Left.is(TT_TemplateString) && Left.TokenText.endswith("${")) || if ((Left.is(TT_TemplateString) && Left.TokenText.endswith("${")) ||
(Right.is(TT_TemplateString) && Right.TokenText.startswith("}"))) (Right.is(TT_TemplateString) && Right.TokenText.startswith("}")))
return false; return false;
if (Left.is(tok::identifier) && Right.is(TT_TemplateString)) // In tagged template literals ("html`bar baz`"), there is no space between
// the tag identifier and the template string. getIdentifierInfo makes sure
// that the identifier is not a pseudo keyword like `yield`, either.
if (Left.is(tok::identifier) && Left.Tok.getIdentifierInfo() == nullptr &&
Right.is(TT_TemplateString))
return false; return false;
if (Right.is(tok::star) && if (Right.is(tok::star) &&
Left.isOneOf(Keywords.kw_function, Keywords.kw_yield)) Left.isOneOf(Keywords.kw_function, Keywords.kw_yield))
return false; return false;
if (Right.isOneOf(tok::l_brace, tok::l_square) && if (Right.isOneOf(tok::l_brace, tok::l_square) &&
Left.isOneOf(Keywords.kw_function, Keywords.kw_yield)) Left.isOneOf(Keywords.kw_function, Keywords.kw_yield))
return true; return true;
// JS methods can use some keywords as names (e.g. `delete()`). // JS methods can use some keywords as names (e.g. `delete()`).
▲ Show 20 Lines • Show All 500 Lines • Show Last 20 Lines

unittests/Format/FormatTestJS.cpp

Show First 20 Lines • Show All 1,558 Lines • ▼ Show 20 Lines verifyFormat("var f = `aaaaaaaaaaaaa:${aaaaaaa.aaaaa} aaaaaaaa\n"
"var f = `aaaaaaaaaaaaa:${aaaaaaa. aaaaa} aaaaaaaa\n" "var f = `aaaaaaaaaaaaa:${aaaaaaa. aaaaa} aaaaaaaa\n"
" aaaaaaaaaaaaa:${ aaaaaaa. aaaaa} aaaaaaaa`;"); " aaaaaaaaaaaaa:${ aaaaaaa. aaaaa} aaaaaaaa`;");
verifyFormat("var x = someFunction(`${})`) //\n" verifyFormat("var x = someFunction(`${})`) //\n"
" .oooooooooooooooooon();"); " .oooooooooooooooooon();");
verifyFormat("var x = someFunction(`${aaaa}${\n" verifyFormat("var x = someFunction(`${aaaa}${\n"
" aaaaa( //\n" " aaaaa( //\n"
" aaaaa)\n" " aaaaa)\n"
" })`);"); " })`);");
verifyFormat("yield `hello`;");
} }
TEST_F(FormatTestJS, TemplateStringMultiLineExpression) { TEST_F(FormatTestJS, TemplateStringMultiLineExpression) {
verifyFormat("var f = `aaaaaaaaaaaaaaaaaa: ${\n" verifyFormat("var f = `aaaaaaaaaaaaaaaaaa: ${\n"
" aaaaa + //\n" " aaaaa + //\n"
" bbbb\n" " bbbb\n"
" }`;", " }`;",
"var f = `aaaaaaaaaaaaaaaaaa: ${aaaaa + //\n" "var f = `aaaaaaaaaaaaaaaaaa: ${aaaaa + //\n"
▲ Show 20 Lines • Show All 344 Lines • Show Last 20 Lines