maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-format: Support function annotations in macros. 

Before:
  DEPRECATED("Use NewClass::NewFunction instead.") string
      OldFunction(const string &parameter) {}

After:
  DEPRECATED("Use NewClass::NewFunction instead.")
  string OldFunction(const string &parameter) {}

llvm-svn: 237562
This commit is contained in:
Daniel Jasper 2015-05-18 09:47:22 +00:00
parent 8fc69dcf42
commit f090f031bc
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clang/lib/Format/ContinuationIndenter.cpp
View File

@ -208,8 +208,13 @@ bool ContinuationIndenter::mustBreak(const LineState &State) {
return true;
if (Current.NestingLevel == 0 && !Current.isTrailingComment()) {
// Always break after "template <...>" and leading annotations. This is only
// for cases where the entire line does not fit on a single line as a
// different LineFormatter would be used otherwise.
if (Previous.ClosesTemplateDeclaration)
return true;
if (Previous.is(TT_FunctionAnnotation) && Previous.is(tok::r_paren))
return true;
if (Previous.is(TT_LeadingJavaAnnotation) && Current.isNot(tok::l_paren) &&
Current.isNot(TT_LeadingJavaAnnotation))
return true;
@ -487,7 +492,8 @@ unsigned ContinuationIndenter::addTokenOnNewLine(LineState &State,
!PreviousNonComment->isOneOf(tok::comma, tok::semi) &&
(PreviousNonComment->isNot(TT_TemplateCloser) ||
Current.NestingLevel != 0) &&
!PreviousNonComment->isOneOf(TT_BinaryOperator, TT_JavaAnnotation,
!PreviousNonComment->isOneOf(TT_BinaryOperator, TT_FunctionAnnotation,
TT_JavaAnnotation,
TT_LeadingJavaAnnotation) &&
Current.isNot(TT_BinaryOperator) && !PreviousNonComment->opensScope())
State.Stack.back().BreakBeforeParameter = true;
@ -568,7 +574,8 @@ unsigned ContinuationIndenter::getNewLineColumn(const LineState &State) {
return State.Stack.back().VariablePos;
if ((PreviousNonComment &&
(PreviousNonComment->ClosesTemplateDeclaration ||
PreviousNonComment->isOneOf(TT_AttributeParen, TT_JavaAnnotation,
PreviousNonComment->isOneOf(TT_AttributeParen, TT_FunctionAnnotation,
TT_JavaAnnotation,
TT_LeadingJavaAnnotation))) ||
(!Style.IndentWrappedFunctionNames &&
NextNonComment->isOneOf(tok::kw_operator, TT_FunctionDeclarationName)))

1
clang/lib/Format/FormatToken.h
View File

@ -42,6 +42,7 @@ enum TokenType {
TT_DesignatedInitializerPeriod,
TT_DictLiteral,
TT_ForEachMacro,
TT_FunctionAnnotation,
TT_FunctionDeclarationName,
TT_FunctionLBrace,
TT_FunctionTypeLParen,

15
clang/lib/Format/TokenAnnotator.cpp
View File

@ -493,7 +493,8 @@ private:
if (Line.MustBeDeclaration && Contexts.size() == 1 &&
!Contexts.back().IsExpression && Line.First->isNot(TT_ObjCProperty) &&
(!Tok->Previous ||
!Tok->Previous->isOneOf(tok::kw_decltype, TT_LeadingJavaAnnotation)))
!Tok->Previous->isOneOf(tok::kw_decltype, TT_LeadingJavaAnnotation,
TT_FunctionAnnotation)))
Line.MightBeFunctionDecl = true;
break;
case tok::l_square:
@ -915,9 +916,16 @@ private:
} else {
Current.Type = TT_LineComment;
}
} else if (Current.is(tok::l_paren) && Current.Previous &&
Current.Previous->is(TT_FunctionAnnotation)) {
Current.Type = TT_FunctionAnnotation;
} else if (Current.is(tok::r_paren)) {
if (rParenEndsCast(Current))
Current.Type = TT_CastRParen;
if (Current.MatchingParen &&
Current.MatchingParen->is(TT_FunctionAnnotation) && Current.Next &&
!Current.Next->isOneOf(tok::semi, tok::colon))
Current.Type = TT_FunctionAnnotation;
} else if (Current.is(tok::at) && Current.Next) {
if (Current.Next->isStringLiteral()) {
Current.Type = TT_ObjCStringLiteral;
@ -968,6 +976,11 @@ private:
TT_LeadingJavaAnnotation)) {
Current.Type = Current.Previous->Type;
}
} else if (Current.is(tok::identifier) &&
Current.TokenText == Current.TokenText.upper() &&
(!Current.Previous ||
Current.Previous->ClosesTemplateDeclaration)) {
Current.Type = TT_FunctionAnnotation;
}
}

8
clang/unittests/Format/FormatTest.cpp
View File

@ -4040,6 +4040,14 @@ TEST_F(FormatTest, BreaksFunctionDeclarationsWithTrailingTokens) {
" aaaaaaaaaaaaaaaaaaaaaaaaa;");
}
TEST_F(FormatTest, FunctionAnnotations) {
verifyFormat("DEPRECATED(\"Use NewClass::NewFunction instead.\")\n"
"string OldFunction(const string &parameter) {}");
verifyFormat("template <typename T>\n"
"DEPRECATED(\"Use NewClass::NewFunction instead.\")\n"
"string OldFunction(const string &parameter) {}");
}
TEST_F(FormatTest, BreaksDesireably) {
verifyFormat("if (aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaa) ||\n"
" aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaa) ||\n"