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

Rename move to move_cursor

Browse Source 
move is pretty ambiguous and hard to find due to std::move.
This commit is contained in:
Maxime Coste 2018-04-29 21:28:02 +10:00
parent 8e555cb992
commit 57112b0845
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/normal.cc
View File

@ -1979,7 +1979,7 @@ void repeated(Context& context, NormalParams params)
} }
template<typename Type, Direction direction, SelectMode mode = SelectMode::Replace> template<typename Type, Direction direction, SelectMode mode = SelectMode::Replace>
void move(Context& context, NormalParams params) void move_cursor(Context& context, NormalParams params)
{ {
kak_assert(mode == SelectMode::Replace or mode == SelectMode::Extend); kak_assert(mode == SelectMode::Replace or mode == SelectMode::Extend);
const Type offset(direction * std::max(params.count,1)); const Type offset(direction * std::max(params.count,1));
@ -2072,25 +2072,25 @@ template<typename T, MemoryDomain domain>
using KeymapBackend = Vector<T, domain>; using KeymapBackend = Vector<T, domain>;
static const HashMap<Key, NormalCmd, MemoryDomain::Undefined, KeymapBackend> keymap = { static const HashMap<Key, NormalCmd, MemoryDomain::Undefined, KeymapBackend> keymap = {
{ {'h'}, {"move left", move<CharCount, Backward>} }, { {'h'}, {"move left", move_cursor<CharCount, Backward>} },
{ {'j'}, {"move down", move<LineCount, Forward>} }, { {'j'}, {"move down", move_cursor<LineCount, Forward>} },
{ {'k'}, {"move up", move<LineCount, Backward>} }, { {'k'}, {"move up", move_cursor<LineCount, Backward>} },
{ {'l'}, {"move right", move<CharCount, Forward>} }, { {'l'}, {"move right", move_cursor<CharCount, Forward>} },
{ {Key::Left}, { "move left", move<CharCount, Backward>} }, { {Key::Left}, { "move left", move_cursor<CharCount, Backward>} },
{ {Key::Down}, { "move down", move<LineCount, Forward>} }, { {Key::Down}, { "move down", move_cursor<LineCount, Forward>} },
{ {Key::Up}, { "move up", move<LineCount, Backward>} }, { {Key::Up}, { "move up", move_cursor<LineCount, Backward>} },
{ {Key::Right}, {"move right", move<CharCount, Forward>} }, { {Key::Right}, {"move right", move_cursor<CharCount, Forward>} },
{ {'H'}, {"extend left", move<CharCount, Backward, SelectMode::Extend>} }, { {'H'}, {"extend left", move_cursor<CharCount, Backward, SelectMode::Extend>} },
{ {'J'}, {"extend down", move<LineCount, Forward, SelectMode::Extend>} }, { {'J'}, {"extend down", move_cursor<LineCount, Forward, SelectMode::Extend>} },
{ {'K'}, {"extend up", move<LineCount, Backward, SelectMode::Extend>} }, { {'K'}, {"extend up", move_cursor<LineCount, Backward, SelectMode::Extend>} },
{ {'L'}, {"extend right", move<CharCount, Forward, SelectMode::Extend>} }, { {'L'}, {"extend right", move_cursor<CharCount, Forward, SelectMode::Extend>} },
{ shift(Key::Left), {"extend left", move<CharCount, Backward, SelectMode::Extend>} }, { shift(Key::Left), {"extend left", move_cursor<CharCount, Backward, SelectMode::Extend>} },
{ shift(Key::Down), {"extend down", move<LineCount, Forward, SelectMode::Extend>} }, { shift(Key::Down), {"extend down", move_cursor<LineCount, Forward, SelectMode::Extend>} },
{ shift(Key::Up), {"extend up", move<LineCount, Backward, SelectMode::Extend>} }, { shift(Key::Up), {"extend up", move_cursor<LineCount, Backward, SelectMode::Extend>} },
{ shift(Key::Right), {"extend right", move<CharCount, Forward, SelectMode::Extend>} }, { shift(Key::Right), {"extend right", move_cursor<CharCount, Forward, SelectMode::Extend>} },
{ {'t'}, {"select to next character", select_to_next_char<SelectFlags::None>} }, { {'t'}, {"select to next character", select_to_next_char<SelectFlags::None>} },
{ {'f'}, {"select to next character included", select_to_next_char<SelectFlags::Inclusive>} }, { {'f'}, {"select to next character included", select_to_next_char<SelectFlags::Inclusive>} },