[include-cleaner] return --remove and --insert to be in deprecation period

Author: hulxv

clang-tools-extra/include-cleaner/test/tool.cpp

@@ -14,6 +14,14 @@ int x = foo();
 //      REMOVE: - "foobar.h"
 //  REMOVE-NOT: + "foo.h"
 
+//         RUN: clang-include-cleaner -remove=0 -print=changes %s -- -I%S/Inputs/ | FileCheck --check-prefix=INSERT %s
+//  INSERT-NOT: - "foobar.h"
+//      INSERT: + "foo.h"
+
+//         RUN: clang-include-cleaner -insert=0 -print=changes %s -- -I%S/Inputs/ | FileCheck --check-prefix=REMOVE %s
+//      REMOVE: - "foobar.h"
+//  REMOVE-NOT: + "foo.h"
+
 //        RUN: clang-include-cleaner -print=changes %s --ignore-headers="foobar\.h,foo\.h" -- -I%S/Inputs/ | FileCheck --match-full-lines --allow-empty --check-prefix=IGNORE %s
 // IGNORE-NOT: - "foobar.h"
 // IGNORE-NOT: + "foo.h"

clang-tools-extra/include-cleaner/tool/IncludeCleaner.cpp

@@ -90,10 +90,21 @@ cl::opt<bool> Edit{
     cl::desc("Apply edits to analyzed source files"),
     cl::cat(IncludeCleaner),
 };
-
+cl::opt<bool> Insert{
+    "insert",
+    cl::desc("Allow header insertions"),
+    cl::init(true),
+    cl::cat(IncludeCleaner),
+};
+cl::opt<bool> Remove{
+    "remove",
+    cl::desc("Allow header removals"),
+    cl::init(true),
+    cl::cat(IncludeCleaner),
+};
 cl::opt<bool> DisableInsert{
     "disable-insert",
-    cl::desc("DIsable header insertions"),
+    cl::desc("Disable header insertions"),
     cl::init(false),
     cl::cat(IncludeCleaner),
 };
@@ -183,9 +194,9 @@ class Action : public clang::ASTFrontendAction {
     auto Results =
         analyze(AST.Roots, PP.MacroReferences, PP.Includes, &PI,
                 getCompilerInstance().getPreprocessor(), HeaderFilter);
-    if (DisableInsert)
+    if (!Insert || DisableInsert)
       Results.Missing.clear();
-    if (DisableRemove)
+    if (!Remove || DisableRemove)
       Results.Unused.clear();
     std::string Final = fixIncludes(Results, AbsPath, Code, getStyle(AbsPath));