[include-fixer] use clang-format cleaner to insert header.

Summary: clang-format's cleanupAroundReplacements() takes care of header insertions.

Reviewers: bkramer

Subscribers: cfe-commits, hokein

Differential Revision: http://reviews.llvm.org/D20816

llvm-svn: 271287

1 files changed, 2 insertions, 4 deletions

diff --git a/clang-tools-extra/include-fixer/tool/ClangIncludeFixer.cpp b/clang-tools-extra/include-fixer/tool/ClangIncludeFixer.cpp
index 6e385fe617f..93952f8cb0b 100644
--- a/clang-tools-extra/include-fixer/tool/ClangIncludeFixer.cpp
+++ b/clang-tools-extra/include-fixer/tool/ClangIncludeFixer.cpp
@@ -168,11 +168,9 @@ int includeFixerMain(int argc, const char **argv) {
       return 1;
     }
 
-    // FIXME: Insert the header in right FirstIncludeOffset.
     tooling::Replacements Replacements =
         clang::include_fixer::createInsertHeaderReplacements(
-            Code->getBuffer(), FilePath, InsertHeader,
-            /*FirstIncludeOffset=*/0, InsertStyle);
+            Code->getBuffer(), FilePath, InsertHeader, InsertStyle);
     tooling::Replacements Replaces(Replacements.begin(), Replacements.end());
     std::string ChangedCode =
         tooling::applyAllReplacements(Code->getBuffer(), Replaces);
@@ -218,7 +216,7 @@ int includeFixerMain(int argc, const char **argv) {
   tooling::Replacements Replacements =
       clang::include_fixer::createInsertHeaderReplacements(
           /*Code=*/Buffer.get()->getBuffer(), FilePath, Context.Headers.front(),
-          Context.FirstIncludeOffset, InsertStyle);
+          InsertStyle);
 
   if (!Quiet)
     llvm::errs() << "Added #include" << Context.Headers.front();