mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2024-12-28 06:08:05 +03:00
Code Issues Projects Releases Wiki Activity

highlighters.cc: Add a '-min-digits' flag to the number-lines highlighter.

Browse Source 
Fixes #3260.
This commit is contained in:
Tim Allen 2019-12-14 23:18:34 +11:00
parent dfc67dd582
commit b09653ccc5
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/pages/highlighters.asciidoc
View File

@ -62,6 +62,11 @@ from the remaining parameters.
specify a string to separate the line numbers column with specify a string to separate the line numbers column with
the rest of the buffer (default is '|') the rest of the buffer (default is '|')
*-min-digits* <num>:::
always reserve room for at least *num* digits,
so text doesn't jump around as lines are added or removed
(default is 2)
*wrap* [options]:: *wrap* [options]::
soft wrap buffer text at window width, with the following *options*: soft wrap buffer text at window width, with the following *options*:

21
src/highlighters.cc
View File

@ -1079,17 +1079,19 @@ private:
struct LineNumbersHighlighter : Highlighter struct LineNumbersHighlighter : Highlighter
{ {
LineNumbersHighlighter(bool relative, bool hl_cursor_line, String separator) LineNumbersHighlighter(bool relative, bool hl_cursor_line, String separator, int min_digits)
: Highlighter{HighlightPass::Move}, : Highlighter{HighlightPass::Move},
m_relative{relative}, m_relative{relative},
m_hl_cursor_line{hl_cursor_line}, m_hl_cursor_line{hl_cursor_line},
m_separator{std::move(separator)} {} m_separator{std::move(separator)},
m_min_digits{min_digits} {}
static std::unique_ptr<Highlighter> create(HighlighterParameters params, Highlighter*) static std::unique_ptr<Highlighter> create(HighlighterParameters params, Highlighter*)
{ {
static const ParameterDesc param_desc{ static const ParameterDesc param_desc{
{ { "relative", { false, "" } }, { { "relative", { false, "" } },
{ "separator", { true, "" } }, { "separator", { true, "" } },
{ "min-digits", { true, "" } },
{ "hlcursor", { false, "" } } }, { "hlcursor", { false, "" } } },
ParameterDesc::Flags::None, 0, 0 ParameterDesc::Flags::None, 0, 0
}; };
@ -1099,7 +1101,13 @@ struct LineNumbersHighlighter : Highlighter
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");
return std::make_unique<LineNumbersHighlighter>((bool)parser.get_switch("relative"), (bool)parser.get_switch("hlcursor"), separator.str()); int min_digits = parser.get_switch("min-digits").map(str_to_int).value_or(2);
if (min_digits < 0)
throw runtime_error("min digits must be positive");
if (min_digits > 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(), min_digits);
} }
private: private:
@ -1151,18 +1159,19 @@ private:
unique_ids.push_back(ms_id); unique_ids.push_back(ms_id);
} }
static int compute_digit_count(const Context& context) int compute_digit_count(const Context& context) const
{ {
int digit_count = 0; int digit_count = 0;
LineCount last_line = context.buffer().line_count(); LineCount last_line = context.buffer().line_count();
for (LineCount c = last_line; c > 0; c /= 10) for (LineCount c = last_line; c > 0; c /= 10)
++digit_count; ++digit_count;
return digit_count; return std::max(digit_count, m_min_digits);
} }
const bool m_relative; const bool m_relative;
const bool m_hl_cursor_line; const bool m_hl_cursor_line;
const String m_separator; const String m_separator;
const int m_min_digits;
}; };
constexpr StringView LineNumbersHighlighter::ms_id; constexpr StringView LineNumbersHighlighter::ms_id;
@ -2194,7 +2203,7 @@ void register_highlighters()
"number-lines", "number-lines",
{ LineNumbersHighlighter::create, { LineNumbersHighlighter::create,
"Display line numbers \n" "Display line numbers \n"
"Parameters: -relative, -hlcursor, -separator <separator text>\n" } }); "Parameters: -relative, -hlcursor, -separator <separator text>, -min-digits <cols>\n" } });
registry.insert({ registry.insert({
"show-matching", "show-matching",
{ create_matching_char_highlighter, { create_matching_char_highlighter,