This is an archive of the discontinued LLVM Phabricator instance.

Differential D40642

clang-format: [JS] do not wrap after async/await.
ClosedPublic

Authored by mprobst on Nov 30 2017, 2:10 AM.

Details

Reviewers
djasper
Commits
rG27b6603f90cd: clang-format: [JS] do not wrap after async/await.
rC319415: clang-format: [JS] do not wrap after async/await.
rL319415: clang-format: [JS] do not wrap after async/await.
Summary

Otherwise automatic semicolon insertion can trigger, i.e. wrapping
produces invalid syntax.

Diff Detail

Event Timeline

mprobst created this revision.Nov 30 2017, 2:10 AM
Herald added subscribers: cfe-commits, klimek. · View Herald TranscriptNov 30 2017, 2:10 AM
djasper accepted this revision.Nov 30 2017, 2:22 AM

Looks good.

This revision is now accepted and ready to land.Nov 30 2017, 2:22 AM
Closed by commit rL319415: clang-format: [JS] do not wrap after async/await. (authored by mprobst). · Explain WhyNov 30 2017, 2:25 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Format/
12 lines
unittests/
Format/
5 lines

Diff 124887

lib/Format/TokenAnnotator.cpp

Show First 20 Lines • Show All 2,695 Lines • ▼ Show 20 Lines if (Left.isOneOf(Keywords.kw_throws, Keywords.kw_extends,
Keywords.kw_implements)) Keywords.kw_implements))
return false; return false;
if (Right.isOneOf(Keywords.kw_throws, Keywords.kw_extends, if (Right.isOneOf(Keywords.kw_throws, Keywords.kw_extends,
Keywords.kw_implements)) Keywords.kw_implements))
return true; return true;
} else if (Style.Language == FormatStyle::LK_JavaScript) { } else if (Style.Language == FormatStyle::LK_JavaScript) {
const FormatToken *NonComment = Right.getPreviousNonComment(); const FormatToken *NonComment = Right.getPreviousNonComment();
if (NonComment && if (NonComment &&
NonComment->isOneOf(tok::kw_return, Keywords.kw_yield, tok::kw_continue, NonComment->isOneOf(
tok::kw_break, tok::kw_throw, Keywords.kw_interface, tok::kw_return, Keywords.kw_yield, tok::kw_continue, tok::kw_break,
Keywords.kw_type, tok::kw_static, tok::kw_public, tok::kw_throw, Keywords.kw_interface, Keywords.kw_type,
tok::kw_private, tok::kw_protected, tok::kw_static, tok::kw_public, tok::kw_private, tok::kw_protected,
Keywords.kw_readonly, Keywords.kw_abstract, Keywords.kw_readonly, Keywords.kw_abstract, Keywords.kw_get,
Keywords.kw_get, Keywords.kw_set)) Keywords.kw_set, Keywords.kw_async, Keywords.kw_await))
return false; // Otherwise automatic semicolon insertion would trigger. return false; // Otherwise automatic semicolon insertion would trigger.
if (Left.Tok.getIdentifierInfo() && if (Left.Tok.getIdentifierInfo() &&
Right.startsSequence(tok::l_square, tok::r_square)) Right.startsSequence(tok::l_square, tok::r_square))
return false; // breaking in "foo[]" creates illegal TS type syntax. return false; // breaking in "foo[]" creates illegal TS type syntax.
if (Left.is(TT_JsFatArrow) && Right.is(tok::l_brace)) if (Left.is(TT_JsFatArrow) && Right.is(tok::l_brace))
return false; return false;
if (Left.is(TT_JsTypeColon)) if (Left.is(TT_JsTypeColon))
return true; return true;
▲ Show 20 Lines • Show All 193 Lines • Show Last 20 Lines

unittests/Format/FormatTestJS.cpp

Show First 20 Lines • Show All 1,146 Lines • ▼ Show 20 Lines verifyFormat("class X {\n"
"class X {\n" "class X {\n"
" readonly ratherLongField = 1;\n" " readonly ratherLongField = 1;\n"
"}", "}",
getGoogleJSStyleWithColumns(20)); getGoogleJSStyleWithColumns(20));
verifyFormat("const x = (5 + 9)\n" verifyFormat("const x = (5 + 9)\n"
"const y = 3\n", "const y = 3\n",
"const x = ( 5 + 9)\n" "const x = ( 5 + 9)\n"
"const y = 3\n"); "const y = 3\n");
// Ideally the foo() bit should be indented relative to the async function().
verifyFormat("async function\n"
"foo() {}",
getGoogleJSStyleWithColumns(10));
verifyFormat("await theReckoning;", getGoogleJSStyleWithColumns(10));
} }
TEST_F(FormatTestJS, AutomaticSemicolonInsertionHeuristic) { TEST_F(FormatTestJS, AutomaticSemicolonInsertionHeuristic) {
verifyFormat("a\n" verifyFormat("a\n"
"b;", "b;",
" a \n" " a \n"
" b ;"); " b ;");
verifyFormat("a()\n" verifyFormat("a()\n"
▲ Show 20 Lines • Show All 1,067 Lines • Show Last 20 Lines