GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 01:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1176: wrong indent when expanding multiple lines

Browse Source 
Problem:  wrong indentation of lastline when expanding multiple lines
Solution: Check OPENLINE_FORCE_INDENT flag in open_line() (glepnir)

closes: #16786

Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
glepnir
2025-03-05 21:18:20 +01:00
committed by Christian Brabandt
parent 2e18facede
commit 34a7d82aae
4 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/change.c
View File

@ -1672,7 +1672,8 @@ open_line(
)
&& in_cinkeys(dir == FORWARD
? KEY_OPEN_FORW
: KEY_OPEN_BACK, ' ', linewhite(curwin->w_cursor.lnum));
: KEY_OPEN_BACK, ' ', linewhite(curwin->w_cursor.lnum))
&& !(flags & OPENLINE_FORCE_INDENT);
// Find out if the current line starts with a comment leader.
// This may then be inserted in front of the new line.

12
src/testdir/dumps/Test_pum_with_special_characters_13.dump Normal file
View File

@ -0,0 +1,12 @@
|m+0#ff404010#ffffff0|y| +0#0000000&@72
| +0#ff404010&@7|m|u|l|t|i| +0#0000000&@61
|l+0#ff404010&|i|n|e> +0#0000000&@70
|m+0#0000001#e0e0e08|y|^|@| @1|m|u|l|t|i|^|@|l|i|n|e| @2| +0#4040ff13#ffffff0@54
|m+0#0000001#ffd7ff255|y|^|@| @3|m|u|l|t|i|^|@|l|i|n|e| | +0#4040ff13#ffffff0@54
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@62

9
src/testdir/test_popup.vim
View File

@ -1905,6 +1905,7 @@ func Test_pum_complete_with_special_characters()
return [#{word: "func ()\n\t\nend", abbr: "function ()",}, #{word: "foobar"}, #{word: "你好\n\t\n我好"}]
endfunc
set omnifunc=Omni_test
inoremap <F5> <Cmd>call complete(col('.'), [ "my\n\tmulti\nline", "my\n\t\tmulti\nline" ])<CR>
END
call writefile(lines, 'Xpreviewscript', 'D')
@ -1963,6 +1964,14 @@ func Test_pum_complete_with_special_characters()
call TermWait(buf, 50)
call VerifyScreenDump(buf, 'Test_pum_with_special_characters_12', {})
call term_sendkeys(buf, "\<ESC>ggVGd")
call term_sendkeys(buf, ":filetype indent on\<CR>")
call term_sendkeys(buf, ":set nocompatible autoindent& shiftwidth& tabstop&\<CR>")
call term_sendkeys(buf, ":setlocal ft=lua\<CR>")
call term_sendkeys(buf, "S\<F5>")
call TermWait(buf, 50)
call VerifyScreenDump(buf, 'Test_pum_with_special_characters_13', {})
call StopVimInTerminal(buf)
endfunc

2
src/version.c
View File

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