Author: ioeric Date: Wed Oct 5 10:42:19 2016 New Revision: 283330 URL: http://llvm.org/viewvc/llvm-project?rev=283330&view=rev Log: [clang-format] append newline after code when inserting new headers at the end of the code which does not end with newline.
Summary: append newline after code when inserting new headers at the end of the code which does not end with newline. Reviewers: djasper Subscribers: cfe-commits, klimek Differential Revision: https://reviews.llvm.org/D21026 Modified: cfe/trunk/lib/Format/Format.cpp cfe/trunk/unittests/Format/CleanupTest.cpp Modified: cfe/trunk/lib/Format/Format.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=283330&r1=283329&r2=283330&view=diff ============================================================================== --- cfe/trunk/lib/Format/Format.cpp (original) +++ cfe/trunk/lib/Format/Format.cpp Wed Oct 5 10:42:19 2016 @@ -1662,6 +1662,7 @@ fixCppIncludeInsertions(StringRef Code, if (CategoryEndOffsets.find(*I) == CategoryEndOffsets.end()) CategoryEndOffsets[*I] = CategoryEndOffsets[*std::prev(I)]; + bool NeedNewLineAtEnd = !Code.empty() && Code.back() != '\n'; for (const auto &R : HeaderInsertions) { auto IncludeDirective = R.getReplacementText(); bool Matched = IncludeRegex.match(IncludeDirective, &Matches); @@ -1680,10 +1681,18 @@ fixCppIncludeInsertions(StringRef Code, std::string NewInclude = !IncludeDirective.endswith("\n") ? (IncludeDirective + "\n").str() : IncludeDirective.str(); + // When inserting headers at end of the code, also append '\n' to the code + // if it does not end with '\n'. + if (NeedNewLineAtEnd && Offset == Code.size()) { + NewInclude = "\n" + NewInclude; + NeedNewLineAtEnd = false; + } auto NewReplace = tooling::Replacement(FileName, Offset, 0, NewInclude); auto Err = Result.add(NewReplace); if (Err) { llvm::consumeError(std::move(Err)); + unsigned NewOffset = Result.getShiftedCodePosition(Offset); + NewReplace = tooling::Replacement(FileName, NewOffset, 0, NewInclude); Result = Result.merge(tooling::Replacements(NewReplace)); } } Modified: cfe/trunk/unittests/Format/CleanupTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/CleanupTest.cpp?rev=283330&r1=283329&r2=283330&view=diff ============================================================================== --- cfe/trunk/unittests/Format/CleanupTest.cpp (original) +++ cfe/trunk/unittests/Format/CleanupTest.cpp Wed Oct 5 10:42:19 2016 @@ -709,16 +709,24 @@ TEST_F(CleanUpReplacementsTest, EmptyCod EXPECT_EQ(Expected, apply(Code, Replaces)); } -// FIXME: although this case does not crash, the insertion is wrong. A '\n' -// should be inserted between the two #includes. TEST_F(CleanUpReplacementsTest, NoNewLineAtTheEndOfCode) { std::string Code = "#include <map>"; - std::string Expected = "#include <map>#include <vector>\n"; + std::string Expected = "#include <map>\n#include <vector>\n"; tooling::Replacements Replaces = toReplacements({createInsertion("#include <vector>")}); EXPECT_EQ(Expected, apply(Code, Replaces)); } +TEST_F(CleanUpReplacementsTest, NoNewLineAtTheEndOfCodeMultipleInsertions) { + std::string Code = "#include <map>"; + std::string Expected = + "#include <map>\n#include <string>\n#include <vector>\n"; + tooling::Replacements Replaces = + toReplacements({createInsertion("#include <string>"), + createInsertion("#include <vector>")}); + EXPECT_EQ(Expected, apply(Code, Replaces)); +} + TEST_F(CleanUpReplacementsTest, SkipExistingHeaders) { std::string Code = "#include \"a.h\"\n" "#include <vector>\n"; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
