Add @ command for tabs to spaces and alt-@ for spaces to tabs

This commit is contained in:
Maxime Coste 2014-03-02 01:04:26 +00:00
parent 0cd82d0ebe
commit bd331742d2
2 changed files with 66 additions and 0 deletions

View File

@ -215,6 +215,11 @@ Changes
* _~_: to upper case * _~_: to upper case
* _alt-`_: swap case * _alt-`_: swap case
* _@_: convert tabs to spaces in current selections, uses the buffer
tabstop option or the count parameter for tabstop.
* _alt-@_: convert spaces to tabs in current selections, uses the buffer
tabstop option or the count parameter for tabstop.
* _alt-R_: rotate selections content * _alt-R_: rotate selections content
Goto Commands Goto Commands

View File

@ -1104,6 +1104,64 @@ void copy_indent(Context& context, int selection)
} }
} }
void tabs_to_spaces(Context& context, int ts)
{
auto& buffer = context.buffer();
const CharCount opt_tabstop = context.options()["tabstop"].get<int>();
const CharCount tabstop = ts == 0 ? opt_tabstop : ts;
for (auto& sel : context.selections())
{
for (auto it = buffer.iterator_at(sel.min()),
end = buffer.iterator_at(sel.max())+1; it != end; ++it)
{
if (*it == '\t')
{
CharCount col = get_column(buffer, opt_tabstop, it.coord());
CharCount end_col = (col / tabstop + 1) * tabstop;
it = buffer.erase(it, it+1);
it = buffer.insert(it, String{ ' ', end_col - col }) + (int)(end_col - col);
end = buffer.iterator_at(sel.max())+1;
}
}
}
}
void spaces_to_tabs(Context& context, int ts)
{
auto& buffer = context.buffer();
const CharCount opt_tabstop = context.options()["tabstop"].get<int>();
const CharCount tabstop = ts == 0 ? opt_tabstop : ts;
for (auto& sel : context.selections())
{
for (auto it = buffer.iterator_at(sel.min()),
end = buffer.iterator_at(sel.max())+1; it != end;)
{
if (*it == ' ')
{
auto spaces_beg = it;
auto spaces_end = spaces_beg+1;
CharCount col = get_column(buffer, opt_tabstop, spaces_end.coord());
while (*spaces_end == ' ' and (col % tabstop) != 0)
{
++spaces_end;
++col;
}
if ((col % tabstop) == 0)
{
it = buffer.erase(spaces_beg, spaces_end);
it = buffer.insert(it, "\t") + 1;
end = buffer.iterator_at(sel.max())+1;
}
else
it = spaces_end;
}
else
++it;
}
}
}
class ModifiedRangesListener : public BufferChangeListener_AutoRegister class ModifiedRangesListener : public BufferChangeListener_AutoRegister
{ {
public: public:
@ -1342,6 +1400,9 @@ KeyMap keymap =
{ '&', align }, { '&', align },
{ alt('&'), copy_indent }, { alt('&'), copy_indent },
{ '@', tabs_to_spaces },
{ alt('@'), spaces_to_tabs },
{ Key::Left, move<CharCount, Backward> }, { Key::Left, move<CharCount, Backward> },
{ Key::Down, move<LineCount, Forward> }, { Key::Down, move<LineCount, Forward> },
{ Key::Up, move<LineCount, Backward> }, { Key::Up, move<LineCount, Backward> },