From c728fe9795023e0daf87c5e33bdd2fabb9033789 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Thu, 27 Jun 2019 19:11:38 -0700 Subject: [PATCH] project: support %cu directive and strip -M* options --- src/lsp.hh | 9 ++++++++- src/project.cc | 22 +++++++++++++++------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/lsp.hh b/src/lsp.hh index 8c507904..bf78f6c7 100644 --- a/src/lsp.hh +++ b/src/lsp.hh @@ -249,6 +249,13 @@ struct ShowMessageParam { // Used to identify the language at a file level. The ordering is important, as // a file previously identified as `C`, will be changed to `Cpp` if it // encounters a c++ declaration. -enum class LanguageId { Unknown = -1, C = 0, Cpp = 1, ObjC = 2, ObjCpp = 3 }; +enum class LanguageId { + Unknown = -1, + C = 0, + Cpp = 1, + ObjC = 2, + ObjCpp = 3, + Cuda = 4, +}; } // namespace ccls diff --git a/src/project.cc b/src/project.cc index 72ed77e8..f183d61f 100644 --- a/src/project.cc +++ b/src/project.cc @@ -48,7 +48,8 @@ std::pair lookupExtension(std::string_view filename) { bool objc = types::isObjC(I); LanguageId ret; if (types::isCXX(I)) - ret = objc ? LanguageId::ObjCpp : LanguageId::Cpp; + ret = types::isCuda(I) ? LanguageId::Cuda + : objc ? LanguageId::ObjCpp : LanguageId::Cpp; else if (objc) ret = LanguageId::ObjC; else if (I == types::TY_C || I == types::TY_CHeader) @@ -83,7 +84,12 @@ struct ProjectProcessor { LOG_S(WARNING) << toString(glob_or_err.takeError()); } - bool ExcludesArg(StringRef arg) { + bool ExcludesArg(StringRef arg, int &i) { + if (arg.startswith("-M")) { + if (arg == "-MF" || arg == "-MT" || arg == "-MQ") + i++; + return true; + } return exclude_args.count(arg) || any_of(exclude_globs, [&](const GlobPattern &glob) { return glob.match(arg); }); } @@ -105,6 +111,8 @@ struct ProjectProcessor { ok |= lang == LanguageId::C && header; else if (A.consume_front("%cpp ")) ok |= lang == LanguageId::Cpp; + else if (A.consume_front("%cu ")) + ok |= lang == LanguageId::Cuda; else if (A.consume_front("%hpp ")) ok |= lang == LanguageId::Cpp && header; else if (A.consume_front("%objective-c ")) @@ -116,7 +124,7 @@ struct ProjectProcessor { } if (ok) args.push_back(A.data()); - } else if (!ExcludesArg(A)) { + } else if (!ExcludesArg(A, i)) { args.push_back(arg); } } @@ -399,10 +407,10 @@ void Project::LoadDirectory(const std::string &root, Project::Folder &folder) { std::vector args = std::move(Cmd.CommandLine); entry.args.reserve(args.size()); - for (std::string &arg : args) { - DoPathMapping(arg); - if (!proc.ExcludesArg(arg)) - entry.args.push_back(Intern(arg)); + for (int i = 0; i < args.size(); i++) { + DoPathMapping(args[i]); + if (!proc.ExcludesArg(args[i], i)) + entry.args.push_back(Intern(args[i])); } entry.compdb_size = entry.args.size();