Add missing implementation for AtomicChange::replace(...)

[ioeric]

Summary

Just realized the implementation is missing...

[ioeric]

• Removed unnecessary variable.

[klimek]

lg

cfe/trunk/lib/Tooling/Refactoring/AtomicChange.cpp

for (const auto &R : NE.Replaces) {
     if (Err)
       llvm_unreachable(
           "Failed to add replacement when Converting YAML to AtomicChange.");
     llvm::consumeError(std::move(Err));
   }
   return E;
 }
 
+llvm::Error AtomicChange::replace(const SourceManager &SM, SourceLocation Loc,
+                                  unsigned Length, llvm::StringRef Text) {
+  return Replaces.add(Replacement(SM, Loc, Length, Text));
+}
+
 llvm::Error AtomicChange::insert(const SourceManager &SM, SourceLocation Loc,
                                  llvm::StringRef Text, bool InsertAfter) {
   if (Text.empty())
     return llvm::Error::success();
   Replacement R(SM, Loc, 0, Text);
   llvm::Error Err = Replaces.add(R);
   if (Err) {
     return llvm::handleErrors(

cfe/trunk/unittests/Tooling/RefactoringTest.cpp

TEST_F(AtomicChangeTest, YAMLToAtomicChange) {
   ExpectedChange.addHeader("a.h");
   ExpectedChange.removeHeader("b.h");
   ExpectedChange.setError("ok");
 
   AtomicChange ActualChange = AtomicChange::convertFromYAML(YamlContent);
   EXPECT_EQ(ExpectedChange.getKey(), ActualChange.getKey());
   EXPECT_EQ(ExpectedChange.getFilePath(), ActualChange.getFilePath());
   EXPECT_EQ(ExpectedChange.getError(), ActualChange.getError());
-  EXPECT_EQ(ExpectedChange.getInsertedHeaders(), ActualChange.getInsertedHeaders());
-  EXPECT_EQ(ExpectedChange.getRemovedHeaders(), ActualChange.getRemovedHeaders());
+  EXPECT_EQ(ExpectedChange.getInsertedHeaders(),
+            ActualChange.getInsertedHeaders());
+  EXPECT_EQ(ExpectedChange.getRemovedHeaders(),
+            ActualChange.getRemovedHeaders());
   EXPECT_EQ(ExpectedChange.getReplacements().size(),
             ActualChange.getReplacements().size());
   EXPECT_EQ(2u, ActualChange.getReplacements().size());
   EXPECT_EQ(*ExpectedChange.getReplacements().begin(),
             *ActualChange.getReplacements().begin());
   EXPECT_EQ(*(++ExpectedChange.getReplacements().begin()),
             *(++ActualChange.getReplacements().begin()));
 }
 
 TEST_F(AtomicChangeTest, CheckKeyAndKeyFile) {
   setUp();
   AtomicChange Change(Context.Sources, DefaultLoc);
   EXPECT_EQ("input.cpp:20", Change.getKey());
   EXPECT_EQ("input.cpp", Change.getFilePath());
 }
 
+TEST_F(AtomicChangeTest, Replace) {
+  setUp();
+  AtomicChange Change(Context.Sources, DefaultLoc);
+  llvm::Error Err = Change.replace(Context.Sources, DefaultLoc, 2, "aa");
+  ASSERT_TRUE(!Err);
+  EXPECT_EQ(Change.getReplacements().size(), 1u);
+  EXPECT_EQ(*Change.getReplacements().begin(),
+            Replacement(Context.Sources, DefaultLoc, 2, "aa"));
+
+  // Add a new replacement that conflicts with the existing one.
+  Err = Change.replace(Context.Sources, DefaultLoc, 3, "ab");
+  EXPECT_TRUE((bool)Err);
+  llvm::consumeError(std::move(Err));
+  EXPECT_EQ(Change.getReplacements().size(), 1u);
+}
+
 TEST_F(AtomicChangeTest, InsertBefore) {
   setUp();
   AtomicChange Change(Context.Sources, DefaultLoc);
   llvm::Error Err = Change.insert(Context.Sources, DefaultLoc, "aa");
   ASSERT_TRUE(!Err);
   EXPECT_EQ(Change.getReplacements().size(), 1u);
   EXPECT_EQ(*Change.getReplacements().begin(),
             Replacement(Context.Sources, DefaultLoc, 0, "aa"));