From 38f4a8ac784ff8254c828e55b09ccae03a6f81bf Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.me>
Date: Mon, 4 Mar 2019 18:21:53 -0800
Subject: [PATCH] Make clang.excludeArgs accept glob patterns

---
 src/config.hh  |  5 ++---
 src/project.cc | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/config.hh b/src/config.hh
index 2761da51..63f3b38a 100644
--- a/src/config.hh
+++ b/src/config.hh
@@ -84,9 +84,8 @@ struct Config {
   } capabilities;
 
   struct Clang {
-    // Arguments that should be excluded, e.g. ["-fopenmp", "-Wall"]
-    //
-    // e.g. If your project is built by GCC and has an option thag clang does not understand.
+    // Arguments matching any of these glob patterns will be excluded, e.g.
+    // ["-fopenmp", "-m*", "-Wall"].
     std::vector<std::string> excludeArgs;
 
     // Additional arguments to pass to clang.
diff --git a/src/project.cc b/src/project.cc
index d04d67c2..24914128 100644
--- a/src/project.cc
+++ b/src/project.cc
@@ -18,6 +18,7 @@
 #include <clang/Tooling/CompilationDatabase.h>
 #include <llvm/ADT/STLExtras.h>
 #include <llvm/ADT/StringSet.h>
+#include <llvm/Support/GlobPattern.h>
 #include <llvm/Support/LineIterator.h>
 #include <llvm/Support/Program.h>
 
@@ -69,10 +70,22 @@ enum OptionClass {
 struct ProjectProcessor {
   Project::Folder &folder;
   std::unordered_set<size_t> command_set;
-  StringSet<> excludeArgs;
+  StringSet<> exclude_args;
+  std::vector<GlobPattern> exclude_globs;
+
   ProjectProcessor(Project::Folder &folder) : folder(folder) {
     for (auto &arg : g_config->clang.excludeArgs)
-      excludeArgs.insert(arg);
+      if (arg.find_first_of("?*[") == std::string::npos)
+        exclude_args.insert(arg);
+      else if (Expected<GlobPattern> glob_or_err = GlobPattern::create(arg))
+        exclude_globs.push_back(std::move(*glob_or_err));
+      else
+        LOG_S(WARNING) << toString(glob_or_err.takeError());
+  }
+
+  bool ExcludesArg(StringRef arg) {
+    return exclude_args.count(arg) || any_of(exclude_globs,
+      [&](const GlobPattern &glob) { return glob.match(arg); });
   }
 
   // Expand %c %cpp ... in .ccls
@@ -103,7 +116,7 @@ struct ProjectProcessor {
         }
         if (ok)
           args.push_back(A.data());
-      } else if (!excludeArgs.count(A)) {
+      } else if (!ExcludesArg(A)) {
         args.push_back(arg);
       }
     }
@@ -384,7 +397,7 @@ void Project::LoadDirectory(const std::string &root, Project::Folder &folder) {
       entry.args.reserve(args.size());
       for (std::string &arg : args) {
         DoPathMapping(arg);
-        if (!proc.excludeArgs.count(arg))
+        if (!proc.ExcludesArg(arg))
           entry.args.push_back(Intern(arg));
       }
       entry.compdb_size = entry.args.size();