This is an archive of the discontinued LLVM Phabricator instance.

Differential D70305

clang-format: fix regression in middle pointer alignment
ClosedPublic

Authored by Typz on Nov 15 2019, 5:05 AM.

Details

Reviewers
MyDeveloperDay
klimek
sammccall
Commits
rG5987cc1bb5d5: [clang-format] fix regression in middle pointer alignment
Summary

a75f8d98d7ac introduced a regression with Middle pointer alignment,
which this patch fixes.

Diff Detail

Event Timeline

Typz created this revision.Nov 15 2019, 5:05 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 15 2019, 5:05 AM
Harbormaster completed remote builds in B41017: Diff 229516.Nov 15 2019, 5:06 AM
sammccall accepted this revision.Nov 15 2019, 5:23 AM
This revision is now accepted and ready to land.Nov 15 2019, 5:23 AM
MyDeveloperDay accepted this revision.Nov 15 2019, 7:04 AM
Closed by commit rG5987cc1bb5d5: [clang-format] fix regression in middle pointer alignment (authored by MyDeveloperDay). · Explain WhyNov 16 2019, 6:39 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Format/
2 lines
unittests/
Format/
22 lines

Diff 229691

clang/lib/Format/TokenAnnotator.cpp

Show First 20 Lines • Show All 2,688 Lines • ▼ Show 20 Linesbool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
if (Right.is(tok::star) && Left.is(tok::l_paren)) if (Right.is(tok::star) && Left.is(tok::l_paren))
return false; return false;
if (Right.isOneOf(tok::star, tok::amp, tok::ampamp) && if (Right.isOneOf(tok::star, tok::amp, tok::ampamp) &&
(Left.is(tok::identifier) || Left.isSimpleTypeSpecifier()) && (Left.is(tok::identifier) || Left.isSimpleTypeSpecifier()) &&
Left.Previous && Left.Previous->is(tok::kw_operator)) Left.Previous && Left.Previous->is(tok::kw_operator))
// Space between the type and the * // Space between the type and the *
// operator void*(), operator char*(), operator Foo*() dependant // operator void*(), operator char*(), operator Foo*() dependant
// on PointerAlignment style. // on PointerAlignment style.
return (Style.PointerAlignment == FormatStyle::PAS_Right); return (Style.PointerAlignment != FormatStyle::PAS_Left);
const auto SpaceRequiredForArrayInitializerLSquare = const auto SpaceRequiredForArrayInitializerLSquare =
[](const FormatToken &LSquareTok, const FormatStyle &Style) { [](const FormatToken &LSquareTok, const FormatStyle &Style) {
return Style.SpacesInContainerLiterals || return Style.SpacesInContainerLiterals ||
((Style.Language == FormatStyle::LK_Proto || ((Style.Language == FormatStyle::LK_Proto ||
Style.Language == FormatStyle::LK_TextProto) && Style.Language == FormatStyle::LK_TextProto) &&
!Style.Cpp11BracedListStyle && !Style.Cpp11BracedListStyle &&
LSquareTok.endsSequence(tok::l_square, tok::colon, LSquareTok.endsSequence(tok::l_square, tok::colon,
TT_SelectorName)); TT_SelectorName));
▲ Show 20 Lines • Show All 953 Lines • Show Last 20 Lines

clang/unittests/Format/FormatTest.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 14,964 Lines • ▼ Show 20 LinesTEST_F(FormatTest, OperatorSpacing) {
verifyFormat("operator&(int (&)(), class Foo);", Style); verifyFormat("operator&(int (&)(), class Foo);", Style);
verifyFormat("Foo::operator&&();", Style); verifyFormat("Foo::operator&&();", Style);
verifyFormat("Foo::operator void&&();", Style); verifyFormat("Foo::operator void&&();", Style);
verifyFormat("Foo::operator()(void&&);", Style); verifyFormat("Foo::operator()(void&&);", Style);
verifyFormat("Foo::operator&&(void&&);", Style); verifyFormat("Foo::operator&&(void&&);", Style);
verifyFormat("Foo::operator&&();", Style); verifyFormat("Foo::operator&&();", Style);
verifyFormat("operator&&(int(&&)(), class Foo);", Style); verifyFormat("operator&&(int(&&)(), class Foo);", Style);
Style.PointerAlignment = FormatStyle::PAS_Middle;
verifyFormat("Foo::operator*();", Style);
verifyFormat("Foo::operator void *();", Style);
verifyFormat("Foo::operator()(void *);", Style);
verifyFormat("Foo::operator*(void *);", Style);
verifyFormat("Foo::operator*();", Style);
verifyFormat("operator*(int (*)(), class Foo);", Style);
verifyFormat("Foo::operator&();", Style);
verifyFormat("Foo::operator void &();", Style);
verifyFormat("Foo::operator()(void &);", Style);
verifyFormat("Foo::operator&(void &);", Style);
verifyFormat("Foo::operator&();", Style);
verifyFormat("operator&(int (&)(), class Foo);", Style);
verifyFormat("Foo::operator&&();", Style);
verifyFormat("Foo::operator void &&();", Style);
verifyFormat("Foo::operator()(void &&);", Style);
verifyFormat("Foo::operator&&(void &&);", Style);
verifyFormat("Foo::operator&&();", Style);
verifyFormat("operator&&(int(&&)(), class Foo);", Style);
} }
} // namespace } // namespace
} // namespace format } // namespace format
} // namespace clang } // namespace clang