On Mi, 04 Apr 2018, Christian Brabandt wrote:

> Take this file:
> ```vim
> let a=[
>   'eins',
>   'zwei',
>   'drei']
> ```
> Start vim in a clean mode: `vim --clean -c 'set sw=2 et' file.vim`
> 
> Go to the beginning of the single quotation marks, block select them and try 
> to add `backslashes in front of them, so that it will become a valid 
> expression:
> 
> `ggjf'<C-V>2jI\ <ESC>`
> 
> The file will look now like this:
> 
> ```vim
> let a=[
>       \ 'eins',
>   'zwe\ 'eini',
>   'dre\ 'eini']
> ```
> 
> I think the problem is that typing the `backslash` triggers the indent 
> expression to kick in and the block insert code did not expect that to happen.

Attached is a patch that fixes the issue including a test.

In addition, it fixes a misplaced comment.

Best,
Christian
-- 
"Was sind Tragödien anders als versifizierte Passionen solcher 
Leute, die sich aus den äußern Dingen ich weiß nicht was machen?"
                -- Goethe, Maximen und Reflektionen, Nr. 157

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
From 26ab950985834579740171f4af6f1f924eb85493 Mon Sep 17 00:00:00 2001
From: Christian Brabandt <c...@256bit.org>
Date: Mon, 9 Apr 2018 21:54:46 +0200
Subject: [PATCH] Fix indenting breaking block editing

fixes #2778
---
 src/ops.c                      |  9 ++++++---
 src/testdir/Make_all.mak       |  1 +
 src/testdir/test_blockedit.vim | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 src/testdir/test_blockedit.vim

diff --git a/src/ops.c b/src/ops.c
index 1318e2ce7..19be17935 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -1093,7 +1093,7 @@ do_record(int c)
 
     if (Recording == FALSE)	    /* start recording */
     {
-			/* registers 0-9, a-z and " are allowed */
+	/* registers 0-9, a-z and " are allowed */
 	if (c < 0 || (!ASCII_ISALNUM(c) && c != '"'))
 	    retval = FAIL;
 	else
@@ -2702,6 +2702,7 @@ op_insert(oparg_T *oap, long count1)
     if (oap->block_mode)
     {
 	struct block_def	bd2;
+	int	did_indent = FALSE; 
 
 	/* If indent kicked in, the firstline might have changed
 	 * but only do that, if the indent actually increased. */
@@ -2710,11 +2711,13 @@ op_insert(oparg_T *oap, long count1)
 	{
 	    bd.textcol += ind_post - ind_pre;
 	    bd.start_vcol += ind_post - ind_pre;
+	    did_indent = TRUE;
 	}
 
 	/* The user may have moved the cursor before inserting something, try
-	 * to adjust the block for that. */
-	if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX)
+	 * to adjust the block for that.
+	 * But only do it, if the difference does not come from indent kicking in */
+	if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX && !did_indent)
 	{
 	    if (oap->op_type == OP_INSERT
 		    && oap->start.col
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index b4e4bc328..ddfb7517a 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -72,6 +72,7 @@ NEW_TESTS = test_arabic.res \
 	    test_autocmd.res \
 	    test_autoload.res \
 	    test_backspace_opt.res \
+			test_blockedit.res \
 	    test_breakindent.res \
 	    test_bufwintabinfo.res \
 	    test_cdo.res \
diff --git a/src/testdir/test_blockedit.vim b/src/testdir/test_blockedit.vim
new file mode 100644
index 000000000..4a8d59952
--- /dev/null
+++ b/src/testdir/test_blockedit.vim
@@ -0,0 +1,20 @@
+" Test for block inserting
+"
+" TODO: rewrite test39.in into this new style test
+
+func Test_blockinsert_indent()
+  new
+  filetype plugin indent on
+  setlocal sw=2 et ft=vim
+  call setline(1, ['let a=[', '  ''eins'',', '  ''zwei'',', '  ''drei'']'])
+  call cursor(2, 3)
+  exe "norm! \<c-v>2jI\\ \<esc>"
+  call assert_equal(['let a=[', '      \ ''eins'',', '      \ ''zwei'',', '      \ ''drei'']'],
+        \ getline(1,'$'))
+  " reset to sane state
+  filetype off
+  bwipe!
+endfunc
+
+
+" vim: shiftwidth=2 sts=2 expandtab
-- 
2.16.1

Raspunde prin e-mail lui