2013-08-16 19:20:30 +08:00
|
|
|
//===--- ContinuationIndenter.cpp - Format C++ code -----------------------===//
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
///
|
|
|
|
/// \file
|
|
|
|
/// \brief This file implements the continuation indenter.
|
|
|
|
///
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#define DEBUG_TYPE "format-formatter"
|
|
|
|
|
|
|
|
#include "BreakableToken.h"
|
|
|
|
#include "ContinuationIndenter.h"
|
|
|
|
#include "WhitespaceManager.h"
|
|
|
|
#include "clang/Basic/OperatorPrecedence.h"
|
|
|
|
#include "clang/Basic/SourceManager.h"
|
|
|
|
#include "clang/Format/Format.h"
|
|
|
|
#include "llvm/Support/Debug.h"
|
|
|
|
#include <string>
|
|
|
|
|
|
|
|
namespace clang {
|
|
|
|
namespace format {
|
|
|
|
|
|
|
|
// Returns the length of everything up to the first possible line break after
|
|
|
|
// the ), ], } or > matching \c Tok.
|
|
|
|
static unsigned getLengthToMatchingParen(const FormatToken &Tok) {
|
|
|
|
if (Tok.MatchingParen == NULL)
|
|
|
|
return 0;
|
|
|
|
FormatToken *End = Tok.MatchingParen;
|
|
|
|
while (End->Next && !End->Next->CanBreakBefore) {
|
|
|
|
End = End->Next;
|
|
|
|
}
|
|
|
|
return End->TotalLength - Tok.TotalLength + 1;
|
|
|
|
}
|
|
|
|
|
clang-format: Format segments of builder-type calls one per line.
This fixes llvm.org/PR14818.
Before:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT).StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH).Default(ORDER_TEXT);
After:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT)
.StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH)
.Default(ORDER_TEXT);
llvm-svn: 189353
2013-08-27 22:24:43 +08:00
|
|
|
// Returns \c true if \c Tok is the "." or "->" of a call and starts the next
|
|
|
|
// segment of a builder type call.
|
|
|
|
static bool startsSegmentOfBuilderTypeCall(const FormatToken &Tok) {
|
|
|
|
return Tok.isMemberAccess() && Tok.Previous && Tok.Previous->closesScope();
|
|
|
|
}
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
ContinuationIndenter::ContinuationIndenter(const FormatStyle &Style,
|
|
|
|
SourceManager &SourceMgr,
|
|
|
|
WhitespaceManager &Whitespaces,
|
|
|
|
encoding::Encoding Encoding,
|
|
|
|
bool BinPackInconclusiveFunctions)
|
2013-09-05 17:29:45 +08:00
|
|
|
: Style(Style), SourceMgr(SourceMgr), Whitespaces(Whitespaces),
|
|
|
|
Encoding(Encoding),
|
2013-08-16 19:20:30 +08:00
|
|
|
BinPackInconclusiveFunctions(BinPackInconclusiveFunctions) {}
|
|
|
|
|
2013-09-05 17:29:45 +08:00
|
|
|
LineState ContinuationIndenter::getInitialState(unsigned FirstIndent,
|
2013-09-06 15:54:20 +08:00
|
|
|
const AnnotatedLine *Line,
|
|
|
|
bool DryRun) {
|
2013-08-16 19:20:30 +08:00
|
|
|
LineState State;
|
2013-09-05 17:29:45 +08:00
|
|
|
State.FirstIndent = FirstIndent;
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Column = FirstIndent;
|
2013-09-05 17:29:45 +08:00
|
|
|
State.Line = Line;
|
|
|
|
State.NextToken = Line->First;
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.push_back(ParenState(FirstIndent, FirstIndent,
|
|
|
|
/*AvoidBinPacking=*/false,
|
|
|
|
/*NoLineBreak=*/false));
|
|
|
|
State.LineContainsContinuedForLoopSection = false;
|
|
|
|
State.ParenLevel = 0;
|
|
|
|
State.StartOfStringLiteral = 0;
|
|
|
|
State.StartOfLineLevel = State.ParenLevel;
|
|
|
|
State.LowestLevelOnLine = State.ParenLevel;
|
|
|
|
State.IgnoreStackForComparison = false;
|
|
|
|
|
|
|
|
// The first token has already been indented and thus consumed.
|
2013-09-06 15:54:20 +08:00
|
|
|
moveStateToNextToken(State, DryRun, /*Newline=*/false);
|
2013-08-16 19:20:30 +08:00
|
|
|
return State;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool ContinuationIndenter::canBreak(const LineState &State) {
|
|
|
|
const FormatToken &Current = *State.NextToken;
|
|
|
|
const FormatToken &Previous = *Current.Previous;
|
|
|
|
assert(&Previous == Current.Previous);
|
|
|
|
if (!Current.CanBreakBefore &&
|
|
|
|
!(Current.is(tok::r_brace) && State.Stack.back().BreakBeforeClosingBrace))
|
|
|
|
return false;
|
|
|
|
// The opening "{" of a braced list has to be on the same line as the first
|
|
|
|
// element if it is nested in another braced init list or function call.
|
|
|
|
if (!Current.MustBreakBefore && Previous.is(tok::l_brace) &&
|
2013-09-05 17:29:45 +08:00
|
|
|
Previous.BlockKind == BK_BracedInit && Previous.Previous &&
|
2013-08-16 19:20:30 +08:00
|
|
|
Previous.Previous->isOneOf(tok::l_brace, tok::l_paren, tok::comma))
|
|
|
|
return false;
|
|
|
|
// This prevents breaks like:
|
|
|
|
// ...
|
|
|
|
// SomeParameter, OtherParameter).DoSomething(
|
|
|
|
// ...
|
|
|
|
// As they hide "DoSomething" and are generally bad for readability.
|
|
|
|
if (Previous.opensScope() && State.LowestLevelOnLine < State.StartOfLineLevel)
|
|
|
|
return false;
|
clang-format: Format segments of builder-type calls one per line.
This fixes llvm.org/PR14818.
Before:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT).StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH).Default(ORDER_TEXT);
After:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT)
.StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH)
.Default(ORDER_TEXT);
llvm-svn: 189353
2013-08-27 22:24:43 +08:00
|
|
|
if (Current.isMemberAccess() && State.Stack.back().ContainsUnwrappedBuilder)
|
|
|
|
return false;
|
2013-08-16 19:20:30 +08:00
|
|
|
return !State.Stack.back().NoLineBreak;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool ContinuationIndenter::mustBreak(const LineState &State) {
|
|
|
|
const FormatToken &Current = *State.NextToken;
|
|
|
|
const FormatToken &Previous = *Current.Previous;
|
|
|
|
if (Current.MustBreakBefore || Current.Type == TT_InlineASMColon)
|
|
|
|
return true;
|
|
|
|
if (!Style.Cpp11BracedListStyle && Current.is(tok::r_brace) &&
|
|
|
|
State.Stack.back().BreakBeforeClosingBrace)
|
|
|
|
return true;
|
|
|
|
if (Previous.is(tok::semi) && State.LineContainsContinuedForLoopSection)
|
|
|
|
return true;
|
|
|
|
if (Style.BreakConstructorInitializersBeforeComma) {
|
|
|
|
if (Previous.Type == TT_CtorInitializerComma)
|
|
|
|
return false;
|
|
|
|
if (Current.Type == TT_CtorInitializerComma)
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if ((Previous.isOneOf(tok::comma, tok::semi) || Current.is(tok::question) ||
|
|
|
|
(Current.Type == TT_ConditionalExpr &&
|
|
|
|
!(Current.is(tok::colon) && Previous.is(tok::question)))) &&
|
|
|
|
State.Stack.back().BreakBeforeParameter && !Current.isTrailingComment() &&
|
|
|
|
!Current.isOneOf(tok::r_paren, tok::r_brace))
|
|
|
|
return true;
|
|
|
|
if (Style.AlwaysBreakBeforeMultilineStrings &&
|
2013-08-23 19:57:34 +08:00
|
|
|
State.Column > State.Stack.back().Indent && // Breaking saves columns.
|
|
|
|
Previous.isNot(tok::lessless) && Previous.Type != TT_InlineASMColon &&
|
|
|
|
NextIsMultilineString(State))
|
2013-08-16 19:20:30 +08:00
|
|
|
return true;
|
|
|
|
|
|
|
|
if (!Style.BreakBeforeBinaryOperators) {
|
|
|
|
// If we need to break somewhere inside the LHS of a binary expression, we
|
|
|
|
// should also break after the operator. Otherwise, the formatting would
|
|
|
|
// hide the operator precedence, e.g. in:
|
|
|
|
// if (aaaaaaaaaaaaaa ==
|
|
|
|
// bbbbbbbbbbbbbb && c) {..
|
|
|
|
// For comparisons, we only apply this rule, if the LHS is a binary
|
|
|
|
// expression itself as otherwise, the line breaks seem superfluous.
|
|
|
|
// We need special cases for ">>" which we have split into two ">" while
|
|
|
|
// lexing in order to make template parsing easier.
|
|
|
|
//
|
|
|
|
// FIXME: We'll need something similar for styles that break before binary
|
|
|
|
// operators.
|
|
|
|
bool IsComparison = (Previous.getPrecedence() == prec::Relational ||
|
|
|
|
Previous.getPrecedence() == prec::Equality) &&
|
|
|
|
Previous.Previous &&
|
|
|
|
Previous.Previous->Type != TT_BinaryOperator; // For >>.
|
|
|
|
bool LHSIsBinaryExpr =
|
2013-09-06 16:08:14 +08:00
|
|
|
Previous.Previous && Previous.Previous->EndsBinaryExpression;
|
2013-08-16 19:20:30 +08:00
|
|
|
if (Previous.Type == TT_BinaryOperator &&
|
|
|
|
(!IsComparison || LHSIsBinaryExpr) &&
|
|
|
|
Current.Type != TT_BinaryOperator && // For >>.
|
|
|
|
!Current.isTrailingComment() &&
|
|
|
|
!Previous.isOneOf(tok::lessless, tok::question) &&
|
|
|
|
Previous.getPrecedence() != prec::Assignment &&
|
|
|
|
State.Stack.back().BreakBeforeParameter)
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Same as above, but for the first "<<" operator.
|
|
|
|
if (Current.is(tok::lessless) && State.Stack.back().BreakBeforeParameter &&
|
|
|
|
State.Stack.back().FirstLessLess == 0)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
// FIXME: Comparing LongestObjCSelectorName to 0 is a hacky way of finding
|
|
|
|
// out whether it is the first parameter. Clean this up.
|
|
|
|
if (Current.Type == TT_ObjCSelectorName &&
|
|
|
|
Current.LongestObjCSelectorName == 0 &&
|
|
|
|
State.Stack.back().BreakBeforeParameter)
|
|
|
|
return true;
|
|
|
|
if ((Current.Type == TT_CtorInitializerColon ||
|
|
|
|
(Previous.ClosesTemplateDeclaration && State.ParenLevel == 0)))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if ((Current.Type == TT_StartOfName || Current.is(tok::kw_operator)) &&
|
2013-09-05 17:29:45 +08:00
|
|
|
State.Line->MightBeFunctionDecl &&
|
|
|
|
State.Stack.back().BreakBeforeParameter && State.ParenLevel == 0)
|
2013-08-16 19:20:30 +08:00
|
|
|
return true;
|
clang-format: Format segments of builder-type calls one per line.
This fixes llvm.org/PR14818.
Before:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT).StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH).Default(ORDER_TEXT);
After:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT)
.StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH)
.Default(ORDER_TEXT);
llvm-svn: 189353
2013-08-27 22:24:43 +08:00
|
|
|
if (startsSegmentOfBuilderTypeCall(Current) &&
|
2013-08-30 15:12:40 +08:00
|
|
|
(State.Stack.back().CallContinuation != 0 ||
|
|
|
|
(State.Stack.back().BreakBeforeParameter &&
|
|
|
|
State.Stack.back().ContainsUnwrappedBuilder)))
|
clang-format: Format segments of builder-type calls one per line.
This fixes llvm.org/PR14818.
Before:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT).StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH).Default(ORDER_TEXT);
After:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT)
.StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH)
.Default(ORDER_TEXT);
llvm-svn: 189353
2013-08-27 22:24:43 +08:00
|
|
|
return true;
|
2013-08-16 19:20:30 +08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned ContinuationIndenter::addTokenToState(LineState &State, bool Newline,
|
clang-format: Add column layout formatting for braced lists
With this patch, braced lists (with more than 3 elements are formatted in a
column layout if possible). E.g.:
static const uint16_t CallerSavedRegs64Bit[] = {
X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,
X86::R8, X86::R9, X86::R10, X86::R11, 0
};
Required other changes:
- FormatTokens can now have a special role that contains extra data and can do
special formattings. A comma separated list is currently the only
implementation.
- Move penalty calculation entirely into ContinuationIndenter (there was a last
piece still in UnwrappedLineFormatter).
Review: http://llvm-reviews.chandlerc.com/D1457
llvm-svn: 189018
2013-08-22 23:00:41 +08:00
|
|
|
bool DryRun,
|
|
|
|
unsigned ExtraSpaces) {
|
2013-08-16 19:20:30 +08:00
|
|
|
const FormatToken &Current = *State.NextToken;
|
|
|
|
const FormatToken &Previous = *State.NextToken->Previous;
|
|
|
|
|
|
|
|
// Extra penalty that needs to be added because of the way certain line
|
|
|
|
// breaks are chosen.
|
clang-format: Add column layout formatting for braced lists
With this patch, braced lists (with more than 3 elements are formatted in a
column layout if possible). E.g.:
static const uint16_t CallerSavedRegs64Bit[] = {
X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,
X86::R8, X86::R9, X86::R10, X86::R11, 0
};
Required other changes:
- FormatTokens can now have a special role that contains extra data and can do
special formattings. A comma separated list is currently the only
implementation.
- Move penalty calculation entirely into ContinuationIndenter (there was a last
piece still in UnwrappedLineFormatter).
Review: http://llvm-reviews.chandlerc.com/D1457
llvm-svn: 189018
2013-08-22 23:00:41 +08:00
|
|
|
unsigned Penalty = 0;
|
2013-08-16 19:20:30 +08:00
|
|
|
|
|
|
|
if (State.Stack.size() == 0 || Current.Type == TT_ImplicitStringLiteral) {
|
|
|
|
// FIXME: Is this correct?
|
|
|
|
int WhitespaceLength = SourceMgr.getSpellingColumnNumber(
|
|
|
|
State.NextToken->WhitespaceRange.getEnd()) -
|
|
|
|
SourceMgr.getSpellingColumnNumber(
|
|
|
|
State.NextToken->WhitespaceRange.getBegin());
|
|
|
|
State.Column += WhitespaceLength + State.NextToken->CodePointCount;
|
|
|
|
State.NextToken = State.NextToken->Next;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we are continuing an expression, we want to indent an extra 4 spaces.
|
|
|
|
unsigned ContinuationIndent =
|
|
|
|
std::max(State.Stack.back().LastSpace, State.Stack.back().Indent) + 4;
|
|
|
|
if (Newline) {
|
clang-format: Add column layout formatting for braced lists
With this patch, braced lists (with more than 3 elements are formatted in a
column layout if possible). E.g.:
static const uint16_t CallerSavedRegs64Bit[] = {
X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,
X86::R8, X86::R9, X86::R10, X86::R11, 0
};
Required other changes:
- FormatTokens can now have a special role that contains extra data and can do
special formattings. A comma separated list is currently the only
implementation.
- Move penalty calculation entirely into ContinuationIndenter (there was a last
piece still in UnwrappedLineFormatter).
Review: http://llvm-reviews.chandlerc.com/D1457
llvm-svn: 189018
2013-08-22 23:00:41 +08:00
|
|
|
// The first line break on any ParenLevel causes an extra penalty in order
|
|
|
|
// prefer similar line breaks.
|
|
|
|
if (!State.Stack.back().ContainsLineBreak)
|
|
|
|
Penalty += 15;
|
|
|
|
State.Stack.back().ContainsLineBreak = true;
|
|
|
|
|
|
|
|
Penalty += State.NextToken->SplitPenalty;
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
// Breaking before the first "<<" is generally not desirable if the LHS is
|
|
|
|
// short.
|
|
|
|
if (Current.is(tok::lessless) && State.Stack.back().FirstLessLess == 0 &&
|
|
|
|
State.Column <= Style.ColumnLimit / 2)
|
clang-format: Add column layout formatting for braced lists
With this patch, braced lists (with more than 3 elements are formatted in a
column layout if possible). E.g.:
static const uint16_t CallerSavedRegs64Bit[] = {
X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,
X86::R8, X86::R9, X86::R10, X86::R11, 0
};
Required other changes:
- FormatTokens can now have a special role that contains extra data and can do
special formattings. A comma separated list is currently the only
implementation.
- Move penalty calculation entirely into ContinuationIndenter (there was a last
piece still in UnwrappedLineFormatter).
Review: http://llvm-reviews.chandlerc.com/D1457
llvm-svn: 189018
2013-08-22 23:00:41 +08:00
|
|
|
Penalty += Style.PenaltyBreakFirstLessLess;
|
2013-08-16 19:20:30 +08:00
|
|
|
|
|
|
|
if (Current.is(tok::r_brace)) {
|
2013-09-07 05:46:41 +08:00
|
|
|
if (Current.MatchingParen &&
|
|
|
|
(Current.MatchingParen->BlockKind == BK_BracedInit ||
|
|
|
|
!Current.MatchingParen->Children.empty()))
|
|
|
|
State.Column = State.Stack[State.Stack.size() - 2].LastSpace;
|
|
|
|
else
|
|
|
|
State.Column = State.FirstIndent;
|
2013-08-16 19:20:30 +08:00
|
|
|
} else if (Current.is(tok::string_literal) &&
|
|
|
|
State.StartOfStringLiteral != 0) {
|
|
|
|
State.Column = State.StartOfStringLiteral;
|
|
|
|
State.Stack.back().BreakBeforeParameter = true;
|
|
|
|
} else if (Current.is(tok::lessless) &&
|
|
|
|
State.Stack.back().FirstLessLess != 0) {
|
|
|
|
State.Column = State.Stack.back().FirstLessLess;
|
clang-format: Format segments of builder-type calls one per line.
This fixes llvm.org/PR14818.
Before:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT).StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH).Default(ORDER_TEXT);
After:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT)
.StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH)
.Default(ORDER_TEXT);
llvm-svn: 189353
2013-08-27 22:24:43 +08:00
|
|
|
} else if (Current.isMemberAccess()) {
|
2013-08-16 19:20:30 +08:00
|
|
|
if (State.Stack.back().CallContinuation == 0) {
|
|
|
|
State.Column = ContinuationIndent;
|
|
|
|
State.Stack.back().CallContinuation = State.Column;
|
|
|
|
} else {
|
|
|
|
State.Column = State.Stack.back().CallContinuation;
|
|
|
|
}
|
|
|
|
} else if (Current.Type == TT_ConditionalExpr) {
|
|
|
|
State.Column = State.Stack.back().QuestionColumn;
|
|
|
|
} else if (Previous.is(tok::comma) && State.Stack.back().VariablePos != 0) {
|
|
|
|
State.Column = State.Stack.back().VariablePos;
|
|
|
|
} else if (Previous.ClosesTemplateDeclaration ||
|
|
|
|
((Current.Type == TT_StartOfName ||
|
|
|
|
Current.is(tok::kw_operator)) &&
|
|
|
|
State.ParenLevel == 0 &&
|
|
|
|
(!Style.IndentFunctionDeclarationAfterType ||
|
2013-09-05 17:29:45 +08:00
|
|
|
State.Line->StartsDefinition))) {
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Column = State.Stack.back().Indent;
|
|
|
|
} else if (Current.Type == TT_ObjCSelectorName) {
|
|
|
|
if (State.Stack.back().ColonPos > Current.CodePointCount) {
|
|
|
|
State.Column = State.Stack.back().ColonPos - Current.CodePointCount;
|
|
|
|
} else {
|
|
|
|
State.Column = State.Stack.back().Indent;
|
|
|
|
State.Stack.back().ColonPos = State.Column + Current.CodePointCount;
|
|
|
|
}
|
2013-09-05 18:04:31 +08:00
|
|
|
} else if (Current.is(tok::l_square) && Current.Type != TT_ObjCMethodExpr &&
|
|
|
|
Current.Type != TT_LambdaLSquare) {
|
2013-08-16 19:20:30 +08:00
|
|
|
if (State.Stack.back().StartOfArraySubscripts != 0)
|
|
|
|
State.Column = State.Stack.back().StartOfArraySubscripts;
|
|
|
|
else
|
|
|
|
State.Column = ContinuationIndent;
|
|
|
|
} else if (Current.Type == TT_StartOfName ||
|
|
|
|
Previous.isOneOf(tok::coloncolon, tok::equal) ||
|
|
|
|
Previous.Type == TT_ObjCMethodExpr) {
|
|
|
|
State.Column = ContinuationIndent;
|
|
|
|
} else if (Current.Type == TT_CtorInitializerColon) {
|
2013-09-05 17:29:45 +08:00
|
|
|
State.Column =
|
|
|
|
State.FirstIndent + Style.ConstructorInitializerIndentWidth;
|
2013-08-16 19:20:30 +08:00
|
|
|
} else if (Current.Type == TT_CtorInitializerComma) {
|
|
|
|
State.Column = State.Stack.back().Indent;
|
|
|
|
} else {
|
|
|
|
State.Column = State.Stack.back().Indent;
|
|
|
|
// Ensure that we fall back to indenting 4 spaces instead of just
|
|
|
|
// flushing continuations left.
|
2013-09-05 17:29:45 +08:00
|
|
|
if (State.Column == State.FirstIndent)
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Column += 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Current.is(tok::question))
|
|
|
|
State.Stack.back().BreakBeforeParameter = true;
|
|
|
|
if ((Previous.isOneOf(tok::comma, tok::semi) &&
|
|
|
|
!State.Stack.back().AvoidBinPacking) ||
|
|
|
|
Previous.Type == TT_BinaryOperator)
|
|
|
|
State.Stack.back().BreakBeforeParameter = false;
|
|
|
|
if (Previous.Type == TT_TemplateCloser && State.ParenLevel == 0)
|
|
|
|
State.Stack.back().BreakBeforeParameter = false;
|
|
|
|
|
|
|
|
if (!DryRun) {
|
|
|
|
unsigned NewLines = 1;
|
|
|
|
if (Current.is(tok::comment))
|
|
|
|
NewLines = std::max(NewLines, std::min(Current.NewlinesBefore,
|
|
|
|
Style.MaxEmptyLinesToKeep + 1));
|
|
|
|
Whitespaces.replaceWhitespace(Current, NewLines, State.Column,
|
2013-09-05 17:29:45 +08:00
|
|
|
State.Column, State.Line->InPPDirective);
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!Current.isTrailingComment())
|
|
|
|
State.Stack.back().LastSpace = State.Column;
|
clang-format: Format segments of builder-type calls one per line.
This fixes llvm.org/PR14818.
Before:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT).StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH).Default(ORDER_TEXT);
After:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT)
.StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH)
.Default(ORDER_TEXT);
llvm-svn: 189353
2013-08-27 22:24:43 +08:00
|
|
|
if (Current.isMemberAccess())
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().LastSpace += Current.CodePointCount;
|
|
|
|
State.StartOfLineLevel = State.ParenLevel;
|
|
|
|
State.LowestLevelOnLine = State.ParenLevel;
|
|
|
|
|
|
|
|
// Any break on this level means that the parent level has been broken
|
|
|
|
// and we need to avoid bin packing there.
|
|
|
|
for (unsigned i = 0, e = State.Stack.size() - 1; i != e; ++i) {
|
|
|
|
State.Stack[i].BreakBeforeParameter = true;
|
|
|
|
}
|
|
|
|
const FormatToken *TokenBefore = Current.getPreviousNonComment();
|
|
|
|
if (TokenBefore && !TokenBefore->isOneOf(tok::comma, tok::semi) &&
|
|
|
|
TokenBefore->Type != TT_TemplateCloser &&
|
|
|
|
TokenBefore->Type != TT_BinaryOperator && !TokenBefore->opensScope())
|
|
|
|
State.Stack.back().BreakBeforeParameter = true;
|
|
|
|
|
|
|
|
// If we break after {, we should also break before the corresponding }.
|
|
|
|
if (Previous.is(tok::l_brace))
|
|
|
|
State.Stack.back().BreakBeforeClosingBrace = true;
|
|
|
|
|
|
|
|
if (State.Stack.back().AvoidBinPacking) {
|
|
|
|
// If we are breaking after '(', '{', '<', this is not bin packing
|
|
|
|
// unless AllowAllParametersOfDeclarationOnNextLine is false.
|
|
|
|
if (!(Previous.isOneOf(tok::l_paren, tok::l_brace) ||
|
|
|
|
Previous.Type == TT_BinaryOperator) ||
|
|
|
|
(!Style.AllowAllParametersOfDeclarationOnNextLine &&
|
2013-09-05 17:29:45 +08:00
|
|
|
State.Line->MustBeDeclaration))
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
if (Current.is(tok::equal) &&
|
2013-09-05 17:29:45 +08:00
|
|
|
(State.Line->First->is(tok::kw_for) || State.ParenLevel == 0) &&
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().VariablePos == 0) {
|
|
|
|
State.Stack.back().VariablePos = State.Column;
|
|
|
|
// Move over * and & if they are bound to the variable name.
|
|
|
|
const FormatToken *Tok = &Previous;
|
|
|
|
while (Tok && State.Stack.back().VariablePos >= Tok->CodePointCount) {
|
|
|
|
State.Stack.back().VariablePos -= Tok->CodePointCount;
|
|
|
|
if (Tok->SpacesRequiredBefore != 0)
|
|
|
|
break;
|
|
|
|
Tok = Tok->Previous;
|
|
|
|
}
|
|
|
|
if (Previous.PartOfMultiVariableDeclStmt)
|
|
|
|
State.Stack.back().LastSpace = State.Stack.back().VariablePos;
|
|
|
|
}
|
|
|
|
|
clang-format: Add column layout formatting for braced lists
With this patch, braced lists (with more than 3 elements are formatted in a
column layout if possible). E.g.:
static const uint16_t CallerSavedRegs64Bit[] = {
X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,
X86::R8, X86::R9, X86::R10, X86::R11, 0
};
Required other changes:
- FormatTokens can now have a special role that contains extra data and can do
special formattings. A comma separated list is currently the only
implementation.
- Move penalty calculation entirely into ContinuationIndenter (there was a last
piece still in UnwrappedLineFormatter).
Review: http://llvm-reviews.chandlerc.com/D1457
llvm-svn: 189018
2013-08-22 23:00:41 +08:00
|
|
|
unsigned Spaces = State.NextToken->SpacesRequiredBefore + ExtraSpaces;
|
2013-08-16 19:20:30 +08:00
|
|
|
|
|
|
|
if (!DryRun)
|
|
|
|
Whitespaces.replaceWhitespace(Current, 0, Spaces, State.Column + Spaces);
|
|
|
|
|
|
|
|
if (Current.Type == TT_ObjCSelectorName &&
|
|
|
|
State.Stack.back().ColonPos == 0) {
|
|
|
|
if (State.Stack.back().Indent + Current.LongestObjCSelectorName >
|
|
|
|
State.Column + Spaces + Current.CodePointCount)
|
|
|
|
State.Stack.back().ColonPos =
|
|
|
|
State.Stack.back().Indent + Current.LongestObjCSelectorName;
|
|
|
|
else
|
|
|
|
State.Stack.back().ColonPos =
|
|
|
|
State.Column + Spaces + Current.CodePointCount;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Previous.opensScope() && Previous.Type != TT_ObjCMethodExpr &&
|
|
|
|
Current.Type != TT_LineComment)
|
|
|
|
State.Stack.back().Indent = State.Column + Spaces;
|
|
|
|
if (Previous.is(tok::comma) && !Current.isTrailingComment() &&
|
|
|
|
State.Stack.back().AvoidBinPacking)
|
|
|
|
State.Stack.back().NoLineBreak = true;
|
clang-format: Format segments of builder-type calls one per line.
This fixes llvm.org/PR14818.
Before:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT).StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH).Default(ORDER_TEXT);
After:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT)
.StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH)
.Default(ORDER_TEXT);
llvm-svn: 189353
2013-08-27 22:24:43 +08:00
|
|
|
if (startsSegmentOfBuilderTypeCall(Current))
|
|
|
|
State.Stack.back().ContainsUnwrappedBuilder = true;
|
2013-08-16 19:20:30 +08:00
|
|
|
|
|
|
|
State.Column += Spaces;
|
|
|
|
if (Current.is(tok::l_paren) && Previous.isOneOf(tok::kw_if, tok::kw_for))
|
|
|
|
// Treat the condition inside an if as if it was a second function
|
|
|
|
// parameter, i.e. let nested calls have an indent of 4.
|
|
|
|
State.Stack.back().LastSpace = State.Column + 1; // 1 is length of "(".
|
|
|
|
else if (Previous.is(tok::comma))
|
|
|
|
State.Stack.back().LastSpace = State.Column;
|
|
|
|
else if ((Previous.Type == TT_BinaryOperator ||
|
|
|
|
Previous.Type == TT_ConditionalExpr ||
|
2013-08-21 16:39:01 +08:00
|
|
|
Previous.Type == TT_UnaryOperator ||
|
2013-08-16 19:20:30 +08:00
|
|
|
Previous.Type == TT_CtorInitializerColon) &&
|
clang-format: Revamp builder-type call formatting.
Previously builder-type calls were only correctly recognized in
top-level calls.
This fixes llvm.org/PR16981.
Before:
someobj->Add((new util::filetools::Handler(dir))->OnEvent1(
NewPermanentCallback(this, &HandlerHolderClass::EventHandlerCBA))
->OnEvent2(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBB))
->OnEvent3(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBC))
->OnEvent5(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBD))
->OnEvent6(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBE)));
After:
someobj->Add((new util::filetools::Handler(dir))
->OnEvent1(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBA))
->OnEvent2(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBB))
->OnEvent3(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBC))
->OnEvent5(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBD))
->OnEvent6(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBE)));
llvm-svn: 189337
2013-08-27 19:09:05 +08:00
|
|
|
(Previous.getPrecedence() != prec::Assignment ||
|
2013-09-06 16:08:14 +08:00
|
|
|
Current.StartsBinaryExpression))
|
2013-08-16 19:20:30 +08:00
|
|
|
// Always indent relative to the RHS of the expression unless this is a
|
2013-08-21 16:39:01 +08:00
|
|
|
// simple assignment without binary expression on the RHS. Also indent
|
|
|
|
// relative to unary operators and the colons of constructor initializers.
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().LastSpace = State.Column;
|
|
|
|
else if (Previous.Type == TT_InheritanceColon)
|
|
|
|
State.Stack.back().Indent = State.Column;
|
|
|
|
else if (Previous.opensScope()) {
|
2013-09-05 17:29:45 +08:00
|
|
|
// If a function has a trailing call, indent all parameters from the
|
|
|
|
// opening parenthesis. This avoids confusing indents like:
|
|
|
|
// OuterFunction(InnerFunctionCall( // break
|
|
|
|
// ParameterToInnerFunction)) // break
|
|
|
|
// .SecondInnerFunctionCall();
|
2013-08-16 19:20:30 +08:00
|
|
|
bool HasTrailingCall = false;
|
|
|
|
if (Previous.MatchingParen) {
|
|
|
|
const FormatToken *Next = Previous.MatchingParen->getNextNonComment();
|
clang-format: Format segments of builder-type calls one per line.
This fixes llvm.org/PR14818.
Before:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT).StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH).Default(ORDER_TEXT);
After:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT)
.StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH)
.Default(ORDER_TEXT);
llvm-svn: 189353
2013-08-27 22:24:43 +08:00
|
|
|
HasTrailingCall = Next && Next->isMemberAccess();
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
2013-09-05 17:29:45 +08:00
|
|
|
if (HasTrailingCall &&
|
|
|
|
State.Stack[State.Stack.size() - 2].CallContinuation == 0)
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().LastSpace = State.Column;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
clang-format: Add column layout formatting for braced lists
With this patch, braced lists (with more than 3 elements are formatted in a
column layout if possible). E.g.:
static const uint16_t CallerSavedRegs64Bit[] = {
X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,
X86::R8, X86::R9, X86::R10, X86::R11, 0
};
Required other changes:
- FormatTokens can now have a special role that contains extra data and can do
special formattings. A comma separated list is currently the only
implementation.
- Move penalty calculation entirely into ContinuationIndenter (there was a last
piece still in UnwrappedLineFormatter).
Review: http://llvm-reviews.chandlerc.com/D1457
llvm-svn: 189018
2013-08-22 23:00:41 +08:00
|
|
|
return moveStateToNextToken(State, DryRun, Newline) + Penalty;
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
unsigned ContinuationIndenter::moveStateToNextToken(LineState &State,
|
|
|
|
bool DryRun, bool Newline) {
|
|
|
|
const FormatToken &Current = *State.NextToken;
|
|
|
|
assert(State.Stack.size());
|
|
|
|
|
|
|
|
if (Current.Type == TT_InheritanceColon)
|
|
|
|
State.Stack.back().AvoidBinPacking = true;
|
|
|
|
if (Current.is(tok::lessless) && State.Stack.back().FirstLessLess == 0)
|
|
|
|
State.Stack.back().FirstLessLess = State.Column;
|
2013-09-05 17:29:45 +08:00
|
|
|
if (Current.is(tok::l_square) && Current.Type != TT_LambdaLSquare &&
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().StartOfArraySubscripts == 0)
|
|
|
|
State.Stack.back().StartOfArraySubscripts = State.Column;
|
|
|
|
if (Current.is(tok::question))
|
|
|
|
State.Stack.back().QuestionColumn = State.Column;
|
|
|
|
if (!Current.opensScope() && !Current.closesScope())
|
|
|
|
State.LowestLevelOnLine =
|
|
|
|
std::min(State.LowestLevelOnLine, State.ParenLevel);
|
clang-format: Format segments of builder-type calls one per line.
This fixes llvm.org/PR14818.
Before:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT).StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH).Default(ORDER_TEXT);
After:
return llvm::StringSwitch<Reference::Kind>(name)
.StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
.StartsWith(".eh_frame", ORDER_EH_FRAME)
.StartsWith(".init", ORDER_INIT)
.StartsWith(".fini", ORDER_FINI)
.StartsWith(".hash", ORDER_HASH)
.Default(ORDER_TEXT);
llvm-svn: 189353
2013-08-27 22:24:43 +08:00
|
|
|
if (Current.isMemberAccess())
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().StartOfFunctionCall =
|
|
|
|
Current.LastInChainOfCalls ? 0 : State.Column + Current.CodePointCount;
|
|
|
|
if (Current.Type == TT_CtorInitializerColon) {
|
|
|
|
// Indent 2 from the column, so:
|
|
|
|
// SomeClass::SomeClass()
|
|
|
|
// : First(...), ...
|
|
|
|
// Next(...)
|
|
|
|
// ^ line up here.
|
|
|
|
State.Stack.back().Indent =
|
|
|
|
State.Column + (Style.BreakConstructorInitializersBeforeComma ? 0 : 2);
|
|
|
|
if (Style.ConstructorInitializerAllOnOneLineOrOnePerLine)
|
|
|
|
State.Stack.back().AvoidBinPacking = true;
|
|
|
|
State.Stack.back().BreakBeforeParameter = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If return returns a binary expression, align after it.
|
2013-09-06 16:08:14 +08:00
|
|
|
if (Current.is(tok::kw_return) && Current.StartsBinaryExpression)
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().LastSpace = State.Column + 7;
|
|
|
|
|
|
|
|
// In ObjC method declaration we align on the ":" of parameters, but we need
|
|
|
|
// to ensure that we indent parameters on subsequent lines by at least 4.
|
|
|
|
if (Current.Type == TT_ObjCMethodSpecifier)
|
|
|
|
State.Stack.back().Indent += 4;
|
|
|
|
|
|
|
|
// Insert scopes created by fake parenthesis.
|
|
|
|
const FormatToken *Previous = Current.getPreviousNonComment();
|
|
|
|
// Don't add extra indentation for the first fake parenthesis after
|
|
|
|
// 'return', assignements or opening <({[. The indentation for these cases
|
|
|
|
// is special cased.
|
|
|
|
bool SkipFirstExtraIndent =
|
|
|
|
Current.is(tok::kw_return) ||
|
|
|
|
(Previous && (Previous->opensScope() ||
|
|
|
|
Previous->getPrecedence() == prec::Assignment));
|
|
|
|
for (SmallVectorImpl<prec::Level>::const_reverse_iterator
|
|
|
|
I = Current.FakeLParens.rbegin(),
|
|
|
|
E = Current.FakeLParens.rend();
|
|
|
|
I != E; ++I) {
|
|
|
|
ParenState NewParenState = State.Stack.back();
|
|
|
|
NewParenState.ContainsLineBreak = false;
|
|
|
|
NewParenState.Indent =
|
|
|
|
std::max(std::max(State.Column, NewParenState.Indent),
|
|
|
|
State.Stack.back().LastSpace);
|
2013-09-05 17:29:45 +08:00
|
|
|
// Do not indent relative to the fake parentheses inserted for "." or "->".
|
|
|
|
// This is a special case to make the following to statements consistent:
|
|
|
|
// OuterFunction(InnerFunctionCall( // break
|
|
|
|
// ParameterToInnerFunction));
|
|
|
|
// OuterFunction(SomeObject.InnerFunctionCall( // break
|
|
|
|
// ParameterToInnerFunction));
|
|
|
|
if (*I > prec::Unknown)
|
|
|
|
NewParenState.LastSpace = std::max(NewParenState.LastSpace, State.Column);
|
2013-08-16 19:20:30 +08:00
|
|
|
|
|
|
|
// Always indent conditional expressions. Never indent expression where
|
|
|
|
// the 'operator' is ',', ';' or an assignment (i.e. *I <=
|
|
|
|
// prec::Assignment) as those have different indentation rules. Indent
|
|
|
|
// other expression, unless the indentation needs to be skipped.
|
|
|
|
if (*I == prec::Conditional ||
|
|
|
|
(!SkipFirstExtraIndent && *I > prec::Assignment &&
|
|
|
|
!Style.BreakBeforeBinaryOperators))
|
|
|
|
NewParenState.Indent += 4;
|
|
|
|
if (Previous && !Previous->opensScope())
|
|
|
|
NewParenState.BreakBeforeParameter = false;
|
|
|
|
State.Stack.push_back(NewParenState);
|
|
|
|
SkipFirstExtraIndent = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we encounter an opening (, [, { or <, we add a level to our stacks to
|
|
|
|
// prepare for the following tokens.
|
|
|
|
if (Current.opensScope()) {
|
|
|
|
unsigned NewIndent;
|
|
|
|
bool AvoidBinPacking;
|
|
|
|
if (Current.is(tok::l_brace)) {
|
2013-09-05 17:29:45 +08:00
|
|
|
if (Current.MatchingParen && Current.BlockKind == BK_Block) {
|
2013-09-05 18:48:50 +08:00
|
|
|
// If this is an l_brace starting a nested block, we pretend (wrt. to
|
|
|
|
// indentation) that we already consumed the corresponding r_brace.
|
|
|
|
// Thus, we remove all ParenStates caused bake fake parentheses that end
|
|
|
|
// at the r_brace. The net effect of this is that we don't indent
|
|
|
|
// relative to the l_brace, if the nested block is the last parameter of
|
|
|
|
// a function. For example, this formats:
|
|
|
|
//
|
|
|
|
// SomeFunction(a, [] {
|
|
|
|
// f(); // break
|
|
|
|
// });
|
|
|
|
//
|
|
|
|
// instead of:
|
|
|
|
// SomeFunction(a, [] {
|
|
|
|
// f(); // break
|
|
|
|
// });
|
2013-09-05 17:29:45 +08:00
|
|
|
for (unsigned i = 0; i != Current.MatchingParen->FakeRParens; ++i)
|
|
|
|
State.Stack.pop_back();
|
|
|
|
NewIndent = State.Stack.back().LastSpace;
|
|
|
|
} else {
|
|
|
|
NewIndent = State.Stack.back().LastSpace +
|
|
|
|
(Style.Cpp11BracedListStyle ? 4 : Style.IndentWidth);
|
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
const FormatToken *NextNoComment = Current.getNextNonComment();
|
|
|
|
AvoidBinPacking = NextNoComment &&
|
|
|
|
NextNoComment->Type == TT_DesignatedInitializerPeriod;
|
|
|
|
} else {
|
2013-09-05 17:29:45 +08:00
|
|
|
NewIndent = 4 + std::max(State.Stack.back().LastSpace,
|
|
|
|
State.Stack.back().StartOfFunctionCall);
|
2013-08-16 19:20:30 +08:00
|
|
|
AvoidBinPacking = !Style.BinPackParameters ||
|
|
|
|
(Style.ExperimentalAutoDetectBinPacking &&
|
|
|
|
(Current.PackingKind == PPK_OnePerLine ||
|
|
|
|
(!BinPackInconclusiveFunctions &&
|
|
|
|
Current.PackingKind == PPK_Inconclusive)));
|
|
|
|
}
|
|
|
|
|
2013-09-05 17:29:45 +08:00
|
|
|
State.Stack.push_back(ParenState(NewIndent, State.Stack.back().LastSpace,
|
|
|
|
AvoidBinPacking,
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().NoLineBreak));
|
|
|
|
++State.ParenLevel;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If this '[' opens an ObjC call, determine whether all parameters fit into
|
|
|
|
// one line and put one per line if they don't.
|
|
|
|
if (Current.is(tok::l_square) && Current.Type == TT_ObjCMethodExpr &&
|
|
|
|
Current.MatchingParen != NULL) {
|
2013-09-05 17:29:45 +08:00
|
|
|
if (getLengthToMatchingParen(Current) + State.Column >
|
|
|
|
getColumnLimit(State))
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we encounter a closing ), ], } or >, we can remove a level from our
|
|
|
|
// stacks.
|
2013-08-28 17:17:37 +08:00
|
|
|
if (State.Stack.size() > 1 &&
|
|
|
|
(Current.isOneOf(tok::r_paren, tok::r_square) ||
|
2013-09-05 17:29:45 +08:00
|
|
|
(Current.is(tok::r_brace) && State.NextToken != State.Line->First) ||
|
2013-08-28 17:17:37 +08:00
|
|
|
State.NextToken->Type == TT_TemplateCloser)) {
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.pop_back();
|
|
|
|
--State.ParenLevel;
|
|
|
|
}
|
|
|
|
if (Current.is(tok::r_square)) {
|
|
|
|
// If this ends the array subscript expr, reset the corresponding value.
|
|
|
|
const FormatToken *NextNonComment = Current.getNextNonComment();
|
|
|
|
if (NextNonComment && NextNonComment->isNot(tok::l_square))
|
|
|
|
State.Stack.back().StartOfArraySubscripts = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Remove scopes created by fake parenthesis.
|
2013-09-05 17:29:45 +08:00
|
|
|
if (Current.isNot(tok::r_brace) ||
|
|
|
|
(Current.MatchingParen && Current.MatchingParen->BlockKind != BK_Block)) {
|
2013-09-05 18:48:50 +08:00
|
|
|
// Don't remove FakeRParens attached to r_braces that surround nested blocks
|
|
|
|
// as they will have been removed early (see above).
|
2013-09-05 17:29:45 +08:00
|
|
|
for (unsigned i = 0, e = Current.FakeRParens; i != e; ++i) {
|
|
|
|
unsigned VariablePos = State.Stack.back().VariablePos;
|
|
|
|
State.Stack.pop_back();
|
|
|
|
State.Stack.back().VariablePos = VariablePos;
|
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (Current.is(tok::string_literal) && State.StartOfStringLiteral == 0) {
|
|
|
|
State.StartOfStringLiteral = State.Column;
|
|
|
|
} else if (!Current.isOneOf(tok::comment, tok::identifier, tok::hash,
|
|
|
|
tok::string_literal)) {
|
|
|
|
State.StartOfStringLiteral = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
State.Column += Current.CodePointCount;
|
|
|
|
State.NextToken = State.NextToken->Next;
|
clang-format: Revamp builder-type call formatting.
Previously builder-type calls were only correctly recognized in
top-level calls.
This fixes llvm.org/PR16981.
Before:
someobj->Add((new util::filetools::Handler(dir))->OnEvent1(
NewPermanentCallback(this, &HandlerHolderClass::EventHandlerCBA))
->OnEvent2(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBB))
->OnEvent3(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBC))
->OnEvent5(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBD))
->OnEvent6(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBE)));
After:
someobj->Add((new util::filetools::Handler(dir))
->OnEvent1(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBA))
->OnEvent2(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBB))
->OnEvent3(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBC))
->OnEvent5(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBD))
->OnEvent6(NewPermanentCallback(
this, &HandlerHolderClass::EventHandlerCBE)));
llvm-svn: 189337
2013-08-27 19:09:05 +08:00
|
|
|
unsigned Penalty = breakProtrudingToken(Current, State, DryRun);
|
2013-09-05 17:29:45 +08:00
|
|
|
if (State.Column > getColumnLimit(State)) {
|
|
|
|
unsigned ExcessCharacters = State.Column - getColumnLimit(State);
|
|
|
|
Penalty += Style.PenaltyExcessCharacter * ExcessCharacters;
|
|
|
|
}
|
clang-format: Add column layout formatting for braced lists
With this patch, braced lists (with more than 3 elements are formatted in a
column layout if possible). E.g.:
static const uint16_t CallerSavedRegs64Bit[] = {
X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,
X86::R8, X86::R9, X86::R10, X86::R11, 0
};
Required other changes:
- FormatTokens can now have a special role that contains extra data and can do
special formattings. A comma separated list is currently the only
implementation.
- Move penalty calculation entirely into ContinuationIndenter (there was a last
piece still in UnwrappedLineFormatter).
Review: http://llvm-reviews.chandlerc.com/D1457
llvm-svn: 189018
2013-08-22 23:00:41 +08:00
|
|
|
|
|
|
|
// If the previous has a special role, let it consume tokens as appropriate.
|
|
|
|
// It is necessary to start at the previous token for the only implemented
|
|
|
|
// role (comma separated list). That way, the decision whether or not to break
|
|
|
|
// after the "{" is already done and both options are tried and evaluated.
|
|
|
|
// FIXME: This is ugly, find a better way.
|
|
|
|
if (Previous && Previous->Role)
|
|
|
|
Penalty += Previous->Role->format(State, this, DryRun);
|
2013-08-16 19:20:30 +08:00
|
|
|
|
clang-format: Add column layout formatting for braced lists
With this patch, braced lists (with more than 3 elements are formatted in a
column layout if possible). E.g.:
static const uint16_t CallerSavedRegs64Bit[] = {
X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,
X86::R8, X86::R9, X86::R10, X86::R11, 0
};
Required other changes:
- FormatTokens can now have a special role that contains extra data and can do
special formattings. A comma separated list is currently the only
implementation.
- Move penalty calculation entirely into ContinuationIndenter (there was a last
piece still in UnwrappedLineFormatter).
Review: http://llvm-reviews.chandlerc.com/D1457
llvm-svn: 189018
2013-08-22 23:00:41 +08:00
|
|
|
return Penalty;
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
|
2013-08-30 01:32:57 +08:00
|
|
|
unsigned
|
|
|
|
ContinuationIndenter::addMultilineStringLiteral(const FormatToken &Current,
|
|
|
|
LineState &State) {
|
|
|
|
// Break before further function parameters on all levels.
|
|
|
|
for (unsigned i = 0, e = State.Stack.size(); i != e; ++i)
|
|
|
|
State.Stack[i].BreakBeforeParameter = true;
|
|
|
|
|
|
|
|
unsigned ColumnsUsed =
|
2013-09-05 22:08:34 +08:00
|
|
|
State.Column - Current.CodePointCount + Current.FirstLineColumnWidth;
|
2013-09-02 21:58:14 +08:00
|
|
|
// We can only affect layout of the first and the last line, so the penalty
|
|
|
|
// for all other lines is constant, and we ignore it.
|
2013-09-05 22:08:34 +08:00
|
|
|
State.Column = Current.LastLineColumnWidth;
|
2013-09-02 21:58:14 +08:00
|
|
|
|
2013-09-05 17:29:45 +08:00
|
|
|
if (ColumnsUsed > getColumnLimit(State))
|
|
|
|
return Style.PenaltyExcessCharacter * (ColumnsUsed - getColumnLimit(State));
|
2013-08-30 01:32:57 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
unsigned ContinuationIndenter::breakProtrudingToken(const FormatToken &Current,
|
|
|
|
LineState &State,
|
|
|
|
bool DryRun) {
|
2013-08-23 18:05:49 +08:00
|
|
|
if (!Current.isOneOf(tok::string_literal, tok::comment))
|
|
|
|
return 0;
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
llvm::OwningPtr<BreakableToken> Token;
|
|
|
|
unsigned StartColumn = State.Column - Current.CodePointCount;
|
|
|
|
|
|
|
|
if (Current.is(tok::string_literal) &&
|
|
|
|
Current.Type != TT_ImplicitStringLiteral) {
|
2013-08-30 01:32:57 +08:00
|
|
|
// Don't break string literals with (in case of non-raw strings, escaped)
|
|
|
|
// newlines. As clang-format must not change the string's content, it is
|
|
|
|
// unlikely that we'll end up with a better format.
|
2013-09-02 21:58:14 +08:00
|
|
|
if (Current.isMultiline())
|
2013-08-30 01:32:57 +08:00
|
|
|
return addMultilineStringLiteral(Current, State);
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
// Only break up default narrow strings.
|
|
|
|
if (!Current.TokenText.startswith("\""))
|
|
|
|
return 0;
|
|
|
|
// Exempts unterminated string literals from line breaking. The user will
|
|
|
|
// likely want to terminate the string before any line breaking is done.
|
|
|
|
if (Current.IsUnterminatedLiteral)
|
|
|
|
return 0;
|
|
|
|
|
2013-09-05 17:29:45 +08:00
|
|
|
Token.reset(new BreakableStringLiteral(
|
2013-09-05 22:08:34 +08:00
|
|
|
Current, StartColumn, State.Line->InPPDirective, Encoding, Style));
|
2013-08-16 19:20:30 +08:00
|
|
|
} else if (Current.Type == TT_BlockComment && Current.isTrailingComment()) {
|
2013-08-30 01:32:57 +08:00
|
|
|
unsigned OriginalStartColumn =
|
|
|
|
SourceMgr.getSpellingColumnNumber(Current.getStartOfNonWhitespace()) -
|
|
|
|
1;
|
2013-08-16 19:20:30 +08:00
|
|
|
Token.reset(new BreakableBlockComment(
|
2013-09-05 22:08:34 +08:00
|
|
|
Current, StartColumn, OriginalStartColumn, !Current.Previous,
|
|
|
|
State.Line->InPPDirective, Encoding, Style));
|
2013-08-16 19:20:30 +08:00
|
|
|
} else if (Current.Type == TT_LineComment &&
|
|
|
|
(Current.Previous == NULL ||
|
|
|
|
Current.Previous->Type != TT_ImplicitStringLiteral)) {
|
|
|
|
// Don't break line comments with escaped newlines. These look like
|
|
|
|
// separate line comments, but in fact contain a single line comment with
|
|
|
|
// multiple lines including leading whitespace and the '//' markers.
|
|
|
|
//
|
|
|
|
// FIXME: If we want to handle them correctly, we'll need to adjust
|
|
|
|
// leading whitespace in consecutive lines when changing indentation of
|
|
|
|
// the first line similar to what we do with block comments.
|
2013-09-02 21:58:14 +08:00
|
|
|
if (Current.isMultiline()) {
|
2013-09-05 22:08:34 +08:00
|
|
|
State.Column = StartColumn + Current.FirstLineColumnWidth;
|
2013-08-16 19:20:30 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-09-05 22:08:34 +08:00
|
|
|
Token.reset(new BreakableLineComment(
|
|
|
|
Current, StartColumn, State.Line->InPPDirective, Encoding, Style));
|
2013-08-16 19:20:30 +08:00
|
|
|
} else {
|
|
|
|
return 0;
|
|
|
|
}
|
2013-09-05 17:29:45 +08:00
|
|
|
if (Current.UnbreakableTailLength >= getColumnLimit(State))
|
2013-08-16 19:20:30 +08:00
|
|
|
return 0;
|
|
|
|
|
2013-09-05 17:29:45 +08:00
|
|
|
unsigned RemainingSpace =
|
|
|
|
getColumnLimit(State) - Current.UnbreakableTailLength;
|
2013-08-16 19:20:30 +08:00
|
|
|
bool BreakInserted = false;
|
|
|
|
unsigned Penalty = 0;
|
|
|
|
unsigned RemainingTokenColumns = 0;
|
|
|
|
for (unsigned LineIndex = 0, EndIndex = Token->getLineCount();
|
|
|
|
LineIndex != EndIndex; ++LineIndex) {
|
|
|
|
if (!DryRun)
|
|
|
|
Token->replaceWhitespaceBefore(LineIndex, Whitespaces);
|
|
|
|
unsigned TailOffset = 0;
|
|
|
|
RemainingTokenColumns =
|
|
|
|
Token->getLineLengthAfterSplit(LineIndex, TailOffset, StringRef::npos);
|
|
|
|
while (RemainingTokenColumns > RemainingSpace) {
|
|
|
|
BreakableToken::Split Split =
|
2013-09-05 17:29:45 +08:00
|
|
|
Token->getSplit(LineIndex, TailOffset, getColumnLimit(State));
|
2013-08-16 19:20:30 +08:00
|
|
|
if (Split.first == StringRef::npos) {
|
|
|
|
// The last line's penalty is handled in addNextStateToQueue().
|
|
|
|
if (LineIndex < EndIndex - 1)
|
|
|
|
Penalty += Style.PenaltyExcessCharacter *
|
|
|
|
(RemainingTokenColumns - RemainingSpace);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
assert(Split.first != 0);
|
|
|
|
unsigned NewRemainingTokenColumns = Token->getLineLengthAfterSplit(
|
|
|
|
LineIndex, TailOffset + Split.first + Split.second, StringRef::npos);
|
|
|
|
assert(NewRemainingTokenColumns < RemainingTokenColumns);
|
|
|
|
if (!DryRun)
|
|
|
|
Token->insertBreak(LineIndex, TailOffset, Split, Whitespaces);
|
2013-08-28 18:03:58 +08:00
|
|
|
Penalty += Current.SplitPenalty;
|
2013-08-16 19:20:30 +08:00
|
|
|
unsigned ColumnsUsed =
|
|
|
|
Token->getLineLengthAfterSplit(LineIndex, TailOffset, Split.first);
|
2013-09-05 17:29:45 +08:00
|
|
|
if (ColumnsUsed > getColumnLimit(State)) {
|
|
|
|
Penalty += Style.PenaltyExcessCharacter *
|
|
|
|
(ColumnsUsed - getColumnLimit(State));
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
TailOffset += Split.first + Split.second;
|
|
|
|
RemainingTokenColumns = NewRemainingTokenColumns;
|
|
|
|
BreakInserted = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
State.Column = RemainingTokenColumns;
|
|
|
|
|
|
|
|
if (BreakInserted) {
|
|
|
|
// If we break the token inside a parameter list, we need to break before
|
|
|
|
// the next parameter on all levels, so that the next parameter is clearly
|
|
|
|
// visible. Line comments already introduce a break.
|
|
|
|
if (Current.Type != TT_LineComment) {
|
|
|
|
for (unsigned i = 0, e = State.Stack.size(); i != e; ++i)
|
|
|
|
State.Stack[i].BreakBeforeParameter = true;
|
|
|
|
}
|
|
|
|
|
2013-08-28 18:03:58 +08:00
|
|
|
Penalty += Current.is(tok::string_literal) ? Style.PenaltyBreakString
|
|
|
|
: Style.PenaltyBreakComment;
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().LastSpace = StartColumn;
|
|
|
|
}
|
|
|
|
return Penalty;
|
|
|
|
}
|
|
|
|
|
2013-09-05 17:29:45 +08:00
|
|
|
unsigned ContinuationIndenter::getColumnLimit(const LineState &State) const {
|
2013-08-16 19:20:30 +08:00
|
|
|
// In preprocessor directives reserve two chars for trailing " \"
|
2013-09-05 17:29:45 +08:00
|
|
|
return Style.ColumnLimit - (State.Line->InPPDirective ? 2 : 0);
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
|
2013-08-23 19:57:34 +08:00
|
|
|
bool ContinuationIndenter::NextIsMultilineString(const LineState &State) {
|
|
|
|
const FormatToken &Current = *State.NextToken;
|
|
|
|
if (!Current.is(tok::string_literal))
|
|
|
|
return false;
|
2013-08-30 01:32:57 +08:00
|
|
|
// We never consider raw string literals "multiline" for the purpose of
|
|
|
|
// AlwaysBreakBeforeMultilineStrings implementation.
|
|
|
|
if (Current.TokenText.startswith("R\""))
|
|
|
|
return false;
|
2013-09-02 21:58:14 +08:00
|
|
|
if (Current.isMultiline())
|
2013-08-30 01:32:57 +08:00
|
|
|
return true;
|
2013-08-23 19:57:34 +08:00
|
|
|
if (Current.getNextNonComment() &&
|
|
|
|
Current.getNextNonComment()->is(tok::string_literal))
|
|
|
|
return true; // Implicit concatenation.
|
|
|
|
if (State.Column + Current.CodePointCount + Current.UnbreakableTailLength >
|
|
|
|
Style.ColumnLimit)
|
|
|
|
return true; // String will be split.
|
2013-08-30 01:32:57 +08:00
|
|
|
return false;
|
2013-08-23 19:57:34 +08:00
|
|
|
}
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
} // namespace format
|
|
|
|
} // namespace clang
|