mirror of
https://github.com/neovim/neovim.git
synced 2025-09-28 22:18:33 +00:00
refactor(uncrustify): change rules to better align with the style guide
Add space around arithmetic operators '+' and '-'. Remove space between back-to-back parentheses, i.e. ')(' vs. ') ('. Remove space between '((' or '))' of control statements. Add space between ')' and '{' of control statements. Remove space between function name and '(' on function declaration. Collapse empty blocks between '{' and '}'. Remove newline at the end of the file. Remove newline between 'enum' and '{'. Remove newline between '}' and ')' in a function invocation. Remove newline between '}' and 'while' of 'do' statement.
This commit is contained in:
@@ -3129,7 +3129,7 @@ static void ui_ext_cmdline_show(CmdlineInfo *line)
|
||||
|
||||
assert(chunk.end >= chunk.start);
|
||||
ADD(item, STRING_OBJ(cbuf_to_string((char *)line->cmdbuff + chunk.start,
|
||||
(size_t)(chunk.end-chunk.start))));
|
||||
(size_t)(chunk.end - chunk.start))));
|
||||
ADD(content, ARRAY_OBJ(item));
|
||||
}
|
||||
} else {
|
||||
@@ -3188,7 +3188,7 @@ void cmdline_screen_cleared(void)
|
||||
ui_call_cmdline_block_show(copy_array(cmdline_block));
|
||||
}
|
||||
|
||||
int prev_level = ccline.level-1;
|
||||
int prev_level = ccline.level - 1;
|
||||
CmdlineInfo *line = ccline.prev_ccline;
|
||||
while (prev_level > 0 && line) {
|
||||
if (line->level == prev_level) {
|
||||
@@ -3645,7 +3645,7 @@ static void cursorcmd(void)
|
||||
}
|
||||
|
||||
if (cmdmsg_rl) {
|
||||
msg_row = cmdline_row + (ccline.cmdspos / (Columns - 1));
|
||||
msg_row = cmdline_row + (ccline.cmdspos / (Columns - 1));
|
||||
msg_col = Columns - (ccline.cmdspos % (Columns - 1)) - 1;
|
||||
if (msg_row <= 0) {
|
||||
msg_row = Rows - 1;
|
||||
@@ -4460,7 +4460,7 @@ char_u *sm_gettail(char_u *s, bool eager)
|
||||
#endif
|
||||
) {
|
||||
if (eager) {
|
||||
t = p+1;
|
||||
t = p + 1;
|
||||
} else {
|
||||
had_sep = true;
|
||||
}
|
||||
@@ -5571,7 +5571,7 @@ static int ExpandPackAddDir(char_u *pat, int *num_file, char_u ***file)
|
||||
for (int i = 0; i < ga.ga_len; i++) {
|
||||
char_u *match = ((char_u **)ga.ga_data)[i];
|
||||
s = path_tail(match);
|
||||
memmove(match, s, STRLEN(s)+1);
|
||||
memmove(match, s, STRLEN(s) + 1);
|
||||
}
|
||||
|
||||
if (GA_EMPTY(&ga)) {
|
||||
@@ -6256,7 +6256,7 @@ void ex_history(exarg_T *eap)
|
||||
if (histype1 == HIST_INVALID) {
|
||||
if (STRNICMP(arg, "all", end - arg) == 0) {
|
||||
histype1 = 0;
|
||||
histype2 = HIST_COUNT-1;
|
||||
histype2 = HIST_COUNT - 1;
|
||||
} else {
|
||||
emsg(_(e_trailing));
|
||||
return;
|
||||
@@ -6282,10 +6282,10 @@ void ex_history(exarg_T *eap)
|
||||
j = hisidx1;
|
||||
k = hisidx2;
|
||||
if (j < 0) {
|
||||
j = (-j > hislen) ? 0 : hist[(hislen+j+idx+1) % hislen].hisnum;
|
||||
j = (-j > hislen) ? 0 : hist[(hislen + j + idx + 1) % hislen].hisnum;
|
||||
}
|
||||
if (k < 0) {
|
||||
k = (-k > hislen) ? 0 : hist[(hislen+k+idx+1) % hislen].hisnum;
|
||||
k = (-k > hislen) ? 0 : hist[(hislen + k + idx + 1) % hislen].hisnum;
|
||||
}
|
||||
if (idx >= 0 && j <= k) {
|
||||
for (i = idx + 1; !got_int; ++i) {
|
||||
|
Reference in New Issue
Block a user