vim: src/undo.c comparison

comparison src/undo.c @ 18025:d19caa851682 v8.1.2008

patch 8.1.2008: error for invalid range when using listener and undo Commit: https://github.com/vim/vim/commit/4544bd2f247425c9dd743c76618dd70f53c72538 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Sep 8 15:27:21 2019 +0200 patch 8.1.2008: error for invalid range when using listener and undo Problem: Error for invalid range when using listener and undo. (Paul Jolly) Solution: Do not change the cursor before the lines are restored. (closes #4908)

author	Bram Moolenaar <Bram@vim.org>
date	Sun, 08 Sep 2019 15:30:04 +0200
parents	684a15da9929
children	d1e77015f60b

comparison

equal deleted inserted replaced

-:5b68c0bb3101
+:d19caa851682
 linenr_T	oldsize;
 linenr_T	newsize;
 linenr_T	top, bot;
 linenr_T	lnum;
 linenr_T	newlnum = MAXLNUM;
+pos_T	new_curpos = curwin->w_cursor;
 long	i;
 u_entry_T	*uep, *nuep;
 u_entry_T	*newlist = NULL;
 int		old_flags;
 int		new_flags;
 	if (top > curbuf->b_ml.ml_line_count || top >= bot
 				      || bot > curbuf->b_ml.ml_line_count + 1)
 	{
 	    unblock_autocmds();
 	    iemsg(_("E438: u_undo: line numbers wrong"));
-	    changed();		/* don't want UNCHANGED now */
+	    changed();		// don't want UNCHANGED now
 	    return;
 	}
-	oldsize = bot - top - 1;    /* number of lines before undo */
+	oldsize = bot - top - 1;    // number of lines before undo
-	newsize = uep->ue_size;	    /* number of lines after undo */
+	newsize = uep->ue_size;	    // number of lines after undo
+	// Decide about the cursor position, depending on what text changed.
+	// Don't set it yet, it may be invalid if lines are going to be added.
 	if (top < newlnum)
 	{
-	    /* If the saved cursor is somewhere in this undo block, move it to
+	    // If the saved cursor is somewhere in this undo block, move it to
-	     * the remembered position.  Makes "gwap" put the cursor back
+	    // the remembered position.  Makes "gwap" put the cursor back
-	     * where it was. */
+	    // where it was.
 	    lnum = curhead->uh_cursor.lnum;
 	    if (lnum >= top && lnum <= top + newsize + 1)
 	    {
-		curwin->w_cursor = curhead->uh_cursor;
+		new_curpos = curhead->uh_cursor;
-		newlnum = curwin->w_cursor.lnum - 1;
+		newlnum = new_curpos.lnum - 1;
 	    }
 	    else
 	    {
-		/* Use the first line that actually changed.  Avoids that
+		// Use the first line that actually changed.  Avoids that
-		 * undoing auto-formatting puts the cursor in the previous
+		// undoing auto-formatting puts the cursor in the previous
-		 * line. */
+		// line.
 		for (i = 0; i < newsize && i < oldsize; ++i)
 		{
 		    char_u *p = ml_get(top + 1 + i);
 		    if (curbuf->b_ml.ml_line_len != uep->ue_array[i].ul_len
 			break;
 		}
 		if (i == newsize && newlnum == MAXLNUM && uep->ue_next == NULL)
 		{
 		    newlnum = top;
-		    curwin->w_cursor.lnum = newlnum + 1;
+		    new_curpos.lnum = newlnum + 1;
 		}
 		else if (i < newsize)
 		{
 		    newlnum = top + i;
-		    curwin->w_cursor.lnum = newlnum + 1;
+		    new_curpos.lnum = newlnum + 1;
 		}
 	    }
 	}
 	empty_buffer = FALSE;
-	/* delete the lines between top and bot and save them in newarray */
+	/*
+	 * Delete the lines between top and bot and save them in newarray.
+	 */
 	if (oldsize > 0)
 	{
 	    if ((newarray = U_ALLOC_LINE(sizeof(undoline_T) * oldsize)) == NULL)
 	    {
 		do_outofmem_msg((long_u)(sizeof(undoline_T) * oldsize));
-		/*
-		 * We have messed up the entry list, repair is impossible.
+		// We have messed up the entry list, repair is impossible.
-		 * we have to free the rest of the list.
+		// we have to free the rest of the list.
-		 */
 		while (uep != NULL)
 		{
 		    nuep = uep->ue_next;
 		    u_freeentry(uep, uep->ue_size);
 		    uep = nuep;
 		}
 		break;
 	    }
-	    /* delete backwards, it goes faster in most cases */
+	    // delete backwards, it goes faster in most cases
 	    for (lnum = bot - 1, i = oldsize; --i >= 0; --lnum)
 	    {
-		/* what can we do when we run out of memory? */
+		// what can we do when we run out of memory?
 		if (u_save_line(&newarray[i], lnum) == FAIL)
 		    do_outofmem_msg((long_u)0);
-		/* remember we deleted the last line in the buffer, and a
+		// remember we deleted the last line in the buffer, and a
-		 * dummy empty line will be inserted */
+		// dummy empty line will be inserted
 		if (curbuf->b_ml.ml_line_count == 1)
 		    empty_buffer = TRUE;
 		ml_delete(lnum, FALSE);
 	    }
 	}
 	else
 	    newarray = NULL;
-	/* insert the lines in u_array between top and bot */
+	// make sure the cursor is on a valid line after the deletions
+	check_cursor_lnum();
+	/*
+	 * Insert the lines in u_array between top and bot.
+	 */
 	if (newsize)
 	{
 	    for (lnum = top, i = 0; i < newsize; ++i, ++lnum)
 	    {
 		// If the file is empty, there is an empty line 1 that we
 		vim_free(uep->ue_array[i].ul_line);
 	    }
 	    vim_free((char_u *)uep->ue_array);
 	}
-	/* adjust marks */
+	// adjust marks
 	if (oldsize != newsize)
 	{
 	    mark_adjust(top + 1, top + oldsize, (long)MAXLNUM,
 					       (long)newsize - (long)oldsize);
 	    if (curbuf->b_op_start.lnum > top + oldsize)
 		curbuf->b_op_end.lnum += newsize - oldsize;
 	}
 	changed_lines(top + 1, 0, bot, newsize - oldsize);
-	/* set '[ and '] mark */
+	// set '[ and '] mark
 	if (top + 1 < curbuf->b_op_start.lnum)
 	    curbuf->b_op_start.lnum = top + 1;
 	if (newsize == 0 && top + 1 > curbuf->b_op_end.lnum)
 	    curbuf->b_op_end.lnum = top + 1;
 	else if (top + newsize > curbuf->b_op_end.lnum)
 	 */
 	nuep = uep->ue_next;
 	uep->ue_next = newlist;
 	newlist = uep;
 }
+// Set the cursor to the desired position.  Check that the line is valid.
+curwin->w_cursor = new_curpos;
+check_cursor_lnum();
 curhead->uh_entry = newlist;
 curhead->uh_flags = new_flags;
 if ((old_flags & UH_EMPTYBUF) && BUFEMPTY())
 	curbuf->b_ml.ml_flags |= ML_EMPTY;

Mercurial > vim

comparison src/undo.c @ 18025:d19caa851682 v8.1.2008