zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Added missing try around boost::property_tree::read_json call

pipelines/235045657
eidheim 5 years ago
parent
06d9854e15
commit
25ce06b79c
1 changed files with 45 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      src/source_language_protocol.cpp

85
src/source_language_protocol.cpp
Unescape View File

@ -269,54 +269,59 @@ void LanguageProtocol::Client::parse_server_message() {
} }
} }
server_message_stream.seekg(server_message_content_pos, std::ios::beg); try {
boost::property_tree::ptree pt; server_message_stream.seekg(server_message_content_pos, std::ios::beg);
boost::property_tree::read_json(server_message_stream, pt); boost::property_tree::ptree pt;
boost::property_tree::read_json(server_message_stream, pt);
if(Config::get().log.language_server) {
std::cout << "language server: "; if(Config::get().log.language_server) {
boost::property_tree::write_json(std::cout, pt); std::cout << "language server: ";
} boost::property_tree::write_json(std::cout, pt);
}
auto message_id = pt.get_optional<size_t>("id"); auto message_id = pt.get_optional<size_t>("id");
{ {
LockGuard lock(read_write_mutex); LockGuard lock(read_write_mutex);
if(auto result = pt.get_child_optional("result")) { if(auto result = pt.get_child_optional("result")) {
if(message_id) { if(message_id) {
auto id_it = handlers.find(*message_id); auto id_it = handlers.find(*message_id);
if(id_it != handlers.end()) { if(id_it != handlers.end()) {
auto function = std::move(id_it->second.second); auto function = std::move(id_it->second.second);
handlers.erase(id_it); handlers.erase(id_it);
lock.unlock(); lock.unlock();
function(*result, false); function(*result, false);
lock.lock(); lock.lock();
}
} }
} }
} else if(auto error = pt.get_child_optional("error")) {
else if(auto error = pt.get_child_optional("error")) { if(!Config::get().log.language_server)
if(!Config::get().log.language_server) boost::property_tree::write_json(std::cerr, pt);
boost::property_tree::write_json(std::cerr, pt); if(message_id) {
if(message_id) { auto id_it = handlers.find(*message_id);
auto id_it = handlers.find(*message_id); if(id_it != handlers.end()) {
if(id_it != handlers.end()) { auto function = std::move(id_it->second.second);
auto function = std::move(id_it->second.second); handlers.erase(id_it);
handlers.erase(id_it); lock.unlock();
function(*error, true);
lock.lock();
}
}
}
else if(auto method = pt.get_optional<std::string>("method")) {
if(auto params = pt.get_child_optional("params")) {
lock.unlock(); lock.unlock();
function(*error, true); if(message_id)
handle_server_request(*message_id, *method, *params);
else
handle_server_notification(*method, *params);
lock.lock(); lock.lock();
} }
} }
} }
else if(auto method = pt.get_optional<std::string>("method")) { }
if(auto params = pt.get_child_optional("params")) { catch(...) {
lock.unlock(); Terminal::get().async_print("\e[31mError\e[m: failed to parse message from language server\n", true);
if(message_id)
handle_server_request(*message_id, *method, *params);
else
handle_server_notification(*method, *params);
lock.lock();
}
}
} }
server_message_stream = std::stringstream(); server_message_stream = std::stringstream();

Write Preview
Loading…
Cancel
Save