2013-08-16 19:20:30 +08:00
|
|
|
//===--- ContinuationIndenter.cpp - Format C++ code -----------------------===//
|
|
|
|
//
|
2019-01-19 16:50:56 +08:00
|
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
2013-08-16 19:20:30 +08:00
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
///
|
|
|
|
/// \file
|
2018-05-09 09:00:01 +08:00
|
|
|
/// This file implements the continuation indenter.
|
2013-08-16 19:20:30 +08:00
|
|
|
///
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "ContinuationIndenter.h"
|
2017-09-20 17:51:03 +08:00
|
|
|
#include "BreakableToken.h"
|
2017-10-30 22:01:50 +08:00
|
|
|
#include "FormatInternal.h"
|
2013-08-16 19:20:30 +08:00
|
|
|
#include "WhitespaceManager.h"
|
|
|
|
#include "clang/Basic/OperatorPrecedence.h"
|
|
|
|
#include "clang/Basic/SourceManager.h"
|
|
|
|
#include "clang/Format/Format.h"
|
|
|
|
#include "llvm/Support/Debug.h"
|
|
|
|
|
2017-01-25 21:58:58 +08:00
|
|
|
#define DEBUG_TYPE "format-indenter"
|
2014-04-22 11:17:02 +08:00
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
namespace clang {
|
|
|
|
namespace format {
|
|
|
|
|
2018-04-12 23:11:48 +08:00
|
|
|
// Returns true if a TT_SelectorName should be indented when wrapped,
|
|
|
|
// false otherwise.
|
|
|
|
static bool shouldIndentWrappedSelectorName(const FormatStyle &Style,
|
|
|
|
LineType LineType) {
|
|
|
|
return Style.IndentWrappedFunctionNames || LineType == LT_ObjCMethodDecl;
|
|
|
|
}
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
// Returns the length of everything up to the first possible line break after
|
|
|
|
// the ), ], } or > matching \c Tok.
|
2018-05-09 17:02:11 +08:00
|
|
|
static unsigned getLengthToMatchingParen(const FormatToken &Tok,
|
|
|
|
const std::vector<ParenState> &Stack) {
|
|
|
|
// Normally whether or not a break before T is possible is calculated and
|
|
|
|
// stored in T.CanBreakBefore. Braces, array initializers and text proto
|
|
|
|
// messages like `key: < ... >` are an exception: a break is possible
|
|
|
|
// before a closing brace R if a break was inserted after the corresponding
|
|
|
|
// opening brace. The information about whether or not a break is needed
|
|
|
|
// before a closing brace R is stored in the ParenState field
|
|
|
|
// S.BreakBeforeClosingBrace where S is the state that R closes.
|
|
|
|
//
|
|
|
|
// In order to decide whether there can be a break before encountered right
|
|
|
|
// braces, this implementation iterates over the sequence of tokens and over
|
|
|
|
// the paren stack in lockstep, keeping track of the stack level which visited
|
|
|
|
// right braces correspond to in MatchingStackIndex.
|
|
|
|
//
|
|
|
|
// For example, consider:
|
|
|
|
// L. <- line number
|
|
|
|
// 1. {
|
|
|
|
// 2. {1},
|
|
|
|
// 3. {2},
|
|
|
|
// 4. {{3}}}
|
|
|
|
// ^ where we call this method with this token.
|
|
|
|
// The paren stack at this point contains 3 brace levels:
|
|
|
|
// 0. { at line 1, BreakBeforeClosingBrace: true
|
|
|
|
// 1. first { at line 4, BreakBeforeClosingBrace: false
|
|
|
|
// 2. second { at line 4, BreakBeforeClosingBrace: false,
|
|
|
|
// where there might be fake parens levels in-between these levels.
|
|
|
|
// The algorithm will start at the first } on line 4, which is the matching
|
|
|
|
// brace of the initial left brace and at level 2 of the stack. Then,
|
|
|
|
// examining BreakBeforeClosingBrace: false at level 2, it will continue to
|
|
|
|
// the second } on line 4, and will traverse the stack downwards until it
|
|
|
|
// finds the matching { on level 1. Then, examining BreakBeforeClosingBrace:
|
|
|
|
// false at level 1, it will continue to the third } on line 4 and will
|
|
|
|
// traverse the stack downwards until it finds the matching { on level 0.
|
|
|
|
// Then, examining BreakBeforeClosingBrace: true at level 0, the algorithm
|
|
|
|
// will stop and will use the second } on line 4 to determine the length to
|
|
|
|
// return, as in this example the range will include the tokens: {3}}
|
|
|
|
//
|
|
|
|
// The algorithm will only traverse the stack if it encounters braces, array
|
|
|
|
// initializer squares or text proto angle brackets.
|
2014-05-09 16:15:10 +08:00
|
|
|
if (!Tok.MatchingParen)
|
2013-08-16 19:20:30 +08:00
|
|
|
return 0;
|
|
|
|
FormatToken *End = Tok.MatchingParen;
|
2018-05-09 17:02:11 +08:00
|
|
|
// Maintains a stack level corresponding to the current End token.
|
|
|
|
int MatchingStackIndex = Stack.size() - 1;
|
|
|
|
// Traverses the stack downwards, looking for the level to which LBrace
|
|
|
|
// corresponds. Returns either a pointer to the matching level or nullptr if
|
|
|
|
// LParen is not found in the initial portion of the stack up to
|
|
|
|
// MatchingStackIndex.
|
|
|
|
auto FindParenState = [&](const FormatToken *LBrace) -> const ParenState * {
|
|
|
|
while (MatchingStackIndex >= 0 && Stack[MatchingStackIndex].Tok != LBrace)
|
|
|
|
--MatchingStackIndex;
|
|
|
|
return MatchingStackIndex >= 0 ? &Stack[MatchingStackIndex] : nullptr;
|
|
|
|
};
|
|
|
|
for (; End->Next; End = End->Next) {
|
2018-05-14 18:33:40 +08:00
|
|
|
if (End->Next->CanBreakBefore)
|
2018-05-09 17:02:11 +08:00
|
|
|
break;
|
2018-05-14 18:33:40 +08:00
|
|
|
if (!End->Next->closesScope())
|
|
|
|
continue;
|
2018-05-22 17:46:55 +08:00
|
|
|
if (End->Next->MatchingParen &&
|
|
|
|
End->Next->MatchingParen->isOneOf(
|
|
|
|
tok::l_brace, TT_ArrayInitializerLSquare, tok::less)) {
|
2018-05-09 17:02:11 +08:00
|
|
|
const ParenState *State = FindParenState(End->Next->MatchingParen);
|
|
|
|
if (State && State->BreakBeforeClosingBrace)
|
|
|
|
break;
|
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
return End->TotalLength - Tok.TotalLength + 1;
|
|
|
|
}
|
|
|
|
|
2016-01-05 21:03:59 +08:00
|
|
|
static unsigned getLengthToNextOperator(const FormatToken &Tok) {
|
|
|
|
if (!Tok.NextOperator)
|
|
|
|
return 0;
|
|
|
|
return Tok.NextOperator->TotalLength - Tok.TotalLength;
|
|
|
|
}
|
|
|
|
|
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-10-08 13:11:18 +08:00
|
|
|
// Returns \c true if \c Current starts a new parameter.
|
|
|
|
static bool startsNextParameter(const FormatToken &Current,
|
|
|
|
const FormatStyle &Style) {
|
|
|
|
const FormatToken &Previous = *Current.Previous;
|
2014-11-25 18:05:17 +08:00
|
|
|
if (Current.is(TT_CtorInitializerComma) &&
|
2017-05-24 19:36:58 +08:00
|
|
|
Style.BreakConstructorInitializers == FormatStyle::BCIS_BeforeComma)
|
2013-10-08 13:11:18 +08:00
|
|
|
return true;
|
2017-06-27 21:43:07 +08:00
|
|
|
if (Style.Language == FormatStyle::LK_Proto && Current.is(TT_SelectorName))
|
|
|
|
return true;
|
2013-10-08 13:11:18 +08:00
|
|
|
return Previous.is(tok::comma) && !Current.isTrailingComment() &&
|
2017-03-10 23:10:37 +08:00
|
|
|
((Previous.isNot(TT_CtorInitializerComma) ||
|
2017-05-24 19:36:58 +08:00
|
|
|
Style.BreakConstructorInitializers !=
|
|
|
|
FormatStyle::BCIS_BeforeComma) &&
|
2017-03-10 23:10:37 +08:00
|
|
|
(Previous.isNot(TT_InheritanceComma) ||
|
2018-06-11 22:41:26 +08:00
|
|
|
Style.BreakInheritanceList != FormatStyle::BILS_BeforeComma));
|
2013-10-08 13:11:18 +08:00
|
|
|
}
|
|
|
|
|
2017-07-03 23:05:14 +08:00
|
|
|
static bool opensProtoMessageField(const FormatToken &LessTok,
|
|
|
|
const FormatStyle &Style) {
|
|
|
|
if (LessTok.isNot(tok::less))
|
|
|
|
return false;
|
|
|
|
return Style.Language == FormatStyle::LK_TextProto ||
|
|
|
|
(Style.Language == FormatStyle::LK_Proto &&
|
|
|
|
(LessTok.NestingLevel > 0 ||
|
|
|
|
(LessTok.Previous && LessTok.Previous->is(tok::equal))));
|
|
|
|
}
|
|
|
|
|
2017-10-30 22:01:50 +08:00
|
|
|
// Returns the delimiter of a raw string literal, or None if TokenText is not
|
|
|
|
// the text of a raw string literal. The delimiter could be the empty string.
|
|
|
|
// For example, the delimiter of R"deli(cont)deli" is deli.
|
|
|
|
static llvm::Optional<StringRef> getRawStringDelimiter(StringRef TokenText) {
|
|
|
|
if (TokenText.size() < 5 // The smallest raw string possible is 'R"()"'.
|
|
|
|
|| !TokenText.startswith("R\"") || !TokenText.endswith("\""))
|
|
|
|
return None;
|
|
|
|
|
|
|
|
// A raw string starts with 'R"<delimiter>(' and delimiter is ascii and has
|
|
|
|
// size at most 16 by the standard, so the first '(' must be among the first
|
|
|
|
// 19 bytes.
|
|
|
|
size_t LParenPos = TokenText.substr(0, 19).find_first_of('(');
|
|
|
|
if (LParenPos == StringRef::npos)
|
|
|
|
return None;
|
|
|
|
StringRef Delimiter = TokenText.substr(2, LParenPos - 2);
|
|
|
|
|
|
|
|
// Check that the string ends in ')Delimiter"'.
|
|
|
|
size_t RParenPos = TokenText.size() - Delimiter.size() - 2;
|
|
|
|
if (TokenText[RParenPos] != ')')
|
|
|
|
return None;
|
|
|
|
if (!TokenText.substr(RParenPos + 1).startswith(Delimiter))
|
|
|
|
return None;
|
|
|
|
return Delimiter;
|
|
|
|
}
|
|
|
|
|
2018-01-20 00:18:47 +08:00
|
|
|
// Returns the canonical delimiter for \p Language, or the empty string if no
|
|
|
|
// canonical delimiter is specified.
|
|
|
|
static StringRef
|
|
|
|
getCanonicalRawStringDelimiter(const FormatStyle &Style,
|
|
|
|
FormatStyle::LanguageKind Language) {
|
|
|
|
for (const auto &Format : Style.RawStringFormats) {
|
|
|
|
if (Format.Language == Language)
|
|
|
|
return StringRef(Format.CanonicalDelimiter);
|
|
|
|
}
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
2017-10-30 22:01:50 +08:00
|
|
|
RawStringFormatStyleManager::RawStringFormatStyleManager(
|
|
|
|
const FormatStyle &CodeStyle) {
|
|
|
|
for (const auto &RawStringFormat : CodeStyle.RawStringFormats) {
|
2018-01-18 00:17:26 +08:00
|
|
|
llvm::Optional<FormatStyle> LanguageStyle =
|
|
|
|
CodeStyle.GetLanguageStyle(RawStringFormat.Language);
|
|
|
|
if (!LanguageStyle) {
|
|
|
|
FormatStyle PredefinedStyle;
|
|
|
|
if (!getPredefinedStyle(RawStringFormat.BasedOnStyle,
|
|
|
|
RawStringFormat.Language, &PredefinedStyle)) {
|
|
|
|
PredefinedStyle = getLLVMStyle();
|
|
|
|
PredefinedStyle.Language = RawStringFormat.Language;
|
2018-01-17 20:24:59 +08:00
|
|
|
}
|
2018-01-18 00:17:26 +08:00
|
|
|
LanguageStyle = PredefinedStyle;
|
|
|
|
}
|
|
|
|
LanguageStyle->ColumnLimit = CodeStyle.ColumnLimit;
|
|
|
|
for (StringRef Delimiter : RawStringFormat.Delimiters) {
|
2018-01-17 20:24:59 +08:00
|
|
|
DelimiterStyle.insert({Delimiter, *LanguageStyle});
|
2017-10-30 22:01:50 +08:00
|
|
|
}
|
2018-01-18 00:17:26 +08:00
|
|
|
for (StringRef EnclosingFunction : RawStringFormat.EnclosingFunctions) {
|
|
|
|
EnclosingFunctionStyle.insert({EnclosingFunction, *LanguageStyle});
|
|
|
|
}
|
2017-10-30 22:01:50 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
llvm::Optional<FormatStyle>
|
2018-01-18 00:17:26 +08:00
|
|
|
RawStringFormatStyleManager::getDelimiterStyle(StringRef Delimiter) const {
|
2017-10-30 22:01:50 +08:00
|
|
|
auto It = DelimiterStyle.find(Delimiter);
|
|
|
|
if (It == DelimiterStyle.end())
|
|
|
|
return None;
|
|
|
|
return It->second;
|
|
|
|
}
|
|
|
|
|
2018-01-18 00:17:26 +08:00
|
|
|
llvm::Optional<FormatStyle>
|
|
|
|
RawStringFormatStyleManager::getEnclosingFunctionStyle(
|
|
|
|
StringRef EnclosingFunction) const {
|
|
|
|
auto It = EnclosingFunctionStyle.find(EnclosingFunction);
|
|
|
|
if (It == EnclosingFunctionStyle.end())
|
|
|
|
return None;
|
|
|
|
return It->second;
|
|
|
|
}
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
ContinuationIndenter::ContinuationIndenter(const FormatStyle &Style,
|
2014-11-04 20:41:02 +08:00
|
|
|
const AdditionalKeywords &Keywords,
|
2016-04-28 15:52:03 +08:00
|
|
|
const SourceManager &SourceMgr,
|
2013-08-16 19:20:30 +08:00
|
|
|
WhitespaceManager &Whitespaces,
|
|
|
|
encoding::Encoding Encoding,
|
|
|
|
bool BinPackInconclusiveFunctions)
|
2014-11-04 20:41:02 +08:00
|
|
|
: Style(Style), Keywords(Keywords), SourceMgr(SourceMgr),
|
|
|
|
Whitespaces(Whitespaces), Encoding(Encoding),
|
2014-01-02 23:13:14 +08:00
|
|
|
BinPackInconclusiveFunctions(BinPackInconclusiveFunctions),
|
2017-10-30 22:01:50 +08:00
|
|
|
CommentPragmasRegex(Style.CommentPragmas), RawStringFormats(Style) {}
|
2013-08-16 19:20:30 +08:00
|
|
|
|
2013-09-05 17:29:45 +08:00
|
|
|
LineState ContinuationIndenter::getInitialState(unsigned FirstIndent,
|
2017-10-30 22:01:50 +08:00
|
|
|
unsigned FirstStartColumn,
|
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;
|
2017-10-30 22:01:50 +08:00
|
|
|
if (FirstStartColumn && Line->First->NewlinesBefore == 0)
|
|
|
|
State.Column = FirstStartColumn;
|
|
|
|
else
|
|
|
|
State.Column = FirstIndent;
|
clang-format: Add preprocessor directive indentation
Summary:
This is an implementation for [bug 17362](https://bugs.llvm.org/attachment.cgi?bugid=17362) which adds support for indenting preprocessor statements inside if/ifdef/endif. This takes previous work from fmauch (https://github.com/fmauch/clang/tree/preprocessor_indent) and makes it into a full feature.
The context of this patch is that I'm a VMware intern, and I implemented this because VMware needs the feature. As such, some decisions were made based on what VMware wants, and I would appreciate suggestions on expanding this if necessary to use-cases other people may want.
This adds a new enum config option, `IndentPPDirectives`. Values are:
* `PPDIS_None` (in config: `None`):
```
#if FOO
#if BAR
#include <foo>
#endif
#endif
```
* `PPDIS_AfterHash` (in config: `AfterHash`):
```
#if FOO
# if BAR
# include <foo>
# endif
#endif
```
This is meant to work whether spaces or tabs are used for indentation. Preprocessor indentation is independent of indentation for non-preprocessor lines.
Preprocessor indentation also attempts to ignore include guards with the checks:
1. Include guards cover the entire file
2. Include guards don't have `#else`
3. Include guards begin with
```
#ifndef <var>
#define <var>
```
This patch allows `UnwrappedLineParser::PPBranchLevel` to be decremented to -1 (the initial value is -1) so the variable can be used for indent tracking.
Defects:
* This patch does not handle the case where there's code between the `#ifndef` and `#define` but all other conditions hold. This is because when the #define line is parsed, `UnwrappedLineParser::Lines` doesn't hold the previous code line yet, so we can't detect it. This is out of the scope of this patch.
* This patch does not handle cases where legitimate lines may be outside an include guard. Examples are `#pragma once` and `#pragma GCC diagnostic`, or anything else that does not change the meaning of the file if it's included multiple times.
* This does not detect when there is a single non-preprocessor line in front of an include-guard-like structure where other conditions hold because `ScopedLineState` hides the line.
* Preprocessor indentation throws off `TokenAnnotator::setCommentLineLevels` so the indentation of comments immediately before indented preprocessor lines is toggled on each run. Fixing this issue appears to be a major change and too much complexity for this patch.
Contributed by @euhlmann!
Reviewers: djasper, klimek, krasimir
Reviewed By: djasper, krasimir
Subscribers: krasimir, mzeren-vmw, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D35955
llvm-svn: 312125
2017-08-30 22:34:57 +08:00
|
|
|
// With preprocessor directive indentation, the line starts on column 0
|
|
|
|
// since it's indented after the hash, but FirstIndent is set to the
|
|
|
|
// preprocessor indent.
|
|
|
|
if (Style.IndentPPDirectives == FormatStyle::PPDIS_AfterHash &&
|
|
|
|
(Line->Type == LT_PreprocessorDirective ||
|
|
|
|
Line->Type == LT_ImportStatement))
|
|
|
|
State.Column = 0;
|
2013-09-05 17:29:45 +08:00
|
|
|
State.Line = Line;
|
|
|
|
State.NextToken = Line->First;
|
2018-05-09 17:02:11 +08:00
|
|
|
State.Stack.push_back(ParenState(/*Tok=*/nullptr, FirstIndent, FirstIndent,
|
2013-08-16 19:20:30 +08:00
|
|
|
/*AvoidBinPacking=*/false,
|
|
|
|
/*NoLineBreak=*/false));
|
|
|
|
State.LineContainsContinuedForLoopSection = false;
|
2017-10-16 17:08:53 +08:00
|
|
|
State.NoContinuation = false;
|
2013-08-16 19:20:30 +08:00
|
|
|
State.StartOfStringLiteral = 0;
|
2014-05-08 20:21:30 +08:00
|
|
|
State.StartOfLineLevel = 0;
|
|
|
|
State.LowestLevelOnLine = 0;
|
2013-08-16 19:20:30 +08:00
|
|
|
State.IgnoreStackForComparison = false;
|
|
|
|
|
2017-07-03 23:05:14 +08:00
|
|
|
if (Style.Language == FormatStyle::LK_TextProto) {
|
|
|
|
// We need this in order to deal with the bin packing of text fields at
|
|
|
|
// global scope.
|
|
|
|
State.Stack.back().AvoidBinPacking = true;
|
|
|
|
State.Stack.back().BreakBeforeParameter = true;
|
2018-02-12 23:49:09 +08:00
|
|
|
State.Stack.back().AlignColons = false;
|
2017-07-03 23:05:14 +08:00
|
|
|
}
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
// 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);
|
2017-09-20 17:51:03 +08:00
|
|
|
if (!Current.CanBreakBefore && !(State.Stack.back().BreakBeforeClosingBrace &&
|
|
|
|
Current.closesBlockOrBlockTypeList(Style)))
|
2013-08-16 19:20:30 +08:00
|
|
|
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) &&
|
2014-11-25 18:05:17 +08:00
|
|
|
Previous.isNot(TT_DictLiteral) && Previous.BlockKind == BK_BracedInit &&
|
2014-05-09 21:11:16 +08:00
|
|
|
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.
|
2014-03-11 19:03:26 +08:00
|
|
|
if (Previous.opensScope() && Previous.isNot(tok::l_brace) &&
|
2014-07-15 17:00:34 +08:00
|
|
|
State.LowestLevelOnLine < State.StartOfLineLevel &&
|
|
|
|
State.LowestLevelOnLine < Current.NestingLevel)
|
2013-08-16 19:20:30 +08:00
|
|
|
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;
|
2014-06-03 20:02:45 +08:00
|
|
|
|
|
|
|
// Don't create a 'hanging' indent if there are multiple blocks in a single
|
|
|
|
// statement.
|
2014-11-21 21:38:53 +08:00
|
|
|
if (Previous.is(tok::l_brace) && State.Stack.size() > 1 &&
|
|
|
|
State.Stack[State.Stack.size() - 2].NestedBlockInlined &&
|
2014-06-03 20:02:45 +08:00
|
|
|
State.Stack[State.Stack.size() - 2].HasMultipleNestedBlocks)
|
|
|
|
return false;
|
|
|
|
|
2014-10-28 01:13:59 +08:00
|
|
|
// Don't break after very short return types (e.g. "void") as that is often
|
|
|
|
// unexpected.
|
2015-12-19 06:20:15 +08:00
|
|
|
if (Current.is(TT_FunctionDeclarationName) && State.Column < 6) {
|
|
|
|
if (Style.AlwaysBreakAfterReturnType == FormatStyle::RTBS_None)
|
|
|
|
return false;
|
|
|
|
}
|
2014-10-28 01:13:59 +08:00
|
|
|
|
2017-01-16 21:13:15 +08:00
|
|
|
// If binary operators are moved to the next line (including commas for some
|
|
|
|
// styles of constructor initializers), that's always ok.
|
|
|
|
if (!Current.isOneOf(TT_BinaryOperator, tok::comma) &&
|
|
|
|
State.Stack.back().NoLineBreakInOperand)
|
|
|
|
return false;
|
|
|
|
|
2018-07-09 14:04:58 +08:00
|
|
|
if (Previous.is(tok::l_square) && Previous.is(TT_ObjCMethodExpr))
|
|
|
|
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;
|
2014-11-25 18:05:17 +08:00
|
|
|
if (Current.MustBreakBefore || Current.is(TT_InlineASMColon))
|
2013-08-16 19:20:30 +08:00
|
|
|
return true;
|
2013-10-22 23:30:28 +08:00
|
|
|
if (State.Stack.back().BreakBeforeClosingBrace &&
|
2015-10-27 21:42:08 +08:00
|
|
|
Current.closesBlockOrBlockTypeList(Style))
|
2013-08-16 19:20:30 +08:00
|
|
|
return true;
|
|
|
|
if (Previous.is(tok::semi) && State.LineContainsContinuedForLoopSection)
|
|
|
|
return true;
|
2018-02-07 18:35:08 +08:00
|
|
|
if (Style.Language == FormatStyle::LK_ObjC &&
|
|
|
|
Current.ObjCSelectorNameParts > 1 &&
|
|
|
|
Current.startsSequence(TT_SelectorName, tok::colon, tok::caret)) {
|
|
|
|
return true;
|
|
|
|
}
|
2013-10-08 13:11:18 +08:00
|
|
|
if ((startsNextParameter(Current, Style) || Previous.is(tok::semi) ||
|
2016-01-09 23:56:47 +08:00
|
|
|
(Previous.is(TT_TemplateCloser) && Current.is(TT_StartOfName) &&
|
2017-03-31 21:30:24 +08:00
|
|
|
Style.isCpp() &&
|
2016-01-11 19:01:05 +08:00
|
|
|
// FIXME: This is a temporary workaround for the case where clang-format
|
|
|
|
// sets BreakBeforeParameter to avoid bin packing and this creates a
|
|
|
|
// completely unnecessary line break after a template type that isn't
|
|
|
|
// line-wrapped.
|
|
|
|
(Previous.NestingLevel == 1 || Style.BinPackParameters)) ||
|
2015-05-27 13:37:40 +08:00
|
|
|
(Style.BreakBeforeTernaryOperators && Current.is(TT_ConditionalExpr) &&
|
|
|
|
Previous.isNot(tok::question)) ||
|
2013-11-08 08:57:11 +08:00
|
|
|
(!Style.BreakBeforeTernaryOperators &&
|
2015-05-27 13:37:40 +08:00
|
|
|
Previous.is(TT_ConditionalExpr))) &&
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter && !Current.isTrailingComment() &&
|
|
|
|
!Current.isOneOf(tok::r_paren, tok::r_brace))
|
|
|
|
return true;
|
2014-11-25 18:05:17 +08:00
|
|
|
if (((Previous.is(TT_DictLiteral) && Previous.is(tok::l_brace)) ||
|
2016-01-04 15:27:33 +08:00
|
|
|
(Previous.is(TT_ArrayInitializerLSquare) &&
|
2017-07-03 23:05:14 +08:00
|
|
|
Previous.ParameterCount > 1) ||
|
|
|
|
opensProtoMessageField(Previous, Style)) &&
|
2014-04-14 20:11:07 +08:00
|
|
|
Style.ColumnLimit > 0 &&
|
2018-05-09 17:02:11 +08:00
|
|
|
getLengthToMatchingParen(Previous, State.Stack) + State.Column - 1 >
|
2015-06-02 23:14:21 +08:00
|
|
|
getColumnLimit(State))
|
2013-10-21 00:45:46 +08:00
|
|
|
return true;
|
2017-05-24 19:36:58 +08:00
|
|
|
|
|
|
|
const FormatToken &BreakConstructorInitializersToken =
|
|
|
|
Style.BreakConstructorInitializers == FormatStyle::BCIS_AfterColon
|
|
|
|
? Previous
|
|
|
|
: Current;
|
|
|
|
if (BreakConstructorInitializersToken.is(TT_CtorInitializerColon) &&
|
|
|
|
(State.Column + State.Line->Last->TotalLength - Previous.TotalLength >
|
2015-08-27 19:59:31 +08:00
|
|
|
getColumnLimit(State) ||
|
|
|
|
State.Stack.back().BreakBeforeParameter) &&
|
2017-05-24 19:36:58 +08:00
|
|
|
(Style.AllowShortFunctionsOnASingleLine != FormatStyle::SFS_All ||
|
|
|
|
Style.BreakConstructorInitializers != FormatStyle::BCIS_BeforeColon ||
|
|
|
|
Style.ColumnLimit != 0))
|
2014-03-28 00:14:13 +08:00
|
|
|
return true;
|
2017-05-24 19:36:58 +08:00
|
|
|
|
2016-11-12 15:38:22 +08:00
|
|
|
if (Current.is(TT_ObjCMethodExpr) && !Previous.is(TT_SelectorName) &&
|
|
|
|
State.Line->startsWith(TT_ObjCMethodSpecifier))
|
|
|
|
return true;
|
2018-06-25 20:43:12 +08:00
|
|
|
if (Current.is(TT_SelectorName) && !Previous.is(tok::at) &&
|
|
|
|
State.Stack.back().ObjCSelectorNameFound &&
|
2015-05-06 21:13:03 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter)
|
|
|
|
return true;
|
2013-08-16 19:20:30 +08:00
|
|
|
|
2015-06-18 17:12:47 +08:00
|
|
|
unsigned NewLineColumn = getNewLineColumn(State);
|
2016-01-14 21:36:46 +08:00
|
|
|
if (Current.isMemberAccess() && Style.ColumnLimit != 0 &&
|
2016-01-11 19:00:58 +08:00
|
|
|
State.Column + getLengthToNextOperator(Current) > Style.ColumnLimit &&
|
|
|
|
(State.Column > NewLineColumn ||
|
|
|
|
Current.NestingLevel < State.StartOfLineLevel))
|
2016-01-05 21:03:59 +08:00
|
|
|
return true;
|
|
|
|
|
2017-01-14 07:18:16 +08:00
|
|
|
if (startsSegmentOfBuilderTypeCall(Current) &&
|
|
|
|
(State.Stack.back().CallContinuation != 0 ||
|
2017-01-30 15:08:40 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter) &&
|
|
|
|
// JavaScript is treated different here as there is a frequent pattern:
|
|
|
|
// SomeFunction(function() {
|
|
|
|
// ...
|
|
|
|
// }.bind(...));
|
|
|
|
// FIXME: We should find a more generic solution to this problem.
|
2017-05-29 15:50:52 +08:00
|
|
|
!(State.Column <= NewLineColumn &&
|
2018-09-17 15:46:20 +08:00
|
|
|
Style.Language == FormatStyle::LK_JavaScript) &&
|
2019-03-01 17:09:54 +08:00
|
|
|
!(Previous.closesScopeAfterBlock() && State.Column <= NewLineColumn))
|
2017-01-14 07:18:16 +08:00
|
|
|
return true;
|
|
|
|
|
2018-05-16 16:25:03 +08:00
|
|
|
// If the template declaration spans multiple lines, force wrap before the
|
|
|
|
// function/class declaration
|
|
|
|
if (Previous.ClosesTemplateDeclaration &&
|
2018-05-23 22:18:19 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter && Current.CanBreakBefore)
|
2018-05-16 16:25:03 +08:00
|
|
|
return true;
|
|
|
|
|
2016-01-11 19:00:58 +08:00
|
|
|
if (State.Column <= NewLineColumn)
|
|
|
|
return false;
|
|
|
|
|
2015-06-18 17:12:47 +08:00
|
|
|
if (Style.AlwaysBreakBeforeMultilineStrings &&
|
2015-06-19 00:05:17 +08:00
|
|
|
(NewLineColumn == State.FirstIndent + Style.ContinuationIndentWidth ||
|
2015-06-19 18:32:28 +08:00
|
|
|
Previous.is(tok::comma) || Current.NestingLevel < 2) &&
|
[clang-format] Add basic support for formatting C# files
Summary:
This revision adds basic support for formatting C# files with clang-format, I know the barrier to entry is high here so I'm sending this revision in to test the water as to whether this might be something we'd consider landing.
Tracking in Bugzilla as:
https://bugs.llvm.org/show_bug.cgi?id=40850
Justification:
C# code just looks ugly in comparison to the C++ code in our source tree which is clang-formatted.
I've struggled with Visual Studio reformatting to get a clean and consistent style, I want to format our C# code on saving like I do now for C++ and i want it to have the same style as defined in our .clang-format file, so it consistent as it can be with C++. (Braces/Breaking/Spaces/Indent etc..)
Using clang format without this patch leaves the code in a bad state, sometimes when the BreakStringLiterals is set, it fails to compile.
Mostly the C# is similar to Java, except instead of JavaAnnotations I try to reuse the TT_AttributeSquare.
Almost the most valuable portion is to have a new Language in order to partition the configuration for C# within a common .clang-format file, with the auto detection on the .cs extension. But there are other C# specific styles that could be added later if this is accepted. in particular how `{ set;get }` is formatted.
Reviewers: djasper, klimek, krasimir, benhamilton, JonasToth
Reviewed By: klimek
Subscribers: llvm-commits, mgorny, jdoerfert, cfe-commits
Tags: #clang, #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D58404
llvm-svn: 356662
2019-03-21 21:09:22 +08:00
|
|
|
!Previous.isOneOf(tok::kw_return, tok::lessless, tok::at,
|
|
|
|
Keywords.kw_dollar) &&
|
2015-06-18 17:12:47 +08:00
|
|
|
!Previous.isOneOf(TT_InlineASMColon, TT_ConditionalExpr) &&
|
|
|
|
nextIsMultilineString(State))
|
|
|
|
return true;
|
|
|
|
|
2015-05-11 05:15:07 +08:00
|
|
|
// Using CanBreakBefore here and below takes care of the decision whether the
|
|
|
|
// current style uses wrapping before or after operators for the given
|
|
|
|
// operator.
|
|
|
|
if (Previous.is(TT_BinaryOperator) && Current.CanBreakBefore) {
|
2013-08-16 19:20:30 +08:00
|
|
|
// 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.
|
|
|
|
bool IsComparison = (Previous.getPrecedence() == prec::Relational ||
|
2017-12-14 23:16:18 +08:00
|
|
|
Previous.getPrecedence() == prec::Equality ||
|
|
|
|
Previous.getPrecedence() == prec::Spaceship) &&
|
2013-08-16 19:20:30 +08:00
|
|
|
Previous.Previous &&
|
2014-11-25 18:05:17 +08:00
|
|
|
Previous.Previous->isNot(TT_BinaryOperator); // For >>.
|
2013-08-16 19:20:30 +08:00
|
|
|
bool LHSIsBinaryExpr =
|
2013-09-06 16:08:14 +08:00
|
|
|
Previous.Previous && Previous.Previous->EndsBinaryExpression;
|
2015-05-11 05:15:07 +08:00
|
|
|
if ((!IsComparison || LHSIsBinaryExpr) && !Current.isTrailingComment() &&
|
2013-08-16 19:20:30 +08:00
|
|
|
Previous.getPrecedence() != prec::Assignment &&
|
|
|
|
State.Stack.back().BreakBeforeParameter)
|
|
|
|
return true;
|
2015-05-11 05:15:07 +08:00
|
|
|
} else if (Current.is(TT_BinaryOperator) && Current.CanBreakBefore &&
|
|
|
|
State.Stack.back().BreakBeforeParameter) {
|
|
|
|
return true;
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Same as above, but for the first "<<" operator.
|
2014-11-25 18:05:17 +08:00
|
|
|
if (Current.is(tok::lessless) && Current.isNot(TT_OverloadedOperator) &&
|
2014-03-06 23:13:08 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter &&
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().FirstLessLess == 0)
|
|
|
|
return true;
|
|
|
|
|
2014-12-09 04:08:04 +08:00
|
|
|
if (Current.NestingLevel == 0 && !Current.isTrailingComment()) {
|
2015-05-18 17:47:22 +08:00
|
|
|
// 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.
|
2014-12-09 04:08:04 +08:00
|
|
|
if (Previous.ClosesTemplateDeclaration)
|
2018-05-16 16:25:03 +08:00
|
|
|
return Style.AlwaysBreakTemplateDeclarations != FormatStyle::BTDS_No;
|
2015-05-18 21:47:23 +08:00
|
|
|
if (Previous.is(TT_FunctionAnnotationRParen))
|
2015-05-18 17:47:22 +08:00
|
|
|
return true;
|
2015-01-10 07:25:06 +08:00
|
|
|
if (Previous.is(TT_LeadingJavaAnnotation) && Current.isNot(tok::l_paren) &&
|
|
|
|
Current.isNot(TT_LeadingJavaAnnotation))
|
2014-12-09 04:08:04 +08:00
|
|
|
return true;
|
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
|
2014-07-09 15:50:33 +08:00
|
|
|
// If the return type spans multiple lines, wrap before the function name.
|
2015-07-16 03:11:58 +08:00
|
|
|
if ((Current.is(TT_FunctionDeclarationName) ||
|
|
|
|
(Current.is(tok::kw_operator) && !Previous.is(tok::coloncolon))) &&
|
2016-02-05 22:17:16 +08:00
|
|
|
!Previous.is(tok::kw_template) && State.Stack.back().BreakBeforeParameter)
|
2013-08-16 19:20:30 +08:00
|
|
|
return true;
|
2014-07-09 15:50:33 +08:00
|
|
|
|
2014-01-05 20:38:10 +08:00
|
|
|
// The following could be precomputed as they do not depend on the state.
|
|
|
|
// However, as they should take effect only if the UnwrappedLine does not fit
|
|
|
|
// into the ColumnLimit, they are checked here in the ContinuationIndenter.
|
2014-04-29 22:05:20 +08:00
|
|
|
if (Style.ColumnLimit != 0 && Previous.BlockKind == BK_Block &&
|
|
|
|
Previous.is(tok::l_brace) && !Current.isOneOf(tok::r_brace, tok::comment))
|
2014-01-05 20:38:10 +08:00
|
|
|
return true;
|
|
|
|
|
2016-01-05 21:06:27 +08:00
|
|
|
if (Current.is(tok::lessless) &&
|
|
|
|
((Previous.is(tok::identifier) && Previous.TokenText == "endl") ||
|
|
|
|
(Previous.Tok.isLiteral() && (Previous.TokenText.endswith("\\n\"") ||
|
|
|
|
Previous.TokenText == "\'\\n\'"))))
|
2015-02-17 18:05:15 +08:00
|
|
|
return true;
|
|
|
|
|
2017-10-16 17:08:53 +08:00
|
|
|
if (Previous.is(TT_BlockComment) && Previous.IsMultiline)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (State.NoContinuation)
|
|
|
|
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;
|
|
|
|
|
2014-03-18 19:22:45 +08:00
|
|
|
assert(!State.Stack.empty());
|
2017-10-16 17:08:53 +08:00
|
|
|
State.NoContinuation = false;
|
|
|
|
|
2014-11-25 18:05:17 +08:00
|
|
|
if ((Current.is(TT_ImplicitStringLiteral) &&
|
2014-05-09 16:15:10 +08:00
|
|
|
(Current.Previous->Tok.getIdentifierInfo() == nullptr ||
|
2013-10-30 21:54:53 +08:00
|
|
|
Current.Previous->Tok.getIdentifierInfo()->getPPKeywordID() ==
|
|
|
|
tok::pp_not_keyword))) {
|
2015-01-31 15:05:46 +08:00
|
|
|
unsigned EndColumn =
|
|
|
|
SourceMgr.getSpellingColumnNumber(Current.WhitespaceRange.getEnd());
|
|
|
|
if (Current.LastNewlineOffset != 0) {
|
|
|
|
// If there is a newline within this token, the final column will solely
|
|
|
|
// determined by the current end column.
|
|
|
|
State.Column = EndColumn;
|
|
|
|
} else {
|
|
|
|
unsigned StartColumn =
|
|
|
|
SourceMgr.getSpellingColumnNumber(Current.WhitespaceRange.getBegin());
|
|
|
|
assert(EndColumn >= StartColumn);
|
|
|
|
State.Column += EndColumn - StartColumn;
|
|
|
|
}
|
2014-03-31 22:23:49 +08:00
|
|
|
moveStateToNextToken(State, DryRun, /*Newline=*/false);
|
2013-08-16 19:20:30 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-01 22:41:18 +08:00
|
|
|
unsigned Penalty = 0;
|
|
|
|
if (Newline)
|
|
|
|
Penalty = addTokenOnNewLine(State, DryRun);
|
|
|
|
else
|
2013-11-20 22:54:39 +08:00
|
|
|
addTokenOnCurrentLine(State, DryRun, ExtraSpaces);
|
2013-10-01 22:41:18 +08:00
|
|
|
|
|
|
|
return moveStateToNextToken(State, DryRun, Newline) + Penalty;
|
|
|
|
}
|
|
|
|
|
2013-11-20 22:54:39 +08:00
|
|
|
void ContinuationIndenter::addTokenOnCurrentLine(LineState &State, bool DryRun,
|
|
|
|
unsigned ExtraSpaces) {
|
2013-10-12 05:25:45 +08:00
|
|
|
FormatToken &Current = *State.NextToken;
|
2013-10-01 22:41:18 +08:00
|
|
|
const FormatToken &Previous = *State.NextToken->Previous;
|
|
|
|
if (Current.is(tok::equal) &&
|
2014-05-08 20:21:30 +08:00
|
|
|
(State.Line->First->is(tok::kw_for) || Current.NestingLevel == 0) &&
|
2013-10-01 22:41:18 +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->ColumnWidth) {
|
|
|
|
State.Stack.back().VariablePos -= Tok->ColumnWidth;
|
|
|
|
if (Tok->SpacesRequiredBefore != 0)
|
|
|
|
break;
|
|
|
|
Tok = Tok->Previous;
|
|
|
|
}
|
|
|
|
if (Previous.PartOfMultiVariableDeclStmt)
|
|
|
|
State.Stack.back().LastSpace = State.Stack.back().VariablePos;
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned Spaces = Current.SpacesRequiredBefore + ExtraSpaces;
|
|
|
|
|
clang-format: Add preprocessor directive indentation
Summary:
This is an implementation for [bug 17362](https://bugs.llvm.org/attachment.cgi?bugid=17362) which adds support for indenting preprocessor statements inside if/ifdef/endif. This takes previous work from fmauch (https://github.com/fmauch/clang/tree/preprocessor_indent) and makes it into a full feature.
The context of this patch is that I'm a VMware intern, and I implemented this because VMware needs the feature. As such, some decisions were made based on what VMware wants, and I would appreciate suggestions on expanding this if necessary to use-cases other people may want.
This adds a new enum config option, `IndentPPDirectives`. Values are:
* `PPDIS_None` (in config: `None`):
```
#if FOO
#if BAR
#include <foo>
#endif
#endif
```
* `PPDIS_AfterHash` (in config: `AfterHash`):
```
#if FOO
# if BAR
# include <foo>
# endif
#endif
```
This is meant to work whether spaces or tabs are used for indentation. Preprocessor indentation is independent of indentation for non-preprocessor lines.
Preprocessor indentation also attempts to ignore include guards with the checks:
1. Include guards cover the entire file
2. Include guards don't have `#else`
3. Include guards begin with
```
#ifndef <var>
#define <var>
```
This patch allows `UnwrappedLineParser::PPBranchLevel` to be decremented to -1 (the initial value is -1) so the variable can be used for indent tracking.
Defects:
* This patch does not handle the case where there's code between the `#ifndef` and `#define` but all other conditions hold. This is because when the #define line is parsed, `UnwrappedLineParser::Lines` doesn't hold the previous code line yet, so we can't detect it. This is out of the scope of this patch.
* This patch does not handle cases where legitimate lines may be outside an include guard. Examples are `#pragma once` and `#pragma GCC diagnostic`, or anything else that does not change the meaning of the file if it's included multiple times.
* This does not detect when there is a single non-preprocessor line in front of an include-guard-like structure where other conditions hold because `ScopedLineState` hides the line.
* Preprocessor indentation throws off `TokenAnnotator::setCommentLineLevels` so the indentation of comments immediately before indented preprocessor lines is toggled on each run. Fixing this issue appears to be a major change and too much complexity for this patch.
Contributed by @euhlmann!
Reviewers: djasper, klimek, krasimir
Reviewed By: djasper, krasimir
Subscribers: krasimir, mzeren-vmw, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D35955
llvm-svn: 312125
2017-08-30 22:34:57 +08:00
|
|
|
// Indent preprocessor directives after the hash if required.
|
|
|
|
int PPColumnCorrection = 0;
|
|
|
|
if (Style.IndentPPDirectives == FormatStyle::PPDIS_AfterHash &&
|
|
|
|
Previous.is(tok::hash) && State.FirstIndent > 0 &&
|
|
|
|
(State.Line->Type == LT_PreprocessorDirective ||
|
|
|
|
State.Line->Type == LT_ImportStatement)) {
|
|
|
|
Spaces += State.FirstIndent;
|
|
|
|
|
|
|
|
// For preprocessor indent with tabs, State.Column will be 1 because of the
|
|
|
|
// hash. This causes second-level indents onward to have an extra space
|
|
|
|
// after the tabs. We avoid this misalignment by subtracting 1 from the
|
|
|
|
// column value passed to replaceWhitespace().
|
|
|
|
if (Style.UseTab != FormatStyle::UT_Never)
|
|
|
|
PPColumnCorrection = -1;
|
|
|
|
}
|
|
|
|
|
2013-10-01 22:41:18 +08:00
|
|
|
if (!DryRun)
|
2017-01-31 19:25:01 +08:00
|
|
|
Whitespaces.replaceWhitespace(Current, /*Newlines=*/0, Spaces,
|
clang-format: Add preprocessor directive indentation
Summary:
This is an implementation for [bug 17362](https://bugs.llvm.org/attachment.cgi?bugid=17362) which adds support for indenting preprocessor statements inside if/ifdef/endif. This takes previous work from fmauch (https://github.com/fmauch/clang/tree/preprocessor_indent) and makes it into a full feature.
The context of this patch is that I'm a VMware intern, and I implemented this because VMware needs the feature. As such, some decisions were made based on what VMware wants, and I would appreciate suggestions on expanding this if necessary to use-cases other people may want.
This adds a new enum config option, `IndentPPDirectives`. Values are:
* `PPDIS_None` (in config: `None`):
```
#if FOO
#if BAR
#include <foo>
#endif
#endif
```
* `PPDIS_AfterHash` (in config: `AfterHash`):
```
#if FOO
# if BAR
# include <foo>
# endif
#endif
```
This is meant to work whether spaces or tabs are used for indentation. Preprocessor indentation is independent of indentation for non-preprocessor lines.
Preprocessor indentation also attempts to ignore include guards with the checks:
1. Include guards cover the entire file
2. Include guards don't have `#else`
3. Include guards begin with
```
#ifndef <var>
#define <var>
```
This patch allows `UnwrappedLineParser::PPBranchLevel` to be decremented to -1 (the initial value is -1) so the variable can be used for indent tracking.
Defects:
* This patch does not handle the case where there's code between the `#ifndef` and `#define` but all other conditions hold. This is because when the #define line is parsed, `UnwrappedLineParser::Lines` doesn't hold the previous code line yet, so we can't detect it. This is out of the scope of this patch.
* This patch does not handle cases where legitimate lines may be outside an include guard. Examples are `#pragma once` and `#pragma GCC diagnostic`, or anything else that does not change the meaning of the file if it's included multiple times.
* This does not detect when there is a single non-preprocessor line in front of an include-guard-like structure where other conditions hold because `ScopedLineState` hides the line.
* Preprocessor indentation throws off `TokenAnnotator::setCommentLineLevels` so the indentation of comments immediately before indented preprocessor lines is toggled on each run. Fixing this issue appears to be a major change and too much complexity for this patch.
Contributed by @euhlmann!
Reviewers: djasper, klimek, krasimir
Reviewed By: djasper, krasimir
Subscribers: krasimir, mzeren-vmw, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D35955
llvm-svn: 312125
2017-08-30 22:34:57 +08:00
|
|
|
State.Column + Spaces + PPColumnCorrection);
|
2013-10-01 22:41:18 +08:00
|
|
|
|
2017-03-10 23:10:37 +08:00
|
|
|
// If "BreakBeforeInheritanceComma" mode, don't break within the inheritance
|
|
|
|
// declaration unless there is multiple inheritance.
|
2018-06-11 22:41:26 +08:00
|
|
|
if (Style.BreakInheritanceList == FormatStyle::BILS_BeforeComma &&
|
|
|
|
Current.is(TT_InheritanceColon))
|
|
|
|
State.Stack.back().NoLineBreak = true;
|
|
|
|
if (Style.BreakInheritanceList == FormatStyle::BILS_AfterColon &&
|
|
|
|
Previous.is(TT_InheritanceColon))
|
2017-03-10 23:10:37 +08:00
|
|
|
State.Stack.back().NoLineBreak = true;
|
|
|
|
|
2014-11-25 18:05:17 +08:00
|
|
|
if (Current.is(TT_SelectorName) &&
|
2013-12-23 15:29:06 +08:00
|
|
|
!State.Stack.back().ObjCSelectorNameFound) {
|
2016-01-04 15:29:07 +08:00
|
|
|
unsigned MinIndent =
|
|
|
|
std::max(State.FirstIndent + Style.ContinuationIndentWidth,
|
|
|
|
State.Stack.back().Indent);
|
|
|
|
unsigned FirstColonPos = State.Column + Spaces + Current.ColumnWidth;
|
2013-12-23 15:29:06 +08:00
|
|
|
if (Current.LongestObjCSelectorName == 0)
|
|
|
|
State.Stack.back().AlignColons = false;
|
2016-01-04 15:29:07 +08:00
|
|
|
else if (MinIndent + Current.LongestObjCSelectorName > FirstColonPos)
|
|
|
|
State.Stack.back().ColonPos = MinIndent + Current.LongestObjCSelectorName;
|
2013-10-01 22:41:18 +08:00
|
|
|
else
|
2016-01-04 15:29:07 +08:00
|
|
|
State.Stack.back().ColonPos = FirstColonPos;
|
2013-10-01 22:41:18 +08:00
|
|
|
}
|
|
|
|
|
2015-10-27 20:38:37 +08:00
|
|
|
// In "AlwaysBreak" mode, enforce wrapping directly after the parenthesis by
|
|
|
|
// disallowing any further line breaks if there is no line break after the
|
|
|
|
// opening parenthesis. Don't break if it doesn't conserve columns.
|
|
|
|
if (Style.AlignAfterOpenBracket == FormatStyle::BAS_AlwaysBreak &&
|
2016-02-02 18:28:11 +08:00
|
|
|
Previous.isOneOf(tok::l_paren, TT_TemplateOpener, tok::l_square) &&
|
|
|
|
State.Column > getNewLineColumn(State) &&
|
2017-09-20 17:51:03 +08:00
|
|
|
(!Previous.Previous || !Previous.Previous->isOneOf(
|
|
|
|
tok::kw_for, tok::kw_while, tok::kw_switch)) &&
|
2016-03-17 20:00:22 +08:00
|
|
|
// Don't do this for simple (no expressions) one-argument function calls
|
|
|
|
// as that feels like needlessly wasting whitespace, e.g.:
|
|
|
|
//
|
|
|
|
// caaaaaaaaaaaall(
|
|
|
|
// caaaaaaaaaaaall(
|
|
|
|
// caaaaaaaaaaaall(
|
|
|
|
// caaaaaaaaaaaaaaaaaaaaaaall(aaaaaaaaaaaaaa, aaaaaaaaa))));
|
|
|
|
Current.FakeLParens.size() > 0 &&
|
|
|
|
Current.FakeLParens.back() > prec::Unknown)
|
2015-10-27 20:38:37 +08:00
|
|
|
State.Stack.back().NoLineBreak = true;
|
2017-02-20 22:51:16 +08:00
|
|
|
if (Previous.is(TT_TemplateString) && Previous.opensScope())
|
|
|
|
State.Stack.back().NoLineBreak = true;
|
2015-10-27 20:38:37 +08:00
|
|
|
|
|
|
|
if (Style.AlignAfterOpenBracket != FormatStyle::BAS_DontAlign &&
|
|
|
|
Previous.opensScope() && Previous.isNot(TT_ObjCMethodExpr) &&
|
2014-11-25 18:05:17 +08:00
|
|
|
(Current.isNot(TT_LineComment) || Previous.BlockKind == BK_BracedInit))
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack.back().Indent = State.Column + Spaces;
|
2013-10-08 13:11:18 +08:00
|
|
|
if (State.Stack.back().AvoidBinPacking && startsNextParameter(Current, Style))
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack.back().NoLineBreak = true;
|
2015-04-24 18:08:09 +08:00
|
|
|
if (startsSegmentOfBuilderTypeCall(Current) &&
|
|
|
|
State.Column > getNewLineColumn(State))
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack.back().ContainsUnwrappedBuilder = true;
|
|
|
|
|
2015-06-05 21:18:09 +08:00
|
|
|
if (Current.is(TT_LambdaArrow) && Style.Language == FormatStyle::LK_Java)
|
2015-03-27 02:46:28 +08:00
|
|
|
State.Stack.back().NoLineBreak = true;
|
2014-09-13 00:35:28 +08:00
|
|
|
if (Current.isMemberAccess() && Previous.is(tok::r_paren) &&
|
|
|
|
(Previous.MatchingParen &&
|
2017-02-20 22:51:16 +08:00
|
|
|
(Previous.TotalLength - Previous.MatchingParen->TotalLength > 10)))
|
2014-09-13 00:35:28 +08:00
|
|
|
// If there is a function call with long parameters, break before trailing
|
|
|
|
// calls. This prevents things like:
|
|
|
|
// EXPECT_CALL(SomeLongParameter).Times(
|
|
|
|
// 2);
|
|
|
|
// We don't want to do this for short parameters as they can just be
|
|
|
|
// indexes.
|
|
|
|
State.Stack.back().NoLineBreak = true;
|
|
|
|
|
2017-01-16 21:13:15 +08:00
|
|
|
// Don't allow the RHS of an operator to be split over multiple lines unless
|
|
|
|
// there is a line-break right after the operator.
|
|
|
|
// Exclude relational operators, as there, it is always more desirable to
|
|
|
|
// have the LHS 'left' of the RHS.
|
|
|
|
const FormatToken *P = Current.getPreviousNonComment();
|
|
|
|
if (!Current.is(tok::comment) && P &&
|
|
|
|
(P->isOneOf(TT_BinaryOperator, tok::comma) ||
|
|
|
|
(P->is(TT_ConditionalExpr) && P->is(tok::colon))) &&
|
|
|
|
!P->isOneOf(TT_OverloadedOperator, TT_CtorInitializerComma) &&
|
|
|
|
P->getPrecedence() != prec::Assignment &&
|
2017-12-14 23:16:18 +08:00
|
|
|
P->getPrecedence() != prec::Relational &&
|
|
|
|
P->getPrecedence() != prec::Spaceship) {
|
2017-01-16 21:13:15 +08:00
|
|
|
bool BreakBeforeOperator =
|
2017-02-02 07:27:37 +08:00
|
|
|
P->MustBreakBefore || P->is(tok::lessless) ||
|
2017-01-16 21:13:15 +08:00
|
|
|
(P->is(TT_BinaryOperator) &&
|
|
|
|
Style.BreakBeforeBinaryOperators != FormatStyle::BOS_None) ||
|
|
|
|
(P->is(TT_ConditionalExpr) && Style.BreakBeforeTernaryOperators);
|
2017-02-01 17:23:39 +08:00
|
|
|
// Don't do this if there are only two operands. In these cases, there is
|
|
|
|
// always a nice vertical separation between them and the extra line break
|
|
|
|
// does not help.
|
|
|
|
bool HasTwoOperands =
|
|
|
|
P->OperatorIndex == 0 && !P->NextOperator && !P->is(TT_ConditionalExpr);
|
2017-02-02 16:30:21 +08:00
|
|
|
if ((!BreakBeforeOperator && !(HasTwoOperands && Style.AlignOperands)) ||
|
2017-01-16 21:13:15 +08:00
|
|
|
(!State.Stack.back().LastOperatorWrapped && BreakBeforeOperator))
|
|
|
|
State.Stack.back().NoLineBreakInOperand = true;
|
|
|
|
}
|
|
|
|
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Column += Spaces;
|
2014-05-07 17:23:05 +08:00
|
|
|
if (Current.isNot(tok::comment) && Previous.is(tok::l_paren) &&
|
2014-12-12 17:40:58 +08:00
|
|
|
Previous.Previous &&
|
2019-07-27 10:41:40 +08:00
|
|
|
(Previous.Previous->is(tok::kw_for) || Previous.Previous->isIf())) {
|
2013-10-01 22:41:18 +08:00
|
|
|
// Treat the condition inside an if as if it was a second function
|
2013-10-18 18:38:14 +08:00
|
|
|
// parameter, i.e. let nested calls have a continuation indent.
|
2014-05-07 17:23:05 +08:00
|
|
|
State.Stack.back().LastSpace = State.Column;
|
2014-12-12 17:40:58 +08:00
|
|
|
State.Stack.back().NestedBlockIndent = State.Column;
|
|
|
|
} else if (!Current.isOneOf(tok::comment, tok::caret) &&
|
2016-01-09 23:56:40 +08:00
|
|
|
((Previous.is(tok::comma) &&
|
|
|
|
!Previous.is(TT_OverloadedOperator)) ||
|
2014-12-12 17:40:58 +08:00
|
|
|
(Previous.is(tok::colon) && Previous.is(TT_ObjCMethodExpr)))) {
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack.back().LastSpace = State.Column;
|
2017-05-24 19:36:58 +08:00
|
|
|
} else if (Previous.is(TT_CtorInitializerColon) &&
|
|
|
|
Style.BreakConstructorInitializers ==
|
|
|
|
FormatStyle::BCIS_AfterColon) {
|
|
|
|
State.Stack.back().Indent = State.Column;
|
|
|
|
State.Stack.back().LastSpace = State.Column;
|
2014-12-12 17:40:58 +08:00
|
|
|
} else if ((Previous.isOneOf(TT_BinaryOperator, TT_ConditionalExpr,
|
|
|
|
TT_CtorInitializerColon)) &&
|
|
|
|
((Previous.getPrecedence() != prec::Assignment &&
|
|
|
|
(Previous.isNot(tok::lessless) || Previous.OperatorIndex != 0 ||
|
2016-01-05 21:03:50 +08:00
|
|
|
Previous.NextOperator)) ||
|
2014-12-12 17:40:58 +08:00
|
|
|
Current.StartsBinaryExpression)) {
|
2016-02-11 21:15:14 +08:00
|
|
|
// Indent relative to the RHS of the expression unless this is a simple
|
|
|
|
// assignment without binary expression on the RHS. Also indent relative to
|
|
|
|
// unary operators and the colons of constructor initializers.
|
2018-08-25 01:14:31 +08:00
|
|
|
if (Style.BreakBeforeBinaryOperators == FormatStyle::BOS_None)
|
|
|
|
State.Stack.back().LastSpace = State.Column;
|
2014-12-12 17:40:58 +08:00
|
|
|
} else if (Previous.is(TT_InheritanceColon)) {
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack.back().Indent = State.Column;
|
2013-10-09 00:24:07 +08:00
|
|
|
State.Stack.back().LastSpace = State.Column;
|
|
|
|
} else if (Previous.opensScope()) {
|
2013-10-01 22:41:18 +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();
|
|
|
|
bool HasTrailingCall = false;
|
|
|
|
if (Previous.MatchingParen) {
|
|
|
|
const FormatToken *Next = Previous.MatchingParen->getNextNonComment();
|
|
|
|
HasTrailingCall = Next && Next->isMemberAccess();
|
|
|
|
}
|
2015-02-17 17:58:03 +08:00
|
|
|
if (HasTrailingCall && State.Stack.size() > 1 &&
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack[State.Stack.size() - 2].CallContinuation == 0)
|
|
|
|
State.Stack.back().LastSpace = State.Column;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned ContinuationIndenter::addTokenOnNewLine(LineState &State,
|
|
|
|
bool DryRun) {
|
2013-10-12 05:25:45 +08:00
|
|
|
FormatToken &Current = *State.NextToken;
|
2013-10-01 22:41:18 +08:00
|
|
|
const FormatToken &Previous = *State.NextToken->Previous;
|
2014-03-27 22:33:30 +08:00
|
|
|
|
2013-10-01 22:41:18 +08:00
|
|
|
// Extra penalty that needs to be added because of the way certain line
|
|
|
|
// breaks are chosen.
|
|
|
|
unsigned Penalty = 0;
|
|
|
|
|
2014-02-11 18:08:11 +08:00
|
|
|
const FormatToken *PreviousNonComment = Current.getPreviousNonComment();
|
|
|
|
const FormatToken *NextNonComment = Previous.getNextNonComment();
|
|
|
|
if (!NextNonComment)
|
|
|
|
NextNonComment = &Current;
|
2014-05-08 20:21:30 +08:00
|
|
|
// The first line break on any NestingLevel causes an extra penalty in order
|
2013-10-01 22:41:18 +08:00
|
|
|
// prefer similar line breaks.
|
|
|
|
if (!State.Stack.back().ContainsLineBreak)
|
|
|
|
Penalty += 15;
|
|
|
|
State.Stack.back().ContainsLineBreak = true;
|
|
|
|
|
|
|
|
Penalty += State.NextToken->SplitPenalty;
|
|
|
|
|
|
|
|
// Breaking before the first "<<" is generally not desirable if the LHS is
|
2016-12-19 19:14:23 +08:00
|
|
|
// short. Also always add the penalty if the LHS is split over multiple lines
|
2014-04-03 20:00:27 +08:00
|
|
|
// to avoid unnecessary line breaks that just work around this penalty.
|
2014-02-11 18:08:11 +08:00
|
|
|
if (NextNonComment->is(tok::lessless) &&
|
|
|
|
State.Stack.back().FirstLessLess == 0 &&
|
2013-12-20 00:06:40 +08:00
|
|
|
(State.Column <= Style.ColumnLimit / 3 ||
|
2013-11-20 22:54:39 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter))
|
2013-10-01 22:41:18 +08:00
|
|
|
Penalty += Style.PenaltyBreakFirstLessLess;
|
|
|
|
|
2014-03-27 22:33:30 +08:00
|
|
|
State.Column = getNewLineColumn(State);
|
2015-06-18 20:32:59 +08:00
|
|
|
|
|
|
|
// Indent nested blocks relative to this column, unless in a very specific
|
|
|
|
// JavaScript special case where:
|
|
|
|
//
|
|
|
|
// var loooooong_name =
|
|
|
|
// function() {
|
|
|
|
// // code
|
|
|
|
// }
|
|
|
|
//
|
2016-06-13 15:48:45 +08:00
|
|
|
// is common and should be formatted like a free-standing function. The same
|
|
|
|
// goes for wrapping before the lambda return type arrow.
|
|
|
|
if (!Current.is(TT_LambdaArrow) &&
|
|
|
|
(Style.Language != FormatStyle::LK_JavaScript ||
|
|
|
|
Current.NestingLevel != 0 || !PreviousNonComment ||
|
|
|
|
!PreviousNonComment->is(tok::equal) ||
|
|
|
|
!Current.isOneOf(Keywords.kw_async, Keywords.kw_function)))
|
2015-06-18 20:32:59 +08:00
|
|
|
State.Stack.back().NestedBlockIndent = State.Column;
|
|
|
|
|
2014-03-27 22:33:30 +08:00
|
|
|
if (NextNonComment->isMemberAccess()) {
|
|
|
|
if (State.Stack.back().CallContinuation == 0)
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack.back().CallContinuation = State.Column;
|
2014-11-25 18:05:17 +08:00
|
|
|
} else if (NextNonComment->is(TT_SelectorName)) {
|
2013-12-23 15:29:06 +08:00
|
|
|
if (!State.Stack.back().ObjCSelectorNameFound) {
|
2014-02-11 18:08:11 +08:00
|
|
|
if (NextNonComment->LongestObjCSelectorName == 0) {
|
2013-12-23 15:29:06 +08:00
|
|
|
State.Stack.back().AlignColons = false;
|
|
|
|
} else {
|
|
|
|
State.Stack.back().ColonPos =
|
2018-04-12 23:11:48 +08:00
|
|
|
(shouldIndentWrappedSelectorName(Style, State.Line->Type)
|
2015-05-13 17:38:25 +08:00
|
|
|
? std::max(State.Stack.back().Indent,
|
|
|
|
State.FirstIndent + Style.ContinuationIndentWidth)
|
|
|
|
: State.Stack.back().Indent) +
|
2018-02-09 23:41:56 +08:00
|
|
|
std::max(NextNonComment->LongestObjCSelectorName,
|
|
|
|
NextNonComment->ColumnWidth);
|
2013-12-23 15:29:06 +08:00
|
|
|
}
|
2014-03-27 22:33:30 +08:00
|
|
|
} else if (State.Stack.back().AlignColons &&
|
|
|
|
State.Stack.back().ColonPos <= NextNonComment->ColumnWidth) {
|
2014-02-11 18:08:11 +08:00
|
|
|
State.Stack.back().ColonPos = State.Column + NextNonComment->ColumnWidth;
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
2014-03-17 22:32:47 +08:00
|
|
|
} else if (PreviousNonComment && PreviousNonComment->is(tok::colon) &&
|
2014-11-25 18:05:17 +08:00
|
|
|
PreviousNonComment->isOneOf(TT_ObjCMethodExpr, TT_DictLiteral)) {
|
2013-12-23 15:29:06 +08:00
|
|
|
// FIXME: This is hacky, find a better way. The problem is that in an ObjC
|
|
|
|
// method expression, the block should be aligned to the line starting it,
|
|
|
|
// e.g.:
|
|
|
|
// [aaaaaaaaaaaaaaa aaaaaaaaa: \\ break for some reason
|
|
|
|
// ^(int *i) {
|
|
|
|
// // ...
|
|
|
|
// }];
|
2014-05-08 20:21:30 +08:00
|
|
|
// Thus, we set LastSpace of the next higher NestingLevel, to which we move
|
2013-12-23 15:29:06 +08:00
|
|
|
// when we consume all of the "}"'s FakeRParens at the "{".
|
2013-12-23 19:25:40 +08:00
|
|
|
if (State.Stack.size() > 1)
|
2014-03-27 22:33:30 +08:00
|
|
|
State.Stack[State.Stack.size() - 2].LastSpace =
|
|
|
|
std::max(State.Stack.back().LastSpace, State.Stack.back().Indent) +
|
|
|
|
Style.ContinuationIndentWidth;
|
2013-10-01 22:41:18 +08:00
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
|
2016-11-29 17:40:01 +08:00
|
|
|
if ((PreviousNonComment &&
|
|
|
|
PreviousNonComment->isOneOf(tok::comma, tok::semi) &&
|
2013-10-01 22:41:18 +08:00
|
|
|
!State.Stack.back().AvoidBinPacking) ||
|
2014-11-25 18:05:17 +08:00
|
|
|
Previous.is(TT_BinaryOperator))
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter = false;
|
2018-05-23 22:18:19 +08:00
|
|
|
if (PreviousNonComment &&
|
|
|
|
PreviousNonComment->isOneOf(TT_TemplateCloser, TT_JavaAnnotation) &&
|
2014-11-03 10:27:28 +08:00
|
|
|
Current.NestingLevel == 0)
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter = false;
|
2014-02-11 18:08:11 +08:00
|
|
|
if (NextNonComment->is(tok::question) ||
|
2013-11-08 08:57:11 +08:00
|
|
|
(PreviousNonComment && PreviousNonComment->is(tok::question)))
|
|
|
|
State.Stack.back().BreakBeforeParameter = true;
|
2015-06-03 17:26:03 +08:00
|
|
|
if (Current.is(TT_BinaryOperator) && Current.CanBreakBefore)
|
|
|
|
State.Stack.back().BreakBeforeParameter = false;
|
2013-10-01 22:41:18 +08:00
|
|
|
|
|
|
|
if (!DryRun) {
|
2017-11-18 02:06:33 +08:00
|
|
|
unsigned MaxEmptyLinesToKeep = Style.MaxEmptyLinesToKeep + 1;
|
|
|
|
if (Current.is(tok::r_brace) && Current.MatchingParen &&
|
|
|
|
// Only strip trailing empty lines for l_braces that have children, i.e.
|
|
|
|
// for function expressions (lambdas, arrows, etc).
|
|
|
|
!Current.MatchingParen->Children.empty()) {
|
|
|
|
// lambdas and arrow functions are expressions, thus their r_brace is not
|
|
|
|
// on its own line, and thus not covered by UnwrappedLineFormatter's logic
|
|
|
|
// about removing empty lines on closing blocks. Special case them here.
|
|
|
|
MaxEmptyLinesToKeep = 1;
|
|
|
|
}
|
2019-03-01 17:09:54 +08:00
|
|
|
unsigned Newlines =
|
|
|
|
std::max(1u, std::min(Current.NewlinesBefore, MaxEmptyLinesToKeep));
|
2017-05-19 18:34:57 +08:00
|
|
|
bool ContinuePPDirective =
|
|
|
|
State.Line->InPPDirective && State.Line->Type != LT_ImportStatement;
|
2017-01-31 19:25:01 +08:00
|
|
|
Whitespaces.replaceWhitespace(Current, Newlines, State.Column, State.Column,
|
2017-05-19 18:34:57 +08:00
|
|
|
ContinuePPDirective);
|
2013-10-01 22:41:18 +08:00
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
|
2013-10-01 22:41:18 +08:00
|
|
|
if (!Current.isTrailingComment())
|
|
|
|
State.Stack.back().LastSpace = State.Column;
|
2016-02-11 21:15:14 +08:00
|
|
|
if (Current.is(tok::lessless))
|
|
|
|
// If we are breaking before a "<<", we always want to indent relative to
|
|
|
|
// RHS. This is necessary only for "<<", as we special-case it and don't
|
|
|
|
// always indent relative to the RHS.
|
|
|
|
State.Stack.back().LastSpace += 3; // 3 -> width of "<< ".
|
|
|
|
|
2014-05-08 20:21:30 +08:00
|
|
|
State.StartOfLineLevel = Current.NestingLevel;
|
|
|
|
State.LowestLevelOnLine = Current.NestingLevel;
|
2013-10-01 22:41:18 +08:00
|
|
|
|
|
|
|
// Any break on this level means that the parent level has been broken
|
|
|
|
// and we need to avoid bin packing there.
|
2014-11-21 21:38:53 +08:00
|
|
|
bool NestedBlockSpecialCase =
|
2017-03-31 21:30:24 +08:00
|
|
|
!Style.isCpp() && Current.is(tok::r_brace) && State.Stack.size() > 1 &&
|
2014-11-21 21:38:53 +08:00
|
|
|
State.Stack[State.Stack.size() - 2].NestedBlockInlined;
|
2015-06-01 17:56:32 +08:00
|
|
|
if (!NestedBlockSpecialCase)
|
|
|
|
for (unsigned i = 0, e = State.Stack.size() - 1; i != e; ++i)
|
2014-05-21 20:51:23 +08:00
|
|
|
State.Stack[i].BreakBeforeParameter = true;
|
|
|
|
|
2013-11-09 03:56:28 +08:00
|
|
|
if (PreviousNonComment &&
|
2017-05-24 19:36:58 +08:00
|
|
|
!PreviousNonComment->isOneOf(tok::comma, tok::colon, tok::semi) &&
|
2014-11-25 18:05:17 +08:00
|
|
|
(PreviousNonComment->isNot(TT_TemplateCloser) ||
|
2014-11-14 21:14:45 +08:00
|
|
|
Current.NestingLevel != 0) &&
|
2015-05-18 21:47:23 +08:00
|
|
|
!PreviousNonComment->isOneOf(
|
|
|
|
TT_BinaryOperator, TT_FunctionAnnotationRParen, TT_JavaAnnotation,
|
|
|
|
TT_LeadingJavaAnnotation) &&
|
2014-11-25 18:05:17 +08:00
|
|
|
Current.isNot(TT_BinaryOperator) && !PreviousNonComment->opensScope())
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter = true;
|
|
|
|
|
2013-10-22 23:30:28 +08:00
|
|
|
// If we break after { or the [ of an array initializer, we should also break
|
|
|
|
// before the corresponding } or ].
|
2014-06-10 18:42:26 +08:00
|
|
|
if (PreviousNonComment &&
|
2017-02-20 22:51:16 +08:00
|
|
|
(PreviousNonComment->isOneOf(tok::l_brace, TT_ArrayInitializerLSquare) ||
|
clang-format: [JS] simplify template string wrapping.
Summary:
Previously, clang-format would try to wrap template string substitutions
by indenting relative to the openening `${`. This helped with
indenting structured strings, such as strings containing HTML, as the
substitutions would be aligned according to the structure of the string.
However it turns out that the overwhelming majority of template string +
substitution usages are for substitutions into non-structured strings,
e.g. URLs or just plain messages. For these situations, clang-format
would often produce very ugly indents, in particular for strings
containing no line breaks:
return `<a href='http://google3/${file}?l=${row}'>${file}</a>(${
row
},${
col
}): `;
This change makes clang-format indent template string substitutions as
if they were string concatenation operations. It wraps +4 on overlong
lines and keeps all operands on the same line:
return `<a href='http://google3/${file}?l=${row}'>${file}</a>(${
row},${col}): `;
While this breaks some lexical continuity between the `${` and `row}`
here, the overall effects are still a huge improvement, and users can
still manually break the string using `+` if desired.
Reviewers: djasper
Subscribers: klimek, cfe-commits
Differential Revision: https://reviews.llvm.org/D37142
llvm-svn: 311988
2017-08-29 16:30:07 +08:00
|
|
|
opensProtoMessageField(*PreviousNonComment, Style)))
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack.back().BreakBeforeClosingBrace = true;
|
|
|
|
|
|
|
|
if (State.Stack.back().AvoidBinPacking) {
|
Clang-format: add finer-grained options for putting all arguments on one line
Summary:
Add two new options,
AllowAllArgumentsOnNextLine and
AllowAllConstructorInitializersOnNextLine. These mirror the existing
AllowAllParametersOfDeclarationOnNextLine and allow me to support an
internal style guide where I work. I think this would be generally
useful, some have asked for it on stackoverflow:
https://stackoverflow.com/questions/30057534/clang-format-binpackarguments-not-working-as-expected
https://stackoverflow.com/questions/38635106/clang-format-how-to-prevent-all-function-arguments-on-next-line
Reviewers: djasper, krasimir, MyDeveloperDay
Reviewed By: MyDeveloperDay
Subscribers: jkorous, MyDeveloperDay, aol-nnov, lebedev.ri, uohcsemaj, cfe-commits, klimek
Differential Revision: https://reviews.llvm.org/D40988
Patch By: russellmcc (Russell McClellan)
llvm-svn: 356834
2019-03-23 22:37:58 +08:00
|
|
|
// If we are breaking after '(', '{', '<', or this is the break after a ':'
|
|
|
|
// to start a member initializater list in a constructor, this should not
|
|
|
|
// be considered bin packing unless the relevant AllowAll option is false or
|
|
|
|
// this is a dict/object literal.
|
|
|
|
bool PreviousIsBreakingCtorInitializerColon =
|
|
|
|
Previous.is(TT_CtorInitializerColon) &&
|
|
|
|
Style.BreakConstructorInitializers == FormatStyle::BCIS_AfterColon;
|
|
|
|
if (!(Previous.isOneOf(tok::l_paren, tok::l_brace, TT_BinaryOperator) ||
|
|
|
|
PreviousIsBreakingCtorInitializerColon) ||
|
2013-10-01 22:41:18 +08:00
|
|
|
(!Style.AllowAllParametersOfDeclarationOnNextLine &&
|
2014-05-21 21:26:58 +08:00
|
|
|
State.Line->MustBeDeclaration) ||
|
Clang-format: add finer-grained options for putting all arguments on one line
Summary:
Add two new options,
AllowAllArgumentsOnNextLine and
AllowAllConstructorInitializersOnNextLine. These mirror the existing
AllowAllParametersOfDeclarationOnNextLine and allow me to support an
internal style guide where I work. I think this would be generally
useful, some have asked for it on stackoverflow:
https://stackoverflow.com/questions/30057534/clang-format-binpackarguments-not-working-as-expected
https://stackoverflow.com/questions/38635106/clang-format-how-to-prevent-all-function-arguments-on-next-line
Reviewers: djasper, krasimir, MyDeveloperDay
Reviewed By: MyDeveloperDay
Subscribers: jkorous, MyDeveloperDay, aol-nnov, lebedev.ri, uohcsemaj, cfe-commits, klimek
Differential Revision: https://reviews.llvm.org/D40988
Patch By: russellmcc (Russell McClellan)
llvm-svn: 356834
2019-03-23 22:37:58 +08:00
|
|
|
(!Style.AllowAllArgumentsOnNextLine &&
|
|
|
|
!State.Line->MustBeDeclaration) ||
|
|
|
|
(!Style.AllowAllConstructorInitializersOnNextLine &&
|
|
|
|
PreviousIsBreakingCtorInitializerColon) ||
|
2014-11-25 18:05:17 +08:00
|
|
|
Previous.is(TT_DictLiteral))
|
2013-10-01 22:41:18 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter = true;
|
Clang-format: add finer-grained options for putting all arguments on one line
Summary:
Add two new options,
AllowAllArgumentsOnNextLine and
AllowAllConstructorInitializersOnNextLine. These mirror the existing
AllowAllParametersOfDeclarationOnNextLine and allow me to support an
internal style guide where I work. I think this would be generally
useful, some have asked for it on stackoverflow:
https://stackoverflow.com/questions/30057534/clang-format-binpackarguments-not-working-as-expected
https://stackoverflow.com/questions/38635106/clang-format-how-to-prevent-all-function-arguments-on-next-line
Reviewers: djasper, krasimir, MyDeveloperDay
Reviewed By: MyDeveloperDay
Subscribers: jkorous, MyDeveloperDay, aol-nnov, lebedev.ri, uohcsemaj, cfe-commits, klimek
Differential Revision: https://reviews.llvm.org/D40988
Patch By: russellmcc (Russell McClellan)
llvm-svn: 356834
2019-03-23 22:37:58 +08:00
|
|
|
|
|
|
|
// If we are breaking after a ':' to start a member initializer list,
|
|
|
|
// and we allow all arguments on the next line, we should not break
|
|
|
|
// before the next parameter.
|
|
|
|
if (PreviousIsBreakingCtorInitializerColon &&
|
|
|
|
Style.AllowAllConstructorInitializersOnNextLine)
|
|
|
|
State.Stack.back().BreakBeforeParameter = false;
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
|
2013-10-01 22:41:18 +08:00
|
|
|
return Penalty;
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
|
2014-03-27 22:33:30 +08:00
|
|
|
unsigned ContinuationIndenter::getNewLineColumn(const LineState &State) {
|
2014-03-28 00:14:13 +08:00
|
|
|
if (!State.NextToken || !State.NextToken->Previous)
|
|
|
|
return 0;
|
2014-03-27 22:33:30 +08:00
|
|
|
FormatToken &Current = *State.NextToken;
|
2014-10-07 22:45:34 +08:00
|
|
|
const FormatToken &Previous = *Current.Previous;
|
2014-03-27 22:33:30 +08:00
|
|
|
// If we are continuing an expression, we want to use the continuation indent.
|
|
|
|
unsigned ContinuationIndent =
|
|
|
|
std::max(State.Stack.back().LastSpace, State.Stack.back().Indent) +
|
|
|
|
Style.ContinuationIndentWidth;
|
|
|
|
const FormatToken *PreviousNonComment = Current.getPreviousNonComment();
|
|
|
|
const FormatToken *NextNonComment = Previous.getNextNonComment();
|
|
|
|
if (!NextNonComment)
|
|
|
|
NextNonComment = &Current;
|
2014-11-03 03:16:41 +08:00
|
|
|
|
|
|
|
// Java specific bits.
|
2014-11-04 20:41:02 +08:00
|
|
|
if (Style.Language == FormatStyle::LK_Java &&
|
|
|
|
Current.isOneOf(Keywords.kw_implements, Keywords.kw_extends))
|
2014-11-03 03:16:41 +08:00
|
|
|
return std::max(State.Stack.back().LastSpace,
|
|
|
|
State.Stack.back().Indent + Style.ContinuationIndentWidth);
|
|
|
|
|
2014-05-09 21:11:16 +08:00
|
|
|
if (NextNonComment->is(tok::l_brace) && NextNonComment->BlockKind == BK_Block)
|
2014-05-08 20:21:30 +08:00
|
|
|
return Current.NestingLevel == 0 ? State.FirstIndent
|
|
|
|
: State.Stack.back().Indent;
|
2017-06-27 21:43:07 +08:00
|
|
|
if ((Current.isOneOf(tok::r_brace, tok::r_square) ||
|
2017-07-03 23:05:14 +08:00
|
|
|
(Current.is(tok::greater) &&
|
|
|
|
(Style.Language == FormatStyle::LK_Proto ||
|
|
|
|
Style.Language == FormatStyle::LK_TextProto))) &&
|
2017-06-27 21:43:07 +08:00
|
|
|
State.Stack.size() > 1) {
|
2015-10-27 21:42:08 +08:00
|
|
|
if (Current.closesBlockOrBlockTypeList(Style))
|
2014-12-12 17:40:58 +08:00
|
|
|
return State.Stack[State.Stack.size() - 2].NestedBlockIndent;
|
|
|
|
if (Current.MatchingParen &&
|
|
|
|
Current.MatchingParen->BlockKind == BK_BracedInit)
|
2014-03-27 22:33:30 +08:00
|
|
|
return State.Stack[State.Stack.size() - 2].LastSpace;
|
2014-12-11 01:24:34 +08:00
|
|
|
return State.FirstIndent;
|
2014-03-27 22:33:30 +08:00
|
|
|
}
|
2019-04-08 05:05:52 +08:00
|
|
|
// Indent a closing parenthesis at the previous level if followed by a semi,
|
|
|
|
// const, or opening brace. This allows indentations such as:
|
2017-05-29 15:50:52 +08:00
|
|
|
// foo(
|
|
|
|
// a,
|
|
|
|
// );
|
2019-04-08 05:05:52 +08:00
|
|
|
// int Foo::getter(
|
|
|
|
// //
|
|
|
|
// ) const {
|
|
|
|
// return foo;
|
|
|
|
// }
|
2017-05-29 15:50:52 +08:00
|
|
|
// function foo(
|
|
|
|
// a,
|
|
|
|
// ) {
|
|
|
|
// code(); //
|
|
|
|
// }
|
|
|
|
if (Current.is(tok::r_paren) && State.Stack.size() > 1 &&
|
2019-04-08 05:05:52 +08:00
|
|
|
(!Current.Next ||
|
|
|
|
Current.Next->isOneOf(tok::semi, tok::kw_const, tok::l_brace)))
|
2017-05-15 19:15:29 +08:00
|
|
|
return State.Stack[State.Stack.size() - 2].LastSpace;
|
2017-02-20 22:51:16 +08:00
|
|
|
if (NextNonComment->is(TT_TemplateString) && NextNonComment->closesScope())
|
|
|
|
return State.Stack[State.Stack.size() - 2].LastSpace;
|
2014-04-15 17:54:30 +08:00
|
|
|
if (Current.is(tok::identifier) && Current.Next &&
|
2017-08-03 22:17:29 +08:00
|
|
|
(Current.Next->is(TT_DictLiteral) ||
|
|
|
|
((Style.Language == FormatStyle::LK_Proto ||
|
|
|
|
Style.Language == FormatStyle::LK_TextProto) &&
|
2018-02-06 19:34:34 +08:00
|
|
|
Current.Next->isOneOf(tok::less, tok::l_brace))))
|
2014-04-15 17:54:30 +08:00
|
|
|
return State.Stack.back().Indent;
|
2015-05-17 16:13:23 +08:00
|
|
|
if (NextNonComment->is(TT_ObjCStringLiteral) &&
|
|
|
|
State.StartOfStringLiteral != 0)
|
|
|
|
return State.StartOfStringLiteral - 1;
|
2017-04-11 17:55:00 +08:00
|
|
|
if (NextNonComment->isStringLiteral() && State.StartOfStringLiteral != 0)
|
|
|
|
return State.StartOfStringLiteral;
|
2014-03-27 22:33:30 +08:00
|
|
|
if (NextNonComment->is(tok::lessless) &&
|
|
|
|
State.Stack.back().FirstLessLess != 0)
|
|
|
|
return State.Stack.back().FirstLessLess;
|
|
|
|
if (NextNonComment->isMemberAccess()) {
|
2014-12-11 01:24:34 +08:00
|
|
|
if (State.Stack.back().CallContinuation == 0)
|
2014-03-27 22:33:30 +08:00
|
|
|
return ContinuationIndent;
|
2014-12-11 01:24:34 +08:00
|
|
|
return State.Stack.back().CallContinuation;
|
2014-03-27 22:33:30 +08:00
|
|
|
}
|
|
|
|
if (State.Stack.back().QuestionColumn != 0 &&
|
2014-04-14 19:08:45 +08:00
|
|
|
((NextNonComment->is(tok::colon) &&
|
2014-11-25 18:05:17 +08:00
|
|
|
NextNonComment->is(TT_ConditionalExpr)) ||
|
|
|
|
Previous.is(TT_ConditionalExpr)))
|
2014-03-27 22:33:30 +08:00
|
|
|
return State.Stack.back().QuestionColumn;
|
|
|
|
if (Previous.is(tok::comma) && State.Stack.back().VariablePos != 0)
|
|
|
|
return State.Stack.back().VariablePos;
|
2014-11-01 02:23:49 +08:00
|
|
|
if ((PreviousNonComment &&
|
|
|
|
(PreviousNonComment->ClosesTemplateDeclaration ||
|
2015-05-18 21:47:23 +08:00
|
|
|
PreviousNonComment->isOneOf(
|
2018-03-12 23:42:38 +08:00
|
|
|
TT_AttributeParen, TT_AttributeSquare, TT_FunctionAnnotationRParen,
|
|
|
|
TT_JavaAnnotation, TT_LeadingJavaAnnotation))) ||
|
2014-07-09 16:42:42 +08:00
|
|
|
(!Style.IndentWrappedFunctionNames &&
|
2014-11-25 18:05:17 +08:00
|
|
|
NextNonComment->isOneOf(tok::kw_operator, TT_FunctionDeclarationName)))
|
2014-03-27 22:33:30 +08:00
|
|
|
return std::max(State.Stack.back().LastSpace, State.Stack.back().Indent);
|
2014-11-25 18:05:17 +08:00
|
|
|
if (NextNonComment->is(TT_SelectorName)) {
|
2014-03-27 22:33:30 +08:00
|
|
|
if (!State.Stack.back().ObjCSelectorNameFound) {
|
2018-03-30 23:38:45 +08:00
|
|
|
unsigned MinIndent = State.Stack.back().Indent;
|
2018-04-12 23:11:48 +08:00
|
|
|
if (shouldIndentWrappedSelectorName(Style, State.Line->Type))
|
2018-03-30 23:38:45 +08:00
|
|
|
MinIndent = std::max(MinIndent,
|
|
|
|
State.FirstIndent + Style.ContinuationIndentWidth);
|
|
|
|
// If LongestObjCSelectorName is 0, we are indenting the first
|
|
|
|
// part of an ObjC selector (or a selector component which is
|
|
|
|
// not colon-aligned due to block formatting).
|
|
|
|
//
|
|
|
|
// Otherwise, we are indenting a subsequent part of an ObjC
|
|
|
|
// selector which should be colon-aligned to the longest
|
|
|
|
// component of the ObjC selector.
|
|
|
|
//
|
|
|
|
// In either case, we want to respect Style.IndentWrappedFunctionNames.
|
|
|
|
return MinIndent +
|
2018-02-09 23:41:56 +08:00
|
|
|
std::max(NextNonComment->LongestObjCSelectorName,
|
|
|
|
NextNonComment->ColumnWidth) -
|
2014-12-11 01:24:34 +08:00
|
|
|
NextNonComment->ColumnWidth;
|
|
|
|
}
|
|
|
|
if (!State.Stack.back().AlignColons)
|
2014-03-27 22:33:30 +08:00
|
|
|
return State.Stack.back().Indent;
|
2014-12-11 01:24:34 +08:00
|
|
|
if (State.Stack.back().ColonPos > NextNonComment->ColumnWidth)
|
2014-03-27 22:33:30 +08:00
|
|
|
return State.Stack.back().ColonPos - NextNonComment->ColumnWidth;
|
2014-12-11 01:24:34 +08:00
|
|
|
return State.Stack.back().Indent;
|
2014-03-27 22:33:30 +08:00
|
|
|
}
|
2016-11-12 15:38:22 +08:00
|
|
|
if (NextNonComment->is(tok::colon) && NextNonComment->is(TT_ObjCMethodExpr))
|
|
|
|
return State.Stack.back().ColonPos;
|
2014-11-25 18:05:17 +08:00
|
|
|
if (NextNonComment->is(TT_ArraySubscriptLSquare)) {
|
2014-03-27 22:33:30 +08:00
|
|
|
if (State.Stack.back().StartOfArraySubscripts != 0)
|
|
|
|
return State.Stack.back().StartOfArraySubscripts;
|
2014-12-11 01:24:34 +08:00
|
|
|
return ContinuationIndent;
|
2014-03-27 22:33:30 +08:00
|
|
|
}
|
2015-05-07 22:19:59 +08:00
|
|
|
|
|
|
|
// This ensure that we correctly format ObjC methods calls without inputs,
|
|
|
|
// i.e. where the last element isn't selector like: [callee method];
|
|
|
|
if (NextNonComment->is(tok::identifier) && NextNonComment->FakeRParens == 0 &&
|
|
|
|
NextNonComment->Next && NextNonComment->Next->is(TT_ObjCMethodExpr))
|
2015-05-06 20:48:06 +08:00
|
|
|
return State.Stack.back().Indent;
|
2015-05-07 22:19:59 +08:00
|
|
|
|
2015-03-12 23:04:53 +08:00
|
|
|
if (NextNonComment->isOneOf(TT_StartOfName, TT_PointerOrReference) ||
|
2015-07-06 22:07:51 +08:00
|
|
|
Previous.isOneOf(tok::coloncolon, tok::equal, TT_JsTypeColon))
|
2014-03-27 22:33:30 +08:00
|
|
|
return ContinuationIndent;
|
|
|
|
if (PreviousNonComment && PreviousNonComment->is(tok::colon) &&
|
2014-11-25 18:05:17 +08:00
|
|
|
PreviousNonComment->isOneOf(TT_ObjCMethodExpr, TT_DictLiteral))
|
2014-03-27 22:33:30 +08:00
|
|
|
return ContinuationIndent;
|
2014-11-25 18:05:17 +08:00
|
|
|
if (NextNonComment->is(TT_CtorInitializerComma))
|
2014-03-27 22:33:30 +08:00
|
|
|
return State.Stack.back().Indent;
|
2017-05-24 19:36:58 +08:00
|
|
|
if (PreviousNonComment && PreviousNonComment->is(TT_CtorInitializerColon) &&
|
|
|
|
Style.BreakConstructorInitializers == FormatStyle::BCIS_AfterColon)
|
|
|
|
return State.Stack.back().Indent;
|
2018-06-11 22:41:26 +08:00
|
|
|
if (PreviousNonComment && PreviousNonComment->is(TT_InheritanceColon) &&
|
|
|
|
Style.BreakInheritanceList == FormatStyle::BILS_AfterColon)
|
|
|
|
return State.Stack.back().Indent;
|
2017-03-10 23:10:37 +08:00
|
|
|
if (NextNonComment->isOneOf(TT_CtorInitializerColon, TT_InheritanceColon,
|
|
|
|
TT_InheritanceComma))
|
|
|
|
return State.FirstIndent + Style.ConstructorInitializerIndentWidth;
|
2014-08-06 21:14:58 +08:00
|
|
|
if (Previous.is(tok::r_paren) && !Current.isBinaryOperator() &&
|
2014-11-14 20:31:14 +08:00
|
|
|
!Current.isOneOf(tok::colon, tok::comment))
|
2014-08-06 21:14:58 +08:00
|
|
|
return ContinuationIndent;
|
2018-02-13 18:20:39 +08:00
|
|
|
if (Current.is(TT_ProtoExtensionLSquare))
|
|
|
|
return State.Stack.back().Indent;
|
2014-03-28 00:14:13 +08:00
|
|
|
if (State.Stack.back().Indent == State.FirstIndent && PreviousNonComment &&
|
2019-04-07 07:10:11 +08:00
|
|
|
!PreviousNonComment->isOneOf(tok::r_brace, TT_CtorInitializerComma))
|
2014-03-27 22:33:30 +08:00
|
|
|
// Ensure that we fall back to the continuation indent width instead of
|
|
|
|
// just flushing continuations left.
|
|
|
|
return State.Stack.back().Indent + Style.ContinuationIndentWidth;
|
|
|
|
return State.Stack.back().Indent;
|
|
|
|
}
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
unsigned ContinuationIndenter::moveStateToNextToken(LineState &State,
|
|
|
|
bool DryRun, bool Newline) {
|
|
|
|
assert(State.Stack.size());
|
2014-05-26 21:10:39 +08:00
|
|
|
const FormatToken &Current = *State.NextToken;
|
2013-08-16 19:20:30 +08:00
|
|
|
|
2017-01-16 21:13:15 +08:00
|
|
|
if (Current.isOneOf(tok::comma, TT_BinaryOperator))
|
|
|
|
State.Stack.back().NoLineBreakInOperand = false;
|
2014-11-25 18:05:17 +08:00
|
|
|
if (Current.is(TT_InheritanceColon))
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().AvoidBinPacking = true;
|
2014-11-25 18:05:17 +08:00
|
|
|
if (Current.is(tok::lessless) && Current.isNot(TT_OverloadedOperator)) {
|
2014-04-14 19:08:45 +08:00
|
|
|
if (State.Stack.back().FirstLessLess == 0)
|
|
|
|
State.Stack.back().FirstLessLess = State.Column;
|
|
|
|
else
|
|
|
|
State.Stack.back().LastOperatorWrapped = Newline;
|
|
|
|
}
|
2017-01-16 21:13:15 +08:00
|
|
|
if (Current.is(TT_BinaryOperator) && Current.isNot(tok::lessless))
|
|
|
|
State.Stack.back().LastOperatorWrapped = Newline;
|
|
|
|
if (Current.is(TT_ConditionalExpr) && Current.Previous &&
|
|
|
|
!Current.Previous->is(TT_ConditionalExpr))
|
2014-04-14 19:08:45 +08:00
|
|
|
State.Stack.back().LastOperatorWrapped = Newline;
|
2014-11-25 18:05:17 +08:00
|
|
|
if (Current.is(TT_ArraySubscriptLSquare) &&
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().StartOfArraySubscripts == 0)
|
|
|
|
State.Stack.back().StartOfArraySubscripts = State.Column;
|
2016-02-04 01:27:10 +08:00
|
|
|
if (Style.BreakBeforeTernaryOperators && Current.is(tok::question))
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().QuestionColumn = State.Column;
|
2016-02-04 01:27:10 +08:00
|
|
|
if (!Style.BreakBeforeTernaryOperators && Current.isNot(tok::colon)) {
|
|
|
|
const FormatToken *Previous = Current.Previous;
|
|
|
|
while (Previous && Previous->isTrailingComment())
|
|
|
|
Previous = Previous->Previous;
|
|
|
|
if (Previous && Previous->is(tok::question))
|
|
|
|
State.Stack.back().QuestionColumn = State.Column;
|
|
|
|
}
|
2017-04-24 22:28:49 +08:00
|
|
|
if (!Current.opensScope() && !Current.closesScope() &&
|
|
|
|
!Current.is(TT_PointerOrReference))
|
2013-08-16 19:20:30 +08:00
|
|
|
State.LowestLevelOnLine =
|
2014-05-08 20:21:30 +08:00
|
|
|
std::min(State.LowestLevelOnLine, Current.NestingLevel);
|
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 =
|
2016-01-05 21:03:50 +08:00
|
|
|
!Current.NextOperator ? 0 : State.Column;
|
2018-05-23 00:44:42 +08:00
|
|
|
if (Current.is(TT_SelectorName))
|
2013-12-23 15:29:06 +08:00
|
|
|
State.Stack.back().ObjCSelectorNameFound = true;
|
2017-05-24 19:36:58 +08:00
|
|
|
if (Current.is(TT_CtorInitializerColon) &&
|
|
|
|
Style.BreakConstructorInitializers != FormatStyle::BCIS_AfterColon) {
|
2013-08-16 19:20:30 +08:00
|
|
|
// Indent 2 from the column, so:
|
|
|
|
// SomeClass::SomeClass()
|
|
|
|
// : First(...), ...
|
|
|
|
// Next(...)
|
|
|
|
// ^ line up here.
|
|
|
|
State.Stack.back().Indent =
|
2017-09-20 17:51:03 +08:00
|
|
|
State.Column +
|
|
|
|
(Style.BreakConstructorInitializers == FormatStyle::BCIS_BeforeComma
|
|
|
|
? 0
|
|
|
|
: 2);
|
2015-01-12 18:23:24 +08:00
|
|
|
State.Stack.back().NestedBlockIndent = State.Stack.back().Indent;
|
Clang-format: add finer-grained options for putting all arguments on one line
Summary:
Add two new options,
AllowAllArgumentsOnNextLine and
AllowAllConstructorInitializersOnNextLine. These mirror the existing
AllowAllParametersOfDeclarationOnNextLine and allow me to support an
internal style guide where I work. I think this would be generally
useful, some have asked for it on stackoverflow:
https://stackoverflow.com/questions/30057534/clang-format-binpackarguments-not-working-as-expected
https://stackoverflow.com/questions/38635106/clang-format-how-to-prevent-all-function-arguments-on-next-line
Reviewers: djasper, krasimir, MyDeveloperDay
Reviewed By: MyDeveloperDay
Subscribers: jkorous, MyDeveloperDay, aol-nnov, lebedev.ri, uohcsemaj, cfe-commits, klimek
Differential Revision: https://reviews.llvm.org/D40988
Patch By: russellmcc (Russell McClellan)
llvm-svn: 356834
2019-03-23 22:37:58 +08:00
|
|
|
if (Style.ConstructorInitializerAllOnOneLineOrOnePerLine) {
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().AvoidBinPacking = true;
|
Clang-format: add finer-grained options for putting all arguments on one line
Summary:
Add two new options,
AllowAllArgumentsOnNextLine and
AllowAllConstructorInitializersOnNextLine. These mirror the existing
AllowAllParametersOfDeclarationOnNextLine and allow me to support an
internal style guide where I work. I think this would be generally
useful, some have asked for it on stackoverflow:
https://stackoverflow.com/questions/30057534/clang-format-binpackarguments-not-working-as-expected
https://stackoverflow.com/questions/38635106/clang-format-how-to-prevent-all-function-arguments-on-next-line
Reviewers: djasper, krasimir, MyDeveloperDay
Reviewed By: MyDeveloperDay
Subscribers: jkorous, MyDeveloperDay, aol-nnov, lebedev.ri, uohcsemaj, cfe-commits, klimek
Differential Revision: https://reviews.llvm.org/D40988
Patch By: russellmcc (Russell McClellan)
llvm-svn: 356834
2019-03-23 22:37:58 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter =
|
|
|
|
!Style.AllowAllConstructorInitializersOnNextLine;
|
|
|
|
} else {
|
|
|
|
State.Stack.back().BreakBeforeParameter = false;
|
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
2017-05-24 19:36:58 +08:00
|
|
|
if (Current.is(TT_CtorInitializerColon) &&
|
|
|
|
Style.BreakConstructorInitializers == FormatStyle::BCIS_AfterColon) {
|
|
|
|
State.Stack.back().Indent =
|
|
|
|
State.FirstIndent + Style.ConstructorInitializerIndentWidth;
|
|
|
|
State.Stack.back().NestedBlockIndent = State.Stack.back().Indent;
|
|
|
|
if (Style.ConstructorInitializerAllOnOneLineOrOnePerLine)
|
2017-09-20 17:51:03 +08:00
|
|
|
State.Stack.back().AvoidBinPacking = true;
|
2017-05-24 19:36:58 +08:00
|
|
|
}
|
2017-03-10 23:10:37 +08:00
|
|
|
if (Current.is(TT_InheritanceColon))
|
|
|
|
State.Stack.back().Indent =
|
2018-06-11 22:41:26 +08:00
|
|
|
State.FirstIndent + Style.ConstructorInitializerIndentWidth;
|
2015-05-14 00:09:21 +08:00
|
|
|
if (Current.isOneOf(TT_BinaryOperator, TT_ConditionalExpr) && Newline)
|
|
|
|
State.Stack.back().NestedBlockIndent =
|
|
|
|
State.Column + Current.ColumnWidth + 1;
|
2017-02-20 20:43:48 +08:00
|
|
|
if (Current.isOneOf(TT_LambdaLSquare, TT_LambdaArrow))
|
|
|
|
State.Stack.back().LastSpace = State.Column;
|
2013-08-16 19:20:30 +08:00
|
|
|
|
|
|
|
// Insert scopes created by fake parenthesis.
|
|
|
|
const FormatToken *Previous = Current.getPreviousNonComment();
|
2014-05-21 20:51:23 +08:00
|
|
|
|
|
|
|
// Add special behavior to support a format commonly used for JavaScript
|
|
|
|
// closures:
|
|
|
|
// SomeFunction(function() {
|
|
|
|
// foo();
|
|
|
|
// bar();
|
|
|
|
// }, a, b, c);
|
2015-06-15 17:23:17 +08:00
|
|
|
if (Current.isNot(tok::comment) && Previous &&
|
|
|
|
Previous->isOneOf(tok::l_brace, TT_ArrayInitializerLSquare) &&
|
[clang-format] tweaked another case of lambda formatting
Summary:
This is done in order to improve cases where the lambda's body is moved too far to the right. Consider the following snippet with column limit set to 79:
```
void f() {
leader::MakeThisCallHere(&leader_service_,
cq_.get(),
[this, liveness](const leader::ReadRecordReq& req,
std::function<void()> done) {
logger_->HandleReadRecord(
req, resp, std::move(done));
});
leader::MakeAnother(&leader_service_,
cq_.get(),
[this, liveness](const leader::ReadRecordReq& req,
std::function<void()> done) {
logger_->HandleReadRecord(
req, resp, std::move(done), a);
});
}
```
The tool favors extra indentation for the lambda body and so the code incurs extra wrapping and adjacent calls are indented to a different level. I find this behavior annoying and I'd like the tool to favor new lines and, thus, use the extra width.
The fix, reduced, brings the following formatting.
Before:
function(1,
[] {
DoStuff();
//
},
1);
After:
function(
1,
[] {
DoStuff();
//
},
1);
Refer to the new tests in FormatTest.cpp
Contributed by oleg.smolsky!
Reviewers: djasper, klimek, krasimir
Subscribers: cfe-commits, owenpan
Tags: #clang
Differential Revision: https://reviews.llvm.org/D52676
llvm-svn: 345753
2018-11-01 01:56:57 +08:00
|
|
|
!Previous->is(TT_DictLiteral) && State.Stack.size() > 1 &&
|
|
|
|
!State.Stack.back().HasMultipleNestedBlocks) {
|
2015-06-01 17:56:32 +08:00
|
|
|
if (State.Stack[State.Stack.size() - 2].NestedBlockInlined && Newline)
|
|
|
|
for (unsigned i = 0, e = State.Stack.size() - 1; i != e; ++i)
|
2014-11-21 21:38:53 +08:00
|
|
|
State.Stack[i].NoLineBreak = true;
|
|
|
|
State.Stack[State.Stack.size() - 2].NestedBlockInlined = false;
|
|
|
|
}
|
2017-09-20 17:51:03 +08:00
|
|
|
if (Previous &&
|
|
|
|
(Previous->isOneOf(tok::l_paren, tok::comma, tok::colon) ||
|
|
|
|
Previous->isOneOf(TT_BinaryOperator, TT_ConditionalExpr)) &&
|
2014-11-21 21:38:53 +08:00
|
|
|
!Previous->isOneOf(TT_DictLiteral, TT_ObjCMethodExpr)) {
|
|
|
|
State.Stack.back().NestedBlockInlined =
|
|
|
|
!Newline &&
|
2014-12-12 17:40:58 +08:00
|
|
|
(Previous->isNot(tok::l_paren) || Previous->ParameterCount > 1);
|
2014-05-21 20:51:23 +08:00
|
|
|
}
|
|
|
|
|
2014-05-26 21:10:39 +08:00
|
|
|
moveStatePastFakeLParens(State, Newline);
|
|
|
|
moveStatePastScopeCloser(State);
|
2017-11-14 17:19:53 +08:00
|
|
|
bool AllowBreak = !State.Stack.back().NoLineBreak &&
|
|
|
|
!State.Stack.back().NoLineBreakInOperand;
|
2017-02-03 22:32:38 +08:00
|
|
|
moveStatePastScopeOpener(State, Newline);
|
2014-05-26 21:10:39 +08:00
|
|
|
moveStatePastFakeRParens(State);
|
|
|
|
|
2015-05-17 16:13:23 +08:00
|
|
|
if (Current.is(TT_ObjCStringLiteral) && State.StartOfStringLiteral == 0)
|
|
|
|
State.StartOfStringLiteral = State.Column + 1;
|
[clang-format] Add basic support for formatting C# files
Summary:
This revision adds basic support for formatting C# files with clang-format, I know the barrier to entry is high here so I'm sending this revision in to test the water as to whether this might be something we'd consider landing.
Tracking in Bugzilla as:
https://bugs.llvm.org/show_bug.cgi?id=40850
Justification:
C# code just looks ugly in comparison to the C++ code in our source tree which is clang-formatted.
I've struggled with Visual Studio reformatting to get a clean and consistent style, I want to format our C# code on saving like I do now for C++ and i want it to have the same style as defined in our .clang-format file, so it consistent as it can be with C++. (Braces/Breaking/Spaces/Indent etc..)
Using clang format without this patch leaves the code in a bad state, sometimes when the BreakStringLiterals is set, it fails to compile.
Mostly the C# is similar to Java, except instead of JavaAnnotations I try to reuse the TT_AttributeSquare.
Almost the most valuable portion is to have a new Language in order to partition the configuration for C# within a common .clang-format file, with the auto detection on the .cs extension. But there are other C# specific styles that could be added later if this is accepted. in particular how `{ set;get }` is formatted.
Reviewers: djasper, klimek, krasimir, benhamilton, JonasToth
Reviewed By: klimek
Subscribers: llvm-commits, mgorny, jdoerfert, cfe-commits
Tags: #clang, #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D58404
llvm-svn: 356662
2019-03-21 21:09:22 +08:00
|
|
|
if (Current.is(TT_CSharpStringLiteral) && State.StartOfStringLiteral == 0)
|
|
|
|
State.StartOfStringLiteral = State.Column + 1;
|
2017-04-11 17:55:00 +08:00
|
|
|
else if (Current.isStringLiteral() && State.StartOfStringLiteral == 0)
|
|
|
|
State.StartOfStringLiteral = State.Column;
|
2015-05-17 16:13:23 +08:00
|
|
|
else if (!Current.isOneOf(tok::comment, tok::identifier, tok::hash) &&
|
2015-06-17 21:08:06 +08:00
|
|
|
!Current.isStringLiteral())
|
2014-05-26 21:10:39 +08:00
|
|
|
State.StartOfStringLiteral = 0;
|
|
|
|
|
|
|
|
State.Column += Current.ColumnWidth;
|
|
|
|
State.NextToken = State.NextToken->Next;
|
2017-11-14 17:19:53 +08:00
|
|
|
|
2019-04-19 01:14:05 +08:00
|
|
|
unsigned Penalty =
|
|
|
|
handleEndOfLine(Current, State, DryRun, AllowBreak, Newline);
|
2014-05-26 21:10:39 +08:00
|
|
|
|
|
|
|
if (Current.Role)
|
|
|
|
Current.Role->formatFromToken(State, this, DryRun);
|
|
|
|
// 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->formatAfterToken(State, this, DryRun);
|
|
|
|
|
|
|
|
return Penalty;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ContinuationIndenter::moveStatePastFakeLParens(LineState &State,
|
|
|
|
bool Newline) {
|
|
|
|
const FormatToken &Current = *State.NextToken;
|
|
|
|
const FormatToken *Previous = Current.getPreviousNonComment();
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
// Don't add extra indentation for the first fake parenthesis after
|
2014-05-02 01:19:34 +08:00
|
|
|
// 'return', assignments or opening <({[. The indentation for these cases
|
2013-08-16 19:20:30 +08:00
|
|
|
// is special cased.
|
|
|
|
bool SkipFirstExtraIndent =
|
2015-03-06 18:57:12 +08:00
|
|
|
(Previous && (Previous->opensScope() ||
|
|
|
|
Previous->isOneOf(tok::semi, tok::kw_return) ||
|
2014-12-02 21:24:51 +08:00
|
|
|
(Previous->getPrecedence() == prec::Assignment &&
|
|
|
|
Style.AlignOperands) ||
|
2014-11-25 18:05:17 +08:00
|
|
|
Previous->is(TT_ObjCMethodExpr)));
|
2013-08-16 19:20:30 +08:00
|
|
|
for (SmallVectorImpl<prec::Level>::const_reverse_iterator
|
|
|
|
I = Current.FakeLParens.rbegin(),
|
|
|
|
E = Current.FakeLParens.rend();
|
|
|
|
I != E; ++I) {
|
|
|
|
ParenState NewParenState = State.Stack.back();
|
2018-05-09 17:02:11 +08:00
|
|
|
NewParenState.Tok = nullptr;
|
2013-08-16 19:20:30 +08:00
|
|
|
NewParenState.ContainsLineBreak = false;
|
2017-03-16 15:54:11 +08:00
|
|
|
NewParenState.LastOperatorWrapped = true;
|
2017-01-16 21:13:15 +08:00
|
|
|
NewParenState.NoLineBreak =
|
|
|
|
NewParenState.NoLineBreak || State.Stack.back().NoLineBreakInOperand;
|
2013-09-30 16:29:03 +08:00
|
|
|
|
2017-05-08 23:07:52 +08:00
|
|
|
// Don't propagate AvoidBinPacking into subexpressions of arg/param lists.
|
|
|
|
if (*I > prec::Comma)
|
|
|
|
NewParenState.AvoidBinPacking = false;
|
|
|
|
|
2014-11-19 07:55:27 +08:00
|
|
|
// Indent from 'LastSpace' unless these are fake parentheses encapsulating
|
|
|
|
// a builder type call after 'return' or, if the alignment after opening
|
|
|
|
// brackets is disabled.
|
2014-10-07 22:45:34 +08:00
|
|
|
if (!Current.isTrailingComment() &&
|
2014-12-02 21:24:51 +08:00
|
|
|
(Style.AlignOperands || *I < prec::Assignment) &&
|
2014-11-20 17:54:49 +08:00
|
|
|
(!Previous || Previous->isNot(tok::kw_return) ||
|
|
|
|
(Style.Language != FormatStyle::LK_Java && *I > 0)) &&
|
2015-10-27 20:38:37 +08:00
|
|
|
(Style.AlignAfterOpenBracket != FormatStyle::BAS_DontAlign ||
|
|
|
|
*I != prec::Comma || Current.NestingLevel == 0))
|
2013-09-30 16:29:03 +08:00
|
|
|
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);
|
2016-02-08 17:52:54 +08:00
|
|
|
if (*I != prec::Conditional && !Current.is(TT_UnaryOperator) &&
|
|
|
|
Style.AlignAfterOpenBracket != FormatStyle::BAS_DontAlign)
|
2014-12-09 05:28:31 +08:00
|
|
|
NewParenState.StartOfFunctionCall = 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 &&
|
2014-12-02 17:46:56 +08:00
|
|
|
!Current.isTrailingComment()))
|
2013-10-18 18:38:14 +08:00
|
|
|
NewParenState.Indent += Style.ContinuationIndentWidth;
|
2016-01-08 02:11:54 +08:00
|
|
|
if ((Previous && !Previous->opensScope()) || *I != prec::Comma)
|
2013-08-16 19:20:30 +08:00
|
|
|
NewParenState.BreakBeforeParameter = false;
|
|
|
|
State.Stack.push_back(NewParenState);
|
|
|
|
SkipFirstExtraIndent = false;
|
|
|
|
}
|
2014-05-26 21:10:39 +08:00
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
|
2014-12-12 17:40:58 +08:00
|
|
|
void ContinuationIndenter::moveStatePastFakeRParens(LineState &State) {
|
|
|
|
for (unsigned i = 0, e = State.NextToken->FakeRParens; i != e; ++i) {
|
2014-05-28 17:11:53 +08:00
|
|
|
unsigned VariablePos = State.Stack.back().VariablePos;
|
|
|
|
if (State.Stack.size() == 1) {
|
|
|
|
// Do not pop the last element.
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
State.Stack.pop_back();
|
|
|
|
State.Stack.back().VariablePos = VariablePos;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-26 21:10:39 +08:00
|
|
|
void ContinuationIndenter::moveStatePastScopeOpener(LineState &State,
|
|
|
|
bool Newline) {
|
|
|
|
const FormatToken &Current = *State.NextToken;
|
|
|
|
if (!Current.opensScope())
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (Current.MatchingParen && Current.BlockKind == BK_Block) {
|
|
|
|
moveStateToNewBlock(State);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned NewIndent;
|
2015-05-04 15:39:00 +08:00
|
|
|
unsigned LastSpace = State.Stack.back().LastSpace;
|
2014-05-26 21:10:39 +08:00
|
|
|
bool AvoidBinPacking;
|
|
|
|
bool BreakBeforeParameter = false;
|
2015-07-14 19:26:14 +08:00
|
|
|
unsigned NestedBlockIndent = std::max(State.Stack.back().StartOfFunctionCall,
|
|
|
|
State.Stack.back().NestedBlockIndent);
|
2017-06-27 21:43:07 +08:00
|
|
|
if (Current.isOneOf(tok::l_brace, TT_ArrayInitializerLSquare) ||
|
2017-07-03 23:05:14 +08:00
|
|
|
opensProtoMessageField(Current, Style)) {
|
2015-10-27 21:42:08 +08:00
|
|
|
if (Current.opensBlockOrBlockTypeList(Style)) {
|
2017-06-06 20:38:29 +08:00
|
|
|
NewIndent = Style.IndentWidth +
|
|
|
|
std::min(State.Column, State.Stack.back().NestedBlockIndent);
|
2014-05-26 21:10:39 +08:00
|
|
|
} else {
|
2014-12-12 17:40:58 +08:00
|
|
|
NewIndent = State.Stack.back().LastSpace + Style.ContinuationIndentWidth;
|
2014-05-26 21:10:39 +08:00
|
|
|
}
|
|
|
|
const FormatToken *NextNoComment = Current.getNextNonComment();
|
clang-format: [ObjC+JS] Allow bin-packing of array literals.
After reading the style guides again, they don't actually say how to
pack or not pack array literals. Based on some user reports, array
initializers can unnecessarily get quite long if they contain many
small elements. Array literals with trailing commas are still formatted
one per line so that users have a way to opt out of the packing.
Before:
var array = [
aaaaaa,
aaaaaa,
aaaaaa,
aaaaaa,
aaaaaa,
aaaaaa,
aaaaaa,
aaaaaa,
aaaaaa,
aaaaaa
];
After:
var array = [
aaaaaa, aaaaaa, aaaaaa, aaaaaa, aaaaaa, aaaaaa, aaaaaa, aaaaaa, aaaaaa,
aaaaaa, aaaaaa
];
llvm-svn: 257615
2016-01-14 00:41:34 +08:00
|
|
|
bool EndsInComma = Current.MatchingParen &&
|
|
|
|
Current.MatchingParen->Previous &&
|
|
|
|
Current.MatchingParen->Previous->is(tok::comma);
|
2017-09-20 17:51:03 +08:00
|
|
|
AvoidBinPacking = EndsInComma || Current.is(TT_DictLiteral) ||
|
|
|
|
Style.Language == FormatStyle::LK_Proto ||
|
|
|
|
Style.Language == FormatStyle::LK_TextProto ||
|
|
|
|
!Style.BinPackArguments ||
|
|
|
|
(NextNoComment &&
|
|
|
|
NextNoComment->isOneOf(TT_DesignatedInitializerPeriod,
|
|
|
|
TT_DesignatedInitializerLSquare));
|
clang-format: Do not binpack initialization lists
Summary:
This patch tries to avoid binpacking when initializing lists/arrays, to allow things like:
static int types[] = {
registerType1(),
registerType2(),
registerType3(),
};
std::map<int, std::string> x = {
{ 0, "foo fjakfjaklf kljj" },
{ 1, "bar fjakfjaklf kljj" },
{ 2, "stuff fjakfjaklf kljj" },
};
This is similar to how dictionnaries are formatted, and actually corresponds to the same conditions: when initializing a container (and not just 'calling' a constructor).
Such formatting involves 2 things:
* Line breaks around the content of the block. This can be forced by adding a comma or comment after the last element
* Elements should not be binpacked
This patch considers the block is an initializer list if it either ends with a comma, or follows an assignment, which seems to provide a sensible approximation.
Reviewers: krasimir, djasper
Reviewed By: djasper
Subscribers: malcolm.parsons, klimek, cfe-commits
Differential Revision: https://reviews.llvm.org/D34238
llvm-svn: 306868
2017-07-01 04:00:02 +08:00
|
|
|
BreakBeforeParameter = EndsInComma;
|
2015-07-14 19:26:14 +08:00
|
|
|
if (Current.ParameterCount > 1)
|
|
|
|
NestedBlockIndent = std::max(NestedBlockIndent, State.Column + 1);
|
2014-05-26 21:10:39 +08:00
|
|
|
} else {
|
|
|
|
NewIndent = Style.ContinuationIndentWidth +
|
|
|
|
std::max(State.Stack.back().LastSpace,
|
|
|
|
State.Stack.back().StartOfFunctionCall);
|
2015-05-04 15:39:00 +08:00
|
|
|
|
|
|
|
// Ensure that different different brackets force relative alignment, e.g.:
|
|
|
|
// void SomeFunction(vector< // break
|
|
|
|
// int> v);
|
|
|
|
// FIXME: We likely want to do this for more combinations of brackets.
|
2017-01-31 22:39:33 +08:00
|
|
|
if (Current.is(tok::less) && Current.ParentBracket == tok::l_paren) {
|
2015-05-04 15:39:00 +08:00
|
|
|
NewIndent = std::max(NewIndent, State.Stack.back().Indent);
|
|
|
|
LastSpace = std::max(LastSpace, State.Stack.back().Indent);
|
|
|
|
}
|
|
|
|
|
2017-05-15 19:15:29 +08:00
|
|
|
bool EndsInComma =
|
|
|
|
Current.MatchingParen &&
|
|
|
|
Current.MatchingParen->getPreviousNonComment() &&
|
|
|
|
Current.MatchingParen->getPreviousNonComment()->is(tok::comma);
|
|
|
|
|
2018-02-03 04:15:14 +08:00
|
|
|
// If ObjCBinPackProtocolList is unspecified, fall back to BinPackParameters
|
|
|
|
// for backwards compatibility.
|
|
|
|
bool ObjCBinPackProtocolList =
|
|
|
|
(Style.ObjCBinPackProtocolList == FormatStyle::BPS_Auto &&
|
|
|
|
Style.BinPackParameters) ||
|
|
|
|
Style.ObjCBinPackProtocolList == FormatStyle::BPS_Always;
|
|
|
|
|
|
|
|
bool BinPackDeclaration =
|
|
|
|
(State.Line->Type != LT_ObjCDecl && Style.BinPackParameters) ||
|
|
|
|
(State.Line->Type == LT_ObjCDecl && ObjCBinPackProtocolList);
|
|
|
|
|
2014-10-09 17:52:05 +08:00
|
|
|
AvoidBinPacking =
|
2017-05-15 19:15:29 +08:00
|
|
|
(Style.Language == FormatStyle::LK_JavaScript && EndsInComma) ||
|
2018-02-03 04:15:14 +08:00
|
|
|
(State.Line->MustBeDeclaration && !BinPackDeclaration) ||
|
2014-10-09 17:52:05 +08:00
|
|
|
(!State.Line->MustBeDeclaration && !Style.BinPackArguments) ||
|
|
|
|
(Style.ExperimentalAutoDetectBinPacking &&
|
|
|
|
(Current.PackingKind == PPK_OnePerLine ||
|
|
|
|
(!BinPackInconclusiveFunctions &&
|
|
|
|
Current.PackingKind == PPK_Inconclusive)));
|
2017-05-15 19:15:29 +08:00
|
|
|
|
2015-04-23 17:23:17 +08:00
|
|
|
if (Current.is(TT_ObjCMethodExpr) && Current.MatchingParen) {
|
|
|
|
if (Style.ColumnLimit) {
|
|
|
|
// If this '[' opens an ObjC call, determine whether all parameters fit
|
|
|
|
// into one line and put one per line if they don't.
|
2018-05-09 17:02:11 +08:00
|
|
|
if (getLengthToMatchingParen(Current, State.Stack) + State.Column >
|
2014-05-26 21:10:39 +08:00
|
|
|
getColumnLimit(State))
|
2015-04-23 17:23:17 +08:00
|
|
|
BreakBeforeParameter = true;
|
|
|
|
} else {
|
|
|
|
// For ColumnLimit = 0, we have to figure out whether there is or has to
|
|
|
|
// be a line break within this call.
|
|
|
|
for (const FormatToken *Tok = &Current;
|
|
|
|
Tok && Tok != Current.MatchingParen; Tok = Tok->Next) {
|
2015-06-17 21:08:06 +08:00
|
|
|
if (Tok->MustBreakBefore ||
|
2015-04-23 17:23:17 +08:00
|
|
|
(Tok->CanBreakBefore && Tok->NewlinesBefore > 0)) {
|
|
|
|
BreakBeforeParameter = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-05-15 19:15:29 +08:00
|
|
|
|
|
|
|
if (Style.Language == FormatStyle::LK_JavaScript && EndsInComma)
|
|
|
|
BreakBeforeParameter = true;
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
2015-10-27 21:42:08 +08:00
|
|
|
// Generally inherit NoLineBreak from the current scope to nested scope.
|
|
|
|
// However, don't do this for non-empty nested blocks, dict literals and
|
|
|
|
// array literals as these follow different indentation rules.
|
|
|
|
bool NoLineBreak =
|
|
|
|
Current.Children.empty() &&
|
|
|
|
!Current.isOneOf(TT_DictLiteral, TT_ArrayInitializerLSquare) &&
|
|
|
|
(State.Stack.back().NoLineBreak ||
|
2017-01-16 21:13:15 +08:00
|
|
|
State.Stack.back().NoLineBreakInOperand ||
|
2015-10-27 21:42:08 +08:00
|
|
|
(Current.is(TT_TemplateOpener) &&
|
2017-01-16 21:13:15 +08:00
|
|
|
State.Stack.back().ContainsUnwrappedBuilder));
|
2017-01-31 19:25:01 +08:00
|
|
|
State.Stack.push_back(
|
2018-05-09 17:02:11 +08:00
|
|
|
ParenState(&Current, NewIndent, LastSpace, AvoidBinPacking, NoLineBreak));
|
2014-12-12 17:40:58 +08:00
|
|
|
State.Stack.back().NestedBlockIndent = NestedBlockIndent;
|
2014-05-26 21:10:39 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter = BreakBeforeParameter;
|
2014-06-03 20:02:45 +08:00
|
|
|
State.Stack.back().HasMultipleNestedBlocks = Current.BlockParameterCount > 1;
|
2018-02-09 00:07:25 +08:00
|
|
|
State.Stack.back().IsInsideObjCArrayLiteral =
|
|
|
|
Current.is(TT_ArrayInitializerLSquare) && Current.Previous &&
|
|
|
|
Current.Previous->is(tok::at);
|
2014-05-26 21:10:39 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void ContinuationIndenter::moveStatePastScopeCloser(LineState &State) {
|
|
|
|
const FormatToken &Current = *State.NextToken;
|
|
|
|
if (!Current.closesScope())
|
|
|
|
return;
|
2013-08-16 19:20:30 +08:00
|
|
|
|
|
|
|
// 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 &&
|
2017-02-03 22:32:38 +08:00
|
|
|
(Current.isOneOf(tok::r_paren, tok::r_square, TT_TemplateString) ||
|
2013-09-05 17:29:45 +08:00
|
|
|
(Current.is(tok::r_brace) && State.NextToken != State.Line->First) ||
|
2018-02-06 19:34:34 +08:00
|
|
|
State.NextToken->is(TT_TemplateCloser) ||
|
|
|
|
(Current.is(tok::greater) && Current.is(TT_DictLiteral))))
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.pop_back();
|
2014-05-28 17:11:53 +08:00
|
|
|
|
2018-07-09 15:08:45 +08:00
|
|
|
// Reevaluate whether ObjC message arguments fit into one line.
|
|
|
|
// If a receiver spans multiple lines, e.g.:
|
|
|
|
// [[object block:^{
|
|
|
|
// return 42;
|
|
|
|
// }] a:42 b:42];
|
|
|
|
// BreakBeforeParameter is calculated based on an incorrect assumption
|
|
|
|
// (it is checked whether the whole expression fits into one line without
|
|
|
|
// considering a line break inside a message receiver).
|
|
|
|
// We check whether arguements fit after receiver scope closer (into the same
|
|
|
|
// line).
|
|
|
|
if (State.Stack.back().BreakBeforeParameter && Current.MatchingParen &&
|
|
|
|
Current.MatchingParen->Previous) {
|
|
|
|
const FormatToken &CurrentScopeOpener = *Current.MatchingParen->Previous;
|
|
|
|
if (CurrentScopeOpener.is(TT_ObjCMethodExpr) &&
|
|
|
|
CurrentScopeOpener.MatchingParen) {
|
|
|
|
int NecessarySpaceInLine =
|
|
|
|
getLengthToMatchingParen(CurrentScopeOpener, State.Stack) +
|
|
|
|
CurrentScopeOpener.TotalLength - Current.TotalLength - 1;
|
|
|
|
if (State.Column + Current.ColumnWidth + NecessarySpaceInLine <=
|
|
|
|
Style.ColumnLimit)
|
|
|
|
State.Stack.back().BreakBeforeParameter = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
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;
|
|
|
|
}
|
2014-05-26 21:10:39 +08:00
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
|
2014-05-26 21:10:39 +08:00
|
|
|
void ContinuationIndenter::moveStateToNewBlock(LineState &State) {
|
2014-12-12 17:40:58 +08:00
|
|
|
unsigned NestedBlockIndent = State.Stack.back().NestedBlockIndent;
|
2014-10-29 00:53:38 +08:00
|
|
|
// ObjC block sometimes follow special indentation rules.
|
2014-11-25 18:05:17 +08:00
|
|
|
unsigned NewIndent =
|
2014-12-12 17:40:58 +08:00
|
|
|
NestedBlockIndent + (State.NextToken->is(TT_ObjCBlockLBrace)
|
|
|
|
? Style.ObjCBlockIndentWidth
|
|
|
|
: Style.IndentWidth);
|
2018-05-09 17:02:11 +08:00
|
|
|
State.Stack.push_back(ParenState(State.NextToken, NewIndent,
|
|
|
|
State.Stack.back().LastSpace,
|
2017-01-31 19:25:01 +08:00
|
|
|
/*AvoidBinPacking=*/true,
|
|
|
|
/*NoLineBreak=*/false));
|
2014-12-12 17:40:58 +08:00
|
|
|
State.Stack.back().NestedBlockIndent = NestedBlockIndent;
|
2014-05-26 21:10:39 +08:00
|
|
|
State.Stack.back().BreakBeforeParameter = true;
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
|
2017-10-30 22:01:50 +08:00
|
|
|
static unsigned getLastLineEndColumn(StringRef Text, unsigned StartColumn,
|
|
|
|
unsigned TabWidth,
|
|
|
|
encoding::Encoding Encoding) {
|
|
|
|
size_t LastNewlinePos = Text.find_last_of("\n");
|
|
|
|
if (LastNewlinePos == StringRef::npos) {
|
|
|
|
return StartColumn +
|
|
|
|
encoding::columnWidthWithTabs(Text, StartColumn, TabWidth, Encoding);
|
|
|
|
} else {
|
|
|
|
return encoding::columnWidthWithTabs(Text.substr(LastNewlinePos),
|
|
|
|
/*StartColumn=*/0, TabWidth, Encoding);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned ContinuationIndenter::reformatRawStringLiteral(
|
2017-11-14 17:19:53 +08:00
|
|
|
const FormatToken &Current, LineState &State,
|
2019-04-19 01:14:05 +08:00
|
|
|
const FormatStyle &RawStringStyle, bool DryRun, bool Newline) {
|
2017-11-14 17:19:53 +08:00
|
|
|
unsigned StartColumn = State.Column - Current.ColumnWidth;
|
2018-01-20 00:18:47 +08:00
|
|
|
StringRef OldDelimiter = *getRawStringDelimiter(Current.TokenText);
|
|
|
|
StringRef NewDelimiter =
|
|
|
|
getCanonicalRawStringDelimiter(Style, RawStringStyle.Language);
|
|
|
|
if (NewDelimiter.empty() || OldDelimiter.empty())
|
|
|
|
NewDelimiter = OldDelimiter;
|
2017-10-30 22:01:50 +08:00
|
|
|
// The text of a raw string is between the leading 'R"delimiter(' and the
|
|
|
|
// trailing 'delimiter)"'.
|
2018-01-20 00:18:47 +08:00
|
|
|
unsigned OldPrefixSize = 3 + OldDelimiter.size();
|
|
|
|
unsigned OldSuffixSize = 2 + OldDelimiter.size();
|
|
|
|
// We create a virtual text environment which expects a null-terminated
|
|
|
|
// string, so we cannot use StringRef.
|
|
|
|
std::string RawText =
|
|
|
|
Current.TokenText.substr(OldPrefixSize).drop_back(OldSuffixSize);
|
|
|
|
if (NewDelimiter != OldDelimiter) {
|
|
|
|
// Don't update to the canonical delimiter 'deli' if ')deli"' occurs in the
|
|
|
|
// raw string.
|
|
|
|
std::string CanonicalDelimiterSuffix = (")" + NewDelimiter + "\"").str();
|
|
|
|
if (StringRef(RawText).contains(CanonicalDelimiterSuffix))
|
|
|
|
NewDelimiter = OldDelimiter;
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned NewPrefixSize = 3 + NewDelimiter.size();
|
|
|
|
unsigned NewSuffixSize = 2 + NewDelimiter.size();
|
2017-10-30 22:01:50 +08:00
|
|
|
|
2018-01-20 00:18:47 +08:00
|
|
|
// The first start column is the column the raw text starts after formatting.
|
|
|
|
unsigned FirstStartColumn = StartColumn + NewPrefixSize;
|
2017-10-30 22:01:50 +08:00
|
|
|
|
|
|
|
// The next start column is the intended indentation a line break inside
|
|
|
|
// the raw string at level 0. It is determined by the following rules:
|
|
|
|
// - if the content starts on newline, it is one level more than the current
|
|
|
|
// indent, and
|
|
|
|
// - if the content does not start on a newline, it is the first start
|
|
|
|
// column.
|
|
|
|
// These rules have the advantage that the formatted content both does not
|
|
|
|
// violate the rectangle rule and visually flows within the surrounding
|
|
|
|
// source.
|
2018-01-20 00:18:47 +08:00
|
|
|
bool ContentStartsOnNewline = Current.TokenText[OldPrefixSize] == '\n';
|
[clang-format] Break before next parameter after a formatted multiline raw string parameter
Summary:
Currently clang-format breaks before the next parameter after multiline parameters (also recursively for the parent expressions of multiline parameters). However, it fails to do so for formatted multiline raw string literals:
```
$ cat test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)", 2);
}
int y = g(h(R"(multi
line)"), 2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
$ clang-format -style=google test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)",
2);
}
int y = g(h(R"(multi
line)"),
2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
```
This patch addresses this inconsistency by forcing breaking after multiline formatted raw string literals. This requires a little tweak to the indentation chosen for the contents of a formatted raw string literal: in case when that's a parameter and not the last one, the indentation is based off of the uniform indentation of all of the parameters.
Reviewers: sammccall
Reviewed By: sammccall
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D52448
llvm-svn: 345242
2018-10-25 15:39:30 +08:00
|
|
|
// If this token is the last parameter (checked by looking if it's followed by
|
2019-04-19 01:14:05 +08:00
|
|
|
// `)` and is not on a newline, the base the indent off the line's nested
|
|
|
|
// block indent. Otherwise, base the indent off the arguments indent, so we
|
|
|
|
// can achieve:
|
|
|
|
//
|
[clang-format] Break before next parameter after a formatted multiline raw string parameter
Summary:
Currently clang-format breaks before the next parameter after multiline parameters (also recursively for the parent expressions of multiline parameters). However, it fails to do so for formatted multiline raw string literals:
```
$ cat test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)", 2);
}
int y = g(h(R"(multi
line)"), 2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
$ clang-format -style=google test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)",
2);
}
int y = g(h(R"(multi
line)"),
2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
```
This patch addresses this inconsistency by forcing breaking after multiline formatted raw string literals. This requires a little tweak to the indentation chosen for the contents of a formatted raw string literal: in case when that's a parameter and not the last one, the indentation is based off of the uniform indentation of all of the parameters.
Reviewers: sammccall
Reviewed By: sammccall
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D52448
llvm-svn: 345242
2018-10-25 15:39:30 +08:00
|
|
|
// fffffffffff(1, 2, 3, R"pb(
|
|
|
|
// key1: 1 #
|
|
|
|
// key2: 2)pb");
|
|
|
|
//
|
|
|
|
// fffffffffff(1, 2, 3,
|
|
|
|
// R"pb(
|
|
|
|
// key1: 1 #
|
|
|
|
// key2: 2
|
2019-04-19 01:14:05 +08:00
|
|
|
// )pb");
|
|
|
|
//
|
|
|
|
// fffffffffff(1, 2, 3,
|
|
|
|
// R"pb(
|
|
|
|
// key1: 1 #
|
|
|
|
// key2: 2
|
[clang-format] Break before next parameter after a formatted multiline raw string parameter
Summary:
Currently clang-format breaks before the next parameter after multiline parameters (also recursively for the parent expressions of multiline parameters). However, it fails to do so for formatted multiline raw string literals:
```
$ cat test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)", 2);
}
int y = g(h(R"(multi
line)"), 2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
$ clang-format -style=google test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)",
2);
}
int y = g(h(R"(multi
line)"),
2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
```
This patch addresses this inconsistency by forcing breaking after multiline formatted raw string literals. This requires a little tweak to the indentation chosen for the contents of a formatted raw string literal: in case when that's a parameter and not the last one, the indentation is based off of the uniform indentation of all of the parameters.
Reviewers: sammccall
Reviewed By: sammccall
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D52448
llvm-svn: 345242
2018-10-25 15:39:30 +08:00
|
|
|
// )pb",
|
|
|
|
// 5);
|
2019-04-19 01:14:05 +08:00
|
|
|
unsigned CurrentIndent =
|
|
|
|
(!Newline && Current.Next && Current.Next->is(tok::r_paren))
|
|
|
|
? State.Stack.back().NestedBlockIndent
|
|
|
|
: State.Stack.back().Indent;
|
[clang-format] Break before next parameter after a formatted multiline raw string parameter
Summary:
Currently clang-format breaks before the next parameter after multiline parameters (also recursively for the parent expressions of multiline parameters). However, it fails to do so for formatted multiline raw string literals:
```
$ cat test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)", 2);
}
int y = g(h(R"(multi
line)"), 2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
$ clang-format -style=google test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)",
2);
}
int y = g(h(R"(multi
line)"),
2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
```
This patch addresses this inconsistency by forcing breaking after multiline formatted raw string literals. This requires a little tweak to the indentation chosen for the contents of a formatted raw string literal: in case when that's a parameter and not the last one, the indentation is based off of the uniform indentation of all of the parameters.
Reviewers: sammccall
Reviewed By: sammccall
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D52448
llvm-svn: 345242
2018-10-25 15:39:30 +08:00
|
|
|
unsigned NextStartColumn = ContentStartsOnNewline
|
|
|
|
? CurrentIndent + Style.IndentWidth
|
|
|
|
: FirstStartColumn;
|
2017-10-30 22:01:50 +08:00
|
|
|
|
|
|
|
// The last start column is the column the raw string suffix starts if it is
|
|
|
|
// put on a newline.
|
|
|
|
// The last start column is the intended indentation of the raw string postfix
|
|
|
|
// if it is put on a newline. It is determined by the following rules:
|
|
|
|
// - if the raw string prefix starts on a newline, it is the column where
|
|
|
|
// that raw string prefix starts, and
|
|
|
|
// - if the raw string prefix does not start on a newline, it is the current
|
|
|
|
// indent.
|
2019-03-01 17:09:54 +08:00
|
|
|
unsigned LastStartColumn =
|
|
|
|
Current.NewlinesBefore ? FirstStartColumn - NewPrefixSize : CurrentIndent;
|
2017-10-30 22:01:50 +08:00
|
|
|
|
|
|
|
std::pair<tooling::Replacements, unsigned> Fixes = internal::reformat(
|
|
|
|
RawStringStyle, RawText, {tooling::Range(0, RawText.size())},
|
|
|
|
FirstStartColumn, NextStartColumn, LastStartColumn, "<stdin>",
|
2017-11-09 21:19:14 +08:00
|
|
|
/*Status=*/nullptr);
|
2017-10-30 22:01:50 +08:00
|
|
|
|
|
|
|
auto NewCode = applyAllReplacements(RawText, Fixes.first);
|
|
|
|
tooling::Replacements NoFixes;
|
|
|
|
if (!NewCode) {
|
[clang-format] Break before next parameter after a formatted multiline raw string parameter
Summary:
Currently clang-format breaks before the next parameter after multiline parameters (also recursively for the parent expressions of multiline parameters). However, it fails to do so for formatted multiline raw string literals:
```
$ cat test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)", 2);
}
int y = g(h(R"(multi
line)"), 2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
$ clang-format -style=google test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)",
2);
}
int y = g(h(R"(multi
line)"),
2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
```
This patch addresses this inconsistency by forcing breaking after multiline formatted raw string literals. This requires a little tweak to the indentation chosen for the contents of a formatted raw string literal: in case when that's a parameter and not the last one, the indentation is based off of the uniform indentation of all of the parameters.
Reviewers: sammccall
Reviewed By: sammccall
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D52448
llvm-svn: 345242
2018-10-25 15:39:30 +08:00
|
|
|
return addMultilineToken(Current, State);
|
2017-10-30 22:01:50 +08:00
|
|
|
}
|
|
|
|
if (!DryRun) {
|
2018-01-20 00:18:47 +08:00
|
|
|
if (NewDelimiter != OldDelimiter) {
|
|
|
|
// In 'R"delimiter(...', the delimiter starts 2 characters after the start
|
|
|
|
// of the token.
|
|
|
|
SourceLocation PrefixDelimiterStart =
|
|
|
|
Current.Tok.getLocation().getLocWithOffset(2);
|
|
|
|
auto PrefixErr = Whitespaces.addReplacement(tooling::Replacement(
|
|
|
|
SourceMgr, PrefixDelimiterStart, OldDelimiter.size(), NewDelimiter));
|
|
|
|
if (PrefixErr) {
|
|
|
|
llvm::errs()
|
|
|
|
<< "Failed to update the prefix delimiter of a raw string: "
|
|
|
|
<< llvm::toString(std::move(PrefixErr)) << "\n";
|
|
|
|
}
|
|
|
|
// In 'R"delimiter(...)delimiter"', the suffix delimiter starts at
|
|
|
|
// position length - 1 - |delimiter|.
|
|
|
|
SourceLocation SuffixDelimiterStart =
|
|
|
|
Current.Tok.getLocation().getLocWithOffset(Current.TokenText.size() -
|
|
|
|
1 - OldDelimiter.size());
|
|
|
|
auto SuffixErr = Whitespaces.addReplacement(tooling::Replacement(
|
|
|
|
SourceMgr, SuffixDelimiterStart, OldDelimiter.size(), NewDelimiter));
|
|
|
|
if (SuffixErr) {
|
|
|
|
llvm::errs()
|
|
|
|
<< "Failed to update the suffix delimiter of a raw string: "
|
|
|
|
<< llvm::toString(std::move(SuffixErr)) << "\n";
|
|
|
|
}
|
|
|
|
}
|
2017-10-30 22:01:50 +08:00
|
|
|
SourceLocation OriginLoc =
|
2018-01-20 00:18:47 +08:00
|
|
|
Current.Tok.getLocation().getLocWithOffset(OldPrefixSize);
|
2017-10-30 22:01:50 +08:00
|
|
|
for (const tooling::Replacement &Fix : Fixes.first) {
|
|
|
|
auto Err = Whitespaces.addReplacement(tooling::Replacement(
|
|
|
|
SourceMgr, OriginLoc.getLocWithOffset(Fix.getOffset()),
|
|
|
|
Fix.getLength(), Fix.getReplacementText()));
|
|
|
|
if (Err) {
|
|
|
|
llvm::errs() << "Failed to reformat raw string: "
|
|
|
|
<< llvm::toString(std::move(Err)) << "\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
unsigned RawLastLineEndColumn = getLastLineEndColumn(
|
|
|
|
*NewCode, FirstStartColumn, Style.TabWidth, Encoding);
|
2018-01-20 00:18:47 +08:00
|
|
|
State.Column = RawLastLineEndColumn + NewSuffixSize;
|
2018-03-16 22:01:25 +08:00
|
|
|
// Since we're updating the column to after the raw string literal here, we
|
|
|
|
// have to manually add the penalty for the prefix R"delim( over the column
|
|
|
|
// limit.
|
|
|
|
unsigned PrefixExcessCharacters =
|
2019-03-01 17:09:54 +08:00
|
|
|
StartColumn + NewPrefixSize > Style.ColumnLimit
|
|
|
|
? StartColumn + NewPrefixSize - Style.ColumnLimit
|
|
|
|
: 0;
|
[clang-format] Break before next parameter after a formatted multiline raw string parameter
Summary:
Currently clang-format breaks before the next parameter after multiline parameters (also recursively for the parent expressions of multiline parameters). However, it fails to do so for formatted multiline raw string literals:
```
$ cat test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)", 2);
}
int y = g(h(R"(multi
line)"), 2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
$ clang-format -style=google test.cc
// Examples
// Regular multiline tokens
int x = f(R"(multi
line)",
2);
}
int y = g(h(R"(multi
line)"),
2);
// Formatted multiline tokens
int z = f(R"pb(multi: 1 #
line: 2)pb", 2);
int w = g(h(R"pb(multi: 1 #
line: 2)pb"), 2);
```
This patch addresses this inconsistency by forcing breaking after multiline formatted raw string literals. This requires a little tweak to the indentation chosen for the contents of a formatted raw string literal: in case when that's a parameter and not the last one, the indentation is based off of the uniform indentation of all of the parameters.
Reviewers: sammccall
Reviewed By: sammccall
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D52448
llvm-svn: 345242
2018-10-25 15:39:30 +08:00
|
|
|
bool IsMultiline =
|
|
|
|
ContentStartsOnNewline || (NewCode->find('\n') != std::string::npos);
|
|
|
|
if (IsMultiline) {
|
|
|
|
// Break before further function parameters on all levels.
|
|
|
|
for (unsigned i = 0, e = State.Stack.size(); i != e; ++i)
|
|
|
|
State.Stack[i].BreakBeforeParameter = true;
|
|
|
|
}
|
2018-03-16 22:01:25 +08:00
|
|
|
return Fixes.second + PrefixExcessCharacters * Style.PenaltyExcessCharacter;
|
2017-10-30 22:01:50 +08:00
|
|
|
}
|
|
|
|
|
2013-09-10 20:29:48 +08:00
|
|
|
unsigned ContinuationIndenter::addMultilineToken(const FormatToken &Current,
|
|
|
|
LineState &State) {
|
2013-08-30 01:32:57 +08:00
|
|
|
// Break before further function parameters on all levels.
|
|
|
|
for (unsigned i = 0, e = State.Stack.size(); i != e; ++i)
|
|
|
|
State.Stack[i].BreakBeforeParameter = true;
|
|
|
|
|
2013-09-10 17:38:25 +08:00
|
|
|
unsigned ColumnsUsed = State.Column;
|
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;
|
|
|
|
}
|
|
|
|
|
2017-11-14 17:19:53 +08:00
|
|
|
unsigned ContinuationIndenter::handleEndOfLine(const FormatToken &Current,
|
|
|
|
LineState &State, bool DryRun,
|
2019-04-19 01:14:05 +08:00
|
|
|
bool AllowBreak, bool Newline) {
|
2017-11-14 17:19:53 +08:00
|
|
|
unsigned Penalty = 0;
|
2017-10-30 22:01:50 +08:00
|
|
|
// Compute the raw string style to use in case this is a raw string literal
|
|
|
|
// that can be reformatted.
|
2017-11-14 17:19:53 +08:00
|
|
|
auto RawStringStyle = getRawStringStyle(Current, State);
|
2018-03-12 18:11:30 +08:00
|
|
|
if (RawStringStyle && !Current.Finalized) {
|
2019-04-19 01:14:05 +08:00
|
|
|
Penalty = reformatRawStringLiteral(Current, State, *RawStringStyle, DryRun,
|
|
|
|
Newline);
|
2017-11-14 17:19:53 +08:00
|
|
|
} else if (Current.IsMultiline && Current.isNot(TT_BlockComment)) {
|
|
|
|
// Don't break multi-line tokens other than block comments and raw string
|
|
|
|
// literals. Instead, just update the state.
|
|
|
|
Penalty = addMultilineToken(Current, State);
|
|
|
|
} else if (State.Line->Type != LT_ImportStatement) {
|
|
|
|
// We generally don't break import statements.
|
2017-12-01 21:28:08 +08:00
|
|
|
LineState OriginalState = State;
|
|
|
|
|
|
|
|
// Whether we force the reflowing algorithm to stay strictly within the
|
|
|
|
// column limit.
|
|
|
|
bool Strict = false;
|
|
|
|
// Whether the first non-strict attempt at reflowing did intentionally
|
|
|
|
// exceed the column limit.
|
|
|
|
bool Exceeded = false;
|
|
|
|
std::tie(Penalty, Exceeded) = breakProtrudingToken(
|
|
|
|
Current, State, AllowBreak, /*DryRun=*/true, Strict);
|
|
|
|
if (Exceeded) {
|
|
|
|
// If non-strict reflowing exceeds the column limit, try whether strict
|
|
|
|
// reflowing leads to an overall lower penalty.
|
|
|
|
LineState StrictState = OriginalState;
|
|
|
|
unsigned StrictPenalty =
|
|
|
|
breakProtrudingToken(Current, StrictState, AllowBreak,
|
|
|
|
/*DryRun=*/true, /*Strict=*/true)
|
|
|
|
.first;
|
|
|
|
Strict = StrictPenalty <= Penalty;
|
|
|
|
if (Strict) {
|
|
|
|
Penalty = StrictPenalty;
|
|
|
|
State = StrictState;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!DryRun) {
|
|
|
|
// If we're not in dry-run mode, apply the changes with the decision on
|
|
|
|
// strictness made above.
|
|
|
|
breakProtrudingToken(Current, OriginalState, AllowBreak, /*DryRun=*/false,
|
|
|
|
Strict);
|
|
|
|
}
|
2017-11-14 17:19:53 +08:00
|
|
|
}
|
|
|
|
if (State.Column > getColumnLimit(State)) {
|
|
|
|
unsigned ExcessCharacters = State.Column - getColumnLimit(State);
|
|
|
|
Penalty += Style.PenaltyExcessCharacter * ExcessCharacters;
|
|
|
|
}
|
|
|
|
return Penalty;
|
|
|
|
}
|
2013-10-30 21:54:53 +08:00
|
|
|
|
2018-01-18 00:17:26 +08:00
|
|
|
// Returns the enclosing function name of a token, or the empty string if not
|
|
|
|
// found.
|
|
|
|
static StringRef getEnclosingFunctionName(const FormatToken &Current) {
|
|
|
|
// Look for: 'function(' or 'function<templates>(' before Current.
|
|
|
|
auto Tok = Current.getPreviousNonComment();
|
|
|
|
if (!Tok || !Tok->is(tok::l_paren))
|
|
|
|
return "";
|
|
|
|
Tok = Tok->getPreviousNonComment();
|
|
|
|
if (!Tok)
|
|
|
|
return "";
|
|
|
|
if (Tok->is(TT_TemplateCloser)) {
|
|
|
|
Tok = Tok->MatchingParen;
|
|
|
|
if (Tok)
|
|
|
|
Tok = Tok->getPreviousNonComment();
|
|
|
|
}
|
|
|
|
if (!Tok || !Tok->is(tok::identifier))
|
|
|
|
return "";
|
|
|
|
return Tok->TokenText;
|
|
|
|
}
|
|
|
|
|
2017-11-14 17:19:53 +08:00
|
|
|
llvm::Optional<FormatStyle>
|
|
|
|
ContinuationIndenter::getRawStringStyle(const FormatToken &Current,
|
|
|
|
const LineState &State) {
|
|
|
|
if (!Current.isStringLiteral())
|
|
|
|
return None;
|
|
|
|
auto Delimiter = getRawStringDelimiter(Current.TokenText);
|
|
|
|
if (!Delimiter)
|
|
|
|
return None;
|
2018-01-18 00:17:26 +08:00
|
|
|
auto RawStringStyle = RawStringFormats.getDelimiterStyle(*Delimiter);
|
2018-06-29 00:58:24 +08:00
|
|
|
if (!RawStringStyle && Delimiter->empty())
|
2018-01-18 00:17:26 +08:00
|
|
|
RawStringStyle = RawStringFormats.getEnclosingFunctionStyle(
|
|
|
|
getEnclosingFunctionName(Current));
|
2017-11-14 17:19:53 +08:00
|
|
|
if (!RawStringStyle)
|
|
|
|
return None;
|
|
|
|
RawStringStyle->ColumnLimit = getColumnLimit(State);
|
|
|
|
return RawStringStyle;
|
|
|
|
}
|
2013-08-23 18:05:49 +08:00
|
|
|
|
2019-03-01 17:09:54 +08:00
|
|
|
std::unique_ptr<BreakableToken>
|
|
|
|
ContinuationIndenter::createBreakableToken(const FormatToken &Current,
|
|
|
|
LineState &State, bool AllowBreak) {
|
2013-09-10 17:38:25 +08:00
|
|
|
unsigned StartColumn = State.Column - Current.ColumnWidth;
|
2013-12-20 14:22:01 +08:00
|
|
|
if (Current.isStringLiteral()) {
|
[clang-format] Add basic support for formatting C# files
Summary:
This revision adds basic support for formatting C# files with clang-format, I know the barrier to entry is high here so I'm sending this revision in to test the water as to whether this might be something we'd consider landing.
Tracking in Bugzilla as:
https://bugs.llvm.org/show_bug.cgi?id=40850
Justification:
C# code just looks ugly in comparison to the C++ code in our source tree which is clang-formatted.
I've struggled with Visual Studio reformatting to get a clean and consistent style, I want to format our C# code on saving like I do now for C++ and i want it to have the same style as defined in our .clang-format file, so it consistent as it can be with C++. (Braces/Breaking/Spaces/Indent etc..)
Using clang format without this patch leaves the code in a bad state, sometimes when the BreakStringLiterals is set, it fails to compile.
Mostly the C# is similar to Java, except instead of JavaAnnotations I try to reuse the TT_AttributeSquare.
Almost the most valuable portion is to have a new Language in order to partition the configuration for C# within a common .clang-format file, with the auto detection on the .cs extension. But there are other C# specific styles that could be added later if this is accepted. in particular how `{ set;get }` is formatted.
Reviewers: djasper, klimek, krasimir, benhamilton, JonasToth
Reviewed By: klimek
Subscribers: llvm-commits, mgorny, jdoerfert, cfe-commits
Tags: #clang, #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D58404
llvm-svn: 356662
2019-03-21 21:09:22 +08:00
|
|
|
// FIXME: String literal breaking is currently disabled for C#,Java and
|
|
|
|
// JavaScript, as it requires strings to be merged using "+" which we
|
|
|
|
// don't support.
|
2015-01-04 17:11:17 +08:00
|
|
|
if (Style.Language == FormatStyle::LK_Java ||
|
[clang-format] Add basic support for formatting C# files
Summary:
This revision adds basic support for formatting C# files with clang-format, I know the barrier to entry is high here so I'm sending this revision in to test the water as to whether this might be something we'd consider landing.
Tracking in Bugzilla as:
https://bugs.llvm.org/show_bug.cgi?id=40850
Justification:
C# code just looks ugly in comparison to the C++ code in our source tree which is clang-formatted.
I've struggled with Visual Studio reformatting to get a clean and consistent style, I want to format our C# code on saving like I do now for C++ and i want it to have the same style as defined in our .clang-format file, so it consistent as it can be with C++. (Braces/Breaking/Spaces/Indent etc..)
Using clang format without this patch leaves the code in a bad state, sometimes when the BreakStringLiterals is set, it fails to compile.
Mostly the C# is similar to Java, except instead of JavaAnnotations I try to reuse the TT_AttributeSquare.
Almost the most valuable portion is to have a new Language in order to partition the configuration for C# within a common .clang-format file, with the auto detection on the .cs extension. But there are other C# specific styles that could be added later if this is accepted. in particular how `{ set;get }` is formatted.
Reviewers: djasper, klimek, krasimir, benhamilton, JonasToth
Reviewed By: klimek
Subscribers: llvm-commits, mgorny, jdoerfert, cfe-commits
Tags: #clang, #clang-tools-extra
Differential Revision: https://reviews.llvm.org/D58404
llvm-svn: 356662
2019-03-21 21:09:22 +08:00
|
|
|
Style.Language == FormatStyle::LK_JavaScript || Style.isCSharp() ||
|
2019-03-01 17:09:54 +08:00
|
|
|
!Style.BreakStringLiterals || !AllowBreak)
|
2017-11-14 17:19:53 +08:00
|
|
|
return nullptr;
|
2015-01-04 17:11:17 +08:00
|
|
|
|
2013-10-12 05:43:05 +08:00
|
|
|
// Don't break string literals inside preprocessor directives (except for
|
|
|
|
// #define directives, as their contents are stored in separate lines and
|
|
|
|
// are not affected by this check).
|
|
|
|
// This way we avoid breaking code with line directives and unknown
|
|
|
|
// preprocessor directives that contain long string literals.
|
|
|
|
if (State.Line->Type == LT_PreprocessorDirective)
|
2017-11-14 17:19:53 +08:00
|
|
|
return nullptr;
|
2013-08-16 19:20:30 +08:00
|
|
|
// 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)
|
2017-11-14 17:19:53 +08:00
|
|
|
return nullptr;
|
2018-02-09 00:07:25 +08:00
|
|
|
// Don't break string literals inside Objective-C array literals (doing so
|
|
|
|
// raises the warning -Wobjc-string-concatenation).
|
|
|
|
if (State.Stack.back().IsInsideObjCArrayLiteral) {
|
|
|
|
return nullptr;
|
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
|
2013-09-17 04:20:49 +08:00
|
|
|
StringRef Text = Current.TokenText;
|
|
|
|
StringRef Prefix;
|
|
|
|
StringRef Postfix;
|
|
|
|
// FIXME: Handle whitespace between '_T', '(', '"..."', and ')'.
|
|
|
|
// FIXME: Store Prefix and Suffix (or PrefixLength and SuffixLength to
|
|
|
|
// reduce the overhead) for each FormatToken, which is a string, so that we
|
|
|
|
// don't run multiple checks here on the hot path.
|
|
|
|
if ((Text.endswith(Postfix = "\"") &&
|
2017-04-11 17:55:00 +08:00
|
|
|
(Text.startswith(Prefix = "@\"") || Text.startswith(Prefix = "\"") ||
|
2014-01-09 22:18:12 +08:00
|
|
|
Text.startswith(Prefix = "u\"") || Text.startswith(Prefix = "U\"") ||
|
|
|
|
Text.startswith(Prefix = "u8\"") ||
|
2013-09-17 04:20:49 +08:00
|
|
|
Text.startswith(Prefix = "L\""))) ||
|
2014-12-15 04:47:11 +08:00
|
|
|
(Text.startswith(Prefix = "_T(\"") && Text.endswith(Postfix = "\")"))) {
|
2018-01-23 19:26:19 +08:00
|
|
|
// We need this to address the case where there is an unbreakable tail
|
|
|
|
// only if certain other formatting decisions have been taken. The
|
|
|
|
// UnbreakableTailLength of Current is an overapproximation is that case
|
|
|
|
// and we need to be correct here.
|
|
|
|
unsigned UnbreakableTailLength = (State.NextToken && canBreak(State))
|
|
|
|
? 0
|
|
|
|
: Current.UnbreakableTailLength;
|
2017-11-14 17:19:53 +08:00
|
|
|
return llvm::make_unique<BreakableStringLiteral>(
|
2018-01-23 19:26:19 +08:00
|
|
|
Current, StartColumn, Prefix, Postfix, UnbreakableTailLength,
|
|
|
|
State.Line->InPPDirective, Encoding, Style);
|
2013-09-17 04:20:49 +08:00
|
|
|
}
|
2016-06-08 17:45:08 +08:00
|
|
|
} else if (Current.is(TT_BlockComment)) {
|
2017-10-16 17:08:53 +08:00
|
|
|
if (!Style.ReflowComments ||
|
2017-01-25 21:58:58 +08:00
|
|
|
// If a comment token switches formatting, like
|
|
|
|
// /* clang-format on */, we don't want to break it further,
|
|
|
|
// but we may still want to adjust its indentation.
|
2017-11-14 17:19:53 +08:00
|
|
|
switchesFormatting(Current)) {
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
return llvm::make_unique<BreakableBlockComment>(
|
2017-01-31 19:25:01 +08:00
|
|
|
Current, StartColumn, Current.OriginalColumn, !Current.Previous,
|
2019-04-24 04:29:46 +08:00
|
|
|
State.Line->InPPDirective, Encoding, Style, Whitespaces.useCRLF());
|
2014-11-25 18:05:17 +08:00
|
|
|
} else if (Current.is(TT_LineComment) &&
|
2014-05-09 16:15:10 +08:00
|
|
|
(Current.Previous == nullptr ||
|
2014-11-25 18:05:17 +08:00
|
|
|
Current.Previous->isNot(TT_ImplicitStringLiteral))) {
|
2015-12-01 21:28:53 +08:00
|
|
|
if (!Style.ReflowComments ||
|
2017-01-25 21:58:58 +08:00
|
|
|
CommentPragmasRegex.match(Current.TokenText.substr(2)) ||
|
|
|
|
switchesFormatting(Current))
|
2017-11-14 17:19:53 +08:00
|
|
|
return nullptr;
|
|
|
|
return llvm::make_unique<BreakableLineCommentSection>(
|
2017-01-31 19:25:01 +08:00
|
|
|
Current, StartColumn, Current.OriginalColumn, !Current.Previous,
|
2017-11-14 17:19:53 +08:00
|
|
|
/*InPPDirective=*/false, Encoding, Style);
|
|
|
|
}
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
2017-12-01 21:28:08 +08:00
|
|
|
std::pair<unsigned, bool>
|
|
|
|
ContinuationIndenter::breakProtrudingToken(const FormatToken &Current,
|
|
|
|
LineState &State, bool AllowBreak,
|
|
|
|
bool DryRun, bool Strict) {
|
2017-11-29 22:29:43 +08:00
|
|
|
std::unique_ptr<const BreakableToken> Token =
|
2017-11-14 17:19:53 +08:00
|
|
|
createBreakableToken(Current, State, AllowBreak);
|
|
|
|
if (!Token)
|
2017-12-01 21:28:08 +08:00
|
|
|
return {0, false};
|
2017-11-29 22:29:43 +08:00
|
|
|
assert(Token->getLineCount() > 0);
|
2017-11-14 17:19:53 +08:00
|
|
|
unsigned ColumnLimit = getColumnLimit(State);
|
|
|
|
if (Current.is(TT_LineComment)) {
|
2013-11-13 01:30:49 +08:00
|
|
|
// We don't insert backslashes when breaking line comments.
|
|
|
|
ColumnLimit = Style.ColumnLimit;
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
2013-11-13 01:30:49 +08:00
|
|
|
if (Current.UnbreakableTailLength >= ColumnLimit)
|
2017-12-01 21:28:08 +08:00
|
|
|
return {0, false};
|
2017-11-29 22:29:43 +08:00
|
|
|
// ColumnWidth was already accounted into State.Column before calling
|
|
|
|
// breakProtrudingToken.
|
|
|
|
unsigned StartColumn = State.Column - Current.ColumnWidth;
|
2017-11-17 19:17:15 +08:00
|
|
|
unsigned NewBreakPenalty = Current.isStringLiteral()
|
|
|
|
? Style.PenaltyBreakString
|
|
|
|
: Style.PenaltyBreakComment;
|
2017-12-01 21:28:08 +08:00
|
|
|
// Stores whether we intentionally decide to let a line exceed the column
|
|
|
|
// limit.
|
|
|
|
bool Exceeded = false;
|
2017-11-29 22:29:43 +08:00
|
|
|
// Stores whether we introduce a break anywhere in the token.
|
2017-11-17 19:17:15 +08:00
|
|
|
bool BreakInserted = Token->introducesBreakBeforeToken();
|
|
|
|
// Store whether we inserted a new line break at the end of the previous
|
|
|
|
// logical line.
|
|
|
|
bool NewBreakBefore = false;
|
2017-01-25 21:58:58 +08:00
|
|
|
// We use a conservative reflowing strategy. Reflow starts after a line is
|
|
|
|
// broken or the corresponding whitespace compressed. Reflow ends as soon as a
|
|
|
|
// line that doesn't get reflown with the previous line is reached.
|
2017-11-29 22:29:43 +08:00
|
|
|
bool Reflow = false;
|
|
|
|
// Keep track of where we are in the token:
|
|
|
|
// Where we are in the content of the current logical line.
|
2017-07-21 06:29:39 +08:00
|
|
|
unsigned TailOffset = 0;
|
2017-11-29 22:29:43 +08:00
|
|
|
// The column number we're currently at.
|
|
|
|
unsigned ContentStartColumn =
|
|
|
|
Token->getContentStartColumn(0, /*Break=*/false);
|
|
|
|
// The number of columns left in the current logical line after TailOffset.
|
|
|
|
unsigned RemainingTokenColumns =
|
|
|
|
Token->getRemainingLength(0, TailOffset, ContentStartColumn);
|
|
|
|
// Adapt the start of the token, for example indent.
|
|
|
|
if (!DryRun)
|
|
|
|
Token->adaptStartOfLine(0, Whitespaces);
|
|
|
|
|
2018-07-30 16:45:45 +08:00
|
|
|
unsigned ContentIndent = 0;
|
2017-11-29 22:29:43 +08:00
|
|
|
unsigned Penalty = 0;
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << "Breaking protruding token at column "
|
|
|
|
<< StartColumn << ".\n");
|
2013-08-16 19:20:30 +08:00
|
|
|
for (unsigned LineIndex = 0, EndIndex = Token->getLineCount();
|
|
|
|
LineIndex != EndIndex; ++LineIndex) {
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs()
|
|
|
|
<< " Line: " << LineIndex << " (Reflow: " << Reflow << ")\n");
|
2017-11-17 19:17:15 +08:00
|
|
|
NewBreakBefore = false;
|
2017-11-29 22:29:43 +08:00
|
|
|
// If we did reflow the previous line, we'll try reflowing again. Otherwise
|
|
|
|
// we'll start reflowing if the current line is broken or whitespace is
|
|
|
|
// compressed.
|
|
|
|
bool TryReflow = Reflow;
|
|
|
|
// Break the current token until we can fit the rest of the line.
|
|
|
|
while (ContentStartColumn + RemainingTokenColumns > ColumnLimit) {
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << " Over limit, need: "
|
|
|
|
<< (ContentStartColumn + RemainingTokenColumns)
|
|
|
|
<< ", space: " << ColumnLimit
|
|
|
|
<< ", reflown prefix: " << ContentStartColumn
|
|
|
|
<< ", offset in line: " << TailOffset << "\n");
|
2017-11-29 22:29:43 +08:00
|
|
|
// If the current token doesn't fit, find the latest possible split in the
|
|
|
|
// current line so that breaking at it will be under the column limit.
|
|
|
|
// FIXME: Use the earliest possible split while reflowing to correctly
|
|
|
|
// compress whitespace within a line.
|
|
|
|
BreakableToken::Split Split =
|
|
|
|
Token->getSplit(LineIndex, TailOffset, ColumnLimit,
|
|
|
|
ContentStartColumn, CommentPragmasRegex);
|
2013-08-16 19:20:30 +08:00
|
|
|
if (Split.first == StringRef::npos) {
|
2017-11-29 22:29:43 +08:00
|
|
|
// No break opportunity - update the penalty and continue with the next
|
|
|
|
// logical line.
|
2013-08-16 19:20:30 +08:00
|
|
|
if (LineIndex < EndIndex - 1)
|
2018-08-07 18:23:24 +08:00
|
|
|
// The last line's penalty is handled in addNextStateToQueue() or when
|
|
|
|
// calling replaceWhitespaceAfterLastLine below.
|
2013-08-16 19:20:30 +08:00
|
|
|
Penalty += Style.PenaltyExcessCharacter *
|
2017-11-29 22:29:43 +08:00
|
|
|
(ContentStartColumn + RemainingTokenColumns - ColumnLimit);
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << " No break opportunity.\n");
|
2013-08-16 19:20:30 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
assert(Split.first != 0);
|
2013-11-13 01:50:13 +08:00
|
|
|
|
2017-11-29 22:29:43 +08:00
|
|
|
if (Token->supportsReflow()) {
|
|
|
|
// Check whether the next natural split point after the current one can
|
|
|
|
// still fit the line, either because we can compress away whitespace,
|
|
|
|
// or because the penalty the excess characters introduce is lower than
|
|
|
|
// the break penalty.
|
|
|
|
// We only do this for tokens that support reflowing, and thus allow us
|
|
|
|
// to change the whitespace arbitrarily (e.g. comments).
|
|
|
|
// Other tokens, like string literals, can be broken on arbitrary
|
|
|
|
// positions.
|
|
|
|
|
|
|
|
// First, compute the columns from TailOffset to the next possible split
|
|
|
|
// position.
|
|
|
|
// For example:
|
|
|
|
// ColumnLimit: |
|
|
|
|
// // Some text that breaks
|
|
|
|
// ^ tail offset
|
|
|
|
// ^-- split
|
|
|
|
// ^-------- to split columns
|
|
|
|
// ^--- next split
|
|
|
|
// ^--------------- to next split columns
|
|
|
|
unsigned ToSplitColumns = Token->getRangeLength(
|
|
|
|
LineIndex, TailOffset, Split.first, ContentStartColumn);
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << " ToSplit: " << ToSplitColumns << "\n");
|
2017-11-29 22:29:43 +08:00
|
|
|
|
|
|
|
BreakableToken::Split NextSplit = Token->getSplit(
|
|
|
|
LineIndex, TailOffset + Split.first + Split.second, ColumnLimit,
|
|
|
|
ContentStartColumn + ToSplitColumns + 1, CommentPragmasRegex);
|
|
|
|
// Compute the columns necessary to fit the next non-breakable sequence
|
|
|
|
// into the current line.
|
|
|
|
unsigned ToNextSplitColumns = 0;
|
|
|
|
if (NextSplit.first == StringRef::npos) {
|
|
|
|
ToNextSplitColumns = Token->getRemainingLength(LineIndex, TailOffset,
|
|
|
|
ContentStartColumn);
|
|
|
|
} else {
|
|
|
|
ToNextSplitColumns = Token->getRangeLength(
|
|
|
|
LineIndex, TailOffset,
|
|
|
|
Split.first + Split.second + NextSplit.first, ContentStartColumn);
|
|
|
|
}
|
|
|
|
// Compress the whitespace between the break and the start of the next
|
|
|
|
// unbreakable sequence.
|
|
|
|
ToNextSplitColumns =
|
|
|
|
Token->getLengthAfterCompression(ToNextSplitColumns, Split);
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs()
|
|
|
|
<< " ContentStartColumn: " << ContentStartColumn << "\n");
|
|
|
|
LLVM_DEBUG(llvm::dbgs()
|
|
|
|
<< " ToNextSplit: " << ToNextSplitColumns << "\n");
|
2017-11-29 22:29:43 +08:00
|
|
|
// If the whitespace compression makes us fit, continue on the current
|
|
|
|
// line.
|
|
|
|
bool ContinueOnLine =
|
|
|
|
ContentStartColumn + ToNextSplitColumns <= ColumnLimit;
|
|
|
|
unsigned ExcessCharactersPenalty = 0;
|
2017-12-01 21:28:08 +08:00
|
|
|
if (!ContinueOnLine && !Strict) {
|
2017-11-29 22:29:43 +08:00
|
|
|
// Similarly, if the excess characters' penalty is lower than the
|
|
|
|
// penalty of introducing a new break, continue on the current line.
|
|
|
|
ExcessCharactersPenalty =
|
|
|
|
(ContentStartColumn + ToNextSplitColumns - ColumnLimit) *
|
|
|
|
Style.PenaltyExcessCharacter;
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs()
|
|
|
|
<< " Penalty excess: " << ExcessCharactersPenalty
|
|
|
|
<< "\n break : " << NewBreakPenalty << "\n");
|
2017-12-01 21:28:08 +08:00
|
|
|
if (ExcessCharactersPenalty < NewBreakPenalty) {
|
|
|
|
Exceeded = true;
|
2017-11-29 22:29:43 +08:00
|
|
|
ContinueOnLine = true;
|
2017-12-01 21:28:08 +08:00
|
|
|
}
|
2017-11-29 22:29:43 +08:00
|
|
|
}
|
|
|
|
if (ContinueOnLine) {
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << " Continuing on line...\n");
|
2017-11-29 22:29:43 +08:00
|
|
|
// The current line fits after compressing the whitespace - reflow
|
|
|
|
// the next line into it if possible.
|
|
|
|
TryReflow = true;
|
|
|
|
if (!DryRun)
|
|
|
|
Token->compressWhitespace(LineIndex, TailOffset, Split,
|
|
|
|
Whitespaces);
|
|
|
|
// When we continue on the same line, leave one space between content.
|
|
|
|
ContentStartColumn += ToSplitColumns + 1;
|
|
|
|
Penalty += ExcessCharactersPenalty;
|
|
|
|
TailOffset += Split.first + Split.second;
|
|
|
|
RemainingTokenColumns = Token->getRemainingLength(
|
|
|
|
LineIndex, TailOffset, ContentStartColumn);
|
|
|
|
continue;
|
|
|
|
}
|
2013-11-13 01:50:13 +08:00
|
|
|
}
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << " Breaking...\n");
|
2018-07-30 16:45:45 +08:00
|
|
|
// Update the ContentIndent only if the current line was not reflown with
|
|
|
|
// the previous line, since in that case the previous line should still
|
|
|
|
// determine the ContentIndent. Also never intent the last line.
|
|
|
|
if (!Reflow)
|
|
|
|
ContentIndent = Token->getContentIndent(LineIndex);
|
|
|
|
LLVM_DEBUG(llvm::dbgs()
|
|
|
|
<< " ContentIndent: " << ContentIndent << "\n");
|
|
|
|
ContentStartColumn = ContentIndent + Token->getContentStartColumn(
|
|
|
|
LineIndex, /*Break=*/true);
|
|
|
|
|
2017-11-29 22:29:43 +08:00
|
|
|
unsigned NewRemainingTokenColumns = Token->getRemainingLength(
|
|
|
|
LineIndex, TailOffset + Split.first + Split.second,
|
|
|
|
ContentStartColumn);
|
2018-07-30 16:45:45 +08:00
|
|
|
if (NewRemainingTokenColumns == 0) {
|
|
|
|
// No content to indent.
|
|
|
|
ContentIndent = 0;
|
|
|
|
ContentStartColumn =
|
|
|
|
Token->getContentStartColumn(LineIndex, /*Break=*/true);
|
|
|
|
NewRemainingTokenColumns = Token->getRemainingLength(
|
|
|
|
LineIndex, TailOffset + Split.first + Split.second,
|
|
|
|
ContentStartColumn);
|
|
|
|
}
|
2017-01-25 21:58:58 +08:00
|
|
|
|
2014-04-15 22:52:43 +08:00
|
|
|
// When breaking before a tab character, it may be moved by a few columns,
|
|
|
|
// but will still be expanded to the next tab stop, so we don't save any
|
|
|
|
// columns.
|
2017-11-29 22:29:43 +08:00
|
|
|
if (NewRemainingTokenColumns == RemainingTokenColumns) {
|
2017-11-17 19:17:15 +08:00
|
|
|
// FIXME: Do we need to adjust the penalty?
|
2014-04-15 22:52:43 +08:00
|
|
|
break;
|
2017-11-29 22:29:43 +08:00
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
assert(NewRemainingTokenColumns < RemainingTokenColumns);
|
2017-11-17 19:17:15 +08:00
|
|
|
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << " Breaking at: " << TailOffset + Split.first
|
|
|
|
<< ", " << Split.second << "\n");
|
2013-08-16 19:20:30 +08:00
|
|
|
if (!DryRun)
|
2018-07-30 16:45:45 +08:00
|
|
|
Token->insertBreak(LineIndex, TailOffset, Split, ContentIndent,
|
|
|
|
Whitespaces);
|
2017-11-17 19:17:15 +08:00
|
|
|
|
2017-11-29 22:29:43 +08:00
|
|
|
Penalty += NewBreakPenalty;
|
2013-08-16 19:20:30 +08:00
|
|
|
TailOffset += Split.first + Split.second;
|
|
|
|
RemainingTokenColumns = NewRemainingTokenColumns;
|
|
|
|
BreakInserted = true;
|
2017-11-17 19:17:15 +08:00
|
|
|
NewBreakBefore = true;
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
2017-11-29 22:29:43 +08:00
|
|
|
// In case there's another line, prepare the state for the start of the next
|
|
|
|
// line.
|
|
|
|
if (LineIndex + 1 != EndIndex) {
|
|
|
|
unsigned NextLineIndex = LineIndex + 1;
|
|
|
|
if (NewBreakBefore)
|
|
|
|
// After breaking a line, try to reflow the next line into the current
|
|
|
|
// one once RemainingTokenColumns fits.
|
|
|
|
TryReflow = true;
|
|
|
|
if (TryReflow) {
|
|
|
|
// We decided that we want to try reflowing the next line into the
|
|
|
|
// current one.
|
|
|
|
// We will now adjust the state as if the reflow is successful (in
|
|
|
|
// preparation for the next line), and see whether that works. If we
|
|
|
|
// decide that we cannot reflow, we will later reset the state to the
|
|
|
|
// start of the next line.
|
|
|
|
Reflow = false;
|
|
|
|
// As we did not continue breaking the line, RemainingTokenColumns is
|
|
|
|
// known to fit after ContentStartColumn. Adapt ContentStartColumn to
|
|
|
|
// the position at which we want to format the next line if we do
|
|
|
|
// actually reflow.
|
|
|
|
// When we reflow, we need to add a space between the end of the current
|
|
|
|
// line and the next line's start column.
|
|
|
|
ContentStartColumn += RemainingTokenColumns + 1;
|
|
|
|
// Get the split that we need to reflow next logical line into the end
|
|
|
|
// of the current one; the split will include any leading whitespace of
|
|
|
|
// the next logical line.
|
|
|
|
BreakableToken::Split SplitBeforeNext =
|
|
|
|
Token->getReflowSplit(NextLineIndex, CommentPragmasRegex);
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs()
|
|
|
|
<< " Size of reflown text: " << ContentStartColumn
|
|
|
|
<< "\n Potential reflow split: ");
|
2017-11-29 22:29:43 +08:00
|
|
|
if (SplitBeforeNext.first != StringRef::npos) {
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << SplitBeforeNext.first << ", "
|
|
|
|
<< SplitBeforeNext.second << "\n");
|
2017-11-29 22:29:43 +08:00
|
|
|
TailOffset = SplitBeforeNext.first + SplitBeforeNext.second;
|
|
|
|
// If the rest of the next line fits into the current line below the
|
|
|
|
// column limit, we can safely reflow.
|
|
|
|
RemainingTokenColumns = Token->getRemainingLength(
|
|
|
|
NextLineIndex, TailOffset, ContentStartColumn);
|
|
|
|
Reflow = true;
|
|
|
|
if (ContentStartColumn + RemainingTokenColumns > ColumnLimit) {
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs()
|
|
|
|
<< " Over limit after reflow, need: "
|
|
|
|
<< (ContentStartColumn + RemainingTokenColumns)
|
|
|
|
<< ", space: " << ColumnLimit
|
|
|
|
<< ", reflown prefix: " << ContentStartColumn
|
|
|
|
<< ", offset in line: " << TailOffset << "\n");
|
2017-11-29 22:29:43 +08:00
|
|
|
// If the whole next line does not fit, try to find a point in
|
|
|
|
// the next line at which we can break so that attaching the part
|
|
|
|
// of the next line to that break point onto the current line is
|
|
|
|
// below the column limit.
|
|
|
|
BreakableToken::Split Split =
|
|
|
|
Token->getSplit(NextLineIndex, TailOffset, ColumnLimit,
|
|
|
|
ContentStartColumn, CommentPragmasRegex);
|
|
|
|
if (Split.first == StringRef::npos) {
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << " Did not find later break\n");
|
2017-11-29 22:29:43 +08:00
|
|
|
Reflow = false;
|
|
|
|
} else {
|
|
|
|
// Check whether the first split point gets us below the column
|
|
|
|
// limit. Note that we will execute this split below as part of
|
|
|
|
// the normal token breaking and reflow logic within the line.
|
|
|
|
unsigned ToSplitColumns = Token->getRangeLength(
|
|
|
|
NextLineIndex, TailOffset, Split.first, ContentStartColumn);
|
|
|
|
if (ContentStartColumn + ToSplitColumns > ColumnLimit) {
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << " Next split protrudes, need: "
|
|
|
|
<< (ContentStartColumn + ToSplitColumns)
|
|
|
|
<< ", space: " << ColumnLimit);
|
2017-11-29 22:29:43 +08:00
|
|
|
unsigned ExcessCharactersPenalty =
|
|
|
|
(ContentStartColumn + ToSplitColumns - ColumnLimit) *
|
|
|
|
Style.PenaltyExcessCharacter;
|
|
|
|
if (NewBreakPenalty < ExcessCharactersPenalty) {
|
|
|
|
Reflow = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << "not found.\n");
|
2017-11-29 22:29:43 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!Reflow) {
|
|
|
|
// If we didn't reflow into the next line, the only space to consider is
|
|
|
|
// the next logical line. Reset our state to match the start of the next
|
|
|
|
// line.
|
|
|
|
TailOffset = 0;
|
|
|
|
ContentStartColumn =
|
|
|
|
Token->getContentStartColumn(NextLineIndex, /*Break=*/false);
|
|
|
|
RemainingTokenColumns = Token->getRemainingLength(
|
|
|
|
NextLineIndex, TailOffset, ContentStartColumn);
|
|
|
|
// Adapt the start of the token, for example indent.
|
|
|
|
if (!DryRun)
|
|
|
|
Token->adaptStartOfLine(NextLineIndex, Whitespaces);
|
|
|
|
} else {
|
|
|
|
// If we found a reflow split and have added a new break before the next
|
|
|
|
// line, we are going to remove the line break at the start of the next
|
|
|
|
// logical line. For example, here we'll add a new line break after
|
|
|
|
// 'text', and subsequently delete the line break between 'that' and
|
|
|
|
// 'reflows'.
|
|
|
|
// // some text that
|
|
|
|
// // reflows
|
|
|
|
// ->
|
|
|
|
// // some text
|
|
|
|
// // that reflows
|
|
|
|
// When adding the line break, we also added the penalty for it, so we
|
|
|
|
// need to subtract that penalty again when we remove the line break due
|
|
|
|
// to reflowing.
|
|
|
|
if (NewBreakBefore) {
|
|
|
|
assert(Penalty >= NewBreakPenalty);
|
|
|
|
Penalty -= NewBreakPenalty;
|
|
|
|
}
|
|
|
|
if (!DryRun)
|
|
|
|
Token->reflow(NextLineIndex, Whitespaces);
|
|
|
|
}
|
|
|
|
}
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
|
2017-08-09 17:42:32 +08:00
|
|
|
BreakableToken::Split SplitAfterLastLine =
|
2017-11-29 22:29:43 +08:00
|
|
|
Token->getSplitAfterLastLine(TailOffset);
|
2017-07-21 06:29:39 +08:00
|
|
|
if (SplitAfterLastLine.first != StringRef::npos) {
|
2018-05-15 21:30:56 +08:00
|
|
|
LLVM_DEBUG(llvm::dbgs() << "Replacing whitespace after last line.\n");
|
2018-08-07 18:23:24 +08:00
|
|
|
|
|
|
|
// We add the last line's penalty here, since that line is going to be split
|
|
|
|
// now.
|
|
|
|
Penalty += Style.PenaltyExcessCharacter *
|
|
|
|
(ContentStartColumn + RemainingTokenColumns - ColumnLimit);
|
|
|
|
|
2017-07-21 06:29:39 +08:00
|
|
|
if (!DryRun)
|
|
|
|
Token->replaceWhitespaceAfterLastLine(TailOffset, SplitAfterLastLine,
|
|
|
|
Whitespaces);
|
2017-11-29 22:29:43 +08:00
|
|
|
ContentStartColumn =
|
|
|
|
Token->getContentStartColumn(Token->getLineCount() - 1, /*Break=*/true);
|
|
|
|
RemainingTokenColumns = Token->getRemainingLength(
|
|
|
|
Token->getLineCount() - 1,
|
|
|
|
TailOffset + SplitAfterLastLine.first + SplitAfterLastLine.second,
|
|
|
|
ContentStartColumn);
|
2017-07-21 06:29:39 +08:00
|
|
|
}
|
|
|
|
|
2017-11-29 22:29:43 +08:00
|
|
|
State.Column = ContentStartColumn + RemainingTokenColumns -
|
|
|
|
Current.UnbreakableTailLength;
|
2013-08-16 19:20:30 +08:00
|
|
|
|
|
|
|
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.
|
2014-11-25 18:05:17 +08:00
|
|
|
if (Current.isNot(TT_LineComment)) {
|
2013-08-16 19:20:30 +08:00
|
|
|
for (unsigned i = 0, e = State.Stack.size(); i != e; ++i)
|
|
|
|
State.Stack[i].BreakBeforeParameter = true;
|
|
|
|
}
|
|
|
|
|
2017-10-16 17:08:53 +08:00
|
|
|
if (Current.is(TT_BlockComment))
|
|
|
|
State.NoContinuation = true;
|
|
|
|
|
2013-08-16 19:20:30 +08:00
|
|
|
State.Stack.back().LastSpace = StartColumn;
|
|
|
|
}
|
2017-01-25 21:58:58 +08:00
|
|
|
|
|
|
|
Token->updateNextToken(State);
|
|
|
|
|
2017-12-01 21:28:08 +08:00
|
|
|
return {Penalty, Exceeded};
|
2013-08-16 19:20:30 +08:00
|
|
|
}
|
|
|
|
|
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-12-16 15:23:08 +08:00
|
|
|
bool ContinuationIndenter::nextIsMultilineString(const LineState &State) {
|
2013-08-23 19:57:34 +08:00
|
|
|
const FormatToken &Current = *State.NextToken;
|
2014-11-25 18:05:17 +08:00
|
|
|
if (!Current.isStringLiteral() || Current.is(TT_ImplicitStringLiteral))
|
2013-08-23 19:57:34 +08:00
|
|
|
return false;
|
2013-08-30 01:32:57 +08:00
|
|
|
// We never consider raw string literals "multiline" for the purpose of
|
2013-12-16 15:23:08 +08:00
|
|
|
// AlwaysBreakBeforeMultilineStrings implementation as they are special-cased
|
|
|
|
// (see TokenAnnotator::mustBreakBefore().
|
2013-08-30 01:32:57 +08:00
|
|
|
if (Current.TokenText.startswith("R\""))
|
|
|
|
return false;
|
2013-09-10 17:38:25 +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() &&
|
2013-12-20 14:22:01 +08:00
|
|
|
Current.getNextNonComment()->isStringLiteral())
|
2013-08-23 19:57:34 +08:00
|
|
|
return true; // Implicit concatenation.
|
2018-02-08 18:47:12 +08:00
|
|
|
if (Style.ColumnLimit != 0 && Style.BreakStringLiterals &&
|
2015-01-20 20:59:20 +08:00
|
|
|
State.Column + Current.ColumnWidth + Current.UnbreakableTailLength >
|
|
|
|
Style.ColumnLimit)
|
2013-08-23 19:57:34 +08:00
|
|
|
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
|