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

src: Use all selections to generate a pattern upon hitting *

Browse Source 
This commit makes the `*` and <a-*> primitives compose a search pattern
comprised of all the current selections, as opposed to only the main one.

All selections are OR'd into the default search register, which makes it
convenient to search for several identifiers already selected.

To retain the old behaviour, the following mappings can be used:

```
map global normal * ': exec -draft -save-regs "" %{<space>*}<ret>'
map global normal <a-*> ': exec -draft -save-regs "" %{<space><a-*>}<ret>'
```

Fixes #2994
This commit is contained in:
Frank LENORMAND 2019-07-01 16:23:19 +03:00
parent 2ff9fd8d92
commit b040bf8b81
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 : '/');