adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.0.0166: when using text properties line text length computed twice

Browse Source 
Problem:    When using text properties the line text length is computed twice.
Solution:   If the text lenght was already computed don't do it again.
This commit is contained in:
Bram Moolenaar
2022-08-07 21:48:37 +01:00
parent e44336b00a
commit 50652b0c5c
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/memline.c
View File

@ -2821,6 +2821,9 @@ ml_append_int(
infoptr_T *ip;
#ifdef FEAT_PROP_POPUP
char_u *tofree = NULL;
# ifdef FEAT_BYTEOFF
colnr_T text_len = 0; // text len with NUL without text properties
# endif
#endif
int ret = FAIL;
@ -2831,7 +2834,19 @@ ml_append_int(
lowest_marked = lnum + 1;
if (len == 0)
{
len = (colnr_T)STRLEN(line) + 1; // space needed for the text
#if defined(FEAT_PROP_POPUP) && defined(FEAT_BYTEOFF)
text_len = len;
#endif
}
#if defined(FEAT_PROP_POPUP) && defined(FEAT_BYTEOFF)
else if (curbuf->b_has_textprop)
// "len" may include text properties, get the length of the text.
text_len = (colnr_T)STRLEN(line) + 1;
else
text_len = len;
#endif
#ifdef FEAT_PROP_POPUP
if (curbuf->b_has_textprop && lnum > 0
@ -3292,13 +3307,14 @@ ml_append_int(
}
#ifdef FEAT_BYTEOFF
# ifdef FEAT_PROP_POPUP
if (curbuf->b_has_textprop)
// only use the space needed for the text, ignore properties
len = (colnr_T)STRLEN(line) + 1;
# endif
// The line was inserted below 'lnum'
ml_updatechunk(buf, lnum + 1, (long)len, ML_CHNK_ADDLINE);
ml_updatechunk(buf, lnum + 1,
# ifdef FEAT_PROP_POPUP
(long)text_len
# else
(long)len
#endif
, ML_CHNK_ADDLINE);
#endif
#ifdef FEAT_NETBEANS_INTG