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

Fix file finding on windows when path case changes.

Browse Source
This commit is contained in:
Jacob Dufault 2017-05-22 00:14:11 -07:00
parent 8d9374ee59
commit 1598129d8b
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/command_line.cc
View File

@ -178,7 +178,7 @@ void PushBack(NonElidedVector<lsLocation>* result, optional<lsLocation> location
} }
QueryFile* FindFile(QueryDatabase* db, const std::string& filename, QueryFileId* file_id) { QueryFile* FindFile(QueryDatabase* db, const std::string& filename, QueryFileId* file_id) {
auto it = db->usr_to_file.find(filename); auto it = db->usr_to_file.find(LowerPathIfCaseInsensitive(filename));
if (it != db->usr_to_file.end()) { if (it != db->usr_to_file.end()) {
optional<QueryFile>& file = db->files[it->second.id]; optional<QueryFile>& file = db->files[it->second.id];
if (file) { if (file) {
@ -193,8 +193,7 @@ QueryFile* FindFile(QueryDatabase* db, const std::string& filename, QueryFileId*
} }
QueryFile* FindFile(QueryDatabase* db, const std::string& filename) { QueryFile* FindFile(QueryDatabase* db, const std::string& filename) {
// TODO: consider calling NormalizePath here. It might add too much latency though. auto it = db->usr_to_file.find(LowerPathIfCaseInsensitive(filename));
auto it = db->usr_to_file.find(filename);
if (it != db->usr_to_file.end()) { if (it != db->usr_to_file.end()) {
optional<QueryFile>& file = db->files[it->second.id]; optional<QueryFile>& file = db->files[it->second.id];
if (file) if (file)

8
src/query.cc
View File

@ -261,12 +261,12 @@ QueryFile::Def BuildFileDef(const IdMap& id_map, const IndexFile& indexed) {
QueryFileId GetQueryFileIdFromPath(QueryDatabase* query_db, const std::string& path) { QueryFileId GetQueryFileIdFromPath(QueryDatabase* query_db, const std::string& path) {
auto it = query_db->usr_to_file.find(path); auto it = query_db->usr_to_file.find(LowerPathIfCaseInsensitive(path));
if (it != query_db->usr_to_file.end()) if (it != query_db->usr_to_file.end())
return QueryFileId(it->second.id); return QueryFileId(it->second.id);
size_t idx = query_db->files.size(); size_t idx = query_db->files.size();
query_db->usr_to_file[path] = QueryFileId(idx); query_db->usr_to_file[LowerPathIfCaseInsensitive(path)] = QueryFileId(idx);
query_db->files.push_back(QueryFile(path)); query_db->files.push_back(QueryFile(path));
return QueryFileId(idx); return QueryFileId(idx);
} }
@ -625,7 +625,7 @@ void QueryDatabase::RemoveUsrs(SymbolKind usr_kind, const std::vector<Usr>& to_r
switch (usr_kind) { switch (usr_kind) {
case SymbolKind::File: { case SymbolKind::File: {
for (const Usr& usr : to_remove) for (const Usr& usr : to_remove)
files[usr_to_file[usr].id] = nullopt; files[usr_to_file[LowerPathIfCaseInsensitive(usr)].id] = nullopt;
break; break;
} }
case SymbolKind::Type: { case SymbolKind::Type: {
@ -691,7 +691,7 @@ void QueryDatabase::ImportOrUpdate(const std::vector<QueryFile::DefUpdate>& upda
// This function runs on the querydb thread. // This function runs on the querydb thread.
for (auto& def : updates) { for (auto& def : updates) {
auto it = usr_to_file.find(def.path); auto it = usr_to_file.find(LowerPathIfCaseInsensitive(def.path));
assert(it != usr_to_file.end()); assert(it != usr_to_file.end());
optional<QueryFile>& existing = files[it->second.id]; optional<QueryFile>& existing = files[it->second.id];

2
src/query.h
View File

@ -281,6 +281,8 @@ struct QueryDatabase {
std::vector<optional<QueryVar>> vars; std::vector<optional<QueryVar>> vars;
// Lookup symbol based on a usr. // Lookup symbol based on a usr.
// NOTE: For usr_to_file make sure to call LowerPathIfCaseInsensitive on key.
// TODO: add type wrapper to enforce we call it
spp::sparse_hash_map<Usr, QueryFileId> usr_to_file; spp::sparse_hash_map<Usr, QueryFileId> usr_to_file;
spp::sparse_hash_map<Usr, QueryTypeId> usr_to_type; spp::sparse_hash_map<Usr, QueryTypeId> usr_to_type;
spp::sparse_hash_map<Usr, QueryFuncId> usr_to_func; spp::sparse_hash_map<Usr, QueryFuncId> usr_to_func;

9
src/utils.cc
View File

@ -95,6 +95,15 @@ std::vector<std::string> SplitString(const std::string& str, const std::string&
return strings; return strings;
} }
std::string LowerPathIfCaseInsensitive(const std::string& path) {
std::string result = path;
#if defined(_WIN32)
for (size_t i = 0; i < result.size(); ++i)
result[i] = (char)tolower(result[i]);
#endif
return result;
}
static void GetFilesInFolderHelper( static void GetFilesInFolderHelper(
std::string folder, bool recursive, std::string output_prefix, const std::function<void(const std::string&)>& handler) { std::string folder, bool recursive, std::string output_prefix, const std::function<void(const std::string&)>& handler) {
tinydir_dir dir; tinydir_dir dir;

2
src/utils.h
View File

@ -23,6 +23,8 @@ std::string ReplaceAll(const std::string& source, const std::string& from, const
std::vector<std::string> SplitString(const std::string& str, const std::string& delimiter); std::vector<std::string> SplitString(const std::string& str, const std::string& delimiter);
std::string LowerPathIfCaseInsensitive(const std::string& path);
template <typename TValues> template <typename TValues>
std::string StringJoin(const TValues& values) { std::string StringJoin(const TValues& values) {
std::string result; std::string result;