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

Fix vertical movement with tabstops

Browse Source 
Fixes #1388
This commit is contained in:
Maxime Coste 2017-05-21 08:24:44 +01:00
parent c6508ee101
commit ad9ad7e603
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/buffer.cc
View File

@ -186,11 +186,10 @@ BufferCoord Buffer::offset_coord(BufferCoord coord, CharCount offset, ColumnCoun
BufferCoordAndTarget Buffer::offset_coord(BufferCoordAndTarget coord, LineCount offset, ColumnCount tabstop) BufferCoordAndTarget Buffer::offset_coord(BufferCoordAndTarget coord, LineCount offset, ColumnCount tabstop)
{ {
auto column = coord.target == -1 ? get_column(*this, tabstop, coord) : coord.target; const auto column = coord.target == -1 ? get_column(*this, tabstop, coord) : coord.target;
auto line = Kakoune::clamp(coord.line + offset, 0_line, line_count()-1); const auto line = Kakoune::clamp(coord.line + offset, 0_line, line_count()-1);
StringView content = m_lines[line]; const auto max_column = get_column(*this, tabstop, {line, m_lines[line].length()-1});
const auto final_column = std::max(0_col, std::min(column, max_column - 1));
auto final_column = std::max(0_col, std::min(column, content.column_length() - 2));
return {line, get_byte_to_column(*this, tabstop, {line, final_column}), column}; return {line, get_byte_to_column(*this, tabstop, {line, final_column}), column};
} }