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

deindent now deindent non completely indented lines

Browse Source 
If indent is 4 spaces, and a line has only 3 leading spaces, they
will get removed. a-< can be used to avoid this behaviour.
This commit is contained in:
Maxime Coste 2013-11-14 00:20:49 +00:00
parent 04ae48c346
commit 9a1d50d9a2
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.asciidoc
View File

@ -127,6 +127,10 @@ Changes
* _>_: indent selected lines * _>_: indent selected lines
* _<_: deindent selected lines * _<_: deindent selected lines
* _alt->_: indent selected lines, including empty lines
* _<_: deindent selected lines
* _alt-<_: deindent selected lines, do not remove incomplete
indent (3 leading spaces when indent is 4)
* _|_: pipe each selections through the given external filter program * _|_: pipe each selections through the given external filter program
and replace with it's output. and replace with it's output.

6
src/normal.cc
View File

@ -580,6 +580,7 @@ void indent(Context& context, int)
editor.insert(indent, InsertMode::Insert); editor.insert(indent, InsertMode::Insert);
} }
template<bool deindent_incomplete = true>
void deindent(Context& context, int) void deindent(Context& context, int)
{ {
CharCount tabstop = context.options()["tabstop"].get<int>(); CharCount tabstop = context.options()["tabstop"].get<int>();
@ -605,7 +606,11 @@ void deindent(Context& context, int)
else if (c == ' ') else if (c == ' ')
++width; ++width;
else else
{
if (deindent_incomplete and width != 0)
res.emplace_back(line, BufferCoord{line, column-1});
break; break;
}
if (width == indent_width) if (width == indent_width)
{ {
res.emplace_back(line, BufferCoord{line, column}); res.emplace_back(line, BufferCoord{line, column});
@ -1027,6 +1032,7 @@ KeyMap keymap =
{ '<', deindent }, { '<', deindent },
{ '>', indent }, { '>', indent },
{ alt('>'), indent<true> }, { alt('>'), indent<true> },
{ alt('<'), deindent<false> },
{ ctrl('i'), jump<Forward> }, { ctrl('i'), jump<Forward> },
{ ctrl('o'), jump<Backward> }, { ctrl('o'), jump<Backward> },