Revert "Implement new interfaces for code-formatting when applying replacements."

This reverts commit r262232.

llvm-svn: 262234

2 files changed, 0 insertions, 50 deletions

diff --git a/clang/unittests/Tooling/CMakeLists.txt b/clang/unittests/Tooling/CMakeLists.txt
index 74e7e76a311..3035fdcc015 100644
--- a/clang/unittests/Tooling/CMakeLists.txt
+++ b/clang/unittests/Tooling/CMakeLists.txt
@@ -24,7 +24,6 @@ target_link_libraries(ToolingTests
   clangAST
   clangASTMatchers
   clangBasic
-  clangFormat
   clangFrontend
   clangLex
   clangRewrite
diff --git a/clang/unittests/Tooling/RefactoringTest.cpp b/clang/unittests/Tooling/RefactoringTest.cpp
index 49a4e1dde78..ff11aeae117 100644
--- a/clang/unittests/Tooling/RefactoringTest.cpp
+++ b/clang/unittests/Tooling/RefactoringTest.cpp
@@ -18,7 +18,6 @@
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/LangOptions.h"
 #include "clang/Basic/SourceManager.h"
-#include "clang/Format/Format.h"
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/FrontendAction.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
@@ -167,35 +166,6 @@ TEST_F(ReplacementTest, ApplyAllFailsIfOneApplyFails) {
   EXPECT_EQ("z", Context.getRewrittenText(IDz));
 }
 
-TEST_F(ReplacementTest, FormatCodeAfterReplacements) {
-  // Column limit is 20.
-  std::string Code = "Type *a =\n"
-                     "    new Type();\n"
-                     "g(iiiii, 0, jjjjj,\n"
-                     "  0, kkkkk, 0, mm);\n"
-                     "int  bad     = format   ;";
-  std::string Expected = "auto a = new Type();\n"
-                         "g(iiiii, nullptr,\n"
-                         "  jjjjj, nullptr,\n"
-                         "  kkkkk, nullptr,\n"
-                         "  mm);\n"
-                         "int  bad     = format   ;";
-  FileID ID = Context.createInMemoryFile("format.cpp", Code);
-  Replacements Replaces;
-  Replaces.insert(
-      Replacement(Context.Sources, Context.getLocation(ID, 1, 1), 6, "auto "));
-  Replaces.insert(Replacement(Context.Sources, Context.getLocation(ID, 3, 10),
-                              1, "nullptr"));
-  Replaces.insert(Replacement(Context.Sources, Context.getLocation(ID, 4, 3), 1,
-                              "nullptr"));
-  Replaces.insert(Replacement(Context.Sources, Context.getLocation(ID, 4, 13),
-                              1, "nullptr"));
-
-  format::FormatStyle Style = format::getLLVMStyle();
-  Style.ColumnLimit = 20; // Set column limit to 20 to increase readibility.
-  EXPECT_EQ(Expected, applyAllReplacementsAndFormat(Code, Replaces, Style));
-}
-
 TEST(ShiftedCodePositionTest, FindsNewCodePosition) {
   Replacements Replaces;
   Replaces.insert(Replacement("", 0, 1, ""));
@@ -448,25 +418,6 @@ TEST(Range, contains) {
   EXPECT_FALSE(Range(0, 10).contains(Range(0, 11)));
 }
 
-TEST(Range, CalculateRangesOfReplacements) {
-  // Before: aaaabbbbbbz
-  // After : bbbbbbzzzzzzoooooooooooooooo
-  Replacements Replaces;
-  Replaces.insert(Replacement("foo", 0, 4, ""));
-  Replaces.insert(Replacement("foo", 10, 1, "zzzzzz"));
-  Replaces.insert(Replacement("foo", 11, 0, "oooooooooooooooo"));
-
-  std::vector<Range> Ranges = calculateChangedRangesInFile(Replaces);
-
-  EXPECT_EQ(3ul, Ranges.size());
-  EXPECT_TRUE(Ranges[0].getOffset() == 0);
-  EXPECT_TRUE(Ranges[0].getLength() == 0);
-  EXPECT_TRUE(Ranges[1].getOffset() == 6);
-  EXPECT_TRUE(Ranges[1].getLength() == 6);
-  EXPECT_TRUE(Ranges[2].getOffset() == 12);
-  EXPECT_TRUE(Ranges[2].getLength() == 16);
-}
-
 TEST(DeduplicateTest, removesDuplicates) {
   std::vector<Replacement> Input;
   Input.push_back(Replacement("fileA", 50, 0, " foo "));