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

Compare column_length of line-number separators

Browse Source
This commit is contained in:
hss 2021-03-20 21:33:53 -04:00
parent 8df2bb8bd5
commit 73ecd3356f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/highlighters.cc
View File

@ -1103,15 +1103,13 @@ struct LineNumbersHighlighter : Highlighter
ParametersParser parser(params, param_desc); ParametersParser parser(params, param_desc);
StringView separator = parser.get_switch("separator").value_or("│"); StringView separator = parser.get_switch("separator").value_or("│");
Optional<StringView> separator_cursor = parser.get_switch("separator-cursor");
if (separator.length() > 10) if (separator.length() > 10)
throw runtime_error("separator length is limited to 10 bytes"); throw runtime_error("separator length is limited to 10 bytes");
Optional<StringView> separator_cursor = parser.get_switch("separator-cursor"); if (separator_cursor && (*separator_cursor).column_length() != separator.column_length())
if (separator_cursor && (*separator_cursor).length() != separator.length()) { throw runtime_error("separator for active line should have the same length as 'separator'");
// Throw runtime error instead?
write_to_debug_buffer("number-lines: Separator for active line should have the same length as `separator`");
separator_cursor.reset();
}
auto separator_cursor_str = separator_cursor.map([](auto&& t){ return t.str(); }); auto separator_cursor_str = separator_cursor.map([](auto&& t){ return t.str(); });
@ -1121,7 +1119,7 @@ struct LineNumbersHighlighter : Highlighter
if (min_digits > 10) if (min_digits > 10)
throw runtime_error("min digits is limited to 10"); throw runtime_error("min digits is limited to 10");
return std::make_unique<LineNumbersHighlighter>((bool)parser.get_switch("relative"), (bool)parser.get_switch("hlcursor"), separator.str(), separator_cursor_str, min_digits); return std::make_unique<LineNumbersHighlighter>((bool)parser.get_switch("relative"), (bool)parser.get_switch("hlcursor"), separator.str(), std::move(separator_cursor_str), min_digits);
} }
private: private:
@ -1152,10 +1150,11 @@ private:
snprintf(buffer, 16, format, std::abs(line_to_format)); snprintf(buffer, 16, format, std::abs(line_to_format));
const auto atom_face = last_line == current_line ? face_wrapped : const auto atom_face = last_line == current_line ? face_wrapped :
((m_hl_cursor_line and is_cursor_line) ? face_absolute : face); ((m_hl_cursor_line and is_cursor_line) ? face_absolute : face);
line.insert(line.begin(), {buffer, atom_face});
const auto separator = is_cursor_line && m_separator_cursor ? *m_separator_cursor const auto& separator {is_cursor_line && m_separator_cursor ? *m_separator_cursor
: m_separator; : m_separator};
line.insert(line.begin(), {buffer, atom_face});
line.insert(line.begin() + 1, {separator, face}); line.insert(line.begin() + 1, {separator, face});
last_line = current_line; last_line = current_line;