This is an archive of the discontinued LLVM Phabricator instance.

Differential D34749

[clang-format] Fix parsing of msg{field}-style proto options
ClosedPublic

Authored by krasimir on Jun 28 2017, 6:54 AM.

Details

Reviewers
djasper
Commits
rGfeeba61006e2: [clang-format] Fix parsing of msg{field}-style proto options
rC306672: [clang-format] Fix parsing of msg{field}-style proto options
rL306672: [clang-format] Fix parsing of msg{field}-style proto options
Summary

This patch makes the { in msg_field{field: OK} in a proto option scope be
treated as an assignment operator. Previosly the added test case was formatted
as:

option (MyProto.options) = {
  field_a: OK
  field_b{field_c: OK} field_d: OKOKOK field_e: OK
}

Diff Detail

Event Timeline

krasimir created this revision.Jun 28 2017, 6:54 AM
Herald added a subscriber: klimek. · View Herald TranscriptJun 28 2017, 6:54 AM
krasimir updated this revision to Diff 104410.Jun 28 2017, 7:01 AM
  • Add a msg<field>-style test too
krasimir added a comment.Jun 28 2017, 8:00 AM

I think this is ready for a review.

djasper accepted this revision.Jun 29 2017, 4:56 AM

Looks good.

This revision is now accepted and ready to land.Jun 29 2017, 4:56 AM
Closed by commit rL306672: [clang-format] Fix parsing of msg{field}-style proto options (authored by krasimir). · Explain WhyJun 29 2017, 6:30 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Format/
2 lines
unittests/
Format/
6 lines

Diff 104409

lib/Format/TokenAnnotator.cpp

Show First 20 Lines • Show All 1,564 Lines • ▼ Show 20 Lines
private: private:
/// \brief Gets the precedence (+1) of the given token for binary operators /// \brief Gets the precedence (+1) of the given token for binary operators
/// and other tokens that we treat like binary operators. /// and other tokens that we treat like binary operators.
int getCurrentPrecedence() { int getCurrentPrecedence() {
if (Current) { if (Current) {
const FormatToken *NextNonComment = Current->getNextNonComment(); const FormatToken *NextNonComment = Current->getNextNonComment();
if (Current->is(TT_ConditionalExpr)) if (Current->is(TT_ConditionalExpr))
return prec::Conditional; return prec::Conditional;
if (NextNonComment && NextNonComment->is(tok::colon) && if (NextNonComment && Current->is(TT_SelectorName) &&
NextNonComment->is(TT_DictLiteral)) NextNonComment->is(TT_DictLiteral))
return prec::Assignment; return prec::Assignment;
if (Current->is(TT_JsComputedPropertyName)) if (Current->is(TT_JsComputedPropertyName))
return prec::Assignment; return prec::Assignment;
if (Current->is(TT_LambdaArrow)) if (Current->is(TT_LambdaArrow))
return prec::Comma; return prec::Comma;
if (Current->is(TT_JsFatArrow)) if (Current->is(TT_JsFatArrow))
return prec::Assignment; return prec::Assignment;
▲ Show 20 Lines • Show All 1,228 Lines • Show Last 20 Lines

unittests/Format/FormatTestProto.cpp

Show First 20 Lines • Show All 195 Lines • ▼ Show 20 Lines verifyFormat("option (MyProto.options) = {\n"
" field_b: \"OK\"\n" " field_b: \"OK\"\n"
" field_c: \"OK\"\n" " field_c: \"OK\"\n"
" msg_field: {field_d: 123}\n" " msg_field: {field_d: 123}\n"
"};"); "};");
verifyFormat("option (MyProto.options) = {\n" verifyFormat("option (MyProto.options) = {\n"
" field_c: \"OK\"\n" " field_c: \"OK\"\n"
" msg_field{field_d: 123}\n" " msg_field{field_d: 123}\n"
"};"); "};");
verifyFormat("option (MyProto.options) = {\n"
" field_a: OK\n"
" field_b{field_c: OK}\n"
" field_d: OKOKOK\n"
" field_e: OK\n"
"}");
// Support syntax with <> instead of {}. // Support syntax with <> instead of {}.
verifyFormat("option (MyProto.options) = {\n" verifyFormat("option (MyProto.options) = {\n"
" field_c: \"OK\",\n" " field_c: \"OK\",\n"
" msg_field: <field_d: 123>\n" " msg_field: <field_d: 123>\n"
"};"); "};");
verifyFormat("option (MyProto.options) = {\n" verifyFormat("option (MyProto.options) = {\n"
▲ Show 20 Lines • Show All 172 Lines • Show Last 20 Lines