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

Correctly set the NotBeginOfSubject/NotEndOfSubject flags for regex matching

Browse Source 
Fixes #1778
This commit is contained in:
Maxime Coste 2017-12-29 09:55:53 +11:00
parent 6851604546
commit 6333ae207f
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/highlighters.cc
View File

@ -367,7 +367,9 @@ private:
match_flags(is_bol(range.begin), match_flags(is_bol(range.begin),
is_eol(buffer, range.end), is_eol(buffer, range.end),
is_bow(buffer, range.begin), is_bow(buffer, range.begin),
is_eow(buffer, range.end))}; is_eow(buffer, range.end),
range.begin == BufferCoord{0,0},
buffer.is_end(range.end))};
RegexIt re_end; RegexIt re_end;
for (; re_it != re_end; ++re_it) for (; re_it != re_end; ++re_it)
{ {

3
src/normal.cc
View File

@ -1005,7 +1005,8 @@ void keep(Context& context, NormalParams)
// give more intuitive behaviours in keep use cases. // give more intuitive behaviours in keep use cases.
const auto flags = match_flags(is_bol(begin.coord()), false, const auto flags = match_flags(is_bol(begin.coord()), false,
is_bow(buffer, begin.coord()), is_bow(buffer, begin.coord()),
is_eow(buffer, end.coord())) | is_eow(buffer, end.coord()),
true, true) |
RegexExecFlags::AnyMatch; RegexExecFlags::AnyMatch;
if (regex_search(begin, end, ex, flags) == matching) if (regex_search(begin, end, ex, flags) == matching)
keep.push_back(sel); keep.push_back(sel);

6
src/regex.hh
View File

@ -100,12 +100,14 @@ private:
Vector<Iterator, MemoryDomain::Regex> m_values; Vector<Iterator, MemoryDomain::Regex> m_values;
}; };
inline RegexExecFlags match_flags(bool bol, bool eol, bool bow, bool eow) inline RegexExecFlags match_flags(bool bol, bool eol, bool bow, bool eow, bool bos, bool eos)
{ {
return (bol ? RegexExecFlags::None : RegexExecFlags::NotBeginOfLine) | return (bol ? RegexExecFlags::None : RegexExecFlags::NotBeginOfLine) |
(eol ? RegexExecFlags::None : RegexExecFlags::NotEndOfLine) | (eol ? RegexExecFlags::None : RegexExecFlags::NotEndOfLine) |
(bow ? RegexExecFlags::None : RegexExecFlags::NotBeginOfWord) | (bow ? RegexExecFlags::None : RegexExecFlags::NotBeginOfWord) |
(eow ? RegexExecFlags::None : RegexExecFlags::NotEndOfWord); (eow ? RegexExecFlags::None : RegexExecFlags::NotEndOfWord) |
(bos ? RegexExecFlags::None : RegexExecFlags::NotBeginOfSubject) |
(eos ? RegexExecFlags::None : RegexExecFlags::NotEndOfSubject);
} }
template<typename It> template<typename It>

18
src/selectors.cc
View File

@ -839,10 +839,12 @@ void select_buffer(SelectionList& selections)
} }
static RegexExecFlags static RegexExecFlags
match_flags(const Buffer& buf, const BufferIterator& begin, const BufferIterator& end) match_flags(const Buffer& buf, const BufferIterator& begin, const BufferIterator& end,
bool bos, bool eos)
{ {
return match_flags(is_bol(begin.coord()), is_eol(buf, end.coord()), return match_flags(is_bol(begin.coord()), is_eol(buf, end.coord()),
is_bow(buf, begin.coord()), is_eow(buf, end.coord())); is_bow(buf, begin.coord()), is_eow(buf, end.coord()),
bos, eos);
} }
static bool find_next(const Buffer& buffer, const BufferIterator& pos, static bool find_next(const Buffer& buffer, const BufferIterator& pos,
@ -851,11 +853,11 @@ static bool find_next(const Buffer& buffer, const BufferIterator& pos,
{ {
if (pos != buffer.end() and if (pos != buffer.end() and
regex_search(pos, buffer.end(), matches, ex, regex_search(pos, buffer.end(), matches, ex,
match_flags(buffer, pos, buffer.end()))) match_flags(buffer, pos, buffer.end(), pos.coord() == BufferCoord{0,0}, true)))
return true; return true;
wrapped = true; wrapped = true;
return regex_search(buffer.begin(), buffer.end(), matches, ex, return regex_search(buffer.begin(), buffer.end(), matches, ex,
match_flags(buffer, buffer.begin(), buffer.end())); match_flags(buffer, buffer.begin(), buffer.end(), true, true));
} }
static bool find_prev(const Buffer& buffer, const BufferIterator& pos, static bool find_prev(const Buffer& buffer, const BufferIterator& pos,
@ -864,12 +866,12 @@ static bool find_prev(const Buffer& buffer, const BufferIterator& pos,
{ {
if (pos != buffer.begin() and if (pos != buffer.begin() and
backward_regex_search(buffer.begin(), pos, matches, ex, backward_regex_search(buffer.begin(), pos, matches, ex,
match_flags(buffer, buffer.begin(), pos) | match_flags(buffer, buffer.begin(), pos, true, buffer.is_end(pos.coord())) |
RegexExecFlags::NotInitialNull)) RegexExecFlags::NotInitialNull))
return true; return true;
wrapped = true; wrapped = true;
return backward_regex_search(buffer.begin(), buffer.end(), matches, ex, return backward_regex_search(buffer.begin(), buffer.end(), matches, ex,
match_flags(buffer, buffer.begin(), buffer.end()) | match_flags(buffer, buffer.begin(), buffer.end(), true, true) |
RegexExecFlags::NotInitialNull); RegexExecFlags::NotInitialNull);
} }
@ -916,7 +918,7 @@ void select_all_matches(SelectionList& selections, const Regex& regex, int captu
auto sel_beg = buffer.iterator_at(sel.min()); auto sel_beg = buffer.iterator_at(sel.min());
auto sel_end = utf8::next(buffer.iterator_at(sel.max()), buffer.end()); auto sel_end = utf8::next(buffer.iterator_at(sel.max()), buffer.end());
RegexIt re_it(sel_beg, sel_end, regex, RegexIt re_it(sel_beg, sel_end, regex,
match_flags(buffer, sel_beg, sel_end)); match_flags(buffer, sel_beg, sel_end, true, true));
RegexIt re_end; RegexIt re_end;
for (; re_it != re_end; ++re_it) for (; re_it != re_end; ++re_it)
@ -961,7 +963,7 @@ void split_selections(SelectionList& selections, const Regex& regex, int capture
auto sel_end = utf8::next(buffer.iterator_at(sel.max()), buffer.end()); auto sel_end = utf8::next(buffer.iterator_at(sel.max()), buffer.end());
RegexIt re_it(begin, sel_end, regex, RegexIt re_it(begin, sel_end, regex,
match_flags(buffer, begin, sel_end)); match_flags(buffer, begin, sel_end, true, true));
RegexIt re_end; RegexIt re_end;
for (; re_it != re_end; ++re_it) for (; re_it != re_end; ++re_it)