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

Add Editor::replace(memoryview) and bind alt-P to replace paste

Browse Source
This commit is contained in:
Maxime Coste 2012-07-11 14:15:27 +02:00
parent 5cbded8221
commit 06dd3f8aad
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/editor.cc
View File

@ -79,6 +79,13 @@ void Editor::replace(const String& string)
insert(string); insert(string);
} }
void Editor::replace(const memoryview<String>& strings)
{
scoped_edition edition(*this);
erase();
insert(strings);
}
std::vector<String> Editor::selections_content() const std::vector<String> Editor::selections_content() const
{ {
std::vector<String> contents; std::vector<String> contents;

1
src/editor.hh
View File

@ -37,6 +37,7 @@ public:
void append(const memoryview<String>& strings); void append(const memoryview<String>& strings);
void replace(const String& string); void replace(const String& string);
void replace(const memoryview<String>& strings);
void push_selections(); void push_selections();
void pop_selections(); void pop_selections();

30
src/main.cc
View File

@ -246,23 +246,34 @@ void do_change(Editor& editor, int count)
do_insert(editor, IncrementalInserter::Mode::Change); do_insert(editor, IncrementalInserter::Mode::Change);
} }
template<bool append> enum class PasteMode
{
Before,
After,
Replace
};
template<PasteMode paste_mode>
void do_paste(Editor& editor, int count) void do_paste(Editor& editor, int count)
{ {
Register& reg = RegisterManager::instance()['"']; Register& reg = RegisterManager::instance()['"'];
if (count == 0) if (count == 0)
{ {
if (append) if (paste_mode == PasteMode::Before)
editor.append(reg);
else
editor.insert(reg); editor.insert(reg);
else if (paste_mode == PasteMode::After)
editor.append(reg);
else if (paste_mode == PasteMode::Replace)
editor.replace(reg);
} }
else else
{ {
if (append) if (paste_mode == PasteMode::Before)
editor.append(reg[count-1]);
else
editor.insert(reg[count-1]); editor.insert(reg[count-1]);
else if (paste_mode == PasteMode::After)
editor.append(reg[count-1]);
else if (paste_mode == PasteMode::Replace)
editor.replace(reg[count-1]);
} }
} }
@ -352,8 +363,9 @@ std::unordered_map<Key, std::function<void (Editor& editor, int count)>> keymap
{ { Key::Modifiers::None, 'G' }, do_go<true> }, { { Key::Modifiers::None, 'G' }, do_go<true> },
{ { Key::Modifiers::None, 'y' }, do_yank }, { { Key::Modifiers::None, 'y' }, do_yank },
{ { Key::Modifiers::None, 'p' }, do_paste<true> }, { { Key::Modifiers::None, 'p' }, do_paste<PasteMode::After> },
{ { Key::Modifiers::None, 'P' }, do_paste<false> }, { { Key::Modifiers::None, 'P' }, do_paste<PasteMode::Before> },
{ { Key::Modifiers::Alt, 'p' }, do_paste<PasteMode::Replace> },
{ { Key::Modifiers::None, 's' }, do_select_regex }, { { Key::Modifiers::None, 's' }, do_select_regex },