IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

globals: can_si_back is bool

Browse Source
This commit is contained in:
Jan Edmund Lazo 2018-08-06 11:29:20 -04:00
parent 6bff0f7b60
commit 5309ad29d4
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/edit.c
View File

@ -4467,9 +4467,10 @@ static int ins_complete(int c, bool enable_pum)
did_ai = FALSE; did_ai = FALSE;
did_si = FALSE; did_si = FALSE;
can_si = FALSE; can_si = FALSE;
can_si_back = FALSE; can_si_back = false;
if (stop_arrow() == FAIL) if (stop_arrow() == FAIL) {
return FAIL; return FAIL;
}
line = ml_get(curwin->w_cursor.lnum); line = ml_get(curwin->w_cursor.lnum);
curs_col = curwin->w_cursor.col; curs_col = curwin->w_cursor.col;
@ -5272,7 +5273,7 @@ insertchar (
did_ai = FALSE; did_ai = FALSE;
did_si = FALSE; did_si = FALSE;
can_si = FALSE; can_si = FALSE;
can_si_back = FALSE; can_si_back = false;
// If there's any pending input, grab up to INPUT_BUFLEN at once. // If there's any pending input, grab up to INPUT_BUFLEN at once.
// This speeds up normal text input considerably. // This speeds up normal text input considerably.
@ -5661,7 +5662,7 @@ internal_format (
did_ai = FALSE; did_ai = FALSE;
did_si = FALSE; did_si = FALSE;
can_si = FALSE; can_si = FALSE;
can_si_back = FALSE; can_si_back = false;
line_breakcheck(); line_breakcheck();
} }
@ -6083,7 +6084,7 @@ stop_insert (
did_ai = FALSE; did_ai = FALSE;
did_si = FALSE; did_si = FALSE;
can_si = FALSE; can_si = FALSE;
can_si_back = FALSE; can_si_back = false;
/* Set '[ and '] to the inserted text. When end_insert_pos is NULL we are /* Set '[ and '] to the inserted text. When end_insert_pos is NULL we are
* now in a different buffer. */ * now in a different buffer. */
@ -7467,7 +7468,7 @@ static void ins_shift(int c, int lastc)
did_ai = FALSE; did_ai = FALSE;
did_si = FALSE; did_si = FALSE;
can_si = FALSE; can_si = FALSE;
can_si_back = FALSE; can_si_back = false;
can_cindent = false; // no cindenting after ^D or ^T can_cindent = false; // no cindenting after ^D or ^T
} }
@ -7491,7 +7492,7 @@ static void ins_del(void)
did_ai = FALSE; did_ai = FALSE;
did_si = FALSE; did_si = FALSE;
can_si = FALSE; can_si = FALSE;
can_si_back = FALSE; can_si_back = false;
AppendCharToRedobuff(K_DEL); AppendCharToRedobuff(K_DEL);
} }

2
src/nvim/globals.h
View File

@ -644,7 +644,7 @@ EXTERN int can_si INIT(= FALSE);
* This flag is set after an "O" command. If the next typed character is a '{' * This flag is set after an "O" command. If the next typed character is a '{'
* one indent will be removed. * one indent will be removed.
*/ */
EXTERN int can_si_back INIT(= FALSE); EXTERN bool can_si_back INIT(= false);
// w_cursor before formatting text. // w_cursor before formatting text.
EXTERN pos_T saved_cursor INIT(= INIT_POS_T(0, 0, 0)); EXTERN pos_T saved_cursor INIT(= INIT_POS_T(0, 0, 0));

7
src/nvim/misc1.c
View File

@ -320,10 +320,11 @@ open_line (
} }
} }
p = skipwhite(ptr); p = skipwhite(ptr);
if (*p == '}') /* if line starts with '}': do indent */ if (*p == '}') { // if line starts with '}': do indent
did_si = TRUE; did_si = TRUE;
else /* can delete indent when '{' typed */ } else { // can delete indent when '{' typed
can_si_back = TRUE; can_si_back = true;
}
} }
curwin->w_cursor = old_cursor; curwin->w_cursor = old_cursor;
} }