MyDeveloperDay updated this revision to Diff 355817. MyDeveloperDay added a comment.
Move Peek next token into a function, add a comment for clarity CHANGES SINCE LAST ACTION https://reviews.llvm.org/D105087/new/ https://reviews.llvm.org/D105087 Files: clang/lib/Format/UnwrappedLineParser.cpp clang/lib/Format/UnwrappedLineParser.h clang/unittests/Format/FormatTestJS.cpp
Index: clang/unittests/Format/FormatTestJS.cpp =================================================================== --- clang/unittests/Format/FormatTestJS.cpp +++ clang/unittests/Format/FormatTestJS.cpp @@ -2604,5 +2604,41 @@ "}\n"); } +TEST_F(FormatTestJS, ASIAfterReturn) { + verifyFormat("if (true) return\n" + "const v = 42"); + verifyFormat("if (true) return\n" + "let v = 42"); + verifyFormat("if (true) return\n" + "var v = 42"); + verifyFormat("if (true) break\n" + "let v = 42"); + verifyFormat("if (true) break\n" + "const v = 42"); + verifyFormat("if (true) break\n" + "v = 42"); + verifyFormat("if (true) continue\n" + "let v = 42"); + verifyFormat("if (true) continue\n" + "var v = 42"); + verifyFormat("if (true) continue\n" + "const v = 42"); + verifyFormat("if (true) yield\n" + "let v = 42"); + verifyFormat("if (true) yield\n" + "var v = 42"); + verifyFormat("if (true) yield\n" + "const v = 42"); + + verifyFormat("if (true) break\n" + "var v = 42"); + verifyFormat("if (true) return\n" + "v = 42"); + verifyFormat("if (true) continue\n" + "v = 42"); + verifyFormat("if (true) yield\n" + "v = 42"); +} + } // namespace format } // end namespace clang Index: clang/lib/Format/UnwrappedLineParser.h =================================================================== --- clang/lib/Format/UnwrappedLineParser.h +++ clang/lib/Format/UnwrappedLineParser.h @@ -185,6 +185,9 @@ bool isOnNewLine(const FormatToken &FormatTok); + // Peek to the next token + FormatToken *peekNextToken() const; + // Compute hash of the current preprocessor branch. // This is used to identify the different branches, and thus track if block // open and close in the same branch. Index: clang/lib/Format/UnwrappedLineParser.cpp =================================================================== --- clang/lib/Format/UnwrappedLineParser.cpp +++ clang/lib/Format/UnwrappedLineParser.cpp @@ -994,6 +994,16 @@ Keywords.kw_import, tok::kw_export); } +FormatToken *UnwrappedLineParser::peekNextToken() const { + unsigned TokenPosition = Tokens->getPosition(); + TokenPosition++; + if (TokenPosition < AllTokens.size()) { + FormatToken *PeekNext = AllTokens[TokenPosition]; + return PeekNext; + } + return nullptr; +} + // readTokenWithJavaScriptASI reads the next token and terminates the current // line if JavaScript Automatic Semicolon Insertion must // happen between the current token and the next token. @@ -1006,6 +1016,21 @@ readToken(); FormatToken *Next = FormatTok; + if (Previous->isOneOf(tok::kw_return, tok::kw_break, tok::kw_continue, + Keywords.kw_yield)) { + if (Next->isOneOf(Keywords.kw_let, tok::kw_const, Keywords.kw_var)) + return addUnwrappedLine(); + // Don't go past the end of the file. + if (!eof()) { + // Look for return xxx = val; but not return xxx(). + if (Next->is(tok::identifier)) { + FormatToken *PeekNext = peekNextToken(); + if (PeekNext && PeekNext->is(tok::equal)) + return addUnwrappedLine(); + } + } + } + bool IsOnSameLine = CommentsBeforeNextToken.empty() ? Next->NewlinesBefore == 0
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits