This is an archive of the discontinued LLVM Phabricator instance.

Differential D40431

clang-format: [JS] do not wrap before yield.
ClosedPublic

Authored by mprobst on Nov 24 2017, 5:53 AM.

Details

Reviewers
djasper
Commits
rGa5968aad3da0: clang-format: [JS] do not wrap before yield.
rC318958: clang-format: [JS] do not wrap before yield.
rL318958: clang-format: [JS] do not wrap before yield.
Summary

The same rules apply as for return.

Diff Detail

Event Timeline

mprobst created this revision.Nov 24 2017, 5:53 AM
Herald added a subscriber: klimek. · View Herald TranscriptNov 24 2017, 5:53 AM
Harbormaster completed remote builds in B12445: Diff 124183.Nov 24 2017, 5:53 AM
djasper accepted this revision.Nov 24 2017, 8:36 AM

Looks good.

This revision is now accepted and ready to land.Nov 24 2017, 8:36 AM
Closed by commit rL318958: clang-format: [JS] do not wrap before yield. (authored by mprobst). · Explain WhyNov 24 2017, 9:06 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

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

Diff 124183

lib/Format/TokenAnnotator.cpp

Show First 20 Lines • Show All 2,692 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, tok::kw_continue, tok::kw_break, NonComment->isOneOf(tok::kw_return, Keywords.kw_yield, tok::kw_continue,
tok::kw_throw, Keywords.kw_interface, tok::kw_break, tok::kw_throw, Keywords.kw_interface,
Keywords.kw_type, tok::kw_static, tok::kw_public, Keywords.kw_type, tok::kw_static, tok::kw_public,
tok::kw_private, tok::kw_protected, tok::kw_private, tok::kw_protected,
Keywords.kw_readonly, Keywords.kw_abstract, Keywords.kw_readonly, Keywords.kw_abstract,
Keywords.kw_get, Keywords.kw_set)) Keywords.kw_get, Keywords.kw_set))
return false; // Otherwise automatic semicolon insertion would trigger. return false; // Otherwise automatic semicolon insertion would trigger.
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))
▲ Show 20 Lines • Show All 194 Lines • Show Last 20 Lines

unittests/Format/FormatTestJS.cpp

Show First 20 Lines • Show All 1,117 Lines • ▼ Show 20 Lines verifyFormat("for (let {a, b} in x) {\n"
"}"); "}");
} }
TEST_F(FormatTestJS, WrapRespectsAutomaticSemicolonInsertion) { TEST_F(FormatTestJS, WrapRespectsAutomaticSemicolonInsertion) {
// The following statements must not wrap, as otherwise the program meaning // The following statements must not wrap, as otherwise the program meaning
// would change due to automatic semicolon insertion. // would change due to automatic semicolon insertion.
// See http://www.ecma-international.org/ecma-262/5.1/#sec-7.9.1. // See http://www.ecma-international.org/ecma-262/5.1/#sec-7.9.1.
verifyFormat("return aaaaa;", getGoogleJSStyleWithColumns(10)); verifyFormat("return aaaaa;", getGoogleJSStyleWithColumns(10));
verifyFormat("yield aaaaa;", getGoogleJSStyleWithColumns(10));
verifyFormat("return /* hello! */ aaaaa;", getGoogleJSStyleWithColumns(10)); verifyFormat("return /* hello! */ aaaaa;", getGoogleJSStyleWithColumns(10));
verifyFormat("continue aaaaa;", getGoogleJSStyleWithColumns(10)); verifyFormat("continue aaaaa;", getGoogleJSStyleWithColumns(10));
verifyFormat("continue /* hello! */ aaaaa;", getGoogleJSStyleWithColumns(10)); verifyFormat("continue /* hello! */ aaaaa;", getGoogleJSStyleWithColumns(10));
verifyFormat("break aaaaa;", getGoogleJSStyleWithColumns(10)); verifyFormat("break aaaaa;", getGoogleJSStyleWithColumns(10));
verifyFormat("throw aaaaa;", getGoogleJSStyleWithColumns(10)); verifyFormat("throw aaaaa;", getGoogleJSStyleWithColumns(10));
verifyFormat("aaaaaaaaa++;", getGoogleJSStyleWithColumns(10)); verifyFormat("aaaaaaaaa++;", getGoogleJSStyleWithColumns(10));
verifyFormat("aaaaaaaaa--;", getGoogleJSStyleWithColumns(10)); verifyFormat("aaaaaaaaa--;", getGoogleJSStyleWithColumns(10));
verifyFormat("return [\n" verifyFormat("return [\n"
▲ Show 20 Lines • Show All 1,076 Lines • Show Last 20 Lines