.ccls: add %objective-c %objective-cpp

Also allow multiple directives on a line, e.g. %c %cpp -DFOO
This commit is contained in:
Fangrui Song 2018-11-19 23:14:49 -08:00
parent 8c73bbc3c7
commit afa654f0d1

View File

@ -102,15 +102,24 @@ struct ProjectProcessor {
args.reserve(entry.args.size() + g_config->clang.extraArgs.size() + 1); args.reserve(entry.args.size() + g_config->clang.extraArgs.size() + 1);
const LanguageId lang = lookupExtension(entry.filename).first; const LanguageId lang = lookupExtension(entry.filename).first;
for (const char *arg : entry.args) { for (const char *arg : entry.args) {
if (strncmp(arg, "%c ", 3) == 0) { StringRef A(arg);
if (lang == LanguageId::C) if (A[0] == '%') {
args.push_back(arg + 3); bool ok = false;
} else if (strncmp(arg, "%cpp ", 5) == 0) { for (;;) {
if (lang == LanguageId::Cpp) if (A.consume_front("%c "))
args.push_back(arg + 5); ok |= lang == LanguageId::C;
} else if (strcmp(arg, "%clang") == 0) { else if (A.consume_front("%cpp "))
args.push_back(lang == LanguageId::Cpp ? "clang++" : "clang"); ok |= lang == LanguageId::Cpp;
} else if (!excludeArgs.count(arg)) { else if (A.consume_front("%objective-c "))
ok |= lang == LanguageId::ObjC;
else if (A.consume_front("%objective-cpp "))
ok |= lang == LanguageId::ObjCpp;
else
break;
}
if (ok)
args.push_back(A.data());
} else if (!excludeArgs.count(A)) {
args.push_back(arg); args.push_back(arg);
} }
} }