mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 01:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): do not trim whitespace that is actually in the terminal (#16423)

Browse Source
This commit is contained in:
zeertzjq
2022-05-17 21:09:28 +08:00
committed by GitHub
parent bbfc4567df
commit f49699737c
4 changed files with 66 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/terminal.c
View File

@@ -1374,26 +1374,21 @@ static void fetch_row(Terminal *term, int row, int end_col)
while (col < end_col) {
VTermScreenCell cell;
fetch_cell(term, row, col, &cell);
int cell_len = 0;
if (cell.chars[0]) {
int cell_len = 0;
for (int i = 0; cell.chars[i]; i++) {
cell_len += utf_char2bytes((int)cell.chars[i], ptr + cell_len);
}
} else {
*ptr = ' ';
cell_len = 1;
}
char c = *ptr;
ptr += cell_len;
if (c != ' ') {
// only increase the line length if the last character is not whitespace
ptr += cell_len;
line_len = (size_t)(ptr - term->textbuf);
} else {
*ptr++ = ' ';
}
col += cell.width;
}
// trim trailing whitespace
term->textbuf[line_len] = 0;
// end of line
term->textbuf[line_len] = NUL;
}
static bool fetch_cell(Terminal *term, int row, int col, VTermScreenCell *cell)