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

Catch expression evaluation errors in line/column highlighters

Browse Source
This commit is contained in:
Maxime Coste 2015-11-09 08:42:40 +00:00
parent 12abb54a88
commit a2d78941ba
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/highlighters.cc
View File

@ -478,14 +478,24 @@ HighlighterAndId create_line_highlighter(HighlighterParameters params)
throw runtime_error("wrong parameter count"); throw runtime_error("wrong parameter count");
String facespec = params[1]; String facespec = params[1];
String option_name = params[0]; String line_expr = params[0];
get_face(facespec); // validate facespec get_face(facespec); // validate facespec
auto func = [=](const Context& context, HighlightFlags flags, auto func = [=](const Context& context, HighlightFlags flags,
DisplayBuffer& display_buffer, BufferRange) DisplayBuffer& display_buffer, BufferRange)
{ {
const LineCount line = str_to_int_ifp(expand(option_name, context)).value_or(0) - 1; LineCount line = -1;
try
{
line = str_to_int_ifp(expand(line_expr, context)).value_or(0) - 1;
}
catch (runtime_error& err)
{
write_to_debug_buffer(
format("Error evaluating highlight line expression: {}", err.what()));
}
if (line < 0) if (line < 0)
return; return;
@ -520,14 +530,24 @@ HighlighterAndId create_column_highlighter(HighlighterParameters params)
throw runtime_error("wrong parameter count"); throw runtime_error("wrong parameter count");
String facespec = params[1]; String facespec = params[1];
String option_name = params[0]; String col_expr = params[0];
get_face(facespec); // validate facespec get_face(facespec); // validate facespec
auto func = [=](const Context& context, HighlightFlags flags, auto func = [=](const Context& context, HighlightFlags flags,
DisplayBuffer& display_buffer, BufferRange) DisplayBuffer& display_buffer, BufferRange)
{ {
const CharCount column = str_to_int_ifp(expand(option_name, context)).value_or(0) - 1; CharCount column = -1;
try
{
column = str_to_int_ifp(expand(col_expr, context)).value_or(0) - 1;
}
catch (runtime_error& err)
{
write_to_debug_buffer(
format("Error evaluating highlight column expression: {}", err.what()));
}
if (column < 0) if (column < 0)
return; return;