xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Notify user on kakrc parsing errors

Browse Source 
Fixes #281
This commit is contained in:
Maxime Coste 2015-06-12 13:43:46 +01:00
parent c9421e4d80
commit 84d8447a58
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.cc
View File

@ -228,7 +228,7 @@ void register_options()
} }
template<typename UI> template<typename UI>
void create_local_client(StringView init_command) void create_local_client(StringView init_command, bool kakrc_error)
{ {
struct LocalUI : UI struct LocalUI : UI
{ {
@ -261,6 +261,13 @@ void create_local_client(StringView init_command)
static Client* client = ClientManager::instance().create_client( static Client* client = ClientManager::instance().create_client(
make_unique<LocalUI>(), get_env_vars(), init_command); make_unique<LocalUI>(), get_env_vars(), init_command);
if (kakrc_error)
client->print_status({
"error while sourcing kakrc, see *debug* buffer for details",
get_face("Error")
});
signal(SIGHUP, [](int) { signal(SIGHUP, [](int) {
if (client) if (client)
ClientManager::instance().remove_client(*client); ClientManager::instance().remove_client(*client);
@ -386,6 +393,7 @@ int run_server(StringView session, StringView init_command,
Server server(session.empty() ? to_string(getpid()) : session.str()); Server server(session.empty() ? to_string(getpid()) : session.str());
bool kakrc_error = false;
if (not ignore_kakrc) try if (not ignore_kakrc) try
{ {
Context initialisation_context{Context::EmptyContextFlag{}}; Context initialisation_context{Context::EmptyContextFlag{}};
@ -394,10 +402,12 @@ int run_server(StringView session, StringView init_command,
} }
catch (Kakoune::runtime_error& error) catch (Kakoune::runtime_error& error)
{ {
kakrc_error = true;
write_to_debug_buffer(format("error while parsing kakrc:\n {}", error.what())); write_to_debug_buffer(format("error while parsing kakrc:\n {}", error.what()));
} }
catch (Kakoune::client_removed&) catch (Kakoune::client_removed&)
{ {
kakrc_error = true;
write_to_debug_buffer("error while parsing kakrc: asked to quit"); write_to_debug_buffer("error while parsing kakrc: asked to quit");
} }
@ -426,9 +436,9 @@ int run_server(StringView session, StringView init_command,
if (not daemon) if (not daemon)
{ {
if (dummy_ui) if (dummy_ui)
create_local_client<DummyUI>(init_command); create_local_client<DummyUI>(init_command, kakrc_error);
else else
create_local_client<NCursesUI>(init_command); create_local_client<NCursesUI>(init_command, kakrc_error);
} }
while (not terminate and (not client_manager.empty() or daemon)) while (not terminate and (not client_manager.empty() or daemon))