vim: src/memline.c comparison

comparison src/memline.c @ 20581:e529690f27bc v8.2.0844

patch 8.2.0844: text properties crossing lines not handled correctly Commit: https://github.com/vim/vim/commit/a9d4b84d97fb74061eeb42c1433e111fb58825dc Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 30 14:46:52 2020 +0200 patch 8.2.0844: text properties crossing lines not handled correctly Problem: Text properties crossing lines not handled correctly. Solution: When saving for undo include an extra line when needed and do not adjust properties when undoing. (Axel Forsman, closes #5875)

author	Bram Moolenaar <Bram@vim.org>
date	Sat, 30 May 2020 15:00:03 +0200
parents	a961efb326e5
children	d067be761cd7

comparison

equal deleted inserted replaced

-:213a1f6ae87d
+:e529690f27bc
 static void set_b0_fname(ZERO_BL *, buf_T *buf);
 static void set_b0_dir_flag(ZERO_BL *b0p, buf_T *buf);
 static void add_b0_fenc(ZERO_BL *b0p, buf_T *buf);
 static time_t swapfile_info(char_u *);
 static int recov_file_names(char_u **, char_u *, int prepend_dot);
-static int ml_delete_int(buf_T *, linenr_T, int);
 static char_u *findswapname(buf_T *, char_u **, char_u *);
 static void ml_flush_line(buf_T *);
 static bhdr_T *ml_new_data(memfile_T *, int, int);
 static bhdr_T *ml_new_ptr(memfile_T *);
 static bhdr_T *ml_find_line(buf_T *, linenr_T, int);
 {
 return (curbuf->b_ml.ml_flags & ML_LINE_DIRTY);
 }
 #ifdef FEAT_PROP_POPUP
+/*
+* Add text properties that continue from the previous line.
+*/
 static void
 add_text_props_for_append(
 	    buf_T	*buf,
 	    linenr_T	lnum,
 	    char_u	**line,
 	// Get the line above to find any props that continue in the next
 	// line.
 	count = get_text_props(buf, lnum, &props, FALSE);
 	for (n = 0; n < count; ++n)
 	{
-	    mch_memmove(&prop, props + n * sizeof(textprop_T), sizeof(textprop_T));
+	    mch_memmove(&prop, props + n * sizeof(textprop_T),
+							   sizeof(textprop_T));
 	    if (prop.tp_flags & TP_FLAG_CONT_NEXT)
 	    {
 		if (round == 2)
 		{
 		    prop.tp_flags |= TP_FLAG_CONT_PREV;
 		    prop.tp_col = 1;
-		    prop.tp_len = *len;
+		    prop.tp_len = *len;  // not exactly the right length
-		    mch_memmove(new_line + *len + new_prop_count * sizeof(textprop_T), &prop, sizeof(textprop_T));
+		    mch_memmove(new_line + *len + new_prop_count
+			      * sizeof(textprop_T), &prop, sizeof(textprop_T));
 		}
 		++new_prop_count;
 	    }
 	}
 }
 ml_append_int(
 buf_T	*buf,
 linenr_T	lnum,		// append after this line (can be 0)
 char_u	*line_arg,	// text of the new line
 colnr_T	len_arg,	// length of line, including NUL, or 0
-int		newfile,	// flag, see above
+int		flags)		// ML_APPEND_ flags
-int		mark)		// mark the new line
 {
 char_u	*line = line_arg;
 colnr_T	len = len_arg;
 int		i;
 int		line_count;	// number of indexes in current block
 if (len == 0)
 	len = (colnr_T)STRLEN(line) + 1;	// space needed for the text
 #ifdef FEAT_PROP_POPUP
-if (curbuf->b_has_textprop && lnum > 0)
+if (curbuf->b_has_textprop && lnum > 0 && !(flags & ML_APPEND_UNDO))
 	// Add text properties that continue from the previous line.
 	add_text_props_for_append(buf, lnum, &line, &len, &tofree);
 #endif
 space_needed = len + INDEX_SIZE;	// space needed for text + index
 	/*
 	 * copy the text into the block
 	 */
 	mch_memmove((char *)dp + dp->db_index[db_idx + 1], line, (size_t)len);
-	if (mark)
+	if (flags & ML_APPEND_MARK)
 	    dp->db_index[db_idx + 1] |= DB_MARKED;
 	/*
 	 * Mark the block dirty.
 	 */
 	buf->b_ml.ml_flags |= ML_LOCKED_DIRTY;
-	if (!newfile)
+	if (!(flags & ML_APPEND_NEW))
 	    buf->b_ml.ml_flags |= ML_LOCKED_POS;
 }
 else	    // not enough space in data block
 {
 	long	    line_count_left, line_count_right;
 		}
 	    }
 	}
 	page_count = ((space_needed + HEADER_SIZE) + page_size - 1) / page_size;
