Skip to content

Commit

Permalink
Revert "Implement new interfaces for code-formatting when applying re…
Browse files Browse the repository at this point in the history 
…placements."

This reverts commit r262232.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@262234 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
@r4nt
r4nt committed Feb 29, 2016
1 parent a2abc61 commit 9356a91
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 132 deletions.
39 changes: 0 additions & 39 deletions include/clang/Tooling/Core/Replacement.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ namespace clang {

class Rewriter;

namespace format {
struct FormatStyle;
} // namespace format

namespace tooling {

/// \brief A source range independent of the \c SourceManager.
Expand Down Expand Up @@ -224,41 +220,6 @@ bool applyAllReplacements(const std::vector<Replacement> &Replaces,
/// replacements cannot be applied, this returns an empty \c string.
std::string applyAllReplacements(StringRef Code, const Replacements &Replaces);

/// \brief Applies all replacements in \p Replaces to \p Code.
///
/// This completely ignores the path stored in each replacement. If one or more
/// replacements cannot be applied, this returns an empty \c string.
std::string applyAllReplacements(StringRef Code,
const std::vector<Replacements> &Replaces);

/// \brief Calculate the ranges in a single file that are affected by the
/// Replacements.
///
/// \pre Replacements must be for the same file.
std::vector<tooling::Range>
calculateChangedRangesInFile(const tooling::Replacements &Replaces);

/// \brief Return replacements that are merged from orginal replacements
/// and the replacements for formatting the code after applying the orginal
/// replacements.
tooling::Replacements formatReplacements(StringRef Code,
const tooling::Replacements &Replaces,
const format::FormatStyle &Style);

/// \brief In addition to applying replacements as in `applyAllReplacements`,
/// this function also reformats the changed code after applying replacements.
///
/// \pre Replacements must be for the same file and conflict-free.
///
/// Replacement applications happen independently of the success of
/// other applications.
///
/// \returns the changed code if all replacements apply and code is fixed.
/// empty string otherwise.
std::string applyAllReplacementsAndFormat(StringRef Code,
const Replacements &Replaces,
const format::FormatStyle &Style);

/// \brief Merges two sets of replacements with the second set referring to the
/// code after applying the first set. Within both 'First' and 'Second',
/// replacements must not overlap.
Expand Down
45 changes: 2 additions & 43 deletions lib/Tooling/Core/Replacement.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,17 @@
//
//===----------------------------------------------------------------------===//

#include "clang/Tooling/Core/Replacement.h"

#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/DiagnosticIDs.h"
#include "clang/Basic/DiagnosticOptions.h"
#include "clang/Basic/FileManager.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Format/Format.h"
#include "clang/Lex/Lexer.h"
#include "clang/Rewrite/Core/Rewriter.h"
#include "clang/Tooling/Core/Replacement.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/raw_os_ostream.h"
#include <iterator>

namespace clang {
namespace tooling {
Expand Down Expand Up @@ -284,44 +281,6 @@ std::string applyAllReplacements(StringRef Code, const Replacements &Replaces) {
return Result;
}

tooling::Replacements formatReplacements(StringRef Code,
const tooling::Replacements &Replaces,
const format::FormatStyle &Style) {
if (Replaces.empty()) return Replacements();

std::string NewCode = applyAllReplacements(Code, Replaces);
std::vector<tooling::Range> ChangedRanges =
calculateChangedRangesInFile(Replaces);
StringRef FileName = Replaces.begin()->getFilePath();
tooling::Replacements FormatReplaces =
format::reformat(Style, NewCode, ChangedRanges, FileName);

tooling::Replacements MergedReplacements =
mergeReplacements(Replaces, FormatReplaces);
return MergedReplacements;
}

std::vector<Range> calculateChangedRangesInFile(const Replacements &Replaces) {
std::vector<Range> ChangedRanges;
int Shift = 0;
for (const tooling::Replacement &R : Replaces) {
unsigned Offset = R.getOffset() + Shift;
unsigned Length = R.getReplacementText().size();
Shift += Length - R.getLength();
ChangedRanges.push_back(tooling::Range(Offset, Length));
}
return ChangedRanges;
}

std::string applyAllReplacementsAndFormat(StringRef Code,
const Replacements &Replaces,
const format::FormatStyle &Style) {
Replacements NewReplacements = formatReplacements(Code, Replaces, Style);
if (NewReplacements.empty())
return Code; // Exit early to avoid overhead in `applyAllReplacements`.
return applyAllReplacements(Code, NewReplacements);
}

namespace {
// Represents a merged replacement, i.e. a replacement consisting of multiple
// overlapping replacements from 'First' and 'Second' in mergeReplacements.
Expand Down Expand Up @@ -355,7 +314,7 @@ class MergedReplacement {

// Merges the next element 'R' into this merged element. As we always merge
// from 'First' into 'Second' or vice versa, the MergedReplacement knows what
// set the next element is coming from.
// set the next element is coming from.
void merge(const Replacement &R) {
if (MergeSecond) {
unsigned REnd = R.getOffset() + Delta + R.getLength();
Expand Down
1 change: 0 additions & 1 deletion unittests/Tooling/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ target_link_libraries(ToolingTests
clangAST
clangASTMatchers
clangBasic
clangFormat
clangFrontend
clangLex
clangRewrite
Expand Down
49 changes: 0 additions & 49 deletions unittests/Tooling/RefactoringTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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, ""));
Expand Down Expand Up @@ -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 "));
Expand Down

0 comments on commit 9356a91

Please sign in to comment.