[change-namespace] add an option to dump changed files in YAML.

[hokein]

change-namespace/tool/ClangChangeNamespace.cpp

68 ↗

(On Diff #88206)

dump_result maybe a clearer name, which also is consistent with clang-move's.

137 ↗

(On Diff #88206)

Is this duplicated as we already have "dump_results" option now?

[ioeric]

• Addressed review comments.

change-namespace/tool/ClangChangeNamespace.cpp

137 ↗

(On Diff #88206)

I'd like this to be default since this produces readable results.

[hokein]

change-namespace/tool/ClangChangeNamespace.cpp

68 ↗

(On Diff #88206)

Nit: Also change the variable name to DumpResult.

137 ↗

(On Diff #88206)

OK, it is up to you.

[ioeric]

change-namespace/tool/ClangChangeNamespace.cpp

68 ↗

(On Diff #88206)

Since I am also dumping output as plain text, I named this DumpYAML for clarity.

clang-tools-extra/trunk/change-namespace/ChangeNamespace.cpp

while (D) {
     D = D->getParent();
   }
   return false;
 }
 
 // Returns true if \p D is visible at \p Loc with DeclContext \p DeclCtx.
 bool isDeclVisibleAtLocation(const SourceManager &SM, const Decl *D,
                              const DeclContext *DeclCtx, SourceLocation Loc) {
-  SourceLocation DeclLoc = SM.getSpellingLoc(D->getLocation());
+  SourceLocation DeclLoc = SM.getSpellingLoc(D->getLocStart());
   Loc = SM.getSpellingLoc(Loc);
   return SM.isBeforeInTranslationUnit(DeclLoc, Loc) &&
          (SM.getFileID(DeclLoc) == SM.getFileID(Loc) &&
           isNestedDeclContext(DeclCtx, D->getDeclContext()));
 }
 
 AST_MATCHER(EnumDecl, isScoped) {
     return Node.isScoped();

clang-tools-extra/trunk/change-namespace/tool/ClangChangeNamespace.cpp

 #include "clang/Frontend/FrontendActions.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
 #include "clang/Rewrite/Core/Rewriter.h"
 #include "clang/Tooling/CommonOptionsParser.h"
 #include "clang/Tooling/Refactoring.h"
 #include "clang/Tooling/Tooling.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Signals.h"
+#include "llvm/Support/YAMLTraits.h"
 
 using namespace clang;
 using namespace llvm;
 
 namespace {
 
 cl::OptionCategory ChangeNamespaceCategory("Change namespace.");
 
 cl::opt<std::string> OldNamespace("old_namespace", cl::Required,
                                   cl::desc("Old namespace."),
                                   cl::cat(ChangeNamespaceCategory));
 
 cl::opt<std::string> NewNamespace("new_namespace", cl::Required,
                                   cl::desc("New namespace."),
                                   cl::cat(ChangeNamespaceCategory));
 
 cl::opt<std::string> FilePattern(
     "file_pattern", cl::Required,
     cl::desc("Only rename namespaces in files that match the given pattern."),
     cl::cat(ChangeNamespaceCategory));
 
 cl::opt<bool> Inplace("i", cl::desc("Inplace edit <file>s, if specified."),
                       cl::cat(ChangeNamespaceCategory));
 
+cl::opt<bool>
+    DumpYAML("dump_result",
+         cl::desc("Dump new file contents in YAML, if specified."),
+         cl::cat(ChangeNamespaceCategory));
+
 cl::opt<std::string> Style("style",
                            cl::desc("The style name used for reformatting."),
                            cl::init("LLVM"), cl::cat(ChangeNamespaceCategory));
 
 } // anonymous namespace
 
 int main(int argc, const char **argv) {
   llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
int main(int argc, const char **argv) {
 
   if (!formatAndApplyAllReplacements(Tool.getReplacements(), Rewrite, Style)) {
     llvm::errs() << "Failed applying all replacements.\n";
     return 1;
   }
   if (Inplace)
     return Rewrite.overwriteChangedFiles();
 
-  for (const auto &File : Files) {
+  std::set<llvm::StringRef> ChangedFiles;
+  for (const auto &it : Tool.getReplacements())
+    ChangedFiles.insert(it.first);
+
+  if (DumpYAML) {
+    auto WriteToYAML = [&](llvm::raw_ostream &OS) {
+      OS << "[\n";
+      for (auto I = ChangedFiles.begin(), E = ChangedFiles.end(); I != E; ++I) {
+        OS << "  {\n";
+        OS << "    \"FilePath\": \"" << *I << "\",\n";
+        const auto *Entry = FileMgr.getFile(*I);
+        auto ID = Sources.getOrCreateFileID(Entry, SrcMgr::C_User);
+        std::string Content;
+        llvm::raw_string_ostream ContentStream(Content);
+        Rewrite.getEditBuffer(ID).write(ContentStream);
+        OS << "    \"SourceText\": \""
+           << llvm::yaml::escape(ContentStream.str()) << "\"\n";
+        OS << "  }";
+        if (I != std::prev(E))
+          OS << ",\n";
+      }
+      OS << "\n]\n";
+    };
+    WriteToYAML(llvm::outs());
+    return 0;
+  }
+
+  for (const auto &File : ChangedFiles) {
     const auto *Entry = FileMgr.getFile(File);
 
     auto ID = Sources.getOrCreateFileID(Entry, SrcMgr::C_User);
-    // FIXME: print results in parsable format, e.g. JSON.
     outs() << "============== " << File << " ==============\n";
     Rewrite.getEditBuffer(ID).write(llvm::outs());
     outs() << "\n============================================\n";
   }
+
   return 0;
 }