r239903 - clang-format: clang-format (NFC)
Daniel Jasper
djasper at google.com
Thu Jun 18 00:39:40 PDT 2015
Yeah.. We really need to implement that comment-reflow logic...
On Wed, Jun 17, 2015 at 6:41 PM, Nico Weber <thakis at chromium.org> wrote:
> On Wed, Jun 17, 2015 at 6:08 AM, Daniel Jasper <djasper at google.com> wrote:
>
>> Author: djasper
>> Date: Wed Jun 17 08:08:06 2015
>> New Revision: 239903
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=239903&view=rev
>> Log:
>> clang-format: clang-format (NFC)
>>
>> Modified:
>> cfe/trunk/lib/Format/BreakableToken.cpp
>> cfe/trunk/lib/Format/ContinuationIndenter.cpp
>> cfe/trunk/lib/Format/Format.cpp
>> cfe/trunk/lib/Format/FormatToken.h
>> cfe/trunk/lib/Format/TokenAnnotator.cpp
>> cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp
>> cfe/trunk/lib/Format/UnwrappedLineFormatter.h
>> cfe/trunk/lib/Format/UnwrappedLineParser.cpp
>> cfe/trunk/lib/Format/WhitespaceManager.h
>> cfe/trunk/unittests/Format/FormatTest.cpp
>> cfe/trunk/unittests/Format/FormatTestJS.cpp
>> cfe/trunk/unittests/Format/FormatTestJava.cpp
>>
>> Modified: cfe/trunk/lib/Format/BreakableToken.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/BreakableToken.cpp?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/lib/Format/BreakableToken.cpp (original)
>> +++ cfe/trunk/lib/Format/BreakableToken.cpp Wed Jun 17 08:08:06 2015
>> @@ -183,7 +183,7 @@ void BreakableStringLiteral::insertBreak
>> }
>>
>> 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::replaceWhites
>> /*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::replaceWhite
>> /*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;
>>
>> Modified: cfe/trunk/lib/Format/ContinuationIndenter.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/ContinuationIndenter.cpp?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/lib/Format/ContinuationIndenter.cpp (original)
>> +++ cfe/trunk/lib/Format/ContinuationIndenter.cpp Wed Jun 17 08:08:06 2015
>> @@ -714,7 +714,7 @@ unsigned ContinuationIndenter::moveState
>> 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::moveStatePast
>> // 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;
>>
>> Modified: cfe/trunk/lib/Format/Format.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/lib/Format/Format.cpp (original)
>> +++ cfe/trunk/lib/Format/Format.cpp Wed Jun 17 08:08:06 2015
>> @@ -174,7 +174,8 @@ template <> struct MappingTraits<FormatS
>> 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<AnnotatedLine *>
>> &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 For
>>
>> tooling::Replacements reformat(const FormatStyle &Style, StringRef Code,
>> ArrayRef<tooling::Range> Ranges,
>> - StringRef FileName,
>> - bool *IncompleteFormat) {
>> + StringRef FileName, bool
>> *IncompleteFormat) {
>> if (Style.DisableFormat)
>> return tooling::Replacements();
>>
>>
>> Modified: cfe/trunk/lib/Format/FormatToken.h
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/FormatToken.h?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/lib/Format/FormatToken.h (original)
>> +++ cfe/trunk/lib/Format/FormatToken.h Wed Jun 17 08:08:06 2015
>> @@ -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;
>>
>> Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)
>> +++ cfe/trunk/lib/Format/TokenAnnotator.cpp Wed Jun 17 08:08:06 2015
>> @@ -1844,7 +1844,8 @@ bool TokenAnnotator::spaceRequiredBetwee
>> 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(con
>> 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(con
>> 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;
>>
>> Modified: cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp (original)
>> +++ cfe/trunk/lib/Format/UnwrappedLineFormatter.cpp Wed Jun 17 08:08:06
>> 2015
>> @@ -445,9 +445,9 @@ private:
>>
>> const FormatStyle &Style;
>> const AdditionalKeywords &Keywords;
>> - const SmallVectorImpl<AnnotatedLine*>::const_iterator End;
>> + const SmallVectorImpl<AnnotatedLine *>::const_iterator End;
>>
>> - SmallVectorImpl<AnnotatedLine*>::const_iterator Next;
>> + SmallVectorImpl<AnnotatedLine *>::const_iterator Next;
>> };
>>
>> static void markFinalized(FormatToken *Tok) {
>>
>> Modified: cfe/trunk/lib/Format/UnwrappedLineFormatter.h
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineFormatter.h?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/lib/Format/UnwrappedLineFormatter.h (original)
>> +++ cfe/trunk/lib/Format/UnwrappedLineFormatter.h Wed Jun 17 08:08:06 2015
>> @@ -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
>>
>> Modified: cfe/trunk/lib/Format/UnwrappedLineParser.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/lib/Format/UnwrappedLineParser.cpp (original)
>> +++ cfe/trunk/lib/Format/UnwrappedLineParser.cpp Wed Jun 17 08:08:06 2015
>> @@ -251,7 +251,6 @@ void UnwrappedLineParser::parse() {
>> assert(PPLevelBranchIndex.back() <= PPLevelBranchCount.back());
>> }
>> } while (!PPLevelBranchIndex.empty());
>> -
>> }
>>
>> void UnwrappedLineParser::parseFile() {
>> @@ -887,8 +886,7 @@ void UnwrappedLineParser::parseStructura
>> ? 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::tryToParseJSFu
>> 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::parseBracedLis
>> 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,
>>
>> Modified: cfe/trunk/lib/Format/WhitespaceManager.h
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/WhitespaceManager.h?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/lib/Format/WhitespaceManager.h (original)
>> +++ cfe/trunk/lib/Format/WhitespaceManager.h Wed Jun 17 08:08:06 2015
>> @@ -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.
>>
>
> This change looks a bit strange.
>
>
>> - 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();
>>
>> Modified: cfe/trunk/unittests/Format/FormatTest.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/unittests/Format/FormatTest.cpp (original)
>> +++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Jun 17 08:08:06 2015
>> @@ -150,8 +150,8 @@ TEST_F(FormatTest, OnlyGeneratesNecessar
>> "\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, MacroDefinitionsWithI
>> "#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 <class T> f();", format("\\\ntemplate <class T>
>> f();"));
>> EXPECT_EQ("/* \\ \\ \\\n*/", format("\\\n/* \\ \\ \\\n*/"));
>> EXPECT_EQ("<a\n\\\\\n>", format("<a\n\\\\\n>"));
>> @@ -6115,20 +6115,19 @@ TEST_F(FormatTest, LayoutCxx11BraceIniti
>> "std::this_thread::sleep_for(\n"
>> " std::chrono::nanoseconds{ std::chrono::seconds{ 1 } } / 5);",
>> ExtraSpaces);
>> - verifyFormat(
>> - "std::vector<MyValues> 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<MyValues> 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<int> foo = { ::SomeGlobalFunction() };",
>> ExtraSpaces);
>> }
>>
>> @@ -8945,13 +8944,15 @@ TEST_F(FormatTest, GetsCorrectBasedOnSty
>> 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, GetsCorrectBasedOnSty
>> "---\n"
>> "BasedOnStyle: Google\n"
>> "Language: JavaScript",
>> - &Styles[4]).value());
>> + &Styles[4])
>> + .value());
>> EXPECT_ALL_STYLES_EQUAL(Styles);
>> }
>>
>> @@ -9260,7 +9262,8 @@ TEST_F(FormatTest, UsesLanguageForBasedO
>> "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, FormatsBlocksWithZero
>>
>> 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"
>>
>> Modified: cfe/trunk/unittests/Format/FormatTestJS.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestJS.cpp?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/unittests/Format/FormatTestJS.cpp (original)
>> +++ cfe/trunk/unittests/Format/FormatTestJS.cpp Wed Jun 17 08:08:06 2015
>> @@ -256,9 +256,8 @@ TEST_F(FormatTestJS, FormatsFreestanding
>> }
>>
>> TEST_F(FormatTestJS, ArrayLiterals) {
>> - verifyFormat(
>> - "var aaaaa: List<SomeThing> =\n"
>> - " [new SomeThingAAAAAAAAAAAA(), new SomeThingBBBBBBBBB()];");
>> + verifyFormat("var aaaaa: List<SomeThing> =\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 = <type>foo;");
>> -}
>> +TEST_F(FormatTestJS, CastSyntax) { verifyFormat("var x = <type>foo;"); }
>>
>> TEST_F(FormatTestJS, TypeArguments) {
>> verifyFormat("class X<Y> {}");
>>
>> Modified: cfe/trunk/unittests/Format/FormatTestJava.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestJava.cpp?rev=239903&r1=239902&r2=239903&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/unittests/Format/FormatTestJava.cpp (original)
>> +++ cfe/trunk/unittests/Format/FormatTestJava.cpp Wed Jun 17 08:08:06 2015
>> @@ -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);
>> }
>>
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150618/c91f3d14/attachment.html>
More information about the cfe-commits
mailing list