<div dir="ltr"><div>Hi Teresa, </div><div><br></div>Thanks a lot! I have patched the error. <div><br></div><div>Thanks,</div><div>Eric</div><br><div class="gmail_quote"><div dir="ltr">On Tue, Mar 29, 2016 at 8:08 PM Teresa Johnson <<a href="mailto:tejohnson@google.com" target="_blank">tejohnson@google.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hi Eric,<div><br></div><div>I'm getting a build error:</div><div><br></div><div><div>In file included from /usr/local/google/home/tejohnson/llvm/llvm_16/tools/clang/lib/Tooling/Refactoring.cpp:21:</div><div>/usr/local/google/home/tejohnson/llvm/llvm_16/tools/clang/include/clang/Tooling/Refactoring.h:32:1: error: class 'FormatStyle' was previously declared as a struct [-Werror,-Wmismatched-tags]</div><div>class FormatStyle;</div><div>^</div><div>/usr/local/google/home/tejohnson/llvm/llvm_16/tools/clang/include/clang/Format/Format.h:43:8: note: previous use is here</div><div>struct FormatStyle {</div><div> ^</div><div>/usr/local/google/home/tejohnson/llvm/llvm_16/tools/clang/include/clang/Tooling/Refactoring.h:32:1: note: did you mean struct here?</div><div>class FormatStyle;</div><div>^~~~~</div><div>struct</div><div>1 error generated.</div><div>ninja: build stopped: subcommand failed.</div></div><div><br></div><div><br></div><div>Looks like you added the "class FormatStyle" in Refactoring.h, looks like this should be a struct instead.</div><div><br></div><div>Thanks,</div><div>Teresa</div></div><div class="gmail_extra"></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Mar 29, 2016 at 9:31 AM, Eric Liu via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ioeric<br>
Date: Tue Mar 29 11:31:53 2016<br>
New Revision: 264745<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=264745&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=264745&view=rev</a><br>
Log:<br>
Added formatAndApplyAllReplacements that works on multiple files in libTooling.<br>
<br>
Summary:<br>
formatAndApplyAllReplacements takes a set of Replacements, applies them on a<br>
Rewriter, and reformats the changed code.<br>
<br>
Reviewers: klimek, djasper<br>
<br>
Subscribers: ioeric, klimek, cfe-commits<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D17852" rel="noreferrer" target="_blank">http://reviews.llvm.org/D17852</a><br>
<br>
Modified:<br>
cfe/trunk/include/clang/Basic/SourceManager.h<br>
cfe/trunk/include/clang/Format/Format.h<br>
cfe/trunk/include/clang/Tooling/Core/Replacement.h<br>
cfe/trunk/include/clang/Tooling/Refactoring.h<br>
cfe/trunk/lib/Format/Format.cpp<br>
cfe/trunk/lib/Tooling/CMakeLists.txt<br>
cfe/trunk/lib/Tooling/Core/Replacement.cpp<br>
cfe/trunk/lib/Tooling/Refactoring.cpp<br>
cfe/trunk/unittests/Format/FormatTest.cpp<br>
cfe/trunk/unittests/Tooling/CMakeLists.txt<br>
cfe/trunk/unittests/Tooling/RefactoringTest.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/SourceManager.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/SourceManager.h?rev=264745&r1=264744&r2=264745&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/SourceManager.h?rev=264745&r1=264744&r2=264745&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/SourceManager.h (original)<br>
+++ cfe/trunk/include/clang/Basic/SourceManager.h Tue Mar 29 11:31:53 2016<br>
@@ -797,6 +797,15 @@ public:<br>
IncludeLoc, FileCharacter, LoadedID, LoadedOffset);<br>
}<br>
<br>
+ /// \brief Get the FileID for \p SourceFile if it exists. Otherwise, create a<br>
+ /// new FileID for the \p SourceFile.<br>
+ FileID getOrCreateFileID(const FileEntry *SourceFile,<br>
+ SrcMgr::CharacteristicKind FileCharacter) {<br>
+ FileID ID = translateFile(SourceFile);<br>
+ return ID.isValid() ? ID : createFileID(SourceFile, SourceLocation(),<br>
+ FileCharacter);<br>
+ }<br>
+<br>
/// \brief Return a new SourceLocation that encodes the<br>
/// fact that a token from SpellingLoc should actually be referenced from<br>
/// ExpansionLoc, and that it represents the expansion of a macro argument<br>
<br>
Modified: cfe/trunk/include/clang/Format/Format.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Format/Format.h?rev=264745&r1=264744&r2=264745&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Format/Format.h?rev=264745&r1=264744&r2=264745&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Format/Format.h (original)<br>
+++ cfe/trunk/include/clang/Format/Format.h Tue Mar 29 11:31:53 2016<br>
@@ -766,22 +766,6 @@ tooling::Replacements formatReplacements<br>
const tooling::Replacements &Replaces,<br>
const FormatStyle &Style);<br>
<br>
-/// \brief In addition to applying all replacements in \p Replaces to \p Code,<br>
-/// this function also reformats the changed code after applying replacements.<br>
-///<br>
-/// \pre Replacements must be for the same file and conflict-free.<br>
-///<br>
-/// Replacement applications happen independently of the success of<br>
-/// other applications.<br>
-///<br>
-/// \returns the changed code with all replacements applied and formatted, if<br>
-/// successful. An empty string otherwise.<br>
-///<br>
-/// See also "include/clang/Tooling/Core/Replacements.h".<br>
-std::string applyAllReplacementsAndFormat(StringRef Code,<br>
- const tooling::Replacements &Replaces,<br>
- const FormatStyle &Style);<br>
-<br>
/// \brief Reformats the given \p Ranges in the file \p ID.<br>
///<br>
/// Each range is extended on either end to its next bigger logic unit, i.e.<br>
<br>
Modified: cfe/trunk/include/clang/Tooling/Core/Replacement.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Tooling/Core/Replacement.h?rev=264745&r1=264744&r2=264745&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Tooling/Core/Replacement.h?rev=264745&r1=264744&r2=264745&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Tooling/Core/Replacement.h (original)<br>
+++ cfe/trunk/include/clang/Tooling/Core/Replacement.h Tue Mar 29 11:31:53 2016<br>
@@ -22,6 +22,7 @@<br>
#include "clang/Basic/LangOptions.h"<br>
#include "clang/Basic/SourceLocation.h"<br>
#include "llvm/ADT/StringRef.h"<br>
+#include <map><br>
#include <set><br>
#include <string><br>
#include <vector><br>
@@ -220,12 +221,16 @@ bool applyAllReplacements(const std::vec<br>
/// replacements cannot be applied, this returns an empty \c string.<br>
std::string applyAllReplacements(StringRef Code, const Replacements &Replaces);<br>
<br>
-/// \brief Calculate the ranges in a single file that are affected by the<br>
+/// \brief Calculates the ranges in a single file that are affected by the<br>
/// Replacements.<br>
///<br>
/// \pre Replacements must be for the same file.<br>
-std::vector<tooling::Range><br>
-calculateChangedRangesInFile(const tooling::Replacements &Replaces);<br>
+std::vector<Range> calculateChangedRanges(const Replacements &Replaces);<br>
+<br>
+/// \brief Groups a random set of replacements by file path. Replacements<br>
+/// related to the same file entry are put into the same vector.<br>
+std::map<std::string, Replacements><br>
+groupReplacementsByFile(const Replacements &Replaces);<br>
<br>
/// \brief Merges two sets of replacements with the second set referring to the<br>
/// code after applying the first set. Within both 'First' and 'Second',<br>
<br>
Modified: cfe/trunk/include/clang/Tooling/Refactoring.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Tooling/Refactoring.h?rev=264745&r1=264744&r2=264745&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Tooling/Refactoring.h?rev=264745&r1=264744&r2=264745&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Tooling/Refactoring.h (original)<br>
+++ cfe/trunk/include/clang/Tooling/Refactoring.h Tue Mar 29 11:31:53 2016<br>
@@ -27,6 +27,12 @@ namespace clang {<br>
<br>
class Rewriter;<br>
<br>
+namespace format {<br>
+<br>
+class FormatStyle;<br>
+<br>
+} // namespace format<br>
+<br>
namespace tooling {<br>
<br>
/// \brief A tool to run refactorings.<br>
@@ -68,6 +74,24 @@ private:<br>
Replacements Replace;<br>
};<br>
<br>
+/// \brief Groups \p Replaces by the file path and applies each group of<br>
+/// Replacements on the related file in \p Rewriter. In addition to applying<br>
+/// given Replacements, this function also formats the changed code.<br>
+///<br>
+/// \pre Replacements must be conflict-free.<br>
+///<br>
+/// Replacement applications happen independently of the success of other<br>
+/// applications.<br>
+///<br>
+/// \param[in] Replaces Replacements to apply.<br>
+/// \param[in] Rewrite The `Rewritter` to apply replacements on.<br>
+/// \param[in] Style The style name used for reformatting. See ```getStyle``` in<br>
+/// "include/clang/Format/Format.h" for all possible style forms.<br>
+///<br>
+/// \returns true if all replacements applied and formatted. false otherwise.<br>
+bool formatAndApplyAllReplacements(const Replacements &Replaces,<br>
+ Rewriter &Rewrite, StringRef Style = "file");<br>
+<br>
} // end namespace tooling<br>
} // end namespace clang<br>
<br>
<br>
Modified: cfe/trunk/lib/Format/Format.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=264745&r1=264744&r2=264745&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=264745&r1=264744&r2=264745&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/Format.cpp (original)<br>
+++ cfe/trunk/lib/Format/Format.cpp Tue Mar 29 11:31:53 2016<br>
@@ -1998,7 +1998,7 @@ tooling::Replacements formatReplacements<br>
<br>
std::string NewCode = applyAllReplacements(Code, Replaces);<br>
std::vector<tooling::Range> ChangedRanges =<br>
- tooling::calculateChangedRangesInFile(Replaces);<br>
+ tooling::calculateChangedRanges(Replaces);<br>
StringRef FileName = Replaces.begin()->getFilePath();<br>
tooling::Replacements FormatReplaces =<br>
reformat(Style, NewCode, ChangedRanges, FileName);<br>
@@ -2009,16 +2009,6 @@ tooling::Replacements formatReplacements<br>
return MergedReplacements;<br>
}<br>
<br>
-std::string applyAllReplacementsAndFormat(StringRef Code,<br>
- const tooling::Replacements &Replaces,<br>
- const FormatStyle &Style) {<br>
- tooling::Replacements NewReplacements =<br>
- formatReplacements(Code, Replaces, Style);<br>
- if (NewReplacements.empty())<br>
- return Code; // Exit early to avoid overhead in `applyAllReplacements`.<br>
- return applyAllReplacements(Code, NewReplacements);<br>
-}<br>
-<br>
tooling::Replacements reformat(const FormatStyle &Style,<br>
SourceManager &SourceMgr, FileID ID,<br>
ArrayRef<CharSourceRange> Ranges,<br>
<br>
Modified: cfe/trunk/lib/Tooling/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/CMakeLists.txt?rev=264745&r1=264744&r2=264745&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/CMakeLists.txt?rev=264745&r1=264744&r2=264745&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Tooling/CMakeLists.txt (original)<br>
+++ cfe/trunk/lib/Tooling/CMakeLists.txt Tue Mar 29 11:31:53 2016<br>
@@ -17,6 +17,7 @@ add_clang_library(clangTooling<br>
clangASTMatchers<br>
clangBasic<br>
clangDriver<br>
+ clangFormat<br>
clangFrontend<br>
clangLex<br>
clangRewrite<br>
<br>
Modified: cfe/trunk/lib/Tooling/Core/Replacement.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/Core/Replacement.cpp?rev=264745&r1=264744&r2=264745&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/Core/Replacement.cpp?rev=264745&r1=264744&r2=264745&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Tooling/Core/Replacement.cpp (original)<br>
+++ cfe/trunk/lib/Tooling/Core/Replacement.cpp Tue Mar 29 11:31:53 2016<br>
@@ -58,14 +58,8 @@ bool Replacement::apply(Rewriter &Rewrit<br>
const FileEntry *Entry = SM.getFileManager().getFile(FilePath);<br>
if (!Entry)<br>
return false;<br>
- FileID ID;<br>
- // FIXME: Use SM.translateFile directly.<br>
- SourceLocation Location = SM.translateFileLineCol(Entry, 1, 1);<br>
- ID = Location.isValid() ?<br>
- SM.getFileID(Location) :<br>
- SM.createFileID(Entry, SourceLocation(), SrcMgr::C_User);<br>
- // FIXME: We cannot check whether Offset + Length is in the file, as<br>
- // the remapping API is not public in the RewriteBuffer.<br>
+<br>
+ FileID ID = SM.getOrCreateFileID(Entry, SrcMgr::C_User);<br>
const SourceLocation Start =<br>
SM.getLocForStartOfFile(ID).<br>
getLocWithOffset(ReplacementRange.getOffset());<br>
@@ -256,6 +250,8 @@ bool applyAllReplacements(const std::vec<br>
}<br>
<br>
std::string applyAllReplacements(StringRef Code, const Replacements &Replaces) {<br>
+ if (Replaces.empty()) return Code;<br>
+<br>
IntrusiveRefCntPtr<vfs::InMemoryFileSystem> InMemoryFileSystem(<br>
new vfs::InMemoryFileSystem);<br>
FileManager Files(FileSystemOptions(), InMemoryFileSystem);<br>
@@ -282,7 +278,7 @@ std::string applyAllReplacements(StringR<br>
return Result;<br>
}<br>
<br>
-std::vector<Range> calculateChangedRangesInFile(const Replacements &Replaces) {<br>
+std::vector<Range> calculateChangedRanges(const Replacements &Replaces) {<br>
std::vector<Range> ChangedRanges;<br>
int Shift = 0;<br>
for (const Replacement &R : Replaces) {<br>
@@ -390,6 +386,15 @@ private:<br>
};<br>
} // namespace<br>
<br>
+std::map<std::string, Replacements><br>
+groupReplacementsByFile(const Replacements &Replaces) {<br>
+ std::map<std::string, Replacements> FileToReplaces;<br>
+ for (const auto &Replace : Replaces) {<br>
+ FileToReplaces[Replace.getFilePath()].insert(Replace);<br>
+ }<br>
+ return FileToReplaces;<br>
+}<br>
+<br>
Replacements mergeReplacements(const Replacements &First,<br>
const Replacements &Second) {<br>
if (First.empty() || Second.empty())<br>
<br>
Modified: cfe/trunk/lib/Tooling/Refactoring.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/Refactoring.cpp?rev=264745&r1=264744&r2=264745&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/Refactoring.cpp?rev=264745&r1=264744&r2=264745&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Tooling/Refactoring.cpp (original)<br>
+++ cfe/trunk/lib/Tooling/Refactoring.cpp Tue Mar 29 11:31:53 2016<br>
@@ -14,6 +14,7 @@<br>
#include "clang/Basic/DiagnosticOptions.h"<br>
#include "clang/Basic/FileManager.h"<br>
#include "clang/Basic/SourceManager.h"<br>
+#include "clang/Format/Format.h"<br>
#include "clang/Frontend/TextDiagnosticPrinter.h"<br>
#include "clang/Lex/Lexer.h"<br>
#include "clang/Rewrite/Core/Rewriter.h"<br>
@@ -61,5 +62,29 @@ int RefactoringTool::saveRewrittenFiles(<br>
return Rewrite.overwriteChangedFiles() ? 1 : 0;<br>
}<br>
<br>
+bool formatAndApplyAllReplacements(const Replacements &Replaces,<br>
+ Rewriter &Rewrite, StringRef Style) {<br>
+ SourceManager &SM = Rewrite.getSourceMgr();<br>
+ FileManager &Files = SM.getFileManager();<br>
+<br>
+ auto FileToReplaces = groupReplacementsByFile(Replaces);<br>
+<br>
+ bool Result = true;<br>
+ for (auto &FileAndReplaces : FileToReplaces) {<br>
+ const std::string FilePath = FileAndReplaces.first;<br>
+ auto &CurReplaces = FileAndReplaces.second;<br>
+<br>
+ const FileEntry *Entry = Files.getFile(FilePath);<br>
+ FileID ID = SM.getOrCreateFileID(Entry, SrcMgr::C_User);<br>
+ StringRef Code = SM.getBufferData(ID);<br>
+<br>
+ format::FormatStyle CurStyle = format::getStyle(Style, FilePath, "LLVM");<br>
+ Replacements NewReplacements =<br>
+ format::formatReplacements(Code, CurReplaces, CurStyle);<br>
+ Result = applyAllReplacements(NewReplacements, Rewrite) && Result;<br>
+ }<br>
+ return Result;<br>
+}<br>
+<br>
} // end namespace tooling<br>
} // end namespace clang<br>
<br>
Modified: cfe/trunk/unittests/Format/FormatTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=264745&r1=264744&r2=264745&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=264745&r1=264744&r2=264745&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Tue Mar 29 11:31:53 2016<br>
@@ -11270,7 +11270,8 @@ TEST_F(ReplacementTest, FormatCodeAfterR<br>
<br>
format::FormatStyle Style = format::getLLVMStyle();<br>
Style.ColumnLimit = 20; // Set column limit to 20 to increase readibility.<br>
- EXPECT_EQ(Expected, applyAllReplacementsAndFormat(Code, Replaces, Style));<br>
+ EXPECT_EQ(Expected, applyAllReplacements(<br>
+ Code, formatReplacements(Code, Replaces, Style)));<br>
}<br>
<br>
} // end namespace<br>
<br>
Modified: cfe/trunk/unittests/Tooling/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/CMakeLists.txt?rev=264745&r1=264744&r2=264745&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/CMakeLists.txt?rev=264745&r1=264744&r2=264745&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Tooling/CMakeLists.txt (original)<br>
+++ cfe/trunk/unittests/Tooling/CMakeLists.txt Tue Mar 29 11:31:53 2016<br>
@@ -30,6 +30,7 @@ target_link_libraries(ToolingTests<br>
clangAST<br>
clangASTMatchers<br>
clangBasic<br>
+ clangFormat<br>
clangFrontend<br>
clangLex<br>
clangRewrite<br>
<br>
Modified: cfe/trunk/unittests/Tooling/RefactoringTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/RefactoringTest.cpp?rev=264745&r1=264744&r2=264745&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/RefactoringTest.cpp?rev=264745&r1=264744&r2=264745&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Tooling/RefactoringTest.cpp (original)<br>
+++ cfe/trunk/unittests/Tooling/RefactoringTest.cpp Tue Mar 29 11:31:53 2016<br>
@@ -18,6 +18,7 @@<br>
#include "clang/Basic/FileManager.h"<br>
#include "clang/Basic/LangOptions.h"<br>
#include "clang/Basic/SourceManager.h"<br>
+#include "clang/Format/Format.h"<br>
#include "clang/Frontend/CompilerInstance.h"<br>
#include "clang/Frontend/FrontendAction.h"<br>
#include "clang/Frontend/TextDiagnosticPrinter.h"<br>
@@ -166,6 +167,39 @@ TEST_F(ReplacementTest, ApplyAllFailsIfO<br>
EXPECT_EQ("z", Context.getRewrittenText(IDz));<br>
}<br>
<br>
+TEST_F(ReplacementTest, MultipleFilesReplaceAndFormat) {<br>
+ // Column limit is 20.<br>
+ std::string Code1 = "Long *a =\n"<br>
+ " new Long();\n"<br>
+ "long x = 1;";<br>
+ std::string Expected1 = "auto a = new Long();\n"<br>
+ "long x =\n"<br>
+ " 12345678901;";<br>
+ std::string Code2 = "int x = 123;\n"<br>
+ "int y = 0;";<br>
+ std::string Expected2 = "int x =\n"<br>
+ " 1234567890123;\n"<br>
+ "int y = 10;";<br>
+ FileID ID1 = Context.createInMemoryFile("format_1.cpp", Code1);<br>
+ FileID ID2 = Context.createInMemoryFile("format_2.cpp", Code2);<br>
+<br>
+ tooling::Replacements Replaces;<br>
+ // Scrambled the order of replacements.<br>
+ Replaces.insert(tooling::Replacement(<br>
+ Context.Sources, Context.getLocation(ID2, 1, 12), 0, "4567890123"));<br>
+ Replaces.insert(tooling::Replacement(<br>
+ Context.Sources, Context.getLocation(ID1, 1, 1), 6, "auto "));<br>
+ Replaces.insert(tooling::Replacement(<br>
+ Context.Sources, Context.getLocation(ID2, 2, 9), 1, "10"));<br>
+ Replaces.insert(tooling::Replacement(<br>
+ Context.Sources, Context.getLocation(ID1, 3, 10), 1, "12345678901"));<br>
+<br>
+ EXPECT_TRUE(formatAndApplyAllReplacements(<br>
+ Replaces, Context.Rewrite, "{BasedOnStyle: LLVM, ColumnLimit: 20}"));<br>
+ EXPECT_EQ(Expected1, Context.getRewrittenText(ID1));<br>
+ EXPECT_EQ(Expected2, Context.getRewrittenText(ID2));<br>
+}<br>
+<br>
TEST(ShiftedCodePositionTest, FindsNewCodePosition) {<br>
Replacements Replaces;<br>
Replaces.insert(Replacement("", 0, 1, ""));<br>
@@ -426,7 +460,7 @@ TEST(Range, CalculateRangesOfReplacement<br>
Replaces.insert(Replacement("foo", 10, 1, "zzzzzz"));<br>
Replaces.insert(Replacement("foo", 11, 0, "oooooooooooooooo"));<br>
<br>
- std::vector<Range> Ranges = calculateChangedRangesInFile(Replaces);<br>
+ std::vector<Range> Ranges = calculateChangedRanges(Replaces);<br>
<br>
EXPECT_EQ(3ul, Ranges.size());<br>
EXPECT_TRUE(Ranges[0].getOffset() == 0);<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div></div><div class="gmail_extra">-- <br><div><span style="font-family:Times;font-size:medium"><table cellspacing="0" cellpadding="0"><tbody><tr style="color:rgb(85,85,85);font-family:sans-serif;font-size:small"><td nowrap style="border-top-style:solid;border-top-color:rgb(213,15,37);border-top-width:2px">Teresa Johnson |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(51,105,232);border-top-width:2px"> Software Engineer |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(0,153,57);border-top-width:2px"> <a href="mailto:tejohnson@google.com" target="_blank">tejohnson@google.com</a> |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(238,178,17);border-top-width:2px"> 408-460-2413</td></tr></tbody></table></span></div>
</div></blockquote></div></div>