-	if ((hp_new = ml_new_data(mfp, newfile, page_count)) == NULL)
+	if ((hp_new = ml_new_data(mfp, flags & ML_APPEND_NEW, page_count))
+								       == NULL)
 	{
 			// correct line counts in pointer blocks
 	    --(buf->b_ml.ml_locked_lineadd);
 	    --(buf->b_ml.ml_locked_high);
 	    goto theend;
 	if (!in_left)
 	{
 	    dp_right->db_txt_start -= len;
 	    dp_right->db_free -= len + INDEX_SIZE;
 	    dp_right->db_index[0] = dp_right->db_txt_start;
-	    if (mark)
+	    if (flags & ML_APPEND_MARK)
 		dp_right->db_index[0] |= DB_MARKED;
 	    mch_memmove((char *)dp_right + dp_right->db_txt_start,
 							   line, (size_t)len);
 	    ++line_count_right;
 	if (in_left)
 	{
 	    dp_left->db_txt_start -= len;
 	    dp_left->db_free -= len + INDEX_SIZE;
 	    dp_left->db_index[line_count_left] = dp_left->db_txt_start;
-	    if (mark)
+	    if (flags & ML_APPEND_MARK)
 		dp_left->db_index[line_count_left] |= DB_MARKED;
 	    mch_memmove((char *)dp_left + dp_left->db_txt_start,
 							   line, (size_t)len);
 	    ++line_count_left;
 	}
 	 * The old one (hp, in ml_locked) gets a positive blocknumber if
 	 * we changed it and we are not editing a new file.
 	 */
 	if (lines_moved || in_left)
 	    buf->b_ml.ml_flags |= ML_LOCKED_DIRTY;
-	if (!newfile && db_idx >= 0 && in_left)
+	if (!(flags & ML_APPEND_NEW) && db_idx >= 0 && in_left)
 	    buf->b_ml.ml_flags |= ML_LOCKED_POS;
 	mf_put(mfp, hp_new, TRUE, FALSE);
 	/*
 	 * flush the old data block
 ml_append_flush(
 buf_T	*buf,
 linenr_T	lnum,		// append after this line (can be 0)
 char_u	*line,		// text of the new line
 colnr_T	len,		// length of line, including NUL, or 0
-int		newfile)	// flag, see above
+int		flags)		// ML_APPEND_ flags
 {
 if (lnum > buf->b_ml.ml_line_count)
 	return FAIL;  // lnum out of range
 if (buf->b_ml.ml_line_lnum != 0)
 may_invoke_listeners(buf, lnum + 1, lnum + 1, 1);
 if (buf->b_ml.ml_line_lnum != 0)
 	ml_flush_line(buf);
 #endif
-return ml_append_int(buf, lnum, line, len, newfile, FALSE);
+return ml_append_int(buf, lnum, line, len, flags);
 }
 /*
 * Append a line after lnum (may be 0 to insert a line in front of the file).
 * "line" does not need to be allocated, but can't be another line in a
 * buffer, unlocking may make it invalid.
 *
-*   newfile: TRUE when starting to edit a new file, meaning that pe_old_lnum
+* "newfile": TRUE when starting to edit a new file, meaning that pe_old_lnum
 *		will be set for recovery
 * Check: The caller of this function should probably also call
 * appended_lines().
 *
 * return FAIL for failure, OK otherwise
 linenr_T	lnum,		// append after this line (can be 0)
 char_u	*line,		// text of the new line
 colnr_T	len,		// length of new line, including NUL, or 0
 int		newfile)	// flag, see above
 {
+return ml_append_flags(lnum, line, len, newfile ? ML_APPEND_NEW : 0);
+}
+int
+ml_append_flags(
+linenr_T	lnum,		// append after this line (can be 0)
+char_u	*line,		// text of the new line
+colnr_T	len,		// length of new line, including NUL, or 0
+int		flags)		// ML_APPEND_ values
+{
 // When starting up, we might still need to create the memfile
 if (curbuf->b_ml.ml_mfp == NULL && open_buffer(FALSE, NULL, 0) == FAIL)
 	return FAIL;
-return ml_append_flush(curbuf, lnum, line, len, newfile);
+return ml_append_flush(curbuf, lnum, line, len, flags);
 }
 #if defined(FEAT_SPELL) || defined(FEAT_QUICKFIX) || defined(PROTO)
 /*
 * Like ml_append() but for an arbitrary buffer.  The buffer must already have
 * a memline.
 colnr_T	len,		// length of new line, including NUL, or 0
 int		newfile)	// flag, see above
 {
 if (buf->b_ml.ml_mfp == NULL)
 	return FAIL;
-return ml_append_flush(buf, lnum, line, len, newfile);
+return ml_append_flush(buf, lnum, line, len, newfile ? ML_APPEND_NEW : 0);
 }
 #endif
 /*
 * Replace line lnum, with buffering, in current buffer.
 }
 #endif
 /*
 * Delete line "lnum" in the current buffer.
-* When "message" is TRUE may give a "No lines in buffer" message.
+* When "flags" has ML_DEL_MESSAGE may give a "No lines in buffer" message.
-*
+* When "flags" has ML_DEL_UNDO this is called from undo.
-* Check: The caller of this function should probably also call
-* deleted_lines() after this.
 *
 * return FAIL for failure, OK otherwise
 */
-int
-ml_delete(linenr_T lnum, int message)
-{
-ml_flush_line(curbuf);
-if (lnum < 1 || lnum > curbuf->b_ml.ml_line_count)
-	return FAIL;
-#ifdef FEAT_EVAL
-// When inserting above recorded changes: flush the changes before changing
-// the text.
-may_invoke_listeners(curbuf, lnum, lnum + 1, -1);
-#endif
-return ml_delete_int(curbuf, lnum, message);
-}
 static int
-ml_delete_int(buf_T *buf, linenr_T lnum, int message)
+ml_delete_int(buf_T *buf, linenr_T lnum, int flags)
 {
 bhdr_T	*hp;
 memfile_T	*mfp;
 DATA_BL	*dp;
 PTR_BL	*pp;
 /*
 * If the file becomes empty the last line is replaced by an empty line.
 */
 if (buf->b_ml.ml_line_count == 1)	    // file becomes empty
 {
-	if (message
+	if ((flags & ML_DEL_MESSAGE)
 #ifdef FEAT_NETBEANS_INTG
 		&& !netbeansSuppressNoLines
 #endif
 	   )
 	    set_keep_msg((char_u *)_(no_lines_msg), 0);
 	netbeans_removed(buf, lnum, 0, (long)line_size);
 #endif
 #ifdef FEAT_PROP_POPUP
 // If there are text properties, make a copy, so that we can update
 // properties in preceding and following lines.
-if (buf->b_has_textprop)
+if (buf->b_has_textprop && !(flags & ML_DEL_UNDO))
 {
 	size_t	textlen = STRLEN((char_u *)dp + line_start) + 1;
 	if ((long)textlen < line_size)
 	{
 #endif
 return ret;
 }
 /*
+* Delete line "lnum" in the current buffer.
+* When "message" is TRUE may give a "No lines in buffer" message.
+*
+* Check: The caller of this function should probably also call
+* deleted_lines() after this.
+*
+* return FAIL for failure, OK otherwise
+*/
+int
+ml_delete(linenr_T lnum, int message)
+{
+return ml_delete_flags(lnum, message ? ML_DEL_MESSAGE : 0);
+}
+/*
+* Like ml_delete() but using flags (see ml_delete_int()).
+*/
+int
+ml_delete_flags(linenr_T lnum, int flags)
+{
+ml_flush_line(curbuf);
+if (lnum < 1 || lnum > curbuf->b_ml.ml_line_count)
+	return FAIL;
+#ifdef FEAT_EVAL
+// When inserting above recorded changes: flush the changes before changing
+// the text.
+may_invoke_listeners(curbuf, lnum, lnum + 1, -1);
+#endif
+return ml_delete_int(curbuf, lnum, flags);
+}
+/*
 * set the DB_MARKED flag for line 'lnum'
 */
 void
 ml_setmarked(linenr_T lnum)
 {
 		 * last line in a buffer, which causes trouble for a buffer
 		 * that has only one line.
 		 * Don't forget to copy the mark!
 		 */
 		// How about handling errors???
-		(void)ml_append_int(buf, lnum, new_line, new_len, FALSE,
+		(void)ml_append_int(buf, lnum, new_line, new_len,
-					     (dp->db_index[idx] & DB_MARKED));
+			 (dp->db_index[idx] & DB_MARKED) ? ML_APPEND_MARK : 0);
-		(void)ml_delete_int(buf, lnum, FALSE);
+		(void)ml_delete_int(buf, lnum, 0);
 	    }
 	}
 	vim_free(new_line);
 	entered = FALSE;

Mercurial > vim

comparison src/memline.c @ 20581:e529690f27bc v8.2.0844