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

Fix indent selection respect for original selection cursor position

Browse Source 
Fixes #1233
This commit is contained in:
Maxime Coste 2017-03-03 22:03:20 +00:00
parent bdb3da6b36
commit 1728c67fef
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/selectors.cc
View File

@ -64,7 +64,8 @@ template Optional<Selection> select_to_next_word<WordType::Word>(const Buffer&,
template Optional<Selection> select_to_next_word<WordType::WORD>(const Buffer&, const Selection&); template Optional<Selection> select_to_next_word<WordType::WORD>(const Buffer&, const Selection&);
template<WordType word_type> template<WordType word_type>
Optional<Selection> select_to_next_word_end(const Buffer& buffer, const Selection& selection) Optional<Selection>
select_to_next_word_end(const Buffer& buffer, const Selection& selection)
{ {
Utf8Iterator begin{buffer.iterator_at(selection.cursor()), buffer}; Utf8Iterator begin{buffer.iterator_at(selection.cursor()), buffer};
if (begin+1 == buffer.end()) if (begin+1 == buffer.end())
@ -632,12 +633,16 @@ select_indent(const Buffer& buffer, const Selection& selection,
return it == str.end(); return it == str.end();
}; };
const bool to_begin = flags & ObjectFlags::ToBegin;
const bool to_end = flags & ObjectFlags::ToEnd;
int tabstop = buffer.options()["tabstop"].get<int>(); int tabstop = buffer.options()["tabstop"].get<int>();
LineCount line = selection.cursor().line; auto pos = selection.cursor();
LineCount line = pos.line;
auto indent = get_indent(buffer[line], tabstop); auto indent = get_indent(buffer[line], tabstop);
LineCount begin_line = line - 1; LineCount begin_line = line - 1;
if (flags & ObjectFlags::ToBegin) if (to_begin)
{ {
while (begin_line >= 0 and (buffer[begin_line] == StringView{"\n"} or while (begin_line >= 0 and (buffer[begin_line] == StringView{"\n"} or
get_indent(buffer[begin_line], tabstop) >= indent)) get_indent(buffer[begin_line], tabstop) >= indent))
@ -645,7 +650,7 @@ select_indent(const Buffer& buffer, const Selection& selection,
} }
++begin_line; ++begin_line;
LineCount end_line = line + 1; LineCount end_line = line + 1;
if (flags & ObjectFlags::ToEnd) if (to_end)
{ {
const LineCount end = buffer.line_count(); const LineCount end = buffer.line_count();
while (end_line < end and (buffer[end_line] == StringView{"\n"} or while (end_line < end and (buffer[end_line] == StringView{"\n"} or
@ -663,7 +668,10 @@ select_indent(const Buffer& buffer, const Selection& selection,
is_only_whitespaces(buffer[end_line])) is_only_whitespaces(buffer[end_line]))
--end_line; --end_line;
} }
return Selection{begin_line, {end_line, buffer[end_line].length() - 1}};
auto first = to_begin ? begin_line : pos;
auto last = to_end ? BufferCoord{end_line, buffer[end_line].length() - 1} : pos;
return to_end ? Selection{first, last} : Selection{last, first};
} }
Optional<Selection> Optional<Selection>

1
test/regression/1233-corrent-cursor-handling-for-indent-objects/cmd Normal file
View File

@ -0,0 +1 @@
]i

3
test/regression/1233-corrent-cursor-handling-for-indent-objects/in Normal file
View File

@ -0,0 +1,3 @@
foo
%(b)ar
baz

3
test/regression/1233-corrent-cursor-handling-for-indent-objects/selections Normal file
View File

@ -0,0 +1,3 @@
bar
baz