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

Force ctor usage on Index_DoIndex

Browse Source
This commit is contained in:
Jacob Dufault 2017-04-20 21:09:54 -07:00
parent 14b47de1db
commit ead75bb7a3
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/command_line.cc
View File

@ -786,11 +786,12 @@ struct Index_DoIndex {
Parse, Parse,
}; };
Index_DoIndex(Type type, const std::string& path, const optional<std::vector<std::string>>& args)
: type(type), path(path), args(args) {}
Type type;
std::string path; std::string path;
optional<std::vector<std::string>> args; optional<std::vector<std::string>> args;
Type type;
Index_DoIndex(Type type) : type(type) {}
}; };
struct Index_DoIdMap { struct Index_DoIdMap {
@ -888,9 +889,7 @@ void ImportCachedIndex(IndexerConfig* config,
// Import all dependencies. // Import all dependencies.
for (auto& dependency_path : cache->dependencies) { for (auto& dependency_path : cache->dependencies) {
std::cerr << "- Dispatching dependency import " << dependency_path << std::endl; std::cerr << "- Dispatching dependency import " << dependency_path << std::endl;
Index_DoIndex dep_index_request(Index_DoIndex::Type::ImportOnly); queue_do_index->PriorityEnqueue(Index_DoIndex(Index_DoIndex::Type::ImportOnly, dependency_path, nullopt));
dep_index_request.path = dependency_path;
queue_do_index->PriorityEnqueue(std::move(dep_index_request));
} }
*last_modification_time = cache->last_modification_time; *last_modification_time = cache->last_modification_time;
@ -1198,10 +1197,7 @@ void QueryDbMainLoop(
<< "] Dispatching index request for file " << filepath << "] Dispatching index request for file " << filepath
<< std::endl; << std::endl;
Index_DoIndex request(Index_DoIndex::Type::ImportAndUpdate); queue_do_index->Enqueue(Index_DoIndex(Index_DoIndex::Type::ImportAndUpdate, filepath, entry.args));
request.path = filepath;
request.args = entry.args;
queue_do_index->Enqueue(std::move(request));
} }
break; break;
} }
@ -1228,18 +1224,16 @@ void QueryDbMainLoop(
case IpcId::TextDocumentDidSave: { case IpcId::TextDocumentDidSave: {
auto msg = static_cast<Ipc_TextDocumentDidSave*>(message.get()); auto msg = static_cast<Ipc_TextDocumentDidSave*>(message.get());
WorkingFile* working_file = working_files->GetFileByFilename(msg->params.textDocument.uri.GetPath()); std::string path = msg->params.textDocument.uri.GetPath();
if (working_file) {
// TODO: Update working file indexed content when we actually get the // TODO: Update working file indexed content when we actually apply the
// index update. // index update.
WorkingFile* working_file = working_files->GetFileByFilename(path);
if (working_file)
working_file->SetIndexContent(working_file->buffer_content); working_file->SetIndexContent(working_file->buffer_content);
}
// Send an index update request. // Send an index update request.
Index_DoIndex request(Index_DoIndex::Type::Parse); queue_do_index->Enqueue(Index_DoIndex(Index_DoIndex::Type::Parse, path, project->FindArgsForFile(path)));
request.path = msg->params.textDocument.uri.GetPath();
request.args = project->FindArgsForFile(msg->params.textDocument.uri.GetPath());
queue_do_index->Enqueue(std::move(request));
break; break;
} }