maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang-refactor] Add "-Inplace" option to the commandline tool. 

Summary:
Change clang-refactor default behavior to print the new code after refactoring
(instead of editing the source files), which would make it easier to use
and debug the refactoring action.

Reviewers: arphaman, ioeric

Reviewed By: arphaman

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D39092

llvm-svn: 316212
This commit is contained in:
Haojian Wu 2017-10-20 12:37:16 +00:00
parent f761d0e514
commit 55186786a9
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/test/Refactor/tool-apply-replacements.cpp
View File

@ -1,10 +1,8 @@
// RUN: rm -f %t.cp.cpp
// RUN: cp %s %t.cp.cpp
// RUN: clang-refactor local-rename -selection=%t.cp.cpp:9:7 -new-name=test %t.cp.cpp --
// RUN: grep -v CHECK %t.cp.cpp | FileCheck %t.cp.cpp
// RUN: cp %s %t.cp.cpp
// RUN: clang-refactor local-rename -selection=%t.cp.cpp:9:7-9:15 -new-name=test %t.cp.cpp --
// RUN: grep -v CHECK %t.cp.cpp | FileCheck %t.cp.cpp
// RUN: sed -e 's#//.*$##' %s > %t.cpp
// RUN: clang-refactor local-rename -selection=%t.cpp:7:7 -new-name=test %t.cpp -- | FileCheck %s
// RUN: clang-refactor local-rename -selection=%t.cpp:7:7-7:15 -new-name=test %t.cpp -- | FileCheck %s
// RUN: clang-refactor local-rename -i -selection=%t.cpp:7:7 -new-name=test %t.cpp --
// RUN: FileCheck -input-file=%t.cpp %s
class RenameMe {
// CHECK: class test {

22
clang/tools/clang-refactor/ClangRefactor.cpp
View File

@ -40,6 +40,11 @@ static cl::OptionCategory CommonRefactorOptions("Refactoring options");
static cl::opt<bool> Verbose("v", cl::desc("Use verbose output"),
cl::cat(cl::GeneralCategory),
cl::sub(*cl::AllSubCommands));
static cl::opt<bool> Inplace("i", cl::desc("Inplace edit <file>s"),
cl::cat(cl::GeneralCategory),
cl::sub(*cl::AllSubCommands));
} // end namespace opts
namespace {
@ -436,13 +441,18 @@ public:
return true;
}
std::error_code EC;
llvm::raw_fd_ostream OS(File, EC, llvm::sys::fs::F_Text);
if (EC) {
llvm::errs() << EC.message() << "\n";
return true;
if (opts::Inplace) {
std::error_code EC;
llvm::raw_fd_ostream OS(File, EC, llvm::sys::fs::F_Text);
if (EC) {
llvm::errs() << EC.message() << "\n";
return true;
}
OS << *Result;
continue;
}
OS << *Result;
llvm::outs() << *Result;
}
return false;
}