Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-04-04 16:02:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add clang.prependArgs

Browse Source
This commit is contained in:
Fangrui Song 2025-03-22 16:02:51 -07:00
parent 962c0e72b4
commit 526a06d78b
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/config.hh
View File

@ -89,6 +89,7 @@ struct Config {
std::vector<std::string> excludeArgs;
// Additional arguments to pass to clang.
std::vector<std::string> prependArgs;
std::vector<std::string> extraArgs;
// Translate absolute paths in compile_commands.json entries, .ccls options
@ -329,7 +330,7 @@ REFLECT_STRUCT(Config::ServerCap::DocumentOnTypeFormattingOptions, firstTriggerC
REFLECT_STRUCT(Config::ServerCap::Workspace::WorkspaceFolders, supported, changeNotifications);
REFLECT_STRUCT(Config::ServerCap::Workspace, workspaceFolders);
REFLECT_STRUCT(Config::ServerCap, documentOnTypeFormattingProvider, foldingRangeProvider, workspace);
REFLECT_STRUCT(Config::Clang, excludeArgs, extraArgs, pathMappings, resourceDir);
REFLECT_STRUCT(Config::Clang, excludeArgs, prependArgs, extraArgs, pathMappings, resourceDir);
REFLECT_STRUCT(Config::ClientCapability, diagnosticsRelatedInformation, hierarchicalDocumentSymbolSupport, linkSupport,
snippetSupport);
REFLECT_STRUCT(Config::CodeLens, localVariables);

12
src/project.cc
View File

@ -489,6 +489,12 @@ Project::Entry Project::findEntry(const std::string &path, bool can_redirect, bo
ProjectProcessor(*best_dot_ccls_folder).process(ret);
for (const std::string &arg : g_config->clang.extraArgs)
ret.args.push_back(intern(arg));
if (g_config->clang.prependArgs.size() && ret.args.size()) {
std::vector<const char *> args;
for (StringRef arg : g_config->clang.prependArgs)
args.push_back(intern(arg));
ret.args.insert(ret.args.begin() + 1, args.begin(), args.end());
}
ret.args.push_back(intern("-working-directory=" + ret.directory));
return ret;
}
@ -529,7 +535,9 @@ void Project::indexRelated(const std::string &path) {
auto &gi = g_config->index;
GroupMatch match(gi.whitelist, gi.blacklist);
StringRef stem = sys::path::stem(path);
std::vector<const char *> args, extra_args;
std::vector<const char *> args, prepend_args, extra_args;
for (const std::string &arg : g_config->clang.prependArgs)
prepend_args.push_back(intern(arg));
for (const std::string &arg : g_config->clang.extraArgs)
extra_args.push_back(intern(arg));
std::lock_guard lock(mtx);
@ -538,6 +546,8 @@ void Project::indexRelated(const std::string &path) {
for (const Project::Entry &entry : folder.entries) {
std::string reason;
args = entry.args;
if (args.size())
args.insert(args.begin() + 1, prepend_args.begin(), prepend_args.end());
args.insert(args.end(), extra_args.begin(), extra_args.end());
args.push_back(intern("-working-directory=" + entry.directory));
if (sys::path::stem(entry.filename) == stem && entry.filename != path && match.matches(entry.filename, &reason))