aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.1.0037: Calling get_breakindent_win() repeatedly when computing virtcol

Browse Source 
Problem:  Calling get_breakindent_win() repeatedly when computing
          virtual column, and get_breakindent_win() does a STRCMP() on
          the whole line since patch 9.0.0016.
Solution: Cache the result, since the line doesn't change.
          (zeertzjq)

closes: #13879

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-01-17 20:42:53 +01:00
committed by Christian Brabandt
parent 73e16c7406
commit 5b0722b864
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/charset.c
View File

@@ -971,6 +971,9 @@ init_chartabsize_arg(
cts->cts_vcol = col; cts->cts_vcol = col;
cts->cts_line = line; cts->cts_line = line;
cts->cts_ptr = ptr; cts->cts_ptr = ptr;
#ifdef FEAT_LINEBREAK
cts->cts_bri_size = -1;
#endif
#ifdef FEAT_PROP_POPUP #ifdef FEAT_PROP_POPUP
if (lnum > 0 && !ignore_text_props) if (lnum > 0 && !ignore_text_props)
{ {
@@ -1282,7 +1285,11 @@ win_lbr_chartabsize(
if (*sbr != NUL) if (*sbr != NUL)
head_prev += vim_strsize(sbr); head_prev += vim_strsize(sbr);
if (wp->w_p_bri) if (wp->w_p_bri)
head_prev += get_breakindent_win(wp, line); {
if (cts->cts_bri_size < 0)
cts->cts_bri_size = get_breakindent_win(wp, line);
head_prev += cts->cts_bri_size;
}
if (wcol < head_prev) if (wcol < head_prev)
{ {
head_prev -= wcol; head_prev -= wcol;
@@ -1303,7 +1310,11 @@ win_lbr_chartabsize(
if (*sbr != NUL) if (*sbr != NUL)
head_mid += vim_strsize(sbr); head_mid += vim_strsize(sbr);
if (wp->w_p_bri) if (wp->w_p_bri)
head_mid += get_breakindent_win(wp, line); {
if (cts->cts_bri_size < 0)
cts->cts_bri_size = get_breakindent_win(wp, line);
head_mid += cts->cts_bri_size;
}
if (head_mid > 0 && wcol + size > wp->w_width) if (head_mid > 0 && wcol + size > wp->w_width)
{ {
// Calculate effective window width. // Calculate effective window width.

4
src/structs.h
View File

@@ -4909,6 +4909,10 @@ typedef struct {
win_T *cts_win; win_T *cts_win;
char_u *cts_line; // start of the line char_u *cts_line; // start of the line
char_u *cts_ptr; // current position in line char_u *cts_ptr; // current position in line
#ifdef FEAT_LINEBREAK
int cts_bri_size; // cached size of 'breakindent', or -1
// if not computed yet
#endif
#ifdef FEAT_PROP_POPUP #ifdef FEAT_PROP_POPUP
int cts_text_prop_count; // number of text props; when zero int cts_text_prop_count; // number of text props; when zero
// cts_text_props is not used // cts_text_props is not used

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
37,
/**/ /**/
36, 36,
/**/ /**/