mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-23 19:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1145: multi-line completion has wrong indentation for last line (#32625)

Browse Source 
Problem:  When expanding omni completion items with newlines (e.g.
          `then\n\t\nend`), the end statement gets wrong indentation.
Solution: Add OPENLINE_FORCE_INDENT flag to make open_line() use
          second_line_indent directly (glepnir)

closes: vim/vim#16614

5090a1fecb
This commit is contained in:
glepnir
2025-02-25 14:30:21 +08:00
committed by GitHub
parent 095c0876c2
commit c9a2b16c48
5 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/change.c
View File

@@ -1071,6 +1071,7 @@ bool copy_indent(int size, char *src)
/// OPENLINE_KEEPTRAIL keep trailing spaces
/// OPENLINE_MARKFIX adjust mark positions after the line break
/// OPENLINE_COM_LIST format comments with list or 2nd line indent
/// OPENLINE_FORCE_INDENT set indent from second_line_indent, ignore 'autoindent'
///
/// "second_line_indent": indent for after ^^D in Insert mode or if flag
/// OPENLINE_COM_LIST
@@ -1162,9 +1163,11 @@ bool open_line(int dir, int flags, int second_line_indent, bool *did_do_comment)
trunc_line = true;
}
// If 'autoindent' and/or 'smartindent' is set, try to figure out what
// indent to use for the new line.
if (curbuf->b_p_ai || do_si) {
if ((flags & OPENLINE_FORCE_INDENT)) {
newindent = second_line_indent;
} else if (curbuf->b_p_ai || do_si) {
// If 'autoindent' and/or 'smartindent' is set, try to figure out what
// indent to use for the new line.
// count white space on current line
newindent = indent_size_ts(saved_line, curbuf->b_p_ts, curbuf->b_p_vts_array);
if (newindent == 0 && !(flags & OPENLINE_COM_LIST)) {

13
src/nvim/change.h
View File

@@ -7,12 +7,13 @@
/// flags for open_line()
enum {
OPENLINE_DELSPACES = 0x01, ///< delete spaces after cursor
OPENLINE_DO_COM = 0x02, ///< format comments
OPENLINE_KEEPTRAIL = 0x04, ///< keep trailing spaces
OPENLINE_MARKFIX = 0x08, ///< fix mark positions
OPENLINE_COM_LIST = 0x10, ///< format comments with list/2nd line indent
OPENLINE_FORMAT = 0x20, ///< formatting long comment
OPENLINE_DELSPACES = 0x01, ///< delete spaces after cursor
OPENLINE_DO_COM = 0x02, ///< format comments
OPENLINE_KEEPTRAIL = 0x04, ///< keep trailing spaces
OPENLINE_MARKFIX = 0x08, ///< fix mark positions
OPENLINE_COM_LIST = 0x10, ///< format comments with list/2nd line indent
OPENLINE_FORMAT = 0x20, ///< formatting long comment
OPENLINE_FORCE_INDENT = 0x40, ///< use second_line_indent without indent logic
};
#ifdef INCLUDE_GENERATED_DECLARATIONS

3
src/nvim/insexpand.c
View File

@@ -3833,6 +3833,7 @@ static void ins_compl_expand_multiple(char *str)
{
char *start = str;
char *curr = str;
int base_indent = get_indent();
while (*curr != NUL) {
if (*curr == '\n') {
// Insert the text chunk before newline
@@ -3841,7 +3842,7 @@ static void ins_compl_expand_multiple(char *str)
}
// Handle newline
open_line(FORWARD, OPENLINE_KEEPTRAIL, false, NULL);
open_line(FORWARD, OPENLINE_KEEPTRAIL | OPENLINE_FORCE_INDENT, base_indent, NULL);
start = curr + 1;
}
curr++;