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

Allow empty initializationOptions or cacheDirectory (which disables cache read/write)

Browse Source
This commit is contained in:
Fangrui Song 2018-01-28 13:52:00 -08:00
parent 80213e8a23
commit 1e7727f75a
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/messages/initialize.cc
View File

@ -49,14 +49,11 @@ struct InitializeHandler : BaseMessageHandler<Ipc_InitializeRequest> {
LOG_S(INFO) << "[querydb] Initialize in directory " << project_path LOG_S(INFO) << "[querydb] Initialize in directory " << project_path
<< " with uri " << request->params.rootUri->raw_uri; << " with uri " << request->params.rootUri->raw_uri;
if (!request->params.initializationOptions) {
LOG_S(FATAL) << "Initialization parameters (particularily "
"cacheDirectory) are required";
exit(1);
}
*config = *request->params.initializationOptions;
{ {
if (request->params.initializationOptions)
*config = *request->params.initializationOptions;
else
*config = Config();
rapidjson::Document reader; rapidjson::Document reader;
reader.Parse(g_init_options.c_str()); reader.Parse(g_init_options.c_str());
if (!reader.HasParseError()) { if (!reader.HasParseError()) {
@ -64,18 +61,20 @@ struct InitializeHandler : BaseMessageHandler<Ipc_InitializeRequest> {
try { try {
Reflect(json_reader, *config); Reflect(json_reader, *config);
} catch (std::invalid_argument& ex) { } catch (std::invalid_argument& ex) {
// FIXME This is not triggered. Need to pass error from // This will not trigger because parse error is handled in
// MessageRegistry::Parse in language_server_api.cc // MessageRegistry::Parse in language_server_api.cc
Out_ShowLogMessage out;
out.display_type = Out_ShowLogMessage::DisplayType::Show;
out.params.type = lsMessageType::Error;
out.params.message = "Failed to deserialize " +
json_reader.GetPath() + " " + ex.what();
out.Write(std::cout);
}
} }
} }
g_enable_comments = config->index.comments; g_enable_comments = config->index.comments;
if (config->cacheDirectory.empty()) {
config->enableCacheRead = config->enableCacheWrite = false;
LOG_S(INFO) << "Disable cache files because cacheDirectory is empty";
} else {
config->cacheDirectory = NormalizePath(config->cacheDirectory);
EnsureEndsInSlash(config->cacheDirectory);
}
}
// Client capabilities // Client capabilities
if (request->params.capabilities.textDocument) { if (request->params.capabilities.textDocument) {
@ -105,15 +104,6 @@ struct InitializeHandler : BaseMessageHandler<Ipc_InitializeRequest> {
out.Write(std::cout); out.Write(std::cout);
} }
// Make sure cache directory is valid.
if (config->cacheDirectory.empty()) {
LOG_S(FATAL) << "Exiting; no cache directory";
exit(1);
}
config->cacheDirectory = NormalizePath(config->cacheDirectory);
EnsureEndsInSlash(config->cacheDirectory);
// Ensure there is a resource directory. // Ensure there is a resource directory.
if (config->resourceDirectory.empty()) if (config->resourceDirectory.empty())
config->resourceDirectory = GetDefaultResourceDirectory(); config->resourceDirectory = GetDefaultResourceDirectory();