From: Daniel Jasper Date: Wed, 17 Jun 2015 13:08:06 +0000 (+0000) Subject: clang-format: clang-format (NFC) X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8d4459793ccfa36bd60427e458a041ac2245a30;p=clang clang-format: clang-format (NFC) git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@239903 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Format/BreakableToken.cpp b/lib/Format/BreakableToken.cpp index e364986783..36a8c4d8da 100644 --- a/lib/Format/BreakableToken.cpp +++ b/lib/Format/BreakableToken.cpp @@ -183,7 +183,7 @@ void BreakableStringLiteral::insertBreak(unsigned LineIndex, } static StringRef getLineCommentIndentPrefix(StringRef Comment) { - static const char *const KnownPrefixes[] = { "///", "//", "//!" }; + static const char *const KnownPrefixes[] = {"///", "//", "//!"}; StringRef LongestPrefix; for (StringRef KnownPrefix : KnownPrefixes) { if (Comment.startswith(KnownPrefix)) { @@ -239,9 +239,8 @@ void BreakableLineComment::replaceWhitespace(unsigned LineIndex, /*Spaces=*/1); } -void -BreakableLineComment::replaceWhitespaceBefore(unsigned LineIndex, - WhitespaceManager &Whitespaces) { +void BreakableLineComment::replaceWhitespaceBefore( + unsigned LineIndex, WhitespaceManager &Whitespaces) { if (OriginalPrefix != Prefix) { Whitespaces.replaceWhitespaceInToken(Tok, OriginalPrefix.size(), 0, "", "", /*InPPDirective=*/false, @@ -415,9 +414,8 @@ void BreakableBlockComment::replaceWhitespace(unsigned LineIndex, /*Newlines=*/0, /*IndentLevel=*/0, /*Spaces=*/1); } -void -BreakableBlockComment::replaceWhitespaceBefore(unsigned LineIndex, - WhitespaceManager &Whitespaces) { +void BreakableBlockComment::replaceWhitespaceBefore( + unsigned LineIndex, WhitespaceManager &Whitespaces) { if (LineIndex == 0) return; StringRef Prefix = Decoration; diff --git a/lib/Format/ContinuationIndenter.cpp b/lib/Format/ContinuationIndenter.cpp index dbdb548eec..8a55241cdc 100644 --- a/lib/Format/ContinuationIndenter.cpp +++ b/lib/Format/ContinuationIndenter.cpp @@ -714,7 +714,7 @@ unsigned ContinuationIndenter::moveStateToNextToken(LineState &State, if (Current.is(TT_ObjCStringLiteral) && State.StartOfStringLiteral == 0) State.StartOfStringLiteral = State.Column + 1; else if (!Current.isOneOf(tok::comment, tok::identifier, tok::hash) && - !Current.isStringLiteral()) + !Current.isStringLiteral()) State.StartOfStringLiteral = 0; State.Column += Current.ColumnWidth; @@ -892,7 +892,7 @@ void ContinuationIndenter::moveStatePastScopeOpener(LineState &State, // be a line break within this call. for (const FormatToken *Tok = &Current; Tok && Tok != Current.MatchingParen; Tok = Tok->Next) { - if (Tok->MustBreakBefore || + if (Tok->MustBreakBefore || (Tok->CanBreakBefore && Tok->NewlinesBefore > 0)) { BreakBeforeParameter = true; break; diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index aa91658491..0feeaa007f 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -174,7 +174,8 @@ template <> struct MappingTraits { IO.mapOptional("AlignEscapedNewlinesLeft", Style.AlignEscapedNewlinesLeft); IO.mapOptional("AlignOperands", Style.AlignOperands); IO.mapOptional("AlignTrailingComments", Style.AlignTrailingComments); - IO.mapOptional("AlignConsecutiveAssignments", Style.AlignConsecutiveAssignments); + IO.mapOptional("AlignConsecutiveAssignments", + Style.AlignConsecutiveAssignments); IO.mapOptional("AllowAllParametersOfDeclarationOnNextLine", Style.AllowAllParametersOfDeclarationOnNextLine); IO.mapOptional("AllowShortBlocksOnASingleLine", @@ -1258,7 +1259,8 @@ public: } tooling::Replacements format(SmallVectorImpl &AnnotatedLines, - FormatTokenLexer &Tokens, bool *IncompleteFormat) { + FormatTokenLexer &Tokens, + bool *IncompleteFormat) { TokenAnnotator Annotator(Style, Tokens.getKeywords()); for (unsigned i = 0, e = AnnotatedLines.size(); i != e; ++i) { Annotator.annotate(*AnnotatedLines[i]); @@ -1504,8 +1506,7 @@ tooling::Replacements reformat(const FormatStyle &Style, tooling::Replacements reformat(const FormatStyle &Style, StringRef Code, ArrayRef Ranges, - StringRef FileName, - bool *IncompleteFormat) { + StringRef FileName, bool *IncompleteFormat) { if (Style.DisableFormat) return tooling::Replacements(); diff --git a/lib/Format/FormatToken.h b/lib/Format/FormatToken.h index dd12969454..5b7dadb854 100644 --- a/lib/Format/FormatToken.h +++ b/lib/Format/FormatToken.h @@ -86,24 +86,12 @@ enum TokenType { }; // Represents what type of block a set of braces open. -enum BraceBlockKind { - BK_Unknown, - BK_Block, - BK_BracedInit -}; +enum BraceBlockKind { BK_Unknown, BK_Block, BK_BracedInit }; // The packing kind of a function's parameters. -enum ParameterPackingKind { - PPK_BinPacked, - PPK_OnePerLine, - PPK_Inconclusive -}; +enum ParameterPackingKind { PPK_BinPacked, PPK_OnePerLine, PPK_Inconclusive }; -enum FormatDecision { - FD_Unformatted, - FD_Continue, - FD_Break -}; +enum FormatDecision { FD_Unformatted, FD_Continue, FD_Break }; class TokenRole; class AnnotatedLine; diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 8ba2eaf8d2..170176cdd7 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -1844,7 +1844,8 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, tok::kw_new, tok::kw_delete) && (!Left.Previous || Left.Previous->isNot(tok::period))))) || (Style.SpaceBeforeParens == FormatStyle::SBPO_Always && - (Left.is(tok::identifier) || Left.isFunctionLikeKeyword() || Left.is(tok::r_paren)) && + (Left.is(tok::identifier) || Left.isFunctionLikeKeyword() || + Left.is(tok::r_paren)) && Line.Type != LT_PreprocessorDirective); } if (Left.is(tok::at) && Right.Tok.getObjCKeywordID() != tok::objc_not_keyword) @@ -2015,11 +2016,10 @@ bool TokenAnnotator::mustBreakBefore(const AnnotatedLine &Line, if (Right.is(tok::char_constant) && Left.is(tok::plus) && Left.Previous && Left.Previous->is(tok::char_constant)) return true; - if (Left.is(TT_DictLiteral) && Left.is(tok::l_brace) && - Line.Level == 0 && Left.Previous && - Left.Previous->is(tok::equal) && - Line.First->isOneOf(tok::identifier, Keywords.kw_import, - tok::kw_export, tok::kw_const) && + if (Left.is(TT_DictLiteral) && Left.is(tok::l_brace) && Line.Level == 0 && + Left.Previous && Left.Previous->is(tok::equal) && + Line.First->isOneOf(tok::identifier, Keywords.kw_import, tok::kw_export, + tok::kw_const) && // kw_var is a pseudo-token that's a tok::identifier, so matches above. !Line.startsWith(Keywords.kw_var)) // Object literals on the top level of a file are treated as "enum-style". @@ -2064,7 +2064,7 @@ bool TokenAnnotator::mustBreakBefore(const AnnotatedLine &Line, Left.isNot(TT_CtorInitializerColon) && (Right.NewlinesBefore > 0 && Right.HasUnescapedNewline); if (Left.isTrailingComment()) - return true; + return true; if (Left.isStringLiteral() && (Right.isStringLiteral() || Right.is(TT_ObjCStringLiteral))) return true; diff --git a/lib/Format/UnwrappedLineFormatter.cpp b/lib/Format/UnwrappedLineFormatter.cpp index e902b06d53..b6784b369e 100644 --- a/lib/Format/UnwrappedLineFormatter.cpp +++ b/lib/Format/UnwrappedLineFormatter.cpp @@ -445,9 +445,9 @@ private: const FormatStyle &Style; const AdditionalKeywords &Keywords; - const SmallVectorImpl::const_iterator End; + const SmallVectorImpl::const_iterator End; - SmallVectorImpl::const_iterator Next; + SmallVectorImpl::const_iterator Next; }; static void markFinalized(FormatToken *Tok) { diff --git a/lib/Format/UnwrappedLineFormatter.h b/lib/Format/UnwrappedLineFormatter.h index da9aa1c605..478617d6a8 100644 --- a/lib/Format/UnwrappedLineFormatter.h +++ b/lib/Format/UnwrappedLineFormatter.h @@ -52,7 +52,8 @@ private: /// \brief Returns the column limit for a line, taking into account whether we /// need an escaped newline due to a continued preprocessor directive. - unsigned getColumnLimit(bool InPPDirective, const AnnotatedLine *NextLine) const; + unsigned getColumnLimit(bool InPPDirective, + const AnnotatedLine *NextLine) const; // Cache to store the penalty of formatting a vector of AnnotatedLines // starting from a specific additional offset. Improves performance if there diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp index 20f5d3f078..aa46e7464c 100644 --- a/lib/Format/UnwrappedLineParser.cpp +++ b/lib/Format/UnwrappedLineParser.cpp @@ -251,7 +251,6 @@ void UnwrappedLineParser::parse() { assert(PPLevelBranchIndex.back() <= PPLevelBranchCount.back()); } } while (!PPLevelBranchIndex.empty()); - } void UnwrappedLineParser::parseFile() { @@ -887,8 +886,7 @@ void UnwrappedLineParser::parseStructuralElement() { ? FormatTok->NewlinesBefore > 0 : CommentsBeforeNextToken.front()->NewlinesBefore > 0; - if (FollowedByNewline && - (Text.size() >= 5 || FunctionLike) && + if (FollowedByNewline && (Text.size() >= 5 || FunctionLike) && tokenCanStartNewLine(FormatTok->Tok) && Text == Text.upper()) { addUnwrappedLine(); return; @@ -1048,7 +1046,7 @@ void UnwrappedLineParser::tryToParseJSFunction() { if (FormatTok->is(tok::l_brace)) tryToParseBracedList(); else - while(FormatTok->isNot(tok::l_brace) && !eof()) + while (FormatTok->isNot(tok::l_brace) && !eof()) nextToken(); } @@ -1081,7 +1079,7 @@ bool UnwrappedLineParser::parseBracedList(bool ContinueOnSemicolons) { nextToken(); // Fat arrows can be followed by simple expressions or by child blocks // in curly braces. - if (FormatTok->is(tok::l_brace)){ + if (FormatTok->is(tok::l_brace)) { parseChildBlock(); continue; } @@ -1591,7 +1589,6 @@ void UnwrappedLineParser::parseRecord() { const FormatToken &InitialToken = *FormatTok; nextToken(); - // The actual identifier can be a nested name specifier, and in macros // it is often token-pasted. while (FormatTok->isOneOf(tok::identifier, tok::coloncolon, tok::hashhash, diff --git a/lib/Format/WhitespaceManager.h b/lib/Format/WhitespaceManager.h index 4bfc813b2c..d973838329 100644 --- a/lib/Format/WhitespaceManager.h +++ b/lib/Format/WhitespaceManager.h @@ -167,9 +167,11 @@ private: /// \brief Align consecutive assignments over all \c Changes. void alignConsecutiveAssignments(); - /// \brief Align consecutive assignments from change \p Start to change \p End at + /// \brief Align consecutive assignments from change \p Start to change \p End + /// at /// the specified \p Column. - void alignConsecutiveAssignments(unsigned Start, unsigned End, unsigned Column); + void alignConsecutiveAssignments(unsigned Start, unsigned End, + unsigned Column); /// \brief Align trailing comments over all \c Changes. void alignTrailingComments(); diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index f129bbbd42..d9298ef73d 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -150,8 +150,8 @@ TEST_F(FormatTest, OnlyGeneratesNecessaryReplacements) { "\r\n" "*/\r\n", format("/*\r\n" - "\r\n" - "*/\r\n")); + "\r\n" + "*/\r\n")); EXPECT_EQ(0, ReplacementCount); } @@ -2664,7 +2664,8 @@ TEST_F(FormatTest, MacroDefinitionsWithIncompleteCode) { "#define b \\\n" " } \\\n" " a\n" - "a", getLLVMStyleWithColumns(15)); + "a", + getLLVMStyleWithColumns(15)); verifyFormat("#define A \\\n" " { \\\n" " {\n" @@ -2892,8 +2893,7 @@ TEST_F(FormatTest, EscapedNewlines) { EXPECT_EQ( "#define A \\\n int i; \\\n int j;", format("#define A \\\nint i;\\\n int j;", getLLVMStyleWithColumns(11))); - EXPECT_EQ( - "#define A\n\nint i;", format("#define A \\\n\n int i;")); + EXPECT_EQ("#define A\n\nint i;", format("#define A \\\n\n int i;")); EXPECT_EQ("template f();", format("\\\ntemplate f();")); EXPECT_EQ("/* \\ \\ \\\n*/", format("\\\n/* \\ \\ \\\n*/")); EXPECT_EQ("", format("")); @@ -6115,20 +6115,19 @@ TEST_F(FormatTest, LayoutCxx11BraceInitializers) { "std::this_thread::sleep_for(\n" " std::chrono::nanoseconds{ std::chrono::seconds{ 1 } } / 5);", ExtraSpaces); - verifyFormat( - "std::vector aaaaaaaaaaaaaaaaaaa{\n" - " aaaaaaa,\n" - " aaaaaaaaaa,\n" - " aaaaa,\n" - " aaaaaaaaaaaaaaa,\n" - " aaa,\n" - " aaaaaaaaaa,\n" - " a,\n" - " aaaaaaaaaaaaaaaaaaaaa,\n" - " aaaaaaaaaaaa,\n" - " aaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaa,\n" - " aaaaaaa,\n" - " a};"); + verifyFormat("std::vector aaaaaaaaaaaaaaaaaaa{\n" + " aaaaaaa,\n" + " aaaaaaaaaa,\n" + " aaaaa,\n" + " aaaaaaaaaaaaaaa,\n" + " aaa,\n" + " aaaaaaaaaa,\n" + " a,\n" + " aaaaaaaaaaaaaaaaaaaaa,\n" + " aaaaaaaaaaaa,\n" + " aaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaa,\n" + " aaaaaaa,\n" + " a};"); verifyFormat("vector foo = { ::SomeGlobalFunction() };", ExtraSpaces); } @@ -8945,13 +8944,15 @@ TEST_F(FormatTest, GetsCorrectBasedOnStyle) { Styles[2].Language = FormatStyle::LK_JavaScript; EXPECT_EQ(0, parseConfiguration("Language: JavaScript\n" "BasedOnStyle: Google", - &Styles[2]).value()); + &Styles[2]) + .value()); Styles[3] = getLLVMStyle(); Styles[3].Language = FormatStyle::LK_JavaScript; EXPECT_EQ(0, parseConfiguration("BasedOnStyle: Google\n" "Language: JavaScript", - &Styles[3]).value()); + &Styles[3]) + .value()); Styles[4] = getLLVMStyle(); Styles[4].Language = FormatStyle::LK_JavaScript; @@ -8961,7 +8962,8 @@ TEST_F(FormatTest, GetsCorrectBasedOnStyle) { "---\n" "BasedOnStyle: Google\n" "Language: JavaScript", - &Styles[4]).value()); + &Styles[4]) + .value()); EXPECT_ALL_STYLES_EQUAL(Styles); } @@ -9260,7 +9262,8 @@ TEST_F(FormatTest, UsesLanguageForBasedOnStyle) { "Language: JavaScript\n" "IndentWidth: 76\n" "...\n", - &Style).value()); + &Style) + .value()); EXPECT_FALSE(Style.BreakBeforeTernaryOperators); EXPECT_EQ(76u, Style.IndentWidth); EXPECT_EQ(FormatStyle::LK_JavaScript, Style.Language); @@ -9933,8 +9936,7 @@ TEST_F(FormatTest, FormatsBlocksWithZeroColumnWidth) { ZeroColumn.AllowShortBlocksOnASingleLine = true; EXPECT_EQ("void (^largeBlock)(void) = ^{ int i; };", - format("void (^largeBlock)(void) = ^{ int i; };", - ZeroColumn)); + format("void (^largeBlock)(void) = ^{ int i; };", ZeroColumn)); ZeroColumn.AllowShortBlocksOnASingleLine = false; EXPECT_EQ("void (^largeBlock)(void) = ^{\n" " int i;\n" diff --git a/unittests/Format/FormatTestJS.cpp b/unittests/Format/FormatTestJS.cpp index 2c20ab058e..6479805b16 100644 --- a/unittests/Format/FormatTestJS.cpp +++ b/unittests/Format/FormatTestJS.cpp @@ -256,9 +256,8 @@ TEST_F(FormatTestJS, FormatsFreestandingFunctions) { } TEST_F(FormatTestJS, ArrayLiterals) { - verifyFormat( - "var aaaaa: List =\n" - " [new SomeThingAAAAAAAAAAAA(), new SomeThingBBBBBBBBB()];"); + verifyFormat("var aaaaa: List =\n" + " [new SomeThingAAAAAAAAAAAA(), new SomeThingBBBBBBBBB()];"); verifyFormat("return [\n" " aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n" " bbbbbbbbbbbbbbbbbbbbbbbbbbb,\n" @@ -856,9 +855,7 @@ TEST_F(FormatTestJS, TemplateStrings) { "var y;")); } -TEST_F(FormatTestJS, CastSyntax) { - verifyFormat("var x = foo;"); -} +TEST_F(FormatTestJS, CastSyntax) { verifyFormat("var x = foo;"); } TEST_F(FormatTestJS, TypeArguments) { verifyFormat("class X {}"); diff --git a/unittests/Format/FormatTestJava.cpp b/unittests/Format/FormatTestJava.cpp index 631a3dca27..4c161e0180 100644 --- a/unittests/Format/FormatTestJava.cpp +++ b/unittests/Format/FormatTestJava.cpp @@ -31,9 +31,9 @@ protected: return Result; } - static std::string format( - llvm::StringRef Code, - const FormatStyle &Style = getGoogleStyle(FormatStyle::LK_Java)) { + static std::string + format(llvm::StringRef Code, + const FormatStyle &Style = getGoogleStyle(FormatStyle::LK_Java)) { return format(Code, 0, Code.size(), Style); }