Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-12-04 05:27:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make clang.excludeArgs accept glob patterns

Browse Source
This commit is contained in:
Fangrui Song 2019-03-04 18:21:53 -08:00
parent c765d3564f
commit b1bb8ffd97
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config.hh
View File

@ -84,9 +84,8 @@ struct Config {
} capabilities; } capabilities;
struct Clang { struct Clang {
// Arguments that should be excluded, e.g. ["-fopenmp", "-Wall"] // Arguments matching any of these glob patterns will be excluded, e.g.
// // ["-fopenmp", "-m*", "-Wall"].
// e.g. If your project is built by GCC and has an option thag clang does not understand.
std::vector<std::string> excludeArgs; std::vector<std::string> excludeArgs;
// Additional arguments to pass to clang. // Additional arguments to pass to clang.

21
src/project.cc
View File

@ -18,6 +18,7 @@
#include <clang/Tooling/CompilationDatabase.h> #include <clang/Tooling/CompilationDatabase.h>
#include <llvm/ADT/STLExtras.h> #include <llvm/ADT/STLExtras.h>
#include <llvm/ADT/StringSet.h> #include <llvm/ADT/StringSet.h>
#include <llvm/Support/GlobPattern.h>
#include <llvm/Support/LineIterator.h> #include <llvm/Support/LineIterator.h>
#include <llvm/Support/Program.h> #include <llvm/Support/Program.h>
@ -69,10 +70,22 @@ enum OptionClass {
struct ProjectProcessor { struct ProjectProcessor {
Project::Folder &folder; Project::Folder &folder;
std::unordered_set<size_t> command_set; std::unordered_set<size_t> command_set;
StringSet<> excludeArgs; StringSet<> exclude_args;
std::vector<GlobPattern> exclude_globs;
ProjectProcessor(Project::Folder &folder) : folder(folder) { ProjectProcessor(Project::Folder &folder) : folder(folder) {
for (auto &arg : g_config->clang.excludeArgs) 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 // Expand %c %cpp ... in .ccls
@ -103,7 +116,7 @@ struct ProjectProcessor {
} }
if (ok) if (ok)
args.push_back(A.data()); args.push_back(A.data());
} else if (!excludeArgs.count(A)) { } else if (!ExcludesArg(A)) {
args.push_back(arg); args.push_back(arg);
} }
} }
@ -384,7 +397,7 @@ void Project::LoadDirectory(const std::string &root, Project::Folder &folder) {
entry.args.reserve(args.size()); entry.args.reserve(args.size());
for (std::string &arg : args) { for (std::string &arg : args) {
DoPathMapping(arg); DoPathMapping(arg);
if (!proc.excludeArgs.count(arg)) if (!proc.ExcludesArg(arg))
entry.args.push_back(Intern(arg)); entry.args.push_back(Intern(arg));
} }
entry.compdb_size = entry.args.size(); entry.compdb_size = entry.args.size();