This is an archive of the discontinued LLVM Phabricator instance.

Differential D44569

[clang-format] Disallow breaks before ']' in text proto extensions
ClosedPublic

Authored by krasimir on Mar 16 2018, 8:13 AM.

Details

Reviewers
None
Commits
rGabbd54ce0095: [clang-format] Disallow breaks before ']' in text proto extensions
rC327716: [clang-format] Disallow breaks before ']' in text proto extensions
rL327716: [clang-format] Disallow breaks before ']' in text proto extensions
Summary

This disallows patterns like [ext.name\n] in text protos.

Diff Detail

Event Timeline

krasimir created this revision.Mar 16 2018, 8:13 AM
Herald added subscribers: cfe-commits, klimek. · View Herald TranscriptMar 16 2018, 8:13 AM
Harbormaster completed remote builds in B16163: Diff 138709.Mar 16 2018, 8:14 AM
krasimir updated this revision to Diff 138710.Mar 16 2018, 8:15 AM
  • Remove newlines
Harbormaster completed remote builds in B16164: Diff 138710.Mar 16 2018, 8:15 AM
This revision was not accepted when it landed; it landed in state Needs Review.Mar 16 2018, 8:26 AM
Closed by commit rL327716: [clang-format] Disallow breaks before ']' in text proto extensions (authored by krasimir). · Explain Why
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptMar 16 2018, 8:26 AM

Revision Contents

PathSize
lib/
Format/
3 lines
unittests/
Format/
25 lines

Diff 138710

lib/Format/TokenAnnotator.cpp

Show First 20 Lines • Show All 2,962 Lines • ▼ Show 20 Lines if (Right.is(tok::colon) &&
return false; return false;
if (Left.is(tok::colon) && Left.isOneOf(TT_DictLiteral, TT_ObjCMethodExpr)) { if (Left.is(tok::colon) && Left.isOneOf(TT_DictLiteral, TT_ObjCMethodExpr)) {
if ((Style.Language == FormatStyle::LK_Proto || if ((Style.Language == FormatStyle::LK_Proto ||
Style.Language == FormatStyle::LK_TextProto) && Style.Language == FormatStyle::LK_TextProto) &&
!Style.AlwaysBreakBeforeMultilineStrings && Right.isStringLiteral()) !Style.AlwaysBreakBeforeMultilineStrings && Right.isStringLiteral())
return false; return false;
return true; return true;
} }
if (Right.is(tok::r_square) && Right.MatchingParen &&
Right.MatchingParen->is(TT_ProtoExtensionLSquare))
return false;
if (Right.is(TT_SelectorName) || (Right.is(tok::identifier) && Right.Next && if (Right.is(TT_SelectorName) || (Right.is(tok::identifier) && Right.Next &&
Right.Next->is(TT_ObjCMethodExpr))) Right.Next->is(TT_ObjCMethodExpr)))
return Left.isNot(tok::period); // FIXME: Properly parse ObjC calls. return Left.isNot(tok::period); // FIXME: Properly parse ObjC calls.
if (Left.is(tok::r_paren) && Line.Type == LT_ObjCProperty) if (Left.is(tok::r_paren) && Line.Type == LT_ObjCProperty)
return true; return true;
if (Left.ClosesTemplateDeclaration || Left.is(TT_FunctionAnnotationRParen)) if (Left.ClosesTemplateDeclaration || Left.is(TT_FunctionAnnotationRParen))
return true; return true;
if (Right.isOneOf(TT_RangeBasedForLoopColon, TT_OverloadedOperatorLParen, if (Right.isOneOf(TT_RangeBasedForLoopColon, TT_OverloadedOperatorLParen,
▲ Show 20 Lines • Show All 120 Lines • Show Last 20 Lines

unittests/Format/FormatTestTextProto.cpp

Show First 20 Lines • Show All 386 Lines • ▼ Show 20 Lines verifyFormat("[longg.long.long.long.long.long.long.long.long.long.long\n"
" key: value\n" " key: value\n"
" key: value\n" " key: value\n"
" key: value\n" " key: value\n"
"}"); "}");
verifyFormat("[longg.long.long.long.long.long.long.long.long.long\n" verifyFormat("[longg.long.long.long.long.long.long.long.long.long\n"
" .long/longg.longlong] { key: value }"); " .long/longg.longlong] { key: value }");
verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/\n" verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/\n"
" bbbbbbbbbbbbbb] { key: value }"); " bbbbbbbbbbbbbb] { key: value }");
verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" // These go over the column limit intentionally, since the alternative
"] { key: value }"); // [aa..a\n] is worse.
verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa] {\n"
"] {\n" " key: value\n"
"}");
verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa] {\n"
" [type.type] {\n" " [type.type] {\n"
" keyyyyyyyyyyyyyy: valuuuuuuuuuuuuuuuuuuuuuuuuue\n" " keyyyyyyyyyyyyyy: valuuuuuuuuuuuuuuuuuuuuuuuuue\n"
" }\n" " }\n"
"}"); "}");
verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/\n" verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/\n"
" bbbbbbb] {\n" " bbbbbbb] {\n"
" [type.type] {\n" " [type.type] {\n"
" keyyyyyyyyyyyyyy: valuuuuuuuuuuuuuuuuuuuuuuuuue\n" " keyyyyyyyyyyyyyy: valuuuuuuuuuuuuuuuuuuuuuuuuue\n"
▲ Show 20 Lines • Show All 63 Lines • ▼ Show 20 Lines verifyFormat("aaaaaaaaaaa: <\n"
">"); ">");
} }
TEST_F(FormatTestTextProto, BreaksConsecutiveStringLiterals) { TEST_F(FormatTestTextProto, BreaksConsecutiveStringLiterals) {
verifyFormat("ala: \"str1\"\n" verifyFormat("ala: \"str1\"\n"
" \"str2\"\n"); " \"str2\"\n");
} }
TEST_F(FormatTestTextProto, PutsMultipleEntriesInExtensionsOnNewlines) {
FormatStyle Style = getGoogleStyle(FormatStyle::LK_TextProto);
verifyFormat("pppppppppp: {\n"
" ssssss: \"http://example.com/blahblahblah\"\n"
" ppppppp: \"sssss/MMMMMMMMMMMM\"\n"
" [ns.sssss.eeeeeeeee.eeeeeeeeeeeeeee] { begin: 24 end: 252 }\n"
" [ns.sssss.eeeeeeeee.eeeeeeeeeeeeeee] {\n"
" begin: 24\n"
" end: 252\n"
" key: value\n"
" key: value\n"
" }\n"
"}", Style);
}
} // end namespace tooling } // end namespace tooling
} // end namespace clang } // end namespace clang