Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-01-31 18:00:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a new file in the session not generating an index.

Browse Source
This commit is contained in:
Jacob Dufault 2018-01-10 21:27:58 -08:00
parent 786ac0bc4f
commit b2672c6009
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/project.cc
View File

@ -481,6 +481,17 @@ Project::Entry Project::FindCompilationEntryForFile(
result.filename = filename; result.filename = filename;
if (best_entry) if (best_entry)
result.args = best_entry->args; result.args = best_entry->args;
// |best_entry| probably has its own path in the arguments. We need to remap
// that path to the new filename.
std::string best_entry_base_name = GetBaseName(best_entry->filename);
for (std::string& arg : result.args) {
if (arg == best_entry->filename ||
GetBaseName(arg) == best_entry_base_name) {
arg = filename;
}
}
return result; return result;
} }
@ -1356,6 +1367,22 @@ TEST_SUITE("Project") {
} }
} }
TEST_CASE("Entry inference remaps file names") {
Project p;
{
Project::Entry e;
e.args = {"a", "b", "aaaa.cc", "d"};
e.filename = "absolute/aaaa.cc";
p.entries.push_back(e);
}
{
optional<Project::Entry> entry = p.FindCompilationEntryForFile("ee.cc");
REQUIRE(entry.has_value());
REQUIRE(entry->args == std::vector<std::string>{"a", "b", "ee.cc", "d"});
}
}
TEST_CASE("Entry inference prefers same file endings") { TEST_CASE("Entry inference prefers same file endings") {
Project p; Project p;
{ {