Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-24 08:35:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor FindEntry and use best-fit .ccls

Browse Source 
Fixes an issue with hierarchical .ccls found by Riatre in #384
This commit is contained in:
Fangrui Song 2019-04-29 08:44:52 -07:00
parent 16bd93b24b
commit 6624108fd9
1 changed files with 101 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/project.cc
View File

@ -240,8 +240,6 @@ std::vector<const char *> GetFallback(const std::string path) {
std::vector<const char *> argv{"clang"}; std::vector<const char *> argv{"clang"};
if (sys::path::extension(path) == ".h") if (sys::path::extension(path) == ".h")
argv.push_back("-xobjective-c++-header"); argv.push_back("-xobjective-c++-header");
for (const std::string &arg : g_config->clang.extraArgs)
argv.push_back(Intern(arg));
argv.push_back(Intern(path)); argv.push_back(Intern(path));
return argv; return argv;
} }
@ -442,13 +440,6 @@ void Project::LoadDirectory(const std::string &root, Project::Folder &folder) {
sys::path::append(Path, root, ".ccls"); sys::path::append(Path, root, ".ccls");
if (sys::fs::exists(Path)) if (sys::fs::exists(Path))
LoadDirectoryListing(proc, root, Seen); LoadDirectoryListing(proc, root, Seen);
std::vector<const char *> extra_args;
for (const std::string &arg : g_config->clang.extraArgs)
extra_args.push_back(Intern(arg));
for (auto &e : folder.entries) {
e.args.insert(e.args.end(), extra_args.begin(), extra_args.end());
e.args.push_back(Intern("-working-directory=" + e.directory));
}
} }
void Project::Load(const std::string &root) { void Project::Load(const std::string &root) {
@ -470,94 +461,106 @@ void Project::Load(const std::string &root) {
Project::Entry Project::FindEntry(const std::string &path, bool can_redirect, Project::Entry Project::FindEntry(const std::string &path, bool can_redirect,
bool must_exist) { bool must_exist) {
Project::Folder *best_folder = nullptr; std::string best_dot_ccls_root;
Project::Folder *best_dot_ccls_folder = nullptr;
std::string best_dot_ccls_dir;
const std::vector<const char *> *best_dot_ccls_args = nullptr;
bool match = false, exact_match = false;
const Entry *best = nullptr; const Entry *best = nullptr;
Project::Folder *best_compdb_folder = nullptr;
Project::Entry ret;
std::lock_guard lock(mtx); std::lock_guard lock(mtx);
for (auto &[root, folder] : root2folder) {
// The entry may have different filename but it doesn't matter when building for (auto &[root, folder] : root2folder)
// CompilerInvocation. The main filename is specified separately. if (StringRef(path).startswith(root)) {
// Find the best-fit .ccls
for (auto &[dir, args] : folder.dot_ccls)
if (StringRef(path).startswith(dir) &&
dir.length() > best_dot_ccls_dir.length()) {
best_dot_ccls_root = root;
best_dot_ccls_folder = &folder;
best_dot_ccls_dir = dir;
best_dot_ccls_args = &args;
}
if (!match) {
auto it = folder.path2entry_index.find(path); auto it = folder.path2entry_index.find(path);
if (it != folder.path2entry_index.end()) { if (it != folder.path2entry_index.end()) {
Project::Entry &entry = folder.entries[it->second]; Project::Entry &entry = folder.entries[it->second];
if (can_redirect || entry.filename == path) exact_match = entry.filename == path;
return entry; if ((match = exact_match || can_redirect) || entry.compdb_size) {
if (entry.compdb_size) { // best->compdb_size is >0 for a compdb entry, 0 for a .ccls entry.
best_folder = &folder; best_compdb_folder = &folder;
best = &entry; best = &entry;
} }
break; }
} }
} }
bool exists = false; bool append;
std::string dir; if (best_dot_ccls_args && !(append = AppendToCDB(*best_dot_ccls_args)) &&
const std::vector<const char *> *extra = nullptr; !exact_match) {
Project::Entry ret; // If the first line is not %compile_commands.json, override the compdb
for (auto &[root, folder] : root2folder) // match if it is not an exact match.
if (StringRef(path).startswith(root)) ret.root = ret.directory = best_dot_ccls_root;
for (auto &[dir1, args] : folder.dot_ccls)
if (StringRef(path).startswith(dir1)) {
dir = dir1;
extra = &args;
if (AppendToCDB(args))
goto out;
exists = true;
ret.root = ret.directory = root;
ret.filename = path; ret.filename = path;
if (args.empty()) { if (best_dot_ccls_args->empty()) {
ret.args = GetFallback(path); ret.args = GetFallback(path);
} else { } else {
ret.args = args; ret.args = *best_dot_ccls_args;
ret.args.push_back(Intern(path)); ret.args.push_back(Intern(path));
} }
ProjectProcessor(folder).Process(ret); } else {
for (const std::string &arg : g_config->clang.extraArgs) // If the first line is %compile_commands.json, find the matching compdb
ret.args.push_back(Intern(arg)); // entry and append .ccls args.
ret.args.push_back(Intern("-working-directory=" + ret.directory)); if (must_exist && !match && !(best_dot_ccls_args && !append))
return ret; return ret;
}
out:
if (must_exist && !exists)
return ret;
if (!best) { if (!best) {
// Infer args from a similar path.
int best_score = INT_MIN; int best_score = INT_MIN;
for (auto &[root, folder] : root2folder) { for (auto &[root, folder] : root2folder)
if (dir.size() && !StringRef(path).startswith(dir)) if (StringRef(path).startswith(root))
continue;
for (const Entry &e : folder.entries) for (const Entry &e : folder.entries)
if (e.compdb_size) { if (e.compdb_size) {
int score = ComputeGuessScore(path, e.filename); int score = ComputeGuessScore(path, e.filename);
if (score > best_score) { if (score > best_score) {
best_score = score; best_score = score;
best_compdb_folder = &folder;
best = &e; best = &e;
best_folder = &folder;
} }
} }
}
}
ret.is_inferred = true; ret.is_inferred = true;
ret.filename = path; }
if (!best) { if (!best) {
if (ret.root.empty()) ret.root = ret.directory = g_config->fallbackFolder;
ret.root = g_config->fallbackFolder;
ret.directory = ret.root;
ret.args = GetFallback(path); ret.args = GetFallback(path);
} else { } else {
// The entry may have different filename but it doesn't matter when
// building CompilerInvocation. The main filename is specified
// separately.
ret.root = best->root; ret.root = best->root;
ret.directory = best->directory; ret.directory = best->directory;
ret.args = best->args; ret.args = best->args;
if (best->compdb_size) // delete trailing .ccls options if exist
ret.args.resize(best->compdb_size); ret.args.resize(best->compdb_size);
if (extra && extra->size()) else
ret.args.insert(ret.args.end(), extra->begin() + 1, extra->end()); best_dot_ccls_args = nullptr;
ProjectProcessor(*best_folder).Process(ret); }
ret.filename = path;
}
if (best_dot_ccls_args && append && best_dot_ccls_args->size())
ret.args.insert(ret.args.end(), best_dot_ccls_args->begin() + 1,
best_dot_ccls_args->end());
if (best_compdb_folder)
ProjectProcessor(*best_compdb_folder).Process(ret);
else if (best_dot_ccls_folder)
ProjectProcessor(*best_dot_ccls_folder).Process(ret);
for (const std::string &arg : g_config->clang.extraArgs) for (const std::string &arg : g_config->clang.extraArgs)
ret.args.push_back(Intern(arg)); ret.args.push_back(Intern(arg));
ret.args.push_back(Intern("-working-directory=" + ret.directory)); ret.args.push_back(Intern("-working-directory=" + ret.directory));
}
return ret; return ret;
} }
@ -565,6 +568,9 @@ void Project::Index(WorkingFiles *wfiles, RequestId id) {
auto &gi = g_config->index; auto &gi = g_config->index;
GroupMatch match(gi.whitelist, gi.blacklist), GroupMatch match(gi.whitelist, gi.blacklist),
match_i(gi.initialWhitelist, gi.initialBlacklist); match_i(gi.initialWhitelist, gi.initialBlacklist);
std::vector<const char *> args, extra_args;
for (const std::string &arg : g_config->clang.extraArgs)
extra_args.push_back(Intern(arg));
{ {
std::lock_guard lock(mtx); std::lock_guard lock(mtx);
for (auto &[root, folder] : root2folder) { for (auto &[root, folder] : root2folder) {
@ -574,7 +580,10 @@ void Project::Index(WorkingFiles *wfiles, RequestId id) {
if (match.Matches(entry.filename, &reason) && if (match.Matches(entry.filename, &reason) &&
match_i.Matches(entry.filename, &reason)) { match_i.Matches(entry.filename, &reason)) {
bool interactive = wfiles->GetFile(entry.filename) != nullptr; bool interactive = wfiles->GetFile(entry.filename) != nullptr;
pipeline::Index(entry.filename, entry.args, args = entry.args;
args.insert(args.end(), extra_args.begin(), extra_args.end());
args.push_back(Intern("-working-directory=" + entry.directory));
pipeline::Index(entry.filename, args,
interactive ? IndexMode::Normal interactive ? IndexMode::Normal
: IndexMode::Background, : IndexMode::Background,
false, id); false, id);
@ -597,15 +606,20 @@ void Project::IndexRelated(const std::string &path) {
auto &gi = g_config->index; auto &gi = g_config->index;
GroupMatch match(gi.whitelist, gi.blacklist); GroupMatch match(gi.whitelist, gi.blacklist);
std::string stem = sys::path::stem(path); std::string stem = sys::path::stem(path);
std::vector<const char *> args, extra_args;
for (const std::string &arg : g_config->clang.extraArgs)
extra_args.push_back(Intern(arg));
std::lock_guard lock(mtx); std::lock_guard lock(mtx);
for (auto &[root, folder] : root2folder) for (auto &[root, folder] : root2folder)
if (StringRef(path).startswith(root)) { if (StringRef(path).startswith(root)) {
for (const Project::Entry &entry : folder.entries) { for (const Project::Entry &entry : folder.entries) {
std::string reason; std::string reason;
args = entry.args;
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 && if (sys::path::stem(entry.filename) == stem && entry.filename != path &&
match.Matches(entry.filename, &reason)) match.Matches(entry.filename, &reason))
pipeline::Index(entry.filename, entry.args, IndexMode::Background, pipeline::Index(entry.filename, args, IndexMode::Background, true);
true);
} }
break; break;
} }