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

Merge remote-tracking branch 'lenormf/fix-2994'

Browse Source
This commit is contained in:
Maxime Coste 2019-07-21 12:10:22 +10:00
commit c54e0ec873
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/normal.cc
View File

@ -939,12 +939,20 @@ template<bool smart>
void use_selection_as_search_pattern(Context& context, NormalParams params)
{
const auto& buffer = context.buffer();
auto& sel = context.selections().main();
const auto beg = sel.min(), end = buffer.char_next(sel.max());
String pattern = format("{}{}{}",
smart and is_bow(buffer, beg) ? "\\b" : "",
escape(buffer.string(beg, end), "^$\\.*+?()[]{}|", '\\'),
smart and is_eow(buffer, end) ? "\\b" : "");
String pattern;
for (auto& sel : context.selections())
{
const auto beg = sel.min(), end = buffer.char_next(sel.max());
const String sel_pattern = format("{}{}{}",
smart and is_bow(buffer, beg) ? "\\b" : "",
escape(buffer.string(beg, end), "^$\\.*+?()[]{}|", '\\'),
smart and is_eow(buffer, end) ? "\\b" : "");
if (not pattern.empty())
pattern += '|';
pattern += sel_pattern;
}
const char reg = to_lower(params.reg ? params.reg : '/');