kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-31 17:13:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1246: code is indented more than necessary (#22006)

Browse Source 
Problem:    Code is indented more than necessary.
Solution:   Use an early return where it makes sense. (Yegappan Lakshmanan,
            closes vim/vim#11887)

142ed77898

Omit function_using_block_scopes(): only affects Vim9 script.

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
zeertzjq 2023-01-26 21:05:34 +08:00 committed by GitHub
parent e02df23b4e
commit 41aa5ce3eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/eval/userfunc.c
View File

@ -760,13 +760,12 @@ static void funccal_unref(funccall_T *fc, ufunc_T *fp, bool force)
static bool func_remove(ufunc_T *fp) static bool func_remove(ufunc_T *fp)
{ {
hashitem_T *hi = hash_find(&func_hashtab, (char *)UF2HIKEY(fp)); hashitem_T *hi = hash_find(&func_hashtab, (char *)UF2HIKEY(fp));
if (HASHITEM_EMPTY(hi)) {
if (!HASHITEM_EMPTY(hi)) { return false;
hash_remove(&func_hashtab, hi);
return true;
} }
return false; hash_remove(&func_hashtab, hi);
return true;
} }
static void func_clear_items(ufunc_T *fp) static void func_clear_items(ufunc_T *fp)

8
src/nvim/undo.c
View File

@ -2985,10 +2985,12 @@ void u_saveline(linenr_T lnum)
/// (this is used externally for crossing a line while in insert mode) /// (this is used externally for crossing a line while in insert mode)
void u_clearline(void) void u_clearline(void)
{ {
if (curbuf->b_u_line_ptr != NULL) { if (curbuf->b_u_line_ptr == NULL) {
XFREE_CLEAR(curbuf->b_u_line_ptr); return;
curbuf->b_u_line_lnum = 0;
} }
XFREE_CLEAR(curbuf->b_u_line_ptr);
curbuf->b_u_line_lnum = 0;
} }
/// Implementation of the "U" command. /// Implementation of the "U" command.

30
src/nvim/window.c
View File

@ -2599,6 +2599,7 @@ static bool close_last_window_tabpage(win_T *win, bool free_buf, tabpage_T *prev
if (!ONE_WINDOW) { if (!ONE_WINDOW) {
return false; return false;
} }
buf_T *old_curbuf = curbuf; buf_T *old_curbuf = curbuf;
Terminal *term = win->w_buffer ? win->w_buffer->terminal : NULL; Terminal *term = win->w_buffer ? win->w_buffer->terminal : NULL;
@ -4144,12 +4145,13 @@ int may_open_tabpage(void)
{ {
int n = (cmdmod.cmod_tab == 0) ? postponed_split_tab : cmdmod.cmod_tab; int n = (cmdmod.cmod_tab == 0) ? postponed_split_tab : cmdmod.cmod_tab;
if (n != 0) { if (n == 0) {
cmdmod.cmod_tab = 0; // reset it to avoid doing it twice return FAIL;
postponed_split_tab = 0;
return win_new_tabpage(n, NULL);
} }
return FAIL;
cmdmod.cmod_tab = 0; // reset it to avoid doing it twice
postponed_split_tab = 0;
return win_new_tabpage(n, NULL);
} }
// Create up to "maxcount" tabpages with empty windows. // Create up to "maxcount" tabpages with empty windows.
@ -4494,11 +4496,12 @@ void goto_tabpage_tp(tabpage_T *tp, bool trigger_enter_autocmds, bool trigger_le
/// @return true if the tab page is valid, false otherwise. /// @return true if the tab page is valid, false otherwise.
bool goto_tabpage_lastused(void) bool goto_tabpage_lastused(void)
{ {
if (valid_tabpage(lastused_tabpage)) { if (!valid_tabpage(lastused_tabpage)) {
goto_tabpage_tp(lastused_tabpage, true, true); return false;
return true;
} }
return false;
goto_tabpage_tp(lastused_tabpage, true, true);
return true;
} }
// Enter window "wp" in tab page "tp". // Enter window "wp" in tab page "tp".
@ -7250,11 +7253,12 @@ static void clear_snapshot(tabpage_T *tp, int idx)
static void clear_snapshot_rec(frame_T *fr) static void clear_snapshot_rec(frame_T *fr)
{ {
if (fr != NULL) { if (fr == NULL) {
clear_snapshot_rec(fr->fr_next); return;
clear_snapshot_rec(fr->fr_child);
xfree(fr);
} }
clear_snapshot_rec(fr->fr_next);
clear_snapshot_rec(fr->fr_child);
xfree(fr);
} }
/// Traverse a snapshot to find the previous curwin. /// Traverse a snapshot to find the previous curwin